aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/lilliput/lilliput.cpp40
-rw-r--r--engines/lilliput/script.cpp11
-rw-r--r--engines/lilliput/script.h3
3 files changed, 25 insertions, 29 deletions
diff --git a/engines/lilliput/lilliput.cpp b/engines/lilliput/lilliput.cpp
index aff61042ed..70b729cc15 100644
--- a/engines/lilliput/lilliput.cpp
+++ b/engines/lilliput/lilliput.cpp
@@ -586,9 +586,9 @@ void LilliputEngine::displayCharactersOnMap() {
byte *buf = (byte *)_mainSurface->getPixels();
for (int index = _numCharacters - 1; index >= 0; index--) {
- if (((_characterTypes[index] & 2) == 0) && (_scriptHandler->_characterTilePosY[index] != -1)) {
+ if (((_characterTypes[index] & 2) == 0) && (_scriptHandler->_characterTilePos[index].y != -1)) {
// FIXME: This is still wrong, but less. The values in both arrays should be verified now!
- int pixIndex = 320 + ((15 * _scriptHandler->_characterTilePosY[index]) / 4) + (_scriptHandler->_characterTilePosX[index] * 4) + 1;
+ int pixIndex = 320 + ((15 * _scriptHandler->_characterTilePos[index].y) / 4) + (_scriptHandler->_characterTilePos[index].x * 4) + 1;
_mapSavedPixelIndex[index] = pixIndex;
_mapSavedPixel[index] = buf[pixIndex];
@@ -632,8 +632,7 @@ void LilliputEngine::moveCharacters() {
_characterPositionY[i] = var4;
}
- _scriptHandler->_characterTilePosX[i] = (_characterPositionX[i] >> 3);
- _scriptHandler->_characterTilePosY[i] = (_characterPositionY[i] >> 3);
+ _scriptHandler->_characterTilePos[i] = Common::Point(_characterPositionX[i] >> 3, _characterPositionY[i] >> 3);
_characterRelativePositionX[i] = -1;
_characterRelativePositionY[i] = -1;
_characterDisplayX[i] = -1;
@@ -937,8 +936,8 @@ void LilliputEngine::sub16CA0() {
if (_characterTypes[index] & 1)
continue;
- int c1 = _scriptHandler->_characterTilePosX[index];
- int c2 = _scriptHandler->_characterTilePosY[index];
+ int c1 = _scriptHandler->_characterTilePos[index].x;
+ int c2 = _scriptHandler->_characterTilePos[index].y;
// Hack: Skip if disabled (c2 negative)
if (c2 == -1)
@@ -950,8 +949,8 @@ void LilliputEngine::sub16CA0() {
(_characterCarried[index] != index2) &&
(_characterCarried[index2] != index) &&
(_characterTypes[index2] & 2) == 0) {
- int d1 = _scriptHandler->_characterTilePosX[index2];
- int d2 = _scriptHandler->_characterTilePosY[index2];
+ int d1 = _scriptHandler->_characterTilePos[index2].x;
+ int d2 = _scriptHandler->_characterTilePos[index2].y;
if (d1 != -1) {
int x = c1 - d1;
@@ -1334,7 +1333,7 @@ byte LilliputEngine::sequenceCharacterHomeIn(int index, Common::Point param1) {
Common::Point var3 = Common::Point(_characterSubTargetPosX[index], _characterSubTargetPosY[index]);
if (var3.x != -1) {
- if ((var3.x != _scriptHandler->_characterTilePosX[index]) || (var3.y != _scriptHandler->_characterTilePosY[index])) {
+ if (var3 != _scriptHandler->_characterTilePos[index]) {
sub1693A_chooseDirections(index);
_scriptHandler->_characterNextSequence[index] -= (param1.x & 0x0F);
return 3;
@@ -1346,7 +1345,7 @@ byte LilliputEngine::sequenceCharacterHomeIn(int index, Common::Point param1) {
sub167EF(index);
- Common::Point pos1 = Common::Point(_scriptHandler->_characterTilePosX[index], _scriptHandler->_characterTilePosY[index]);
+ Common::Point pos1 = _scriptHandler->_characterTilePos[index];
Common::Point pos2 = Common::Point(_characterSubTargetPosX[index], _characterSubTargetPosY[index]);
_characterDirectionArray[index] = getDirection(pos1, pos2);
@@ -1360,7 +1359,7 @@ byte LilliputEngine::sequenceCharacterHomeIn(int index, Common::Point param1) {
void LilliputEngine::sub167EF(int index) {
debugC(2, kDebugEngine, "sub167EF(%d)", index);
- int16 word167EB = findHotspot(Common::Point(_scriptHandler->_characterTilePosX[index], _scriptHandler->_characterTilePosY[index]));
+ int16 word167EB = findHotspot(_scriptHandler->_characterTilePos[index]);
int16 word167ED = findHotspot(Common::Point(_characterTargetPosX[index], _characterTargetPosY[index]));
if (word167EB == word167ED) {
@@ -1445,7 +1444,7 @@ void LilliputEngine::sub1693A_chooseDirections(int index) {
static const int16 mapArrayMove[4] = {4, -256, 256, -4};
- _word16937Pos = Common::Point(_scriptHandler->_characterTilePosX[index], _scriptHandler->_characterTilePosY[index]);
+ _word16937Pos = _scriptHandler->_characterTilePos[index];
sub16A08(index);
@@ -1723,8 +1722,7 @@ byte LilliputEngine::sequenceSound(int index, Common::Point var1) {
int param4x = ((index | 0xFF00) >> 8);
int param1 = var1.y;
_soundHandler->contentFct2(param1, _scriptHandler->_viewportPos,
- Common::Point(_scriptHandler->_characterTilePosX[index], _scriptHandler->_characterTilePosY[index]),
- Common::Point(param4x, 0));
+ _scriptHandler->_characterTilePos[index], Common::Point(param4x, 0));
return 2;
}
@@ -1732,9 +1730,11 @@ byte LilliputEngine::sequenceSeekMovingCharacter(int index, Common::Point var1)
debugC(2, kDebugEngine, "sequenceSeekMovingCharacter(%d, %d - %d)", index, var1.x, var1.y);
int charIndex = _scriptHandler->_characterSeek[index];
- Common::Point charPos = Common::Point(_scriptHandler->_characterTilePosX[charIndex], _scriptHandler->_characterTilePosY[charIndex]);
+ Common::Point charPos = _scriptHandler->_characterTilePos[charIndex];
- if ((_characterSubTargetPosX[index] != -1) && (_characterSubTargetPosX[index] == _characterTargetPosX[index]) && (_characterSubTargetPosY[index] == _characterTargetPosY[index])) {
+ if ((_characterSubTargetPosX[index] != -1)
+ && (_characterSubTargetPosX[index] == _characterTargetPosX[index])
+ && (_characterSubTargetPosY[index] == _characterTargetPosY[index])) {
_characterSubTargetPosX[index] = charPos.x;
_characterSubTargetPosY[index] = charPos.y;
}
@@ -1750,11 +1750,11 @@ void LilliputEngine::sub16EBC() {
for (int index1 = _numCharacters - 1; index1 >= 0; index1--) {
// Hack: The original doesn't check if it's disabled, which looks wrong
- if ((_scriptHandler->_characterTilePosX[index1] == -1) || (_scriptHandler->_characterTilePosY[index1] == -1))
+ if ((_scriptHandler->_characterTilePos[index1].x == -1) || (_scriptHandler->_characterTilePos[index1].y == -1))
continue;
//
- int mapIndex = 3 + (_scriptHandler->_characterTilePosY[index1] * 64 + _scriptHandler->_characterTilePosX[index1]) * 4;
+ int mapIndex = 3 + (_scriptHandler->_characterTilePos[index1].y * 64 + _scriptHandler->_characterTilePos[index1].x) * 4;
assert((mapIndex >= 0) && (mapIndex < 16384));
byte var1 = _bufferIsoMap[mapIndex] & 0x40;
@@ -2158,7 +2158,7 @@ void LilliputEngine::sub16B8F_moveCharacter(int index, Common::Point pos, int di
debugC(2, kDebugEngine, "sub16B8F_moveCharacter(%d, %d - %d, %d)", index, pos.x, pos.y, direction);
int16 diffX = pos.x >> 3;
- if (((diffX & 0xFF) == _scriptHandler->_characterTilePosX[index]) && ((pos.y >> 3) == _scriptHandler->_characterTilePosY[index])) {
+ if (((diffX & 0xFF) == _scriptHandler->_characterTilePos[index].x) && ((pos.y >> 3) == _scriptHandler->_characterTilePos[index].y)) {
_characterPositionX[index] = pos.x;
_characterPositionY[index] = pos.y;
return;
@@ -2167,7 +2167,7 @@ void LilliputEngine::sub16B8F_moveCharacter(int index, Common::Point pos, int di
if ((pos.x < 0) || (pos.x >= 512) || (pos.y < 0) || (pos.y >= 512))
return;
- int mapIndex = (_scriptHandler->_characterTilePosY[index] * 64 + _scriptHandler->_characterTilePosX[index]) * 4;
+ int mapIndex = (_scriptHandler->_characterTilePos[index].y * 64 + _scriptHandler->_characterTilePos[index].x) * 4;
assert(mapIndex < 16384);
if ((_bufferIsoMap[mapIndex + 3] & _array16C58[direction]) == 0)
diff --git a/engines/lilliput/script.cpp b/engines/lilliput/script.cpp
index 37b97c194b..7600028991 100644
--- a/engines/lilliput/script.cpp
+++ b/engines/lilliput/script.cpp
@@ -66,8 +66,7 @@ LilliputScript::LilliputScript(LilliputEngine *vm) : _vm(vm), _currScript(NULL)
_characterPose[i] = 0;
_characterNextSequence[i] = 16;
_characterLastSequence[i] = -1;
- _characterTilePosX[i] = 0;
- _characterTilePosY[i] = 0;
+ _characterTilePos[i] = Common::Point(0, 0);
_array122C1[i] = 0;
}
@@ -1371,11 +1370,9 @@ byte LilliputScript::OC_comparePos() {
debugC(2, kDebugScript, "OC_comparePos()");
int index = getValue1();
- int8 d1 = _characterTilePosX[index];
- int8 d2 = _characterTilePosY[index];
Common::Point var1 = getPosFromScript();
- if (var1 == Common::Point(d1, d2))
+ if (var1 == _characterTilePos[index])
return 1;
return 0;
@@ -1541,7 +1538,7 @@ byte LilliputScript::OC_compareCoords_2() {
debugC(1, kDebugScript, "OC_compareCoords_2()");
int16 index = getValue1();
- Common::Point var1 = Common::Point(_characterTilePosX[index], _characterTilePosY[index]);
+ Common::Point var1 = _characterTilePos[index];
index = _currScript->readUint16LE();
MinMax xMinMax = _vm->_rectXMinMax[index];
MinMax yMinMax = _vm->_rectYMinMax[index];
@@ -3301,7 +3298,7 @@ void LilliputScript::OC_playObjectSound() {
Common::Point var4 = Common::Point(0xFF, index & 0xFF);
int soundId = (_currScript->readUint16LE() & 0xFF);
- _vm->_soundHandler->contentFct2(soundId, _viewportPos, Common::Point(_characterTilePosX[index], _characterTilePosY[index]), var4);
+ _vm->_soundHandler->contentFct2(soundId, _viewportPos, _characterTilePos[index], var4);
}
void LilliputScript::OC_startLocationSound() {
diff --git a/engines/lilliput/script.h b/engines/lilliput/script.h
index 9f22817cf1..2199f51a3b 100644
--- a/engines/lilliput/script.h
+++ b/engines/lilliput/script.h
@@ -71,8 +71,7 @@ public:
byte _characterScriptEnabled[40];
int8 _interfaceHotspotStatus[20];
- int8 _characterTilePosX[40];
- int8 _characterTilePosY[40];
+ Common::Point _characterTilePos[40];
int8 _characterNextSequence[40];
int8 _characterPose[40];
byte _interfaceButtonActivationDelay[20];
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 07:40:30 +0000