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

SCUMM: fix ScummEngine_v0::ifEqualActiveObject2Common() parameter name

Browse source
This commit is contained in:
Tobias Gunkel 2012-01-15 23:51:28 +01:00
parent c138ef6709
commit 8141511e2f
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/scumm/script_v0.cpp
View file

@ -828,9 +828,9 @@ void ScummEngine_v0::o_doSentence() {
doSentence(verb, obj, obj2); doSentence(verb, obj, obj2);
} }
bool ScummEngine_v0::ifEqualActiveObject2Common(bool ignoreType) { bool ScummEngine_v0::ifEqualActiveObject2Common(bool checkType) {
byte obj = fetchScriptByte(); byte obj = fetchScriptByte();
if (!ignoreType || (OBJECT_V0_TYPE(_cmdObject2) == kObjectV0TypeFG)) if (!checkType || (OBJECT_V0_TYPE(_cmdObject2) == kObjectV0TypeFG))
return (obj == OBJECT_V0_NR(_cmdObject2)); return (obj == OBJECT_V0_NR(_cmdObject2));
return false; return false;
} }

2
engines/scumm/scumm_v0.h
View file

@ -102,7 +102,7 @@ protected:
virtual bool areBoxesNeighbors(int box1nr, int box2nr); virtual bool areBoxesNeighbors(int box1nr, int box2nr);
bool ifEqualActiveObject2Common(bool ignoreType); bool ifEqualActiveObject2Common(bool checkType);
/* Version C64 script opcodes */ /* Version C64 script opcodes */
void o_stopCurrentScript(); void o_stopCurrentScript();