aboutsummaryrefslogtreecommitdiff
path: root/engines/lilliput
diff options
context:
space:
mode:
authorStrangerke2012-05-15 08:05:20 +0200
committerEugene Sandulenko2018-03-28 17:36:57 +0200
commit2d88b963a94cce11f94c1de1e37aebbb190b8a11 (patch)
tree0f10432fa44c6a5d3a1a65109990dd58c6c9be46 /engines/lilliput
parent1f249aa23d8301b285261e5923cd5c1f55195772 (diff)
downloadscummvm-rg350-2d88b963a94cce11f94c1de1e37aebbb190b8a11.tar.gz
scummvm-rg350-2d88b963a94cce11f94c1de1e37aebbb190b8a11.tar.bz2
scummvm-rg350-2d88b963a94cce11f94c1de1e37aebbb190b8a11.zip
LILLIPUT: Fix a value in character move, some comments
Diffstat (limited to 'engines/lilliput')
-rw-r--r--engines/lilliput/lilliput.cpp12
-rw-r--r--engines/lilliput/script.cpp6
2 files changed, 10 insertions, 8 deletions
diff --git a/engines/lilliput/lilliput.cpp b/engines/lilliput/lilliput.cpp
index 1c865dcdef..26143e9812 100644
--- a/engines/lilliput/lilliput.cpp
+++ b/engines/lilliput/lilliput.cpp
@@ -1733,7 +1733,7 @@ void LilliputEngine::sub16626() {
result = sub166EA(index);
break;
default:
- warning("sub16626 - unexpected value %d", var2 / 2);
+ error("sub16626 - unexpected value %d", var2 / 2);
break;
}
@@ -2011,6 +2011,7 @@ byte LilliputEngine::sub16675(int idx, Common::Point var1) {
debugC(2, kDebugEngineTBC, "sub16675(%d, %d - %d)", idx, var1.x, var1.y);
sub16685(idx, var1);
+
int index = idx;
switch (var1.x) {
case 0:
@@ -2105,7 +2106,7 @@ void LilliputEngine::sub166B6(int index) {
void LilliputEngine::sub166BB(int index) {
debugC(2, kDebugEngineTBC, "sub166BB(%d)", index);
- sub16B31(index, 0xFE);
+ sub16B31(index, -2);
}
void LilliputEngine::sub166D8(int index) {
@@ -2681,10 +2682,10 @@ void LilliputEngine::handleGameScripts() {
int tmpVal = _rulesBuffer2_12[index];
if (tmpVal == 0xFF)
return;
-/*
- _scriptHandler->listAllTexts();
+/* Decompiler follows
+ _scriptHandler->listAllTexts();
debugC(1, kDebugEngineTBC, "================= Menu Script ==================");
ScriptStream script = ScriptStream(_menuScript, _menuScriptSize);
@@ -2777,10 +2778,11 @@ void LilliputEngine::initialize() {
byte *LilliputEngine::getCharacterVariablesPtr(int16 index) {
debugC(1, kDebugEngineTBC, "getCharacterVariablesPtr(%d)", index);
+/* used to debug
if(index == 96 + 22) {
int a = 0;
}
-
+*/
assert((index > -3120) && (index < 1400));
if (index >= 0)
diff --git a/engines/lilliput/script.cpp b/engines/lilliput/script.cpp
index 5caae8a3d5..85bb07f6e0 100644
--- a/engines/lilliput/script.cpp
+++ b/engines/lilliput/script.cpp
@@ -1303,7 +1303,7 @@ int16 LilliputScript::getValue1() {
}
Common::Point LilliputScript::getPosFromScript() {
- debugC(2, kDebugScriptTBC, "getPosFromScript()");
+ debugC(2, kDebugScript, "getPosFromScript()");
int curWord = _currScript->readUint16LE();
int tmpVal = curWord >> 8;
@@ -1355,7 +1355,7 @@ Common::Point LilliputScript::getPosFromScript() {
return _vm->_savedMousePosDivided;
default:
Common::Point pos = Common::Point(curWord >> 8, curWord & 0xFF);
- //warning("getPosFromScript - High value %d -> %d %d", curWord, pos.x, pos.y);
+ // warning("getPosFromScript - High value %d -> %d %d", curWord, pos.x, pos.y);
return pos;
}
}
@@ -3059,7 +3059,7 @@ void LilliputScript::OC_sub17E22_speech1IfSoundOff() {
}
void LilliputScript::OC_sub1844A() {
- debugC(1, kDebugScriptTBC, "OC_sub1847F()");
+ debugC(1, kDebugScriptTBC, "OC_sub1844A()");
int var1 = getValue1();
int var2 = _currScript->readUint16LE();