From 5fd488b7a0e39dadb93cc8c7875ed6d28abfab01 Mon Sep 17 00:00:00 2001 From: Chris Apers Date: Tue, 9 Nov 2004 11:46:50 +0000 Subject: - operator new moved to extend.h - bLauched var : to know if we have launched an engine - new info panel - sysAppLaunchCustomDeleteEngine : if the back to launcher option is disabled svn-id: r15766 --- backends/PalmOS/Src/start.cpp | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) (limited to 'backends/PalmOS/Src') diff --git a/backends/PalmOS/Src/start.cpp b/backends/PalmOS/Src/start.cpp index 9245d97404..a617c59fe7 100644 --- a/backends/PalmOS/Src/start.cpp +++ b/backends/PalmOS/Src/start.cpp @@ -23,12 +23,13 @@ #include #include +#include "palmdefs.h" #include "start.h" #include "games.h" #include "globals.h" +#include "modules.h" #include "forms.h" - /*********************************************************************** * * Internal Structures @@ -46,6 +47,7 @@ GlobalsDataPtr gVars; Boolean bDirectMode = false; Boolean bStartScumm = false; +Boolean bLaunched = false; /*********************************************************************** * @@ -198,10 +200,6 @@ static Boolean AppHandleEvent(EventPtr eventP) FrmSetEventHandler(frmP, MiscFormHandleEvent); break; - case SystemInfoForm: - FrmSetEventHandler(frmP, SystemInfoFormHandleEvent); - break; - case CardSlotForm: FrmSetEventHandler(frmP, CardSlotFormHandleEvent); break; @@ -210,6 +208,10 @@ static Boolean AppHandleEvent(EventPtr eventP) FrmSetEventHandler(frmP, MusicFormHandleEvent); break; + case InfoForm: + FrmSetEventHandler(frmP, InfoFormHandleEvent); + break; + default: // ErrFatalDisplay("Invalid Form Load Event"); break; @@ -347,7 +349,12 @@ static UInt32 ScummVMPalmMain(UInt16 cmd, MemPtr cmdPBP, UInt16 launchFlags) AppLaunchCmdNotify(launchFlags, (SysNotifyParamType *) cmdPBP); break; - case sysAppLaunchCmdNormalLaunch: + + case sysAppLaunchCustomDeleteEngine: + ModDelete(); + break; + + case sysAppLaunchCmdNormalLaunch: error = AppStart(); if (error) goto end; @@ -390,13 +397,4 @@ end: UInt32 PilotMain( UInt16 cmd, MemPtr cmdPBP, UInt16 launchFlags) { return ScummVMPalmMain(cmd, cmdPBP, launchFlags); -} - -// This is now required since ScummEngine are now very big :) -#include "MemGlue.h" - -void *operator new(UInt32 size) { - void *ptr = MemGluePtrNew(size); - MemSet(ptr, 0, size); - return ptr; -} +} \ No newline at end of file -- cgit v1.2.3