diff options
| author | Max Roncace <me@caseif.net> | 2025-12-11 18:34:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-11 15:34:16 -0800 |
| commit | 8ad2d661a2c33a3c3e60d2a7089c9f5463ae2ab0 (patch) | |
| tree | e60bbe0b605fa455fc8bdabb8b38dccf5ff0e629 /src/d/d_save.cpp | |
| parent | ae4ad9f47779db56713bca41f6535bea31ec5490 (diff) | |
Clean up conditional compilation a bit (#2943)
Diffstat (limited to 'src/d/d_save.cpp')
| -rw-r--r-- | src/d/d_save.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp index f2fa9866ce..bc82bb05d1 100644 --- a/src/d/d_save.cpp +++ b/src/d/d_save.cpp @@ -709,7 +709,7 @@ void dSv_player_item_record_c::init() { } void dSv_player_item_record_c::setBombNum(u8 i_bagIdx, u8 i_bombNum) { -#if VERSION == VERSION_SHIELD_DEBUG +#if DEBUG if (i_bagIdx == 8) { return; } @@ -989,10 +989,10 @@ void dSv_player_config_c::init() { mAttentionType = 0; mVibration = 1; -#if VERSION == VERSION_GCN_PAL - mLanguage = OSGetLanguage(); -#elif VERSION == VERSION_SHIELD_DEBUG +#if DEBUG mLanguage = SCGetLanguage(); +#elif REGION_PAL || VERSION >= VERSION_WII_USA_R2 + mLanguage = OSGetLanguage(); #else mLanguage = 0; #endif @@ -1043,7 +1043,7 @@ u8 dSv_player_config_c::getPalLanguage() const { case 4: return LANGAUGE_ITALIAN; } -#elif VERSION == VERSION_SHIELD_DEBUG +#elif VERSION >= VERSION_WII_USA_R0 switch (SCGetLanguage()) { case 1: return 0; @@ -1298,7 +1298,7 @@ BOOL dSv_danBit_c::isItem(int i_no) const { return mItem[i_no >> 5] & 1 << (i_no & 0x1F) ? TRUE : FALSE; } -#if VERSION == VERSION_SHIELD_DEBUG +#if DEBUG static void dummyString() { DEAD_STRING("i_no < 6"); } @@ -1449,7 +1449,7 @@ void dSv_info_c::init() { initZone(); mTmp.init(); -#if VERSION == VERSION_SHIELD_DEBUG +#if DEBUG unk_0x0 = 0; unk_0x1 = 0; #endif |