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

Chris Apers chrilith at users.sourceforge.net
Tue Nov 9 03:50:01 CET 2004


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

Modified Files:
	games.cpp games.h 
Log Message:
Updated based on last changes

Index: games.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/games.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- games.cpp	12 Sep 2004 13:32:27 -0000	1.7
+++ games.cpp	9 Nov 2004 11:49:07 -0000	1.8
@@ -25,6 +25,7 @@
 #include <ctype.h>
 
 #include "globals.h"
+#include "palmdefs.h"
 #include "start.h"
 #include "games.h"
 #include "skin.h"
@@ -62,11 +63,12 @@
 				frmP = FrmInitForm(ConvertForm);
 				FrmSetActiveForm(frmP);
 				FrmDrawForm(frmP);
-				SysTaskDelay(200);
+				SysTaskDelay(1 * SysTicksPerSecond());
 
 				MemSet(&gitCur, sizeof(GameInfoType), 0);
 
-				if (version == itemVersion_27 ||
+				if (version == itemVersion_30 ||
+					version == itemVersion_27 ||
 					version == itemVersion_26 ||
 					version == itemVersion_25) {
 
@@ -78,15 +80,19 @@
 						MemMove(&gitCur, tmpP, MemHandleSize(tmpH));
 						MemHandleUnlock(tmpH);
 						
-						gitCur.musicInfo.volume.master = 192;
-						gitCur.musicInfo.volume.music = 192;
-						gitCur.musicInfo.volume.sfx = 192;
-						gitCur.musicInfo.volume.speech = 192;
-						gitCur.musicInfo.volume.audiocd = 50;
+						if (version != itemVersion_30) {
+							gitCur.musicInfo.volume.master = 192;
+							gitCur.musicInfo.volume.music = 192;
+							gitCur.musicInfo.volume.sfx = 192;
+							gitCur.musicInfo.volume.speech = 192;
+							gitCur.musicInfo.volume.audiocd = 50;
+							
+							gitCur.musicInfo.sound.tempo = 100;
+							gitCur.musicInfo.sound.defaultTrackLength = 10;
+							gitCur.musicInfo.sound.firstTrack = 1;
+						}
 						
-						gitCur.musicInfo.sound.tempo = 100;
-						gitCur.musicInfo.sound.defaultTrackLength = 10;
-						gitCur.musicInfo.sound.firstTrack = 1;
+						gitCur.engine = 0;
 
 						// simply resize the old record
 						tmpH = DmResizeRecord(gameDB, index, sizeof(GameInfoType));	// TODO : check error on resize tmpH==NULL
@@ -137,6 +143,8 @@
 						gitCur.musicInfo.sound.tempo = 100;
 						gitCur.musicInfo.sound.defaultTrackLength = 10;
 						gitCur.musicInfo.sound.firstTrack = 1;
+						
+						gitCur.engine = 0;
 
 						tmpH = DmResizeRecord(gameDB, index, sizeof(GameInfoType));	// TODO : check error on resize tmpH==NULL
 						tmpP = MemHandleLock(tmpH);
@@ -185,6 +193,8 @@
 						gitCur.musicInfo.sound.tempo = 100;
 						gitCur.musicInfo.sound.defaultTrackLength = 10;
 						gitCur.musicInfo.sound.firstTrack = 1;
+						
+						gitCur.engine = 0;
 
 						tmpH = DmResizeRecord(gameDB, index, sizeof(GameInfoType));	// TODO : check error on resize tmpH==NULL
 						tmpP = MemHandleLock(tmpH);

Index: games.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/games.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- games.h	12 Sep 2004 13:32:27 -0000	1.6
+++ games.h	9 Nov 2004 11:49:07 -0000	1.7
@@ -23,6 +23,14 @@
 #ifndef __GAMES_H__
 #define	__GAMES_H__
 
+#define curItemVersion sysMakeROMVersion(3,1,0,0,0)
+
+#define itemVersion_30 sysMakeROMVersion(3,0,0,0,0)
+#define itemVersion_27 sysMakeROMVersion(2,7,0,0,0)
+#define itemVersion_26 sysMakeROMVersion(2,6,0,0,0)
+#define itemVersion_25 sysMakeROMVersion(2,5,0,0,0)
+#define itemVersion_20 sysMakeROMVersion(2,0,0,0,0)
+
 // old config structs
 typedef struct {
 	UInt32	version;
@@ -125,9 +133,18 @@
 	Boolean aspectRatio;	// |-	v2.7
 	
 	MusicInfoType musicInfo;// 		v3.0
+	
+	UInt8 engine;			// |-	v3.1
 
 } GameInfoType;
 
+enum {
+	ENGINE_SCUMM = 0,
+	ENGINE_SIMON,
+	ENGINE_QUEEN,
+	ENGINE_SWORD1
+};
+
 // protos
 Err		GamOpenDatabase		();
 void	GamImportDatabase	();





More information about the Scummvm-git-logs mailing list