thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LILLIPUT: Fix a value in character move, some comments

Browse source
This commit is contained in:
Strangerke 2012-05-15 08:05:20 +02:00 • committed by Eugene Sandulenko
parent 1f249aa23d
commit 2d88b963a9
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
engines/lilliput/lilliput.cpp
View file

@ -1733,7 +1733,7 @@ void LilliputEngine::sub16626() {
result = sub166EA(index); result = sub166EA(index);
break; break;
default: default:
warning("sub16626 - unexpected value %d", var2 / 2); error("sub16626 - unexpected value %d", var2 / 2);
break; 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); debugC(2, kDebugEngineTBC, "sub16675(%d, %d - %d)", idx, var1.x, var1.y);
sub16685(idx, var1); sub16685(idx, var1);
int index = idx; int index = idx;
switch (var1.x) { switch (var1.x) {
case 0: case 0:
@ -2105,7 +2106,7 @@ void LilliputEngine::sub166B6(int index) {
void LilliputEngine::sub166BB(int index) { void LilliputEngine::sub166BB(int index) {
debugC(2, kDebugEngineTBC, "sub166BB(%d)", index); debugC(2, kDebugEngineTBC, "sub166BB(%d)", index);
sub16B31(index, 0xFE); sub16B31(index, -2);
} }
void LilliputEngine::sub166D8(int index) { void LilliputEngine::sub166D8(int index) {
@ -2681,11 +2682,11 @@ void LilliputEngine::handleGameScripts() {
int tmpVal = _rulesBuffer2_12[index]; int tmpVal = _rulesBuffer2_12[index];
if (tmpVal == 0xFF) if (tmpVal == 0xFF)
return; return;
/*
/* Decompiler follows
_scriptHandler->listAllTexts(); _scriptHandler->listAllTexts();
debugC(1, kDebugEngineTBC, "================= Menu Script =================="); debugC(1, kDebugEngineTBC, "================= Menu Script ==================");
ScriptStream script = ScriptStream(_menuScript, _menuScriptSize); ScriptStream script = ScriptStream(_menuScript, _menuScriptSize);
_scriptHandler->disasmScript(script); _scriptHandler->disasmScript(script);
@ -2777,10 +2778,11 @@ void LilliputEngine::initialize() {
byte *LilliputEngine::getCharacterVariablesPtr(int16 index) { byte *LilliputEngine::getCharacterVariablesPtr(int16 index) {
debugC(1, kDebugEngineTBC, "getCharacterVariablesPtr(%d)", index); debugC(1, kDebugEngineTBC, "getCharacterVariablesPtr(%d)", index);
/* used to debug
if(index == 96 + 22) { if(index == 96 + 22) {
int a = 0; int a = 0;
} }
*/
assert((index > -3120) && (index < 1400)); assert((index > -3120) && (index < 1400));
if (index >= 0) if (index >= 0)

6
engines/lilliput/script.cpp
View file

@ -1303,7 +1303,7 @@ int16 LilliputScript::getValue1() {
} }
Common::Point LilliputScript::getPosFromScript() { Common::Point LilliputScript::getPosFromScript() {
debugC(2, kDebugScriptTBC, "getPosFromScript()"); debugC(2, kDebugScript, "getPosFromScript()");
int curWord = _currScript->readUint16LE(); int curWord = _currScript->readUint16LE();
int tmpVal = curWord >> 8; int tmpVal = curWord >> 8;
@ -1355,7 +1355,7 @@ Common::Point LilliputScript::getPosFromScript() {
return _vm->_savedMousePosDivided; return _vm->_savedMousePosDivided;
default: default:
Common::Point pos = Common::Point(curWord >> 8, curWord & 0xFF); 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; return pos;
} }
} }
@ -3059,7 +3059,7 @@ void LilliputScript::OC_sub17E22_speech1IfSoundOff() {
} }
void LilliputScript::OC_sub1844A() { void LilliputScript::OC_sub1844A() {
debugC(1, kDebugScriptTBC, "OC_sub1847F()"); debugC(1, kDebugScriptTBC, "OC_sub1844A()");
int var1 = getValue1(); int var1 = getValue1();
int var2 = _currScript->readUint16LE(); int var2 = _currScript->readUint16LE();