diff options
author | Paul Gilbert | 2013-12-12 08:51:13 -0500 |
---|---|---|
committer | Paul Gilbert | 2013-12-12 08:51:13 -0500 |
commit | dfd4e765f2072a108308be183427504c2efad643 (patch) | |
tree | 06cc1c09c3a39b0b8d28bd6c80021fd4ee0d7720 /engines | |
parent | 888f35fe5edb2c9de74651f2ba4be1975470bd0f (diff) | |
download | scummvm-rg350-dfd4e765f2072a108308be183427504c2efad643.tar.gz scummvm-rg350-dfd4e765f2072a108308be183427504c2efad643.tar.bz2 scummvm-rg350-dfd4e765f2072a108308be183427504c2efad643.zip |
VOYEUR: Implementing code for chooseSTAMPButton and sub-methods
Diffstat (limited to 'engines')
-rw-r--r-- | engines/voyeur/files.h | 10 | ||||
-rw-r--r-- | engines/voyeur/files_threads.cpp | 118 | ||||
-rw-r--r-- | engines/voyeur/voyeur_game.cpp | 2 |
3 files changed, 124 insertions, 6 deletions
diff --git a/engines/voyeur/files.h b/engines/voyeur/files.h index f32cbdf6ea..e753b1d4c0 100644 --- a/engines/voyeur/files.h +++ b/engines/voyeur/files.h @@ -430,10 +430,18 @@ private: void performOpenCard(); const byte *getRecordOffset(const byte *p); const byte *getNextRecord(const byte *p); + const byte *getSTAMPCard(int cardId); + int getStateFromID(uint32 id); + uint32 getSID(int sid); void cardAction(const byte *p); + void doSTAMPCardAction(); void addAudioEventStart(); void addAudioEventEnd(); void addVideoEventEnd(); + bool goToStateID(int stackId, int sceneId); + bool goToState(int stackId, int sceneId); + const byte *cardPerform(const byte *card); + void savePrevious(); public: VoyeurEngine *_vm; @@ -464,7 +472,7 @@ public: void unloadAStack(int idx); bool doState(); - bool chooseSTAMPButton(int idx); + bool chooseSTAMPButton(int buttonId); void parsePlayCommands(); int doInterface(); void doRoom(); diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp index a437f012c7..8176a4f925 100644 --- a/engines/voyeur/files_threads.cpp +++ b/engines/voyeur/files_threads.cpp @@ -249,16 +249,88 @@ const byte *ThreadResource::getNextRecord(const byte *p) { } } -void ThreadResource::cardAction(const byte *p) { - warning("TODO: cardAction"); +const byte *ThreadResource::getSTAMPCard(int cardId) { + const byte *p; + int count = 0; + for (p = _field4A; count <= cardId && *p != 0x49; p = getNextRecord(p)) { + if (*p == 0xC0) + ++count; + } + + return p; +} + +int ThreadResource::getStateFromID(uint32 id) { + int count = READ_LE_UINT16(_ctlPtr); + + for (int i = 0; i < count; ++i) { + uint32 sid = getSID(i); + if (sid == id) + return i; + } + + return -1; +} + +uint32 ThreadResource::getSID(int sid) { + uint32 offset = READ_LE_UINT32(_ctlPtr + 2) + (sid << 3) + 4; + return READ_LE_UINT32(_ctlPtr + offset); +} + +void ThreadResource::doSTAMPCardAction() { + for (const byte *p = _field4A; *p != 0x49; p = getNextRecord(p)) { + if (*p == 0x48) { + cardAction(p + 1); + return; + } + } +} + +void ThreadResource::cardAction(const byte *card) { + _vm->_glGoScene = -1; + _vm->_glGoStack = -1; + + // Loop to perform card commands + while (!_vm->shouldQuit() && *card < 70 && _vm->_glGoScene == -1) { + card = cardPerform(card); + } } -bool ThreadResource::chooseSTAMPButton(int idx) { - warning("TODO: chooseSTAMPButton"); +bool ThreadResource::chooseSTAMPButton(int buttonId) { + _flags &= ~1; + + for (int idx = 0; idx < _field42; ++idx) { + if (_field18E[idx] == buttonId) { + const byte *card = getSTAMPCard(idx); + cardAction(card); + + bool flag = true; + while (!_vm->shouldQuit() && _vm->_glGoStack != -1 && flag) { + doSTAMPCardAction(); + flag = goToStateID(_vm->_glGoStack, _vm->_glGoScene); + } + + while (!_vm->shouldQuit() && _vm->_glGoScene != -1 && flag) { + doSTAMPCardAction(); + flag = goToState(-1, _vm->_glGoScene); + } + + return flag; + } + } + return false; } void ThreadResource::parsePlayCommands() { + _vm->_voy._field470 = -1; + _vm->_voy._field468 = 0; + _vm->_voy._field46A = 0; + _vm->_voy._field47A = -1; + _vm->_voy._field4E2 = -1; + _vm->_voy._field478 &= ~8; + _vm->_eventsManager._videoDead = -1; + Common::fill(&_vm->_voy._arr1[0][0], &_vm->_voy._arr1[8][20], 0); Common::fill(&_vm->_voy._arr2[0][0], &_vm->_voy._arr2[8][20], 0); Common::fill(&_vm->_voy._arr3[0][0], &_vm->_voy._arr3[3][20], 9999); @@ -707,6 +779,11 @@ void ThreadResource::parsePlayCommands() { } } +const byte *ThreadResource::cardPerform(const byte *card) { + error("TODO"); + return NULL; +} + int ThreadResource::doApt() { warning("TODO: doApt"); return 0; @@ -736,4 +813,37 @@ void ThreadResource::addVideoEventEnd() { error("TODO: addVideoEventEnd"); } +bool ThreadResource::goToStateID(int stackId, int sceneId) { + // Save current stack + savePrevious(); + + if (_controlIndex == stackId || stackId == -1 || loadAStack(stackId)) { + // Now in the correct state + _threadId = getStateFromID(sceneId); + + if (_threadId != -1) { + return doState(); + } else { + _threadId = _field4; + _controlIndex = _field6; + } + } + + return false; +} + +bool ThreadResource::goToState(int stackId, int sceneId) { + error("TODO: goToState"); +} + +void ThreadResource::savePrevious() { + if (_field4 == _threadId && _controlIndex == _field6) { + _flags &= ~1; + } else { + _flags |= 1; + _field4 = _threadId; + _field6 = _controlIndex; + } +} + } // End of namespace Voyeur diff --git a/engines/voyeur/voyeur_game.cpp b/engines/voyeur/voyeur_game.cpp index 616a0b89a7..8c765b2687 100644 --- a/engines/voyeur/voyeur_game.cpp +++ b/engines/voyeur/voyeur_game.cpp @@ -197,7 +197,7 @@ void VoyeurEngine::playStamp() { // Break out of loop flag = false; - } else if (threadP->_field40 == 2) { + } else if (threadP->_field40 & 2) { _eventsManager.getMouseInfo(); threadP->chooseSTAMPButton(0); flag = true; |