From 2ea8d71a5a45a885bd0026ea291a49d7850294e4 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Fri, 23 Mar 2018 08:07:40 +0100 Subject: LILLIPUT: More renaming --- engines/lilliput/lilliput.cpp | 104 ++++++++++++++++++------------------ engines/lilliput/lilliput.h | 10 ++-- engines/lilliput/script.cpp | 121 +++++++++++++++++++++--------------------- engines/lilliput/script.h | 22 ++++---- 4 files changed, 128 insertions(+), 129 deletions(-) diff --git a/engines/lilliput/lilliput.cpp b/engines/lilliput/lilliput.cpp index ae6b298afe..e475a34f03 100644 --- a/engines/lilliput/lilliput.cpp +++ b/engines/lilliput/lilliput.cpp @@ -187,18 +187,18 @@ LilliputEngine::LilliputEngine(OSystem *syst, const LilliputGameDescription *gd) _characterDisplayX[i] = 0; _characterDisplayY[i] = 0; _array12299[i] = -1; - _array109E9PosX[i] = -1; - _array10A11PosY[i] = -1; + _characterSubTargetPosX[i] = -1; + _characterSubTargetPosY[i] = -1; _stingArray[i] = 0; _array11D49[i] = -1; _characterPositionX[i] = -1; _characterPositionY[i] = -1; - _characterPositionAltitude[i] = 0; + _characterPosAltitude[i] = 0; _characterFrameArray[i] = 0; _characterCarried[i] = -1; - _rulesBuffer2_6[i] = 4; - _rulesBuffer2_7[i] = 0; + _characterBehindDist[i] = 4; + _characterAboveDist[i] = 0; _spriteSizeArray[i] = 20; _characterDirectionArray[i] = 0; _rulesBuffer2_10[i] = 0; @@ -626,8 +626,8 @@ void LilliputEngine::moveCharacters() { for (int i = index; i >= 0; i--) { if (_characterCarried[i] != -1) { int index2 = _characterCarried[i]; - _characterPositionAltitude[i] = _characterPositionAltitude[index2] + _rulesBuffer2_7[i]; - int8 tmpVal = _rulesBuffer2_6[i]; + _characterPosAltitude[i] = _characterPosAltitude[index2] + _characterAboveDist[i]; + int8 tmpVal = _characterBehindDist[i]; _characterDirectionArray[i] = _characterDirectionArray[index2]; int var3 = _characterPositionX[index2]; int var4 = _characterPositionY[index2]; @@ -665,7 +665,7 @@ void LilliputEngine::moveCharacters() { _characterRelativePositionY[i] = tmpVal3; tmpVal2 = _characterPositionX[i] - pos16213.x; tmpVal3 = _characterPositionY[i] - pos16213.y; - int tmpVal4 = _characterPositionAltitude[i]; + int tmpVal4 = _characterPosAltitude[i]; _characterDisplayX[i] = ((60 + tmpVal2 - tmpVal3) * 2) & 0xFF; _characterDisplayY[i] = (20 + tmpVal2 + tmpVal3 - tmpVal4) & 0xFF; _charactersToDisplay[_numCharactersToDisplay] = i; @@ -1128,10 +1128,10 @@ void LilliputEngine::sortCharacters() { continue; if (_characterRelativePositionX[index1] == _characterRelativePositionX[index2]) { - if (_characterPositionAltitude[index1] < _characterPositionAltitude[index2]) + if (_characterPosAltitude[index1] < _characterPosAltitude[index2]) continue; - if (_characterPositionAltitude[index1] == _characterPositionAltitude[index2]) { + if (_characterPosAltitude[index1] == _characterPosAltitude[index2]) { if (_characterDisplayY[index1] < _characterDisplayY[index2]) continue; } @@ -1350,7 +1350,7 @@ byte LilliputEngine::getDirection(Common::Point param1, Common::Point param2) { byte LilliputEngine::sub16799(int index, Common::Point param1) { debugC(2, kDebugEngine, "sub16799(%d, %d - %d)", index, param1.x, param1.y); - Common::Point var3 = Common::Point(_array109E9PosX[index], _array10A11PosY[index]); + Common::Point var3 = Common::Point(_characterSubTargetPosX[index], _characterSubTargetPosY[index]); if (var3.x != -1) { if ((var3.x != _scriptHandler->_characterTilePosX[index]) || (var3.y != _scriptHandler->_characterTilePosY[index])) { @@ -1366,7 +1366,7 @@ byte LilliputEngine::sub16799(int index, Common::Point param1) { sub167EF(index); Common::Point pos1 = Common::Point(_scriptHandler->_characterTilePosX[index], _scriptHandler->_characterTilePosY[index]); - Common::Point pos2 = Common::Point(_array109E9PosX[index], _array10A11PosY[index]); + Common::Point pos2 = Common::Point(_characterSubTargetPosX[index], _characterSubTargetPosY[index]); _characterDirectionArray[index] = getDirection(pos1, pos2); @@ -1383,15 +1383,15 @@ void LilliputEngine::sub167EF(int index) { int16 word167ED = findHotspot(Common::Point(_characterTargetPosX[index], _characterTargetPosY[index])); if (word167EB == word167ED) { - _array109E9PosX[index] = _characterTargetPosX[index]; - _array10A11PosY[index] = _characterTargetPosY[index]; + _characterSubTargetPosX[index] = _characterTargetPosX[index]; + _characterSubTargetPosY[index] = _characterTargetPosY[index]; return; } if (word167EB == -1) { int tmpVal = reverseFindHotspot(Common::Point(_characterTargetPosX[index], _characterTargetPosY[index])); - _array109E9PosX[index] = _rulesBuffer12Pos4[tmpVal].x; - _array10A11PosY[index] = _rulesBuffer12Pos4[tmpVal].y; + _characterSubTargetPosX[index] = _rulesBuffer12Pos4[tmpVal].x; + _characterSubTargetPosY[index] = _rulesBuffer12Pos4[tmpVal].y; return; } @@ -1400,26 +1400,26 @@ void LilliputEngine::sub167EF(int index) { (_characterTargetPosX[index] <= _rectXMinMax[word167EB].max) && (_characterTargetPosY[index] >= _rectYMinMax[word167EB].min) && (_characterTargetPosY[index] <= _rectYMinMax[word167EB].max)) { - _array109E9PosX[index] = _rulesBuffer12Pos4[word167ED].x; - _array10A11PosY[index] = _rulesBuffer12Pos4[word167ED].y; + _characterSubTargetPosX[index] = _rulesBuffer12Pos4[word167ED].x; + _characterSubTargetPosY[index] = _rulesBuffer12Pos4[word167ED].y; return; } - _array109E9PosX[index] = _rulesBuffer12Pos4[word167EB].x; - _array10A11PosY[index] = _rulesBuffer12Pos4[word167EB].y; + _characterSubTargetPosX[index] = _rulesBuffer12Pos4[word167EB].x; + _characterSubTargetPosY[index] = _rulesBuffer12Pos4[word167EB].y; int var4h = _rectXMinMax[word167EB].min; int var4l = _rectXMinMax[word167EB].max; if (var4h != var4l) { if (_rulesBuffer12Pos4[word167EB].x == var4h) { - _array109E9PosX[index] = _rulesBuffer12Pos4[word167EB].x - 1; - _array10A11PosY[index] = _rulesBuffer12Pos4[word167EB].y; + _characterSubTargetPosX[index] = _rulesBuffer12Pos4[word167EB].x - 1; + _characterSubTargetPosY[index] = _rulesBuffer12Pos4[word167EB].y; return; } if (_rulesBuffer12Pos4[word167EB].x == var4l) { - _array109E9PosX[index] = _rulesBuffer12Pos4[word167EB].x + 1; - _array10A11PosY[index] = _rulesBuffer12Pos4[word167EB].y; + _characterSubTargetPosX[index] = _rulesBuffer12Pos4[word167EB].x + 1; + _characterSubTargetPosY[index] = _rulesBuffer12Pos4[word167EB].y; return; } @@ -1428,11 +1428,11 @@ void LilliputEngine::sub167EF(int index) { if (var4h != var4l) { if (_rulesBuffer12Pos4[word167EB].y == var4h) { - _array109E9PosX[index] = _rulesBuffer12Pos4[word167EB].x; - _array10A11PosY[index] = _rulesBuffer12Pos4[word167EB].y - 1; + _characterSubTargetPosX[index] = _rulesBuffer12Pos4[word167EB].x; + _characterSubTargetPosY[index] = _rulesBuffer12Pos4[word167EB].y - 1; } else { - _array109E9PosX[index] = _rulesBuffer12Pos4[word167EB].x; - _array10A11PosY[index] = _rulesBuffer12Pos4[word167EB].y + 1; + _characterSubTargetPosX[index] = _rulesBuffer12Pos4[word167EB].x; + _characterSubTargetPosY[index] = _rulesBuffer12Pos4[word167EB].y + 1; } return; } @@ -1444,17 +1444,17 @@ void LilliputEngine::sub167EF(int index) { int tmpVal = _bufferIsoMap[mapIndex + 3]; if ((tmpVal & 8) != 0) { - _array109E9PosX[index] = _rulesBuffer12Pos4[word167EB].x + 1; - _array10A11PosY[index] = _rulesBuffer12Pos4[word167EB].y; + _characterSubTargetPosX[index] = _rulesBuffer12Pos4[word167EB].x + 1; + _characterSubTargetPosY[index] = _rulesBuffer12Pos4[word167EB].y; } else if ((tmpVal & 4) != 0) { - _array109E9PosX[index] = _rulesBuffer12Pos4[word167EB].x; - _array10A11PosY[index] = _rulesBuffer12Pos4[word167EB].y - 1; + _characterSubTargetPosX[index] = _rulesBuffer12Pos4[word167EB].x; + _characterSubTargetPosY[index] = _rulesBuffer12Pos4[word167EB].y - 1; } else if ((tmpVal & 2) != 0) { - _array109E9PosX[index] = _rulesBuffer12Pos4[word167EB].x; - _array10A11PosY[index] = _rulesBuffer12Pos4[word167EB].y + 1; + _characterSubTargetPosX[index] = _rulesBuffer12Pos4[word167EB].x; + _characterSubTargetPosY[index] = _rulesBuffer12Pos4[word167EB].y + 1; } else { - _array109E9PosX[index] = _rulesBuffer12Pos4[word167EB].x - 1; - _array10A11PosY[index] = _rulesBuffer12Pos4[word167EB].y; + _characterSubTargetPosX[index] = _rulesBuffer12Pos4[word167EB].x - 1; + _characterSubTargetPosY[index] = _rulesBuffer12Pos4[word167EB].y; } return; } @@ -1528,8 +1528,8 @@ byte LilliputEngine::sub16A76(int indexb, int indexs) { if ((var1h >= _rectXMinMax[var2].min) && (var1h <= _rectXMinMax[var2].max) && (var1l >= _rectYMinMax[var2].min) && (var1l <= _rectYMinMax[var2].max)) return 0; - var1h = _array109E9PosX[indexs]; - var1l = _array10A11PosY[indexs]; + var1h = _characterSubTargetPosX[indexs]; + var1l = _characterSubTargetPosY[indexs]; if ((var1h >= _rectXMinMax[var2].min) && (var1h <= _rectXMinMax[var2].max) && (var1l >= _rectYMinMax[var2].min) && (var1l <= _rectYMinMax[var2].max)) return 0; @@ -1567,8 +1567,8 @@ void LilliputEngine::sub16A08(int index) { int16 arrayDistance[4]; for (int i = 3; i >= 0; i--) { - int16 var1h = _word16937Pos.x + arrayMoveX[i] - _array109E9PosX[index]; - int16 var1l = _word16937Pos.y + arrayMoveY[i] - _array10A11PosY[index]; + int16 var1h = _word16937Pos.x + arrayMoveX[i] - _characterSubTargetPosX[index]; + int16 var1l = _word16937Pos.y + arrayMoveY[i] - _characterSubTargetPosY[index]; arrayDistance[i] = (var1l * var1l) + (var1h * var1h); } @@ -1636,7 +1636,7 @@ void LilliputEngine::sub16626() { break; uint16 index2 = _scriptHandler->_characterNextSequence[index] + (index * 16); - Common::Point var1 = _scriptHandler->_array12311[index2]; + Common::Point var1 = _scriptHandler->_sequenceArr[index2]; // /8, then /2 as the function array is a word array int16 var2 = var1.x / 16; @@ -1708,7 +1708,7 @@ byte LilliputEngine::sub166F7(int index, Common::Point var1, int tmpVal) { a2 |= (a2 << 4); a2 -= 16; - _scriptHandler->_array12311[tmpVal] = Common::Point(var1.x, a2); + _scriptHandler->_sequenceArr[tmpVal] = Common::Point(var1.x, a2); if ((a2 & 0xF0) == 0) return 2; @@ -1749,9 +1749,9 @@ byte LilliputEngine::sub1675D(int index, Common::Point var1) { int charIndex = _scriptHandler->_array10A39[index]; Common::Point charPos = Common::Point(_scriptHandler->_characterTilePosX[charIndex], _scriptHandler->_characterTilePosY[charIndex]); - if ((_array109E9PosX[index] != -1) && (_array109E9PosX[index] == _characterTargetPosX[index]) && (_array10A11PosY[index] == _characterTargetPosY[index])) { - _array109E9PosX[index] = charPos.x; - _array10A11PosY[index] = charPos.y; + if ((_characterSubTargetPosX[index] != -1) && (_characterSubTargetPosX[index] == _characterTargetPosX[index]) && (_characterSubTargetPosY[index] == _characterTargetPosY[index])) { + _characterSubTargetPosX[index] = charPos.x; + _characterSubTargetPosY[index] = charPos.y; } _characterTargetPosX[index] = charPos.x; @@ -2099,25 +2099,25 @@ void LilliputEngine::turnCharacter2(int index) { void LilliputEngine::moveCharacterUp1(int index) { debugC(2, kDebugEngine, "moveCharacterUp1(%d)", index); - _characterPositionAltitude[index] += 1; + _characterPosAltitude[index] += 1; } void LilliputEngine::moveCharacterUp2(int index) { debugC(2, kDebugEngine, "moveCharacterUp2(%d)", index); - _characterPositionAltitude[index] += 2; + _characterPosAltitude[index] += 2; } void LilliputEngine::moveCharacterDown1(int index) { debugC(2, kDebugEngine, "moveCharacterDown1(%d)", index); - _characterPositionAltitude[index] -= 1; + _characterPosAltitude[index] -= 1; } void LilliputEngine::moveCharacterDown2(int index) { debugC(2, kDebugEngine, "moveCharacterDown2(%d)", index); - _characterPositionAltitude[index] -= 2; + _characterPosAltitude[index] -= 2; } void LilliputEngine::moveCharacterSpeed2(int index) { @@ -2518,11 +2518,11 @@ void LilliputEngine::loadRules() { curWord = (curWord << 3) + 4; _characterPositionY[j] = curWord; - _characterPositionAltitude[j] = (f.readUint16LE() & 0xFF); + _characterPosAltitude[j] = (f.readUint16LE() & 0xFF); _characterFrameArray[j] = f.readUint16LE(); _characterCarried[j] = (int8)f.readByte(); - _rulesBuffer2_6[j] = (int8)f.readByte(); - _rulesBuffer2_7[j] = f.readByte(); + _characterBehindDist[j] = (int8)f.readByte(); + _characterAboveDist[j] = f.readByte(); _spriteSizeArray[j] = f.readByte(); _characterDirectionArray[j] = f.readByte(); _rulesBuffer2_10[j] = f.readByte(); diff --git a/engines/lilliput/lilliput.h b/engines/lilliput/lilliput.h index 024994d9cc..4817a2d013 100644 --- a/engines/lilliput/lilliput.h +++ b/engines/lilliput/lilliput.h @@ -169,11 +169,11 @@ public: int16 _currentScriptCharacter; int16 _characterPositionX[40]; int16 _characterPositionY[40]; - int8 _characterPositionAltitude[40]; + int8 _characterPosAltitude[40]; int16 _characterFrameArray[40]; int8 _characterCarried[40]; - int8 _rulesBuffer2_6[40]; - byte _rulesBuffer2_7[40]; + int8 _characterBehindDist[40]; + byte _characterAboveDist[40]; byte _spriteSizeArray[40]; byte _characterDirectionArray[40]; byte _rulesBuffer2_10[40]; @@ -217,8 +217,8 @@ public: int16 _characterDisplayX[40]; int16 _characterDisplayY[40]; int8 _array12299[40]; - int16 _array109E9PosX[40]; - int16 _array10A11PosY[40]; + int16 _characterSubTargetPosX[40]; + int16 _characterSubTargetPosY[40]; byte _stingArray[40]; byte _array16C54[4]; byte _array16C58[4]; diff --git a/engines/lilliput/script.cpp b/engines/lilliput/script.cpp index 32de831a31..6dc6ee0eb9 100644 --- a/engines/lilliput/script.cpp +++ b/engines/lilliput/script.cpp @@ -72,7 +72,7 @@ LilliputScript::LilliputScript(LilliputEngine *vm) : _vm(vm), _currScript(NULL) } for (int i = 0; i < 640; i++) { - _array12311[i] = Common::Point(-1, -1); + _sequenceArr[i] = Common::Point(-1, -1); } for (int i = 0; i < 1600; i++) @@ -290,7 +290,7 @@ void LilliputScript::handleOpcodeType2(int curWord) { OC_startSpeech5(); break; case 0xF: - OC_resetByte1714E(); + OC_resetHandleOpcodeFlag(); break; case 0x10: OC_deleteSavegameAndQuit(); @@ -299,7 +299,7 @@ void LilliputScript::handleOpcodeType2(int curWord) { OC_incScriptForVal(); break; case 0x12: - OC_sub17BA5(); + OC_computeChararacterAttr(); break; case 0x13: OC_setByte18823(); @@ -317,22 +317,22 @@ void LilliputScript::handleOpcodeType2(int curWord) { OC_initScriptFor(); break; case 0x18: - OC_sub17AE1(); + OC_setCurrentCharacterSequence(); break; case 0x19: - OC_sub17AEE(); + OC_setNextCharacterSequence(); break; case 0x1A: - OC_setWord10804(); + OC_setHost(); break; case 0x1B: - OC_sub17C0E(); + OC_changeMapCube(); break; case 0x1C: - OC_sub17C55(); + OC_setCharacterCarry(); break; case 0x1D: - OC_sub17C76(); + OC_dropCarried(); break; case 0x1E: OC_setCurrentCharacter(); @@ -626,21 +626,21 @@ static const OpCode opCodes2[] = { /* 0x0c */ { "OC_saveAndQuit", 0, kNone, kNone, kNone, kNone, kNone }, /* 0x0d */ { "OC_nSkipOpcodes", 1, kImmediateValue, kNone, kNone, kNone, kNone }, // todo : jump to other opcode /* 0x0e */ { "OC_startSpeech5", 0, kNone, kNone, kNone, kNone, kNone }, // todo -/* 0x0f */ { "OC_resetByte1714E", 0, kNone, kNone, kNone, kNone, kNone }, +/* 0x0f */ { "OC_resetHandleOpcodeFlag", 0, kNone, kNone, kNone, kNone, kNone }, /* 0x10 */ { "OC_deleteSavegameAndQuit", 0, kNone, kNone, kNone, kNone, kNone }, /* 0x11 */ { "OC_incScriptForVal", 0, kNone, kNone, kNone, kNone, kNone }, -/* 0x12 */ { "OC_sub17BA5", 5, kGetValue1, kImmediateValue,kComputeOperation, kGetValue1, kImmediateValue }, +/* 0x12 */ { "OC_ComputeChararacterAttr", 5, kGetValue1, kImmediateValue,kComputeOperation, kGetValue1, kImmediateValue }, /* 0x13 */ { "OC_setByte18823", 2, kGetValue1, kImmediateValue, kNone, kNone, kNone }, /* 0x14 */ { "OC_callScript", 2, kImmediateValue, kGetValue1, kNone, kNone, kNone }, // run script /* 0x15 */ { "OC_callScriptAndReturn", 2, kImmediateValue, kGetValue1, kNone, kNone, kNone }, // run script then stop /* 0x16 */ { "OC_setCurrentScriptCharacterPos", 1, kgetPosFromScript, kNone, kNone, kNone, kNone }, /* 0x17 */ { "OC_initScriptFor", 0, kNone, kNone, kNone, kNone, kNone }, -/* 0x18 */ { "OC_sub17AE1", 1, kImmediateValue, kNone, kNone, kNone, kNone }, -/* 0x19 */ { "OC_sub17AEE", 1, kImmediateValue, kNone, kNone, kNone, kNone }, -/* 0x1a */ { "OC_setWord10804", 1, kGetValue1, kNone, kNone, kNone, kNone }, -/* 0x1b */ { "OC_sub17C0E", 0, kNone, kNone, kNone, kNone, kNone }, -/* 0x1c */ { "OC_sub17C55", 4, kGetValue1, kGetValue1, kImmediateValue, kImmediateValue, kNone }, -/* 0x1d */ { "OC_sub17C76", 1, kGetValue1, kNone, kNone, kNone, kNone }, +/* 0x18 */ { "OC_setCurrentCharacterSequence", 1, kImmediateValue, kNone, kNone, kNone, kNone }, +/* 0x19 */ { "OC_setNextCharacterSequence", 1, kImmediateValue, kNone, kNone, kNone, kNone }, +/* 0x1a */ { "OC_setHost", 1, kGetValue1, kNone, kNone, kNone, kNone }, +/* 0x1b */ { "OC_changeMapCube", 0, kNone, kNone, kNone, kNone, kNone }, +/* 0x1c */ { "OC_setCharacterCarry", 4, kGetValue1, kGetValue1, kImmediateValue, kImmediateValue, kNone }, +/* 0x1d */ { "OC_dropCarried", 1, kGetValue1, kNone, kNone, kNone, kNone }, /* 0x1e */ { "OC_setCurrentCharacter", 1, kGetValue1, kNone, kNone, kNone, kNone }, /* 0x1f */ { "OC_sub17C8B", 2, kImmediateValue, kImmediateValue, kNone, kNone, kNone }, /* 0x20 */ { "OC_sub17CA2", 2, kImmediateValue, kImmediateValue, kNone, kNone, kNone }, @@ -1041,33 +1041,33 @@ void LilliputScript::skipOpcodes(int var1) { _currScript->seek(_currScript->pos() - 2); } -void LilliputScript::sub16C86(int index, byte *buf) { - debugC(1, kDebugScript, "sub16C86()"); +void LilliputScript::copySequence(int index, byte *buf) { + debugC(1, kDebugScript, "copySequence()"); _characterNextSequence[index] = 0; for (int i = 0; i < 16; i++) { - _array12311[(index * 16) + i] = Common::Point(buf[(2 * i) + 1], buf[2 * i]); + _sequenceArr[(index * 16) + i] = Common::Point(buf[(2 * i) + 1], buf[2 * i]); } } -void LilliputScript::sub16C5C(int index, int8 var3) { - debugC(1, kDebugScript, "sub16C5C(%d, %d)", index, var3); +void LilliputScript::setSequence(int charIdx, int8 seqIdx) { + debugC(1, kDebugScript, "setSequence(%d, %d)", charIdx, seqIdx); - assert(index < 40); - _characterLastSequence[index] = var3; + assert(charIdx < 40); + _characterLastSequence[charIdx] = seqIdx; byte *buf = _vm->_rulesChunk1; - if (var3 != 0) { + if (seqIdx != 0) { int count = 0; - while (count < var3) { + while (count < seqIdx) { if ((buf[0] == 0xFF) && (buf[1] == 0xFF)) ++count; buf += 2; } } - sub16C86(index, buf); + copySequence(charIdx, buf); } void LilliputScript::checkSpeechAllowed(bool &forceReturnFl) { @@ -2296,7 +2296,7 @@ void LilliputScript::OC_DisableCharacter() { void LilliputScript::OC_saveAndQuit() { warning("TODO: OC_saveAndQuit"); - _vm->_soundHandler.contentFct6(); // Kill music + _vm->_soundHandler->contentFct6(); // Kill music // TODO: Save game _vm->_shouldQuit = true; } @@ -2320,8 +2320,8 @@ void LilliputScript::OC_startSpeech5() { startSpeech(5); } -void LilliputScript::OC_resetByte1714E() { - debugC(1, kDebugScriptTBC, "OC_resetByte1714E()"); +void LilliputScript::OC_resetHandleOpcodeFlag() { + debugC(1, kDebugScriptTBC, "OC_resetHandleOpcodeFlag()"); _vm->_handleOpcodeReturnCode = 0; } @@ -2337,8 +2337,8 @@ void LilliputScript::OC_incScriptForVal() { ++_scriptForVal; } -void LilliputScript::OC_sub17BA5() { - debugC(1, kDebugScript, "OC_sub17BA5()"); +void LilliputScript::OC_computeChararacterAttr() { + debugC(1, kDebugScript, "OC_ComputeChararacterAttr()"); byte *tmpArr = getCharacterAttributesPtr(); uint16 oper = _currScript->readUint16LE(); @@ -2395,7 +2395,7 @@ void LilliputScript::OC_setCurrentScriptCharacterPos() { Common::Point pos = getPosFromScript(); _vm->_characterTargetPosX[_vm->_currentScriptCharacter] = pos.x; _vm->_characterTargetPosY[_vm->_currentScriptCharacter] = pos.y; - _vm->_array109E9PosX[_vm->_currentScriptCharacter] = -1; + _vm->_characterSubTargetPosX[_vm->_currentScriptCharacter] = -1; } void LilliputScript::OC_initScriptFor() { @@ -2404,28 +2404,28 @@ void LilliputScript::OC_initScriptFor() { _scriptForVal = 0; } -void LilliputScript::OC_sub17AE1() { - debugC(1, kDebugScript, "OC_sub17AE1()"); +void LilliputScript::OC_setCurrentCharacterSequence() { + debugC(1, kDebugScript, "OC_setCurrentCharacterSequence()"); - int8 var3 = (_currScript->readUint16LE() & 0xFF); - sub16C5C(_vm->_currentScriptCharacter, var3); + int8 seqIdx = (_currScript->readUint16LE() & 0xFF); + setSequence(_vm->_currentScriptCharacter, seqIdx); } -void LilliputScript::OC_sub17AEE() { - debugC(1, kDebugScript, "OC_sub17AEE()"); +void LilliputScript::OC_setNextCharacterSequence() { + debugC(1, kDebugScript, "OC_setNextCharacterSequence()"); - int8 var3 = (_currScript->readUint16LE() & 0xFF); - sub16C5C(_vm->_currentScriptCharacter + 1, var3); + int8 seqIdx = (_currScript->readUint16LE() & 0xFF); + setSequence(_vm->_currentScriptCharacter + 1, seqIdx); } -void LilliputScript::OC_setWord10804() { - debugC(1, kDebugScript, "OC_setWord10804()"); +void LilliputScript::OC_setHost() { + debugC(1, kDebugScript, "OC_setHost()"); _vm->_host = getValue1(); } -void LilliputScript::OC_sub17C0E() { - debugC(1, kDebugScript, "OC_sub17C0E()"); +void LilliputScript::OC_changeMapCube() { + debugC(1, kDebugScript, "OC_changeMapCube()"); assert(_vm->_currentCharacterAttributes != NULL); Common::Point var1 = Common::Point(_vm->_currentCharacterAttributes[4], _vm->_currentCharacterAttributes[5]); @@ -2442,31 +2442,30 @@ void LilliputScript::OC_sub17C0E() { } } -void LilliputScript::OC_sub17C55() { - debugC(1, kDebugScript, "OC_sub17C55()"); +void LilliputScript::OC_setCharacterCarry() { + debugC(1, kDebugScript, "OC_setCharacterCarry()"); - int8 var1 = (getValue1() & 0xFF); + int8 carriedIdx = (getValue1() & 0xFF); int16 index = getValue1(); - int8 var3 = (_currScript->readSint16LE() & 0xFF); - byte var4 = (_currScript->readUint16LE() & 0xFF); + int8 distBehind = (_currScript->readSint16LE() & 0xFF); + byte distAbove = (_currScript->readUint16LE() & 0xFF); assert((index >= 0) && (index < 40)); - _vm->_characterCarried[index] = var1; - _vm->_rulesBuffer2_6[index] = var3; - _vm->_rulesBuffer2_7[index] = var4; + _vm->_characterCarried[index] = carriedIdx; + _vm->_characterBehindDist[index] = distBehind; + _vm->_characterAboveDist[index] = distAbove; - warning("debug - OC_sub17C55 index %d, var1 0x%x var3 0x%x var4 0x%x", index, var1, var3, var4); + warning("debug - OC_setCharacterCarry index %d, var1 0x%x var3 0x%x var4 0x%x", index, carriedIdx, distBehind, distAbove); } -void LilliputScript::OC_sub17C76() { - debugC(1, kDebugScript, "OC_sub17C76()"); +void LilliputScript::OC_dropCarried() { + debugC(1, kDebugScript, "OC_dropCarried()"); int index = getValue1(); _vm->_characterCarried[index] = -1; - _vm->_characterPositionAltitude[index] = 0; + _vm->_characterPosAltitude[index] = 0; _characterScriptEnabled[index] = 1; - } void LilliputScript::OC_setCurrentCharacter() { @@ -2663,7 +2662,7 @@ void LilliputScript::OC_sub17F4F() { int16 var = getValue1(); _array10A39[_vm->_currentScriptCharacter] = (byte)(var & 0xFF); warning("debug - OC_sub17F4F: _array10A39[%d] = %d", _vm->_currentScriptCharacter, var); - _vm->_array109E9PosX[_vm->_currentScriptCharacter] = -1; + _vm->_characterSubTargetPosX[_vm->_currentScriptCharacter] = -1; } void LilliputScript::OC_scrollAwayFromCharacter() { @@ -2761,7 +2760,7 @@ void LilliputScript::OC_setCharacterProperties() { y += _currScript->readSint16LE(); _vm->_characterPositionY[index] = y; - _vm->_characterPositionAltitude[index] = (int8)(_currScript->readUint16LE() & 0xFF); + _vm->_characterPosAltitude[index] = (int8)(_currScript->readUint16LE() & 0xFF); _vm->_characterDirectionArray[index] = _currScript->readUint16LE() & 0xFF; } @@ -2835,7 +2834,7 @@ void LilliputScript::OC_setViewPortPos() { void LilliputScript::OC_setCurrentCharacterAltitude() { debugC(1, kDebugScript, "OC_setCurrentCharacterAltitude()"); - _vm->_characterPositionAltitude[_vm->_currentScriptCharacter] = (_currScript->readUint16LE() & 0xFF); + _vm->_characterPosAltitude[_vm->_currentScriptCharacter] = (_currScript->readUint16LE() & 0xFF); } void LilliputScript::OC_sub1817F() { diff --git a/engines/lilliput/script.h b/engines/lilliput/script.h index c292e12a85..4261b695ab 100644 --- a/engines/lilliput/script.h +++ b/engines/lilliput/script.h @@ -88,7 +88,7 @@ public: int _heroismBarX; int _heroismBarBottomY; - Common::Point _array12311[640]; + Common::Point _sequenceArr[640]; byte _characterMapPixelColor[40]; int8 _characterLastSequence[40]; Common::Point _array1813BPos[32]; @@ -129,8 +129,8 @@ private: void enableCharacterScript(byte index, byte var1, byte *curBufPtr); void skipOpcodes(int var1); - void sub16C86(int index, byte *buf); - void sub16C5C(int index, int8 var3); + void copySequence(int index, byte *buf); + void setSequence(int charIdx, int8 seqIdx); void checkSpeechAllowed(bool &forceReturnFl); void decodePackedText(char *buf); void startSpeech(int var); @@ -219,21 +219,21 @@ private: void OC_saveAndQuit(); void OC_nSkipOpcodes(); void OC_startSpeech5(); - void OC_resetByte1714E(); + void OC_resetHandleOpcodeFlag(); void OC_deleteSavegameAndQuit(); void OC_incScriptForVal(); - void OC_sub17BA5(); + void OC_computeChararacterAttr(); void OC_setByte18823(); void OC_callScript(); void OC_callScriptAndReturn(); void OC_setCurrentScriptCharacterPos(); void OC_initScriptFor(); - void OC_sub17AE1(); - void OC_sub17AEE(); - void OC_setWord10804(); - void OC_sub17C0E(); - void OC_sub17C55(); - void OC_sub17C76(); + void OC_setCurrentCharacterSequence(); + void OC_setNextCharacterSequence(); + void OC_setHost(); + void OC_changeMapCube(); + void OC_setCharacterCarry(); + void OC_dropCarried(); void OC_setCurrentCharacter(); void OC_sub17C8B(); void OC_sub17CA2(); -- cgit v1.2.3