[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.96,2.97 scummvm.cpp,2.142,2.143 dialogs.cpp,1.47,1.48

[Max Horn]

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

Modified Files:
	gfx.cpp scummvm.cpp dialogs.cpp 
Log Message:
various V8 tweaks

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.96
retrieving revision 2.97
diff -u -d -r2.96 -r2.97
--- gfx.cpp	13 May 2003 23:42:39 -0000	2.96
+++ gfx.cpp	14 May 2003 09:47:52 -0000	2.97
@@ -203,7 +203,7 @@
 		initScreens(0, 0, _screenWidth, _screenHeight);
 	}
 
-	if (!(_features & GF_SMALL_HEADER))	// Variable is reserved for game scripts in earlier games
+	if (VAR_PERFORMANCE_1 != 0xFF)	// Variable is reserved for game scripts in earlier games
 		VAR(VAR_PERFORMANCE_1) = 0;
 
 	for (i = 10; i != 0; i--) {
@@ -211,7 +211,7 @@
 		drawDirtyScreenParts();
 	}
 
-	if (!(_features & GF_SMALL_HEADER))	// Variable is reserved for game scripts in earlier games
+	if (VAR_PERFORMANCE_2 != 0xFF)	// Variable is reserved for game scripts in earlier games
 		VAR(VAR_PERFORMANCE_2) = 0;
 
 	if (_features & GF_AFTER_V7)

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.142
retrieving revision 2.143
diff -u -d -r2.142 -r2.143
--- scummvm.cpp	13 May 2003 23:42:41 -0000	2.142
+++ scummvm.cpp	14 May 2003 09:47:53 -0000	2.143
@@ -795,7 +795,12 @@
 	if (!(_features & GF_AFTER_V6))
 		VAR(VAR_V5_TALK_STRING_Y) = -0x50;
 
-	if (!(_features & GF_AFTER_V7)) {
+	if (_features & GF_AFTER_V8) {	// Fixme: How do we deal with non-cd installs?
+		VAR(VAR_CURRENTDISK) = 1;
+		VAR(VAR_LANGUAGE) = _language;
+	} else if (_features & GF_AFTER_V7) {
+		VAR(VAR_V6_EMSSPACE) = 10000;
+	} else {
 		VAR(VAR_CURRENTDRIVE) = 0;
 		VAR(VAR_FIXEDDISK) = true;
 		VAR(VAR_SOUNDCARD) = 3;
@@ -815,14 +820,8 @@
 
 		// Setup light
 		VAR(VAR_CURRENT_LIGHTS) = LIGHTMODE_actor_base | LIGHTMODE_actor_color | LIGHTMODE_screen;
-	} else {
-		VAR(VAR_V6_EMSSPACE) = 10000;
 	}
 
-	if (_features & GF_AFTER_V8) {	// Fixme: How do we deal with non-cd installs?
-		VAR(VAR_CURRENTDISK) = 1;
-		VAR(VAR_LANGUAGE) = _language;
-	}
 
 	VAR(VAR_CHARINC) = 4;
 	VAR(VAR_TALK_ACTOR) = 0;

Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- dialogs.cpp	13 May 2003 23:33:01 -0000	1.47
+++ dialogs.cpp	14 May 2003 09:47:53 -0000	1.48
@@ -175,7 +175,10 @@
 	if (stringno == 0)
 		return String();
 
-	if (_scumm->_features & GF_AFTER_V7)
+	if (_scumm->_features & GF_AFTER_V8	)
+		// TODO: Maybe grab the strings from the language file?
+		return string_map_table_v5[stringno - 1].string;
+	else if (_scumm->_features & GF_AFTER_V7)
 		result = _scumm->getStringAddressVar(string_map_table_v7[stringno - 1].num);
 	else if (_scumm->_features & GF_AFTER_V6)
 		result = _scumm->getStringAddressVar(string_map_table_v6[stringno - 1].num);