diff options
| author | Max Horn | 2003-05-09 00:57:10 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-09 00:57:10 +0000 |
| commit | bb4f80695495246d4feb4d5f48c495d22cc2704c (patch) | |
| tree | 2969a3171068d38fd10a71f84dc1e9fdccccf4c5 /scumm/script_v2.cpp | |
| parent | c63ec9d0084f341c39118cfe8d5a01434bc9bbf5 (diff) | |
| download | scummvm-rg350-bb4f80695495246d4feb4d5f48c495d22cc2704c.tar.gz scummvm-rg350-bb4f80695495246d4feb4d5f48c495d22cc2704c.tar.bz2 scummvm-rg350-bb4f80695495246d4feb4d5f48c495d22cc2704c.zip | |
cleanup
svn-id: r7399
Diffstat (limited to 'scumm/script_v2.cpp')
| -rw-r--r-- | scumm/script_v2.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp index 1e7adcee50..ec364cdbb5 100644 --- a/scumm/script_v2.cpp +++ b/scumm/script_v2.cpp @@ -495,11 +495,10 @@ void Scumm_v2::o2_getObjY() { } void Scumm_v2::o2_setBitVar() { - byte lo = fetchScriptByte(); - byte hi = fetchScriptByte(); + byte var = fetchScriptWord(); byte a = getVarOrDirectByte(0x80); - int bit_var = (hi << 8) + lo + a; + int bit_var = var + a; int bit_offset = bit_var & 0x0f; bit_var >>= 4; @@ -511,11 +510,10 @@ void Scumm_v2::o2_setBitVar() { void Scumm_v2::o2_getBitVar() { getResultPos(); - byte lo = fetchScriptByte(); - byte hi = fetchScriptByte(); + byte var = fetchScriptWord(); byte a = getVarOrDirectByte(0x80); - int bit_var = (hi << 8) + lo + a; + int bit_var = var + a; int bit_offset = bit_var & 0x0f; bit_var >>= 4; |