[Scummvm-cvs-logs] CVS: scummvm/saga game.cpp,1.11,1.12 game.h,1.5,1.6 timer.cpp,1.1,1.2

Jonathan Gray khalek at users.sourceforge.net
Sat May 1 18:40:01 CEST 2004


Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14501

Modified Files:
	game.cpp game.h timer.cpp 
Log Message:
use features so ihnm doesn't default to 1280x960, change over some of the timer stuff to osystem not yet finished

Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/game.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- game.cpp	1 May 2004 23:42:22 -0000	1.11
+++ game.cpp	2 May 2004 01:39:14 -0000	1.12
@@ -173,6 +173,7 @@
 		ARRAYSIZE(ITEDEMO_GameFonts),
 		ITEDEMO_GameFonts,
 		&ITEDEMO_GameSound,
+		0,
 		0 // Game supported flag
 	},
 
@@ -191,6 +192,7 @@
 		ARRAYSIZE(ITECD_GameFonts),
 		ITECD_GameFonts,
 		&ITECD_GameSound,
+		0,
 		0
 	},
 	
@@ -210,6 +212,7 @@
 		ARRAYSIZE(ITECD_GameFonts),
 		ITECD_GameFonts,
 		&ITECD_GameSound,
+		0,
 		1
 	},
 
@@ -228,6 +231,7 @@
 		ARRAYSIZE(ITEDISK_GameFonts),
 		ITEDISK_GameFonts,
 		&ITE_GameSound,
+		0,
 		1
 	},
 
@@ -246,6 +250,7 @@
 		0,
 		NULL,
 		&IHNM_GameSound,
+		GF_DEFAULT_TO_1X_SCALER,
 		0
 	},
 
@@ -257,19 +262,14 @@
 		"I Have No Mouth and I Must Scream (DOS)",
 		640, 480,
 		304,
-
 		1,
-
 		&IHNM_Resources,
-
 		ARRAYSIZE(IHNMCD_GameFiles),
 		IHNMCD_GameFiles,
-
 		ARRAYSIZE(IHNMCD_GameFonts),
 		IHNMCD_GameFonts,
-
 		&IHNM_GameSound,
-
+		GF_DEFAULT_TO_1X_SCALER,
 		1
 	}
 };

Index: game.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/game.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- game.h	1 May 2004 23:42:22 -0000	1.5
+++ game.h	2 May 2004 01:39:14 -0000	1.6
@@ -60,10 +60,11 @@
 	int gd_fontct;
 	R_GAME_FONTDESC *gd_fontdescs;
 	R_GAME_SOUNDINFO *gd_soundinfo;
+	uint32 features;
 	int gd_supported;
 
 	GameSettings toGameSettings() const {
-		GameSettings dummy = { name, gd_title, gd_game_id };
+		GameSettings dummy = { name, gd_title, features };
 		return dummy;
 	}
 };

Index: timer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/timer.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- timer.cpp	1 May 2004 23:46:23 -0000	1.1
+++ timer.cpp	2 May 2004 01:39:14 -0000	1.2
@@ -53,7 +53,7 @@
 		return R_FAILURE;
 	}
 
-	R_TimerData.t_previous_ticks = SDL_GetTicks();
+	R_TimerData.t_previous_ticks = g_system->get_msecs();
 	R_TimerData.initialized = 1;
 
 	return R_SUCCESS;
@@ -66,7 +66,7 @@
 		return 0;
 	}
 
-	R_TimerData.t_current_ticks = SDL_GetTicks();
+	R_TimerData.t_current_ticks = g_system->get_msecs();
 
 	if (R_TimerData.t_current_ticks < R_TimerData.t_previous_ticks) {
 		// Timer has rolled over after 49 days
@@ -83,13 +83,13 @@
 		return R_FAILURE;
 	}
 
-	R_TimerData.t_previous_ticks = SDL_GetTicks();
+	R_TimerData.t_previous_ticks = g_system->get_msecs();
 
 	return R_SUCCESS;
 }
 
 int SYSTIMER_Sleep(uint16 msec) {
-	SDL_Delay(msec);
+	g_system->delay_msecs(msec);
 
 	return R_SUCCESS;
 }





More information about the Scummvm-git-logs mailing list