From 9643a3eea32cc1c86e215bafaab029f3f714e836 Mon Sep 17 00:00:00 2001 From: KiritoDv Date: Sun, 15 Oct 2023 23:17:37 -0600 Subject: [PATCH] Fixed even more stupid msvc compilation issues --- src/game/level_update.h | 7 +++++++ src/port/Enhancements/game-interactor/GameInteractor.cpp | 2 -- src/port/Game.cpp | 3 +-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/game/level_update.h b/src/game/level_update.h index 6693b295..2ed4850d 100644 --- a/src/game/level_update.h +++ b/src/game/level_update.h @@ -5,6 +5,9 @@ #include "types.h" +#ifdef __cplusplus +extern "C" { +#endif #define TIMER_CONTROL_SHOW 0 #define TIMER_CONTROL_START 1 @@ -128,4 +131,8 @@ s32 lvl_set_current_level(UNUSED s16 arg0, s32 levelNum); s32 lvl_play_the_end_screen_sound(UNUSED s16 arg0, UNUSED s32 arg1); void basic_update(UNUSED s16 *arg); +#ifdef __cplusplus +} +#endif + #endif // LEVEL_UPDATE_H diff --git a/src/port/Enhancements/game-interactor/GameInteractor.cpp b/src/port/Enhancements/game-interactor/GameInteractor.cpp index 93854f3b..f237c091 100644 --- a/src/port/Enhancements/game-interactor/GameInteractor.cpp +++ b/src/port/Enhancements/game-interactor/GameInteractor.cpp @@ -2,8 +2,6 @@ #include "game/level_update.h" -extern int16_t sCurrPlayMode; - // Taken from game/level_update.c #define PLAY_MODE_NORMAL 0 #define PLAY_MODE_PAUSED 2 diff --git a/src/port/Game.cpp b/src/port/Game.cpp index db4fd50a..be7197fa 100644 --- a/src/port/Game.cpp +++ b/src/port/Game.cpp @@ -7,9 +7,8 @@ extern "C" { #include "audio/external.h" #include "game/game_init.h" #include "sm64.h" -} - float gInterpolationStep = 0.0f; +} void alloc_pool() { static u64 pool[1024 * 1024 * 4];