[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src app.cpp,1.10,1.10.2.1 compile.h,1.2,1.2.2.1 launch.cpp,1.12,1.12.2.1

[Chris Apers]

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

Modified Files:
      Tag: branch-0-7-0
	app.cpp compile.h launch.cpp 
Log Message:
- CLeanup
- More comilation option

Index: app.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/app.cpp,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- app.cpp	10 Dec 2004 16:11:16 -0000	1.10
+++ app.cpp	20 Dec 2004 19:04:28 -0000	1.10.2.1
@@ -274,9 +274,11 @@
 	Boolean color;
 	Err error;
 
+#ifndef _DEBUG_ENGINE
 	// delete old databases
  	ModDelete();
- 
+#endif
+
 	// allocate global variables space
 	dataSize = sizeof(GlobalsDataType);
 	gVars = (GlobalsDataType *)MemPtrNew(dataSize);

Index: compile.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/compile.h,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- compile.h	9 Nov 2004 11:56:45 -0000	1.2
+++ compile.h	20 Dec 2004 19:04:29 -0000	1.2.2.1
@@ -1,11 +1,11 @@
 #ifndef __COMPILE_H__
 #define __COMPILE_H__
 
-// Engines
+// Engines, please define only one engine at a time
 #define DISABLE_SCUMM
-#define DISABLE_SIMON
+//#define DISABLE_SIMON
 #define DISABLE_SKY
-//#define DISABLE_SWORD1
+#define DISABLE_SWORD1
 #define DISABLE_SWORD2
 #define DISABLE_QUEEN
 #define DISABLE_SAGA
@@ -13,11 +13,15 @@
 #define DISABLE_AWE
 
 // PalmOS
+#define __PALM_OS__
 //#define DISABLE_LIGHTSPEED
 //#define DISABLE_TAPWAVE
+//#define DISABLE_ARM
 //#define REDUCE_MEMORY_USAGE
 
+//#define DEBUG_ARM
 //#define _DEBUG
 //#define _DEBUG_STDIO
+//#define _DEBUG_ENGINE
 
 #endif

Index: launch.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/launch.cpp,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -d -r1.12 -r1.12.2.1
--- launch.cpp	10 Dec 2004 15:28:41 -0000	1.12
+++ launch.cpp	20 Dec 2004 19:04:29 -0000	1.12.2.1
@@ -46,10 +46,7 @@
 	LocalID del_dbID;
 
 	DELET_FILE("Glbs::Common");
-	DELET_FILE("Glbs::Scumm");
-	DELET_FILE("Glbs::Simon");
-	DELET_FILE("Glbs::Queen");
-	DELET_FILE("Glbs::Sword1");
+	DELET_FILE("Glbs::Engine");
 	DELET_FILE("ScummVM-Engine");
 }
 
@@ -84,21 +81,24 @@
 		{ "scumm" },
 		{ "simon" },
 		{ "queen" },
-		{ "sword1" }
+		{ "sword1" },
+		{ "sky" }
 	};
 	
 	char filename[256];
 	UInt16 dum1;
 	UInt32 dum2;
 	FileRef file;
-	Err e;
 	FormPtr ofmP, frmP;
+	Err e = errNone;
 
 	ofmP = FrmGetActiveForm();
 	frmP = FrmInitForm(ImportForm);
 	FrmSetActiveForm(frmP);
 	FrmDrawForm(frmP);
 
+#ifndef _DEBUG_ENGINE
+	// In debug mode, the engine files are directly uploaded to the simulator
 	BUILD_FILE(files[engine], ".engine");	// engine file ?
 	CHECK_FILE();
 	BUILD_FILE(files[engine], ".data");		// data file ?
@@ -112,7 +112,7 @@
 	e = (e) ? e : VFSImportDatabaseFromFile(volRefNum, filename, &dum1, &dum2);
 	BUILD_FILE(files[engine], ".engine");
 	e = (e) ? e : VFSImportDatabaseFromFile(volRefNum, filename, &dum1, &dum2);
-
+#endif
 	// if error, cleanup
 	if (e) ModDelete();
 
@@ -363,8 +363,8 @@
 			ArgsAdd(&argvP[argc], "--demo-mode", NULL, &argc);
 	}
 
-//	if (argc > MAX_ARG)
-//		FrmCustomAlert(FrmErrorAlert, "Too many parameters.",0,0);
+	if (argc > MAX_ARG)
+		FrmCustomAlert(FrmErrorAlert, "Too many parameters.",0,0);
 
 	stackSize = (gPrefs->setStack ? STACK_LARGER : STACK_DEFAULT);
 	lightspeed= (gPrefs->lightspeed.enable ? gPrefs->lightspeed.mode : 255);