From 5e4ee6d07792a976280cb00e01d3cb0f64be4f04 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Mon, 31 Oct 2011 21:02:59 +0000
Subject: SWORD1: Fix bug #3430793 Freeze before meeting with police

---
 engines/sword1/logic.cpp | 4 ++--
 engines/sword1/sword1.h  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/sword1/logic.cpp b/engines/sword1/logic.cpp
index 9d92a29a63..8e04861edf 100644
--- a/engines/sword1/logic.cpp
+++ b/engines/sword1/logic.cpp
@@ -520,7 +520,7 @@ int Logic::interpretScript(Object *compact, int id, Header *scriptModule, int sc
 		case IT_PUSHVARIABLE:
 			debug(9, "IT_PUSHVARIABLE: ScriptVar[%d] => %d", scriptCode[pc], _scriptVars[scriptCode[pc]]);
 			varNum = scriptCode[pc++];
-			if (SwordEngine::_systemVars.isDemo && SwordEngine::isPc()) {
+			if (SwordEngine::_systemVars.isDemo && SwordEngine::isWindows()) {
 				if (varNum >= 397) // BS1 Demo has different number of script variables
 					varNum++;
 				if (varNum >= 699)
@@ -611,7 +611,7 @@ int Logic::interpretScript(Object *compact, int id, Header *scriptModule, int sc
 		case IT_POPVAR:         // pop a variable
 			debug(9, "IT_POPVAR: ScriptVars[%d] = %d", scriptCode[pc], stack[stackIdx - 1]);
 			varNum = scriptCode[pc++];
-			if (SwordEngine::_systemVars.isDemo && SwordEngine::isPc()) {
+			if (SwordEngine::_systemVars.isDemo && SwordEngine::isWindows()) {
 				if (varNum >= 397) // BS1 Demo has different number of script variables
 					varNum++;
 				if (varNum >= 699)
diff --git a/engines/sword1/sword1.h b/engines/sword1/sword1.h
index e973c12754..ccdc2d3a59 100644
--- a/engines/sword1/sword1.h
+++ b/engines/sword1/sword1.h
@@ -90,7 +90,7 @@ public:
 
 	static bool isMac() { return _systemVars.platform == Common::kPlatformMacintosh; }
 	static bool isPsx() { return _systemVars.platform == Common::kPlatformPSX; }
-	static bool isPc() { return _systemVars.platform == Common::kPlatformPC; }
+	static bool isWindows() { return _systemVars.platform == Common::kPlatformWindows ; }
 
 protected:
 	// Engine APIs
-- 
cgit v1.2.3