diff options
| author | Max Horn | 2009-04-20 12:35:17 +0000 |
|---|---|---|
| committer | Max Horn | 2009-04-20 12:35:17 +0000 |
| commit | 6a7bb77305dc280e6af2afb4beb5cc06ca6350b8 (patch) | |
| tree | 57399b6035ea9b2467a36d6b5f3eb18a5359610b /engines/scumm/script_v4.cpp | |
| parent | 4cf0f0a9a50f6a87a9a769c51f7a7958c13844a7 (diff) | |
| download | scummvm-rg350-6a7bb77305dc280e6af2afb4beb5cc06ca6350b8.tar.gz scummvm-rg350-6a7bb77305dc280e6af2afb4beb5cc06ca6350b8.tar.bz2 scummvm-rg350-6a7bb77305dc280e6af2afb4beb5cc06ca6350b8.zip | |
SCUMM: Introduced new method ScummEngine_v5::jumpRelative; unified some v0 and v2 opcodes
svn-id: r40025
Diffstat (limited to 'engines/scumm/script_v4.cpp')
| -rw-r--r-- | engines/scumm/script_v4.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/engines/scumm/script_v4.cpp b/engines/scumm/script_v4.cpp index b8964c4194..a8702a5d79 100644 --- a/engines/scumm/script_v4.cpp +++ b/engines/scumm/script_v4.cpp @@ -66,20 +66,14 @@ void ScummEngine_v4::o4_ifState() { int a = getVarOrDirectWord(PARAM_1); int b = getVarOrDirectByte(PARAM_2); - if (getState(a) != b) - o5_jumpRelative(); - else - ignoreScriptWord(); + jumpRelative(getState(a) == b); } void ScummEngine_v4::o4_ifNotState() { int a = getVarOrDirectWord(PARAM_1); int b = getVarOrDirectByte(PARAM_2); - if (getState(a) == b) - o5_jumpRelative(); - else - ignoreScriptWord(); + jumpRelative(getState(a) != b); } void ScummEngine_v4::o4_pickupObject() { |