use features so ihnm doesn't default to 1280x960, change over some of the timer stuff to osystem not yet finished

svn-id: r13728

3 files changed, 12 insertions, 11 deletions

diff --git a/saga/game.cpp b/saga/game.cpp
index 3bbbf4909f..104f7b436f 100644
--- a/saga/game.cpp
+++ b/saga/game.cpp
@@ -173,6 +173,7 @@ R_GAMEDESC GameDescs[] = {
 		ARRAYSIZE(ITEDEMO_GameFonts),
 		ITEDEMO_GameFonts,
 		&ITEDEMO_GameSound,
+		0,
 		0 // Game supported flag
 	},
 
@@ -191,6 +192,7 @@ R_GAMEDESC GameDescs[] = {
 		ARRAYSIZE(ITECD_GameFonts),
 		ITECD_GameFonts,
 		&ITECD_GameSound,
+		0,
 		0
 	},
 	
@@ -210,6 +212,7 @@ R_GAMEDESC GameDescs[] = {
 		ARRAYSIZE(ITECD_GameFonts),
 		ITECD_GameFonts,
 		&ITECD_GameSound,
+		0,
 		1
 	},
 
@@ -228,6 +231,7 @@ R_GAMEDESC GameDescs[] = {
 		ARRAYSIZE(ITEDISK_GameFonts),
 		ITEDISK_GameFonts,
 		&ITE_GameSound,
+		0,
 		1
 	},
 
@@ -246,6 +250,7 @@ R_GAMEDESC GameDescs[] = {
 		0,
 		NULL,
 		&IHNM_GameSound,
+		GF_DEFAULT_TO_1X_SCALER,
 		0
 	},
 
@@ -257,19 +262,14 @@ R_GAMEDESC GameDescs[] = {
 		"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
 	}
 };
diff --git a/saga/game.h b/saga/game.h
index fdf065f77f..37a346cff5 100644
--- a/saga/game.h
+++ b/saga/game.h
@@ -60,10 +60,11 @@ struct R_GAMEDESC {
 	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;
 	}
 };
diff --git a/saga/timer.cpp b/saga/timer.cpp
index a79d42f241..c5e5f41156 100644
--- a/saga/timer.cpp
+++ b/saga/timer.cpp
@@ -53,7 +53,7 @@ int SYSTIMER_InitMSCounter() {
 		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 @@ unsigned long SYSTIMER_ReadMSCounter() {
 		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 @@ int SYSTIMER_ResetMSCounter() {
 		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;
 }