[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src games.h,1.7,1.8 launch.cpp,1.12,1.13

Chris Apers chrilith at users.sourceforge.net
Mon Dec 20 09:20:00 CET 2004


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

Modified Files:
	games.h launch.cpp 
Log Message:
Added Sky support

Index: games.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/games.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- games.h	9 Nov 2004 11:49:07 -0000	1.7
+++ games.h	20 Dec 2004 17:19:05 -0000	1.8
@@ -142,7 +142,8 @@
 	ENGINE_SCUMM = 0,
 	ENGINE_SIMON,
 	ENGINE_QUEEN,
-	ENGINE_SWORD1
+	ENGINE_SWORD1,
+	ENGINE_SKY
 };
 
 // protos

Index: launch.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/launch.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- launch.cpp	10 Dec 2004 15:28:41 -0000	1.12
+++ launch.cpp	20 Dec 2004 17:19:05 -0000	1.13
@@ -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();
 
@@ -348,7 +348,7 @@
 		ArgsAdd(&argvP[argc], "-d", num, &argc);
 	}
 	
-	if (engine == ENGINE_QUEEN) {
+	if (engine == ENGINE_QUEEN || engine == ENGINE_SKY) {
 		// alternative intro ?
 		if (gPrefs->altIntro)
 			ArgsAdd(&argvP[argc], "--alt-intro", NULL, &argc);
@@ -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);





More information about the Scummvm-git-logs mailing list