aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scumm/script_v2.cpp10
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;