Use ArchHooks::SetUserQuit()

This commit is contained in:
Steve Checkoway
2005-12-17 13:03:04 +00:00
parent 2ab8fcd709
commit ee07c1d20d
4 changed files with 8 additions and 8 deletions
+2 -2
View File
@@ -4,7 +4,7 @@
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#include "ProductInfo.h" #include "ProductInfo.h"
#include "GameLoop.h" #include "arch/ArchHooks/ArchHooks.h"
// XXX remove this // XXX remove this
extern "C" extern "C"
@@ -29,7 +29,7 @@ extern "C"
// Invoked from the Quit menu item. // Invoked from the Quit menu item.
- (void)terminate:(id)sender - (void)terminate:(id)sender
{ {
ExitGame(); ArchHooks::SetUserQuit();
} }
- (void)sendEvent:(NSEvent *)event - (void)sendEvent:(NSEvent *)event
+3 -3
View File
@@ -5,7 +5,7 @@
#include "GameSoundManager.h" #include "GameSoundManager.h"
#include "RageSound.h" #include "RageSound.h"
#include "RageLog.h" #include "RageLog.h"
#include "GameLoop.h" #include "arch/ArchHooks/ArchHooks.h"
/* This screen used to wait for sounds to stop. However, implementing GetPlayingSounds() /* 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 * is annoying, because sounds might be deleted at any time; they aren't ours to have
@@ -20,7 +20,7 @@ void ScreenExit::Init()
{ {
m_Exited = false; m_Exited = false;
ExitGame(); ArchHooks::SetUserQuit();
/* It'd be better for any previous screen playing music to fade it out as it fades /* It'd be better for any previous screen playing music to fade it out as it fades
* out the screen. XXX: Check to see if it's fading out; if it'll stop playing in * out the screen. XXX: Check to see if it's fading out; if it'll stop playing in
@@ -58,7 +58,7 @@ void ScreenExit::Update( float fDelta )
{ {
m_Exited = true; m_Exited = true;
LOG->Trace("ScreenExit: shutting down"); LOG->Trace("ScreenExit: shutting down");
ExitGame(); ArchHooks::SetUserQuit();
} }
#endif #endif
} }
+1 -1
View File
@@ -1299,7 +1299,7 @@ bool HandleGlobalInputs( const InputEventPlus &input )
INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_LALT)) ) INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_LALT)) )
{ {
// pressed Alt+F4 // pressed Alt+F4
ExitGame(); ArchHooks::SetUserQuit();
return true; return true;
} }
} }
@@ -4,7 +4,7 @@
#include "RageLog.h" #include "RageLog.h"
#include "RageDisplay.h" // for REFRESH_DEFAULT #include "RageDisplay.h" // for REFRESH_DEFAULT
#include "StepMania.h" #include "StepMania.h"
#include "GameLoop.h" #include "arch/ArchHooks/ArchHooks.h"
#include "DisplayResolutions.h" #include "DisplayResolutions.h"
#if defined(MACOSX) #if defined(MACOSX)
@@ -220,7 +220,7 @@ void LowLevelWindow_SDL::Update()
break; break;
case SDL_QUIT: case SDL_QUIT:
LOG->Trace("SDL_QUIT: shutting down"); LOG->Trace("SDL_QUIT: shutting down");
ExitGame(); ArchHooks::SetUserQuit();
break; break;
} }
} }