various V8 tweaks

svn-id: r7494

3 files changed, 12 insertions, 10 deletions

diff --git a/scumm/dialogs.cpp b/scumm/dialogs.cpp
index 435e58a89d..44c04c69d1 100644
--- a/scumm/dialogs.cpp
+++ b/scumm/dialogs.cpp
@@ -175,7 +175,10 @@ const ScummVM::String ScummDialog::queryResString(int stringno) {
 	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);
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index d4ce3168d5..763740765f 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -203,7 +203,7 @@ void Scumm::getGraphicsPerformance() {
 		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 @@ void Scumm::getGraphicsPerformance() {
 		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)
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 49f45aa1a3..9c6333755e 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -795,7 +795,12 @@ void Scumm::initScummVars() {
 	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 @@ void Scumm::initScummVars() {
 
 		// 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;