diff options
Diffstat (limited to 'engines/gnap/gnap.cpp')
| -rw-r--r-- | engines/gnap/gnap.cpp | 209 |
1 files changed, 2 insertions, 207 deletions
diff --git a/engines/gnap/gnap.cpp b/engines/gnap/gnap.cpp index 42d5277dc6..e40d50e621 100644 --- a/engines/gnap/gnap.cpp +++ b/engines/gnap/gnap.cpp @@ -941,211 +941,6 @@ void GnapEngine::deleteSurface(Graphics::Surface **surface) { } } -int GnapEngine::getGnapShowSequenceId(int index, int gridX, int gridY) { - int sequenceId; - Facing facing = _gnap->_idleFacing; - - if (gridY > 0 && gridX > 0) { - if (_gnap->_pos.y > gridY) { - if (_gnap->_pos.x > gridX) - _gnap->_idleFacing = kDirUpLeft; - else - _gnap->_idleFacing = kDirUpRight; - } else { - if (_gnap->_pos.x > gridX) - _gnap->_idleFacing = kDirUpLeft; - else - _gnap->_idleFacing = kDirUpRight; - } - } else if (_gnap->_idleFacing != kDirBottomRight && _gnap->_idleFacing != kDirUpRight) { - _gnap->_idleFacing = kDirUpLeft; - } else { - _gnap->_idleFacing = kDirUpRight; - } - - switch (index) { - case 0: - if (_gnap->_idleFacing == kDirUpRight) - sequenceId = 0x8A0; - else - sequenceId = 0x8A1; - break; - case 1: - if (_gnap->_idleFacing == kDirUpRight) - sequenceId = 0x880; - else - sequenceId = 0x895; - break; - case 2: - if (_gnap->_idleFacing == kDirUpRight) - sequenceId = 0x884; - else - sequenceId = 0x899; - break; - //Skip 3 - case 4: - if (_gnap->_idleFacing == kDirUpRight) - sequenceId = 0x881; - else - sequenceId = 0x896; - break; - case 5: - if (_gnap->_idleFacing == kDirUpRight) - sequenceId = 0x883; - else - sequenceId = 0x898; - break; - case 6: - if (_gnap->_idleFacing == kDirUpRight) - sequenceId = 0x87E; - else - sequenceId = 0x893; - break; - case 7: - if (_gnap->_idleFacing == kDirUpRight) - sequenceId = 0x848; - else - sequenceId = 0x890; - break; - case 8: - if (_gnap->_idleFacing == kDirUpRight) - sequenceId = 0x87D; - else - sequenceId = 0x892; - break; - case 9: - if (_gnap->_idleFacing == kDirUpRight) - sequenceId = 0x882; - else - sequenceId = 0x897; - break; - case 10: - if (_gnap->_idleFacing == kDirUpRight) - sequenceId = 0x87C; - else - sequenceId = 0x891; - break; - case 11: - if (_gnap->_idleFacing == kDirUpRight) - sequenceId = 0x87C; - else - sequenceId = 0x891; - break; - case 12: - if (_gnap->_idleFacing == kDirUpRight) - sequenceId = 0x87D; - else - sequenceId = 0x892; - break; - case 13: - if (_gnap->_idleFacing == kDirUpRight) - sequenceId = 0x888; - else - sequenceId = 0x89D; - break; - case 14: - if (_gnap->_idleFacing == kDirUpRight) - sequenceId = 0x87F; - else - sequenceId = 0x894; - break; - case 15: - if (_gnap->_idleFacing == kDirUpRight) - sequenceId = 0x87B; - else - sequenceId = 0x8A3; - break; - case 16: - if (_gnap->_idleFacing == kDirUpRight) - sequenceId = 0x877; - else - sequenceId = 0x88C; - break; - //Skip 17 - case 18: - sequenceId = 0x887; - break; - case 19: - if (_gnap->_idleFacing == kDirUpRight) - sequenceId = 0x87A; - else - sequenceId = 0x88F; - break; - case 20: - if (_gnap->_idleFacing == kDirUpRight) - sequenceId = 0x878; - else - sequenceId = 0x88D; - break; - case 21: - if (_gnap->_idleFacing == kDirUpRight) - sequenceId = 0x879; - else - sequenceId = 0x88E; - break; - case 22: - if (_gnap->_idleFacing == kDirUpRight) - sequenceId = 0x88A; - else - sequenceId = 0x89F; - break; - case 23: - if (_gnap->_idleFacing == kDirUpRight) - sequenceId = 0x889; - else - sequenceId = 0x89E; - break; - case 24: - if (_gnap->_idleFacing == kDirUpRight) - sequenceId = 0x886; - else - sequenceId = 0x89B; - break; - case 25: - if (_gnap->_idleFacing == kDirUpRight) - sequenceId = 0x87A; - else - sequenceId = 0x88F; - break; - //Skip 26 - //Skip 27 - //Skip 28 - //Skip 29 - default: - _gnap->_idleFacing = facing; - sequenceId = _gnap->getSequenceId(gskImpossible, 0, 0); - break; - } - return sequenceId; -} - -void GnapEngine::gnapIdle() { - if (_gnap->_sequenceId != -1 && _gnap->_sequenceDatNum == 1 && - (_gnap->_sequenceId == 0x7A6 || _gnap->_sequenceId == 0x7AA || - _gnap->_sequenceId == 0x832 || _gnap->_sequenceId == 0x841 || - _gnap->_sequenceId == 0x842 || _gnap->_sequenceId == 0x8A2 || - _gnap->_sequenceId == 0x833 || _gnap->_sequenceId == 0x834 || - _gnap->_sequenceId == 0x885 || _gnap->_sequenceId == 0x7A8 || - _gnap->_sequenceId == 0x831 || _gnap->_sequenceId == 0x89A)) { - _gameSys->insertSequence(_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, _gnap->_id, - makeRid(_gnap->_sequenceDatNum, _gnap->_sequenceId), _gnap->_id, - kSeqSyncExists, 0, 75 * _gnap->_pos.x - _gnap->_gridX, 48 * _gnap->_pos.y - _gnap->_gridY); - _gnap->_sequenceId = _gnap->getSequenceId(gskIdle, 0, 0); - _gnap->_sequenceDatNum = 1; - } -} - -void GnapEngine::gnapActionIdle(int sequenceId) { - if (_gnap->_sequenceId != -1 && ridToDatIndex(sequenceId) == _gnap->_sequenceDatNum && - ridToEntryIndex(sequenceId) == _gnap->_sequenceId) { - _gameSys->insertSequence(_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, _gnap->_id, - makeRid(_gnap->_sequenceDatNum, _gnap->_sequenceId), _gnap->_id, - kSeqSyncExists, 0, 75 * _gnap->_pos.x - _gnap->_gridX, 48 * _gnap->_pos.y - _gnap->_gridY); - _gnap->_sequenceId = _gnap->getSequenceId(gskIdle, 0, 0); - _gnap->_sequenceDatNum = 1; - } -} - void GnapEngine::playGnapImpossible(int gridX, int gridY) { _gnap->playSequence(_gnap->getSequenceId(gskImpossible, gridX, gridY) | 0x10000); } @@ -1183,12 +978,12 @@ void GnapEngine::playGnapIdle(int gridX, int gridY) { } void GnapEngine::playGnapShowItem(int itemIndex, int gridLookX, int gridLookY) { - _gnap->playSequence(getGnapShowSequenceId(itemIndex, gridLookX, gridLookY) | 0x10000); + _gnap->playSequence(_gnap->getShowSequenceId(itemIndex, gridLookX, gridLookY) | 0x10000); } void GnapEngine::playGnapShowCurrItem(int gridX, int gridY, int gridLookX, int gridLookY) { if (_plat->_pos.x == gridX && _plat->_pos.y == gridY) - platypusMakeRoom(); + _plat->makeRoom(); _gnap->walkTo(Common::Point(gridX, gridY), -1, -1, 1); playGnapShowItem(_grabCursorSpriteIndex, gridLookX, gridLookY); } |