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

SCUMM: o5_ifNotState and o5_ifState are actually not part of v5, only in v3 & v4 -> renamed and moved them accordingly

Browse source 
svn-id: r40013
This commit is contained in:
Max Horn 2009-04-19 01:01:28 +00:00
parent 57c624b24d
commit 0e82403daa
4 changed files with 39 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

29
engines/scumm/script_v4.cpp
View file

@ -45,6 +45,35 @@ void ScummEngine_v4::setupOpcodes() {
OPCODE(0x5c, o4_oldRoomEffect);
OPCODE(0xdc, o4_oldRoomEffect);
OPCODE(0x0f, o4_ifState);
OPCODE(0x2f, o4_ifNotState);
OPCODE(0x4f, o4_ifState);
OPCODE(0x6f, o4_ifNotState);
OPCODE(0x8f, o4_ifState);
OPCODE(0xaf, o4_ifNotState);
OPCODE(0xcf, o4_ifState);
OPCODE(0xef, o4_ifNotState);
}
void ScummEngine_v4::o4_ifState() {
int a = getVarOrDirectWord(PARAM_1);
int b = getVarOrDirectByte(PARAM_2);
if (getState(a) != b)
o5_jumpRelative();
else
ignoreScriptWord();
}
void ScummEngine_v4::o4_ifNotState() {
int a = getVarOrDirectWord(PARAM_1);
int b = getVarOrDirectByte(PARAM_2);
if (getState(a) == b)
o5_jumpRelative();
else
ignoreScriptWord();
}
void ScummEngine_v4::o4_pickupObject() {