[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.507,2.508

Chris Apers chrilith at users.sourceforge.net
Mon Dec 15 07:17:15 CET 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv13558

Modified Files:
	scummvm.cpp 
Log Message:
Removed obsolete stuffs

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.507
retrieving revision 2.508
diff -u -d -r2.507 -r2.508
--- scummvm.cpp	15 Dec 2003 14:54:35 -0000	2.507
+++ scummvm.cpp	15 Dec 2003 15:16:01 -0000	2.508
@@ -58,10 +58,6 @@
 #include "sound/mididrv.h"
 #include "sound/mixer.h"
 
-#ifdef __PALM_OS__
-#include "globals.h"
-#endif
-
 #ifdef MACOSX
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -205,7 +201,6 @@
 	{"digdemo", "The Dig (Demo)", GID_DIG, 7, MDT_NONE,
 	 GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_DEMO, "dig"},
 
-#ifndef __PALM_OS__ // these are SVGA games not supported under PalmOS
 	/* Scumm Version 8 */
 	{"comi", "The Curse of Monkey Island", GID_CMI, 8, MDT_NONE,
 	 GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_DEFAULT_TO_1X_SCALER, 0},
@@ -295,7 +290,6 @@
 	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
 	// bunch of backyard sports games...
 */
-#endif
 	{NULL, NULL, 0, 0, MDT_NONE, 0, 0}
 };
 
@@ -2959,11 +2953,9 @@
 	case 7:
 		engine = new ScummEngine_v7(detector, syst, game);
 		break;
-#ifndef __PALM_OS__
 	case 8:
 		engine = new ScummEngine_v8(detector, syst, game);
 		break;
-#endif
 	default:
 		error("Engine_SCUMM_create(): Unknown version of game engine");
 	}





More information about the Scummvm-git-logs mailing list