diff options
| author | Joost Peters | 2006-01-01 18:25:49 +0000 |
|---|---|---|
| committer | Joost Peters | 2006-01-01 18:25:49 +0000 |
| commit | 1ef2e300b27aa2a9a5b1d2d4f316782b410c5c99 (patch) | |
| tree | 69246948bc6a25fefb0803e9b0e30052dcd48edf /backends/psp | |
| parent | 58f64c5ef5506194ec913203b84f3fc390c5a9f6 (diff) | |
| download | scummvm-rg350-1ef2e300b27aa2a9a5b1d2d4f316782b410c5c99.tar.gz scummvm-rg350-1ef2e300b27aa2a9a5b1d2d4f316782b410c5c99.tar.bz2 scummvm-rg350-1ef2e300b27aa2a9a5b1d2d4f316782b410c5c99.zip | |
Get rid of an old hack
svn-id: r19886
Diffstat (limited to 'backends/psp')
| -rw-r--r-- | backends/psp/osys_psp.cpp | 10 | ||||
| -rw-r--r-- | backends/psp/osys_psp_gu.cpp | 10 | ||||
| -rw-r--r-- | backends/psp/psp_main.cpp | 5 |
3 files changed, 1 insertions, 24 deletions
diff --git a/backends/psp/osys_psp.cpp b/backends/psp/osys_psp.cpp index a5c01b7efd..f68de5d2bf 100644 --- a/backends/psp/osys_psp.cpp +++ b/backends/psp/osys_psp.cpp @@ -37,7 +37,6 @@ #define SCREEN_WIDTH 480 #define SCREEN_HEIGHT 272 -extern bool g_quit; unsigned short *DrawBuffer = (unsigned short *)0x44044000; unsigned short *DisplayBuffer = (unsigned short *)0x44000000; @@ -407,15 +406,6 @@ bool OSystem_PSP::pollEvent(Event &event) { */ uint32 buttonsChanged = pad.Buttons ^ _prevButtons; - /* check if user exited using the Home button */ - if (g_quit) { - g_quit = false; //set g_quit back to false or else pollEvent keeps looping.. - - warning("g_quit signal caught, sending EVENT_QUIT to VM engine"); - event.type = OSystem::EVENT_QUIT; - return true; - } - if (buttonsChanged & (PSP_CTRL_CROSS | PSP_CTRL_CIRCLE | PSP_CTRL_LTRIGGER | PSP_CTRL_RTRIGGER | PSP_CTRL_START | PSP_CTRL_SELECT | PSP_CTRL_SQUARE)) { if (buttonsChanged & PSP_CTRL_CROSS) { event.type = (pad.Buttons & PSP_CTRL_CROSS) ? OSystem::EVENT_LBUTTONDOWN : OSystem::EVENT_LBUTTONUP; diff --git a/backends/psp/osys_psp_gu.cpp b/backends/psp/osys_psp_gu.cpp index 74e26087dc..c18000b852 100644 --- a/backends/psp/osys_psp_gu.cpp +++ b/backends/psp/osys_psp_gu.cpp @@ -65,7 +65,6 @@ unsigned int kbd_code_cl[] = {SDLK_EXCLAIM, SDLK_AT, SDLK_HASH, SDLK_DOLLAR, 3 #define CAPS_LOCK (1 << 0) #define SYMBOLS (1 << 1) -extern bool g_quit; OSystem_PSP_GU::OSystem_PSP_GU() { //sceKernelDcacheWritebackAll(); @@ -484,15 +483,6 @@ bool OSystem_PSP_GU::pollEvent(Event &event) { uint32 buttonsChanged = pad.Buttons ^ _prevButtons; - /* check if user exited using the Home button */ - if (g_quit) { - g_quit = false; //set g_quit back to false or else pollEvent keeps looping.. - - warning("g_quit signal caught, sending EVENT_QUIT to VM engine"); - event.type = OSystem::EVENT_QUIT; - return true; - } - if ((buttonsChanged & PSP_CTRL_SELECT) || (pad.Buttons & PSP_CTRL_SELECT)) { if( !(pad.Buttons & PSP_CTRL_SELECT) ) diff --git a/backends/psp/psp_main.cpp b/backends/psp/psp_main.cpp index d5f584a6bf..f8e59d4abf 100644 --- a/backends/psp/psp_main.cpp +++ b/backends/psp/psp_main.cpp @@ -62,8 +62,6 @@ PSP_MODULE_INFO("SCUMMVM-PSP", 0, 1, 1); PSP_MAIN_THREAD_ATTR(THREAD_ATTR_USER | THREAD_ATTR_VFPU); #endif -/* global quit flag, this is used to let the VM engine shutdown properly */ -bool g_quit = false; #ifndef USERSPACE_ONLY void MyExceptionHandler(PspDebugRegBlock *regs) { @@ -94,8 +92,7 @@ void loaderInit() { /* Exit callback */ SceKernelCallbackFunction exit_callback(int /*arg1*/, int /*arg2*/, void * /*common*/) { - g_quit = true; //Set g_quit so our backend can shutdown the VM - sceKernelDelayThread(1000); + sceKernelExitGame(); return 0; } |