diff --git a/platform.h b/platform.h index c4e5609a..bc42cc5e 100644 --- a/platform.h +++ b/platform.h @@ -33,7 +33,11 @@ /// ---------- #if (__cplusplus < 201103L) - #define nullptr 0 + #ifdef __LARGE__ + #define nullptr 0UL + #else + #define nullptr 0U + #endif #endif // Message-less static_assert() wasn't available until C++17 diff --git a/th01/fuuin_01.cpp b/th01/fuuin_01.cpp index c428c630..a5c6575a 100644 --- a/th01/fuuin_01.cpp +++ b/th01/fuuin_01.cpp @@ -96,5 +96,5 @@ void main(int argc, const char *argv[]) game_init(); end_and_verdict_and_regist_animate(); game_switch_binary(); - execl(BINARY_OP, BINARY_OP, nullptr, nullptr); + execl(BINARY_OP, BINARY_OP, nullptr); } diff --git a/th01/main/hud/menu.cpp b/th01/main/hud/menu.cpp index a66c4c2b..069f8910 100644 --- a/th01/main/hud/menu.cpp +++ b/th01/main/hud/menu.cpp @@ -240,7 +240,7 @@ bool16 continue_menu(void) resident->snd_need_init = false; game_switch_binary(); resident->point_value = 0; - execl(BINARY_MAIN_CAPS, BINARY_MAIN_CAPS, nullptr, nullptr); + execl(BINARY_MAIN_CAPS, BINARY_MAIN_CAPS, nullptr); } else { no_continue: player_is_hit = false; diff --git a/th01/main_01.cpp b/th01/main_01.cpp index 8fc71db2..986f0a01 100644 --- a/th01/main_01.cpp +++ b/th01/main_01.cpp @@ -891,7 +891,7 @@ int main(void) } frame_delay(120); game_switch_binary(); - execl(BINARY_END, BINARY_END, nullptr, nullptr); + execl(BINARY_END, BINARY_END, nullptr); } // ZUN quirk: Placing this after the [game_cleared] branch robs @@ -956,7 +956,7 @@ int main(void) mdrv2_bgm_fade_out_nonblock(); resident->bombs = bombs; game_switch_binary(); - execl(BINARY_MAIN, BINARY_MAIN, nullptr, nullptr); + execl(BINARY_MAIN, BINARY_MAIN, nullptr); } orb_in_portal = false; if(boss_id == BID_NONE) { @@ -1002,6 +1002,6 @@ op: game_switch_binary(); key_end(); arc_free(); - execl(BINARY_OP, BINARY_OP, nullptr, nullptr); + execl(BINARY_OP, BINARY_OP, nullptr); return 0; }