[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src start.cpp,1.8,1.9

Chris Apers chrilith at users.sourceforge.net
Tue Nov 9 03:47:02 CET 2004


Update of /cvsroot/scummvm/scummvm/backends/PalmOS/Src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14293

Modified Files:
	start.cpp 
Log Message:

- 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

Index: start.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/start.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- start.cpp	12 Sep 2004 13:48:20 -0000	1.8
+++ start.cpp	9 Nov 2004 11:46:50 -0000	1.9
@@ -23,12 +23,13 @@
 #include <PalmOS.h>
 #include <SonyClie.h>
 
+#include "palmdefs.h"
 #include "start.h"
 #include "games.h"
 #include "globals.h"
+#include "modules.h"
 
 #include "forms.h"
-
 /***********************************************************************
  *
  *	Internal Structures
@@ -46,6 +47,7 @@
 
 Boolean bDirectMode = false;
 Boolean bStartScumm = false;
+Boolean bLaunched	= false;
 
 /***********************************************************************
  *
@@ -198,10 +200,6 @@
 				FrmSetEventHandler(frmP, MiscFormHandleEvent);
 				break;
 
-			case SystemInfoForm:
-				FrmSetEventHandler(frmP, SystemInfoFormHandleEvent);
-				break;
-
 			case CardSlotForm:
 				FrmSetEventHandler(frmP, CardSlotFormHandleEvent);
 				break;
@@ -210,6 +208,10 @@
 				FrmSetEventHandler(frmP, MusicFormHandleEvent);
 				break;
 
+			case InfoForm:
+				FrmSetEventHandler(frmP, InfoFormHandleEvent);
+				break;
+
 			default:
 //				ErrFatalDisplay("Invalid Form Load Event");
 				break;
@@ -347,7 +349,12 @@
 			AppLaunchCmdNotify(launchFlags, (SysNotifyParamType *) cmdPBP);
 			break;
 
-		case sysAppLaunchCmdNormalLaunch:
+
+		case sysAppLaunchCustomDeleteEngine:
+			ModDelete();
+			break;
+
+		case sysAppLaunchCmdNormalLaunch:	
 			error = AppStart();
 			if (error) 
 				goto end;
@@ -390,13 +397,4 @@
 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





More information about the Scummvm-git-logs mailing list