From 8d56d70e0f32e293bd6693331ceb1e185ab35ca5 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Sun, 30 Oct 2005 09:45:52 +0000 Subject: [PATCH] Move ExitGame into GameLoop.h. --- stepmania/PBProject/SMMain.mm | 2 +- stepmania/src/GameLoop.h | 1 + stepmania/src/ScreenExit.cpp | 2 +- stepmania/src/StepMania.h | 1 - stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp | 1 + stepmania/src/arch/ArchHooks/ArchHooks_darwin.cpp | 1 + stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp | 1 + 7 files changed, 6 insertions(+), 3 deletions(-) diff --git a/stepmania/PBProject/SMMain.mm b/stepmania/PBProject/SMMain.mm index d8d595afa4..dc740f65f6 100755 --- a/stepmania/PBProject/SMMain.mm +++ b/stepmania/PBProject/SMMain.mm @@ -1,8 +1,8 @@ #import #include "ProductInfo.h" +#include "GameLoop.h" // XXX remove these -extern void ExitGame(); extern "C" { extern int SDL_main(int, char **); diff --git a/stepmania/src/GameLoop.h b/stepmania/src/GameLoop.h index b34072c272..884b4fece1 100644 --- a/stepmania/src/GameLoop.h +++ b/stepmania/src/GameLoop.h @@ -3,6 +3,7 @@ #ifndef GAME_LOOP_H #define GAME_LOOP_H +void ExitGame(); void GameLoop(); void StartConcurrentRendering(); void FinishConcurrentRendering(); diff --git a/stepmania/src/ScreenExit.cpp b/stepmania/src/ScreenExit.cpp index ba35392288..0c2f97ea45 100644 --- a/stepmania/src/ScreenExit.cpp +++ b/stepmania/src/ScreenExit.cpp @@ -5,7 +5,7 @@ #include "GameSoundManager.h" #include "RageSound.h" #include "RageLog.h" -#include "StepMania.h" +#include "GameLoop.h" /* This screen used to wait for sounds to stop. However, implementing GetPlayingSounds() * is annoying, because sounds might be deleted at any time; they aren't ours to have diff --git a/stepmania/src/StepMania.h b/stepmania/src/StepMania.h index bf23dce310..9830765289 100644 --- a/stepmania/src/StepMania.h +++ b/stepmania/src/StepMania.h @@ -11,7 +11,6 @@ int main( int argc, char* argv[] ); #endif void ApplyGraphicOptions(); void NORETURN HandleException( CString error ); -void ExitGame(); void ResetGame(); void ChangeCurrentGame( const Game* g ); void FocusChanged( bool bHasFocus ); diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp b/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp index 59ca654c2c..20e8e0df34 100644 --- a/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp +++ b/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp @@ -3,6 +3,7 @@ #include "RageThreads.h" #include "ArchHooks_Unix.h" #include "StepMania.h" +#include "GameLoop.h" #include "archutils/Unix/SignalHandler.h" #include "archutils/Unix/GetSysInfo.h" #include "archutils/Unix/LinuxThreadHelpers.h" diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_darwin.cpp b/stepmania/src/arch/ArchHooks/ArchHooks_darwin.cpp index 6cb59e5cc9..a6714cac47 100644 --- a/stepmania/src/arch/ArchHooks/ArchHooks_darwin.cpp +++ b/stepmania/src/arch/ArchHooks/ArchHooks_darwin.cpp @@ -8,6 +8,7 @@ #include "archutils/Unix/CrashHandler.h" #include "archutils/Unix/SignalHandler.h" #include "StepMania.h" +#include "GameLoop.h" #define Random Random_ // work around namespace pollution #include #undef Random_ diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp index 94415714e1..ba558a551b 100644 --- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp +++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp @@ -4,6 +4,7 @@ #include "RageLog.h" #include "RageDisplay.h" // for REFRESH_DEFAULT #include "StepMania.h" +#include "GameLoop.h" #if defined(UNIX) #include