thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SWORD1: Fix bug #3430793 Freeze before meeting with police

Browse source 
(cherry picked from commit 5e4ee6d077)
This commit is contained in:
Thierry Crozat 2011-10-31 21:02:59 +00:00
parent 797406fe4c
commit 060a750b44
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/sword1/logic.cpp
View file

@ -520,7 +520,7 @@ int Logic::interpretScript(Object *compact, int id, Header *scriptModule, int sc
case IT_PUSHVARIABLE: case IT_PUSHVARIABLE:
debug(9, "IT_PUSHVARIABLE: ScriptVar[%d] => %d", scriptCode[pc], _scriptVars[scriptCode[pc]]); debug(9, "IT_PUSHVARIABLE: ScriptVar[%d] => %d", scriptCode[pc], _scriptVars[scriptCode[pc]]);
varNum = 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 if (varNum >= 397) // BS1 Demo has different number of script variables
varNum++; varNum++;
if (varNum >= 699) if (varNum >= 699)
@ -611,7 +611,7 @@ int Logic::interpretScript(Object *compact, int id, Header *scriptModule, int sc
case IT_POPVAR: // pop a variable case IT_POPVAR: // pop a variable
debug(9, "IT_POPVAR: ScriptVars[%d] = %d", scriptCode[pc], stack[stackIdx - 1]); debug(9, "IT_POPVAR: ScriptVars[%d] = %d", scriptCode[pc], stack[stackIdx - 1]);
varNum = 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 if (varNum >= 397) // BS1 Demo has different number of script variables
varNum++; varNum++;
if (varNum >= 699) if (varNum >= 699)

2
engines/sword1/sword1.h
View file

@ -90,7 +90,7 @@ public:
static bool isMac() { return _systemVars.platform == Common::kPlatformMacintosh; } static bool isMac() { return _systemVars.platform == Common::kPlatformMacintosh; }
static bool isPsx() { return _systemVars.platform == Common::kPlatformPSX; } 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: protected:
// Engine APIs // Engine APIs