mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-31 15:47:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into feature/autosave

Browse Source 
# Conflicts:
#	src/dusk/imgui/ImGuiConsole.cpp
This commit is contained in:
MelonSpeedruns
2026-04-30 14:51:17 -04:00
parent d7dced7ddf 9b6b344ecf
commit 5c4bb8d33d
99 changed files with 3280 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_save.cpp
+6 -2
View File
@@ -16,6 +16,8 @@
#include <cstdio>
#include <cstring>
#include "dusk/version.hpp"
#if PLATFORM_WII || PLATFORM_SHIELD
#include <revolution/sc.h>
#include <revolution/wpad.h>
@@ -1035,7 +1037,7 @@ void dSv_player_config_c::init() {
mAttentionType = 0;
mVibration = 1;
#if DEBUG
#if DEBUG // DUSK VERSION SUPPORT: This field isn't used, so we can ignore it.
mLanguage = SCGetLanguage();
#elif REGION_PAL || VERSION >= VERSION_WII_USA_R2
mLanguage = OSGetLanguage();
@@ -1080,7 +1082,8 @@ void dSv_player_config_c::setVibration(u8 i_status) {
}
u8 dSv_player_config_c::getPalLanguage() const {
#if VERSION == VERSION_GCN_PAL
#if TARGET_PC || VERSION == VERSION_GCN_PAL
IF_DUSK_BLOCK(dusk::version::getGameVersion() == dusk::version::GameVersion::GcnPal)
switch (OSGetLanguage()) {
case 0:
return LANGUAGE_ENGLISH;
@@ -1093,6 +1096,7 @@ u8 dSv_player_config_c::getPalLanguage() const {
case 4:
return LANGUAGE_ITALIAN;
}
IF_DUSK_BLOCK_END
#elif VERSION >= VERSION_WII_USA_R0
switch (SCGetLanguage()) {
case 1: