aboutsummaryrefslogtreecommitdiff
path: root/engines/lilliput/script.cpp
diff options
context:
space:
mode:
authorStrangerke2012-04-28 08:19:54 +0200
committerEugene Sandulenko2018-03-28 17:36:57 +0200
commitb87053574536607e7dba212416531745af6d6882 (patch)
tree06220a07cbd0931ec41ef963318bb0958808abf4 /engines/lilliput/script.cpp
parent566954c8e6026633b1474b309c8bb46980175b4f (diff)
downloadscummvm-rg350-b87053574536607e7dba212416531745af6d6882.tar.gz
scummvm-rg350-b87053574536607e7dba212416531745af6d6882.tar.bz2
scummvm-rg350-b87053574536607e7dba212416531745af6d6882.zip
LILLIPUT: Remove double implementation of getMapPtr
Diffstat (limited to 'engines/lilliput/script.cpp')
-rw-r--r--engines/lilliput/script.cpp19
1 files changed, 7 insertions, 12 deletions
diff --git a/engines/lilliput/script.cpp b/engines/lilliput/script.cpp
index 4851f8a70a..7c10b82151 100644
--- a/engines/lilliput/script.cpp
+++ b/engines/lilliput/script.cpp
@@ -929,12 +929,6 @@ byte LilliputScript::OC_sub173F0() {
return 0;
}
-byte* LilliputScript::sub17399(int val) {
- int x = (val >> 8);
- int y = (val & 0xFF);
- return &_vm->_bufferIsoMap[(y * 320 + x) << 2];
-}
-
byte LilliputScript::OC_sub1740A() {
debugC(1, kDebugScript, "OC_sub1740A()");
@@ -944,7 +938,7 @@ byte LilliputScript::OC_sub1740A() {
return 0;
}
- byte *isoMapBuf = sub17399(var);
+ byte *isoMapBuf = getMapPtr(var);
int var2 = isoMapBuf[3];
int var3 = _currScript->readUint16LE();
@@ -1252,11 +1246,12 @@ byte LilliputScript::OC_sub17782() {
return 0;
}
-byte *LilliputScript::getMapPtr(int var1) {
- debugC(1, kDebugScript, "getMapPtr(%d)", var1);
-
- int index = (((var1 & 0xFF) << 6) + (var1 >> 8)) << 2;
- return &_vm->_bufferIsoMap[index];
+byte *LilliputScript::getMapPtr(int val) {
+ debugC(1, kDebugScript, "getMapPtr(%d)", val);
+
+ int x = (val >> 8);
+ int y = (val & 0xFF);
+ return &_vm->_bufferIsoMap[(y * 320 + x) << 2];
}
byte LilliputScript::OC_sub1779E() {