From d439765145486893dd0d8ff74c69224310864ab4 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 10 Dec 2005 18:42:55 +0000 Subject: [PATCH] implement UserQuit to eliminate bad GameLoop.h dependency --- stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp | 9 +++++++-- stepmania/src/arch/ArchHooks/ArchHooks_Unix.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp b/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp index 030eeb6f61..2d8b82cd96 100644 --- a/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp +++ b/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp @@ -2,7 +2,6 @@ #include "RageLog.h" #include "RageThreads.h" #include "ArchHooks_Unix.h" -#include "GameLoop.h" #include "archutils/Unix/SignalHandler.h" #include "archutils/Unix/GetSysInfo.h" #include "archutils/Unix/LinuxThreadHelpers.h" @@ -16,6 +15,12 @@ #include "archutils/Unix/CrashHandler.h" #endif +static bool g_bExitingGame = false; + +bool ArchHooks_Unix::UserQuit() +{ + return g_bExitingGame; +} static bool IsFatalSignal( int signal ) { @@ -36,7 +41,7 @@ static void DoCleanShutdown( int signal, siginfo_t *si, const ucontext_t *uc ) return; /* ^C. */ - ExitGame(); + g_bExitingGame = true; } #if defined(CRASH_HANDLER) diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_Unix.h b/stepmania/src/arch/ArchHooks/ArchHooks_Unix.h index a6930ad5ef..890cb21985 100644 --- a/stepmania/src/arch/ArchHooks/ArchHooks_Unix.h +++ b/stepmania/src/arch/ArchHooks/ArchHooks_Unix.h @@ -12,6 +12,7 @@ public: int64_t GetMicrosecondsSinceStart(); void MountInitialFilesystems( const CString &sDirOfExecutable ); + bool UserQuit(); }; #ifdef ARCH_HOOKS