diff options
| -rw-r--r-- | engines/gnap/gnap.cpp | 29 | ||||
| -rw-r--r-- | engines/gnap/gnap.h | 7 | ||||
| -rw-r--r-- | engines/gnap/scenes/scene16.cpp | 98 | ||||
| -rw-r--r-- | engines/gnap/scenes/scene47.cpp | 158 | ||||
| -rw-r--r-- | engines/gnap/scenes/scene48.cpp | 78 | ||||
| -rw-r--r-- | engines/gnap/scenes/scene54.cpp | 134 |
6 files changed, 250 insertions, 254 deletions
diff --git a/engines/gnap/gnap.cpp b/engines/gnap/gnap.cpp index 2edfcacabc..30311ea776 100644 --- a/engines/gnap/gnap.cpp +++ b/engines/gnap/gnap.cpp @@ -751,7 +751,7 @@ void GnapEngine::mainLoop() { // > DEBUG BEGIN _currentSceneNum = 53; - _newSceneNum = 42; + _newSceneNum = 48; _newCursorValue = 3; // < DEBUG END @@ -2341,7 +2341,7 @@ void GnapEngine::cutscene_run() { if (_prevSceneNum == 2) { soundId = 0x36B; - duration = MAX(1, 300 / getSequenceTotalDuration(_s99_dword_47F370[_s99_itemsCount - 1]));//CHECKME + duration = MAX(1, 300 / getSequenceTotalDuration(_s99_sequenceIdArr[_s99_itemsCount - 1]));//CHECKME _timers[0] = 0; } @@ -2350,11 +2350,11 @@ void GnapEngine::cutscene_run() { hideCursor(); - _gameSys->drawSpriteToBackground(0, 0, _s99_dword_47F2F0[0]); + _gameSys->drawSpriteToBackground(0, 0, _s99_resourceIdArr[0]); - for (int j = 0; j < _s99_dword_47F330[0]; ++j) - _gameSys->insertSequence(_s99_dword_47F370[j], j + 2, 0, 0, kSeqNone, 0, 0, 0); - _gameSys->setAnimation(_s99_dword_47F370[0], 2, 0); + for (int j = 0; j < _s99_sequenceCountArr[0]; ++j) + _gameSys->insertSequence(_s99_sequenceIdArr[j], j + 2, 0, 0, kSeqNone, 0, 0, 0); + _gameSys->setAnimation(_s99_sequenceIdArr[0], 2, 0); clearKeyStatus1(Common::KEYCODE_ESCAPE); clearKeyStatus1(Common::KEYCODE_SPACE); @@ -2362,9 +2362,8 @@ void GnapEngine::cutscene_run() { _mouseClickState._left = false; - int v1 = 0; + int firstSequenceIndex = 0; while (!_sceneDone) { - gameUpdateTick(); if (_gameSys->getAnimationStatus(0) == 2 || skip) { @@ -2372,14 +2371,14 @@ void GnapEngine::cutscene_run() { _gameSys->requestClear2(false); _gameSys->requestClear1(); _gameSys->setAnimation(0, 0, 0); - v1 += _s99_dword_47F330[itemIndex++]; + firstSequenceIndex += _s99_sequenceCountArr[itemIndex++]; if (itemIndex >= _s99_itemsCount) { _sceneDone = true; } else { - for (int m = 0; m < _s99_dword_47F330[itemIndex]; ++m) - _gameSys->insertSequence(_s99_dword_47F370[v1 + m], m + 2, 0, 0, kSeqNone, 0, 0, 0); - _gameSys->drawSpriteToBackground(0, 0, _s99_dword_47F2F0[itemIndex]); - _gameSys->setAnimation(_s99_dword_47F370[v1], 2, 0); + for (int m = 0; m < _s99_sequenceCountArr[itemIndex]; ++m) + _gameSys->insertSequence(_s99_sequenceIdArr[firstSequenceIndex + m], m + 2, 0, 0, kSeqNone, 0, 0, 0); + _gameSys->drawSpriteToBackground(0, 0, _s99_resourceIdArr[itemIndex]); + _gameSys->setAnimation(_s99_sequenceIdArr[firstSequenceIndex], 2, 0); } } @@ -2398,12 +2397,10 @@ void GnapEngine::cutscene_run() { volume = MAX(1, volume - duration); setSoundVolume(soundId, volume); } - } if (soundId != -1) - stopSound(soundId); - + stopSound(soundId); } } // End of namespace Gnap diff --git a/engines/gnap/gnap.h b/engines/gnap/gnap.h index c17ae728f5..8e23990f52 100644 --- a/engines/gnap/gnap.h +++ b/engines/gnap/gnap.h @@ -1090,13 +1090,12 @@ public: // Scene 99 int _s99_itemsCount; - int _s99_dword_47F2F0[16]; - int _s99_dword_47F330[16]; - int _s99_dword_47F370[50]; + int _s99_resourceIdArr[16]; + int _s99_sequenceCountArr[16]; + int _s99_sequenceIdArr[50]; byte _s99_canSkip[16]; int cutscene_init(); void cutscene_run(); - }; } // End of namespace Gnap diff --git a/engines/gnap/scenes/scene16.cpp b/engines/gnap/scenes/scene16.cpp index dfc852293e..64db758545 100644 --- a/engines/gnap/scenes/scene16.cpp +++ b/engines/gnap/scenes/scene16.cpp @@ -27,55 +27,55 @@ namespace Gnap { void GnapEngine::scene16_initCutscene() { - _s99_dword_47F370[0] = 0x1F2; - _s99_dword_47F370[1] = 0x201; - _s99_dword_47F370[2] = 0x1FC; - _s99_dword_47F370[3] = 0x1F4; - _s99_dword_47F370[4] = 0x1FB; - _s99_dword_47F370[5] = 0x1F0; - _s99_dword_47F370[6] = 0x1FD; - _s99_dword_47F370[7] = 0x1FE; - _s99_dword_47F370[8] = 0x1F7; - _s99_dword_47F370[9] = 0x1F9; - _s99_dword_47F370[10] = 0x1F8; - _s99_dword_47F370[11] = 0x1F1; - _s99_dword_47F370[12] = 0x202; - _s99_dword_47F370[13] = 0x1F6; - _s99_dword_47F370[14] = 0x1F3; - _s99_dword_47F370[15] = 0x1FA; - _s99_dword_47F370[16] = 0x1FF; - _s99_dword_47F370[17] = 0x200; - _s99_dword_47F370[18] = 0x203; - _s99_dword_47F370[19] = 0x206; - _s99_dword_47F370[20] = 0x207; - _s99_dword_47F370[21] = 0x204; - _s99_dword_47F370[22] = 0x205; - _s99_dword_47F2F0[0] = 0x1C; - _s99_dword_47F2F0[1] = 2; - _s99_dword_47F2F0[2] = 0x1B; - _s99_dword_47F2F0[3] = 0; - _s99_dword_47F2F0[4] = 0x167; - _s99_dword_47F2F0[5] = 1; - _s99_dword_47F2F0[6] = 0x15B; - _s99_dword_47F2F0[7] = 0x15A; - _s99_dword_47F2F0[8] = 0x170; - _s99_dword_47F2F0[9] = 0x1EB; - _s99_dword_47F2F0[10] = 0x1EC; - _s99_dword_47F2F0[11] = 0x1BE; - _s99_dword_47F2F0[12] = 0x1BF; - _s99_dword_47F330[0] = 4; - _s99_dword_47F330[1] = 1; - _s99_dword_47F330[2] = 1; - _s99_dword_47F330[3] = 6; - _s99_dword_47F330[4] = 1; - _s99_dword_47F330[5] = 3; - _s99_dword_47F330[6] = 1; - _s99_dword_47F330[7] = 1; - _s99_dword_47F330[8] = 1; - _s99_dword_47F330[9] = 1; - _s99_dword_47F330[10] = 1; - _s99_dword_47F330[11] = 1; - _s99_dword_47F330[12] = 1; + _s99_sequenceIdArr[0] = 0x1F2; + _s99_sequenceIdArr[1] = 0x201; + _s99_sequenceIdArr[2] = 0x1FC; + _s99_sequenceIdArr[3] = 0x1F4; + _s99_sequenceIdArr[4] = 0x1FB; + _s99_sequenceIdArr[5] = 0x1F0; + _s99_sequenceIdArr[6] = 0x1FD; + _s99_sequenceIdArr[7] = 0x1FE; + _s99_sequenceIdArr[8] = 0x1F7; + _s99_sequenceIdArr[9] = 0x1F9; + _s99_sequenceIdArr[10] = 0x1F8; + _s99_sequenceIdArr[11] = 0x1F1; + _s99_sequenceIdArr[12] = 0x202; + _s99_sequenceIdArr[13] = 0x1F6; + _s99_sequenceIdArr[14] = 0x1F3; + _s99_sequenceIdArr[15] = 0x1FA; + _s99_sequenceIdArr[16] = 0x1FF; + _s99_sequenceIdArr[17] = 0x200; + _s99_sequenceIdArr[18] = 0x203; + _s99_sequenceIdArr[19] = 0x206; + _s99_sequenceIdArr[20] = 0x207; + _s99_sequenceIdArr[21] = 0x204; + _s99_sequenceIdArr[22] = 0x205; + _s99_resourceIdArr[0] = 0x1C; + _s99_resourceIdArr[1] = 2; + _s99_resourceIdArr[2] = 0x1B; + _s99_resourceIdArr[3] = 0; + _s99_resourceIdArr[4] = 0x167; + _s99_resourceIdArr[5] = 1; + _s99_resourceIdArr[6] = 0x15B; + _s99_resourceIdArr[7] = 0x15A; + _s99_resourceIdArr[8] = 0x170; + _s99_resourceIdArr[9] = 0x1EB; + _s99_resourceIdArr[10] = 0x1EC; + _s99_resourceIdArr[11] = 0x1BE; + _s99_resourceIdArr[12] = 0x1BF; + _s99_sequenceCountArr[0] = 4; + _s99_sequenceCountArr[1] = 1; + _s99_sequenceCountArr[2] = 1; + _s99_sequenceCountArr[3] = 6; + _s99_sequenceCountArr[4] = 1; + _s99_sequenceCountArr[5] = 3; + _s99_sequenceCountArr[6] = 1; + _s99_sequenceCountArr[7] = 1; + _s99_sequenceCountArr[8] = 1; + _s99_sequenceCountArr[9] = 1; + _s99_sequenceCountArr[10] = 1; + _s99_sequenceCountArr[11] = 1; + _s99_sequenceCountArr[12] = 1; _s99_itemsCount = 13; } diff --git a/engines/gnap/scenes/scene47.cpp b/engines/gnap/scenes/scene47.cpp index f4aa91feda..bb5f53286f 100644 --- a/engines/gnap/scenes/scene47.cpp +++ b/engines/gnap/scenes/scene47.cpp @@ -27,21 +27,21 @@ namespace Gnap { void GnapEngine::scene47_initCutscene1() { - _s99_dword_47F370[0] = 0x301; - _s99_dword_47F370[1] = 0x305; - _s99_dword_47F370[2] = 0x302; - _s99_dword_47F370[3] = 0x304; - _s99_dword_47F370[4] = 0x300; - _s99_dword_47F2F0[0] = 3; - _s99_dword_47F2F0[1] = 0; - _s99_dword_47F2F0[2] = 1; - _s99_dword_47F2F0[3] = 0; - _s99_dword_47F2F0[4] = 2; - _s99_dword_47F330[0] = 1; - _s99_dword_47F330[1] = 1; - _s99_dword_47F330[2] = 1; - _s99_dword_47F330[3] = 1; - _s99_dword_47F330[4] = 1; + _s99_sequenceIdArr[0] = 0x301; + _s99_sequenceIdArr[1] = 0x305; + _s99_sequenceIdArr[2] = 0x302; + _s99_sequenceIdArr[3] = 0x304; + _s99_sequenceIdArr[4] = 0x300; + _s99_resourceIdArr[0] = 3; + _s99_resourceIdArr[1] = 0; + _s99_resourceIdArr[2] = 1; + _s99_resourceIdArr[3] = 0; + _s99_resourceIdArr[4] = 2; + _s99_sequenceCountArr[0] = 1; + _s99_sequenceCountArr[1] = 1; + _s99_sequenceCountArr[2] = 1; + _s99_sequenceCountArr[3] = 1; + _s99_sequenceCountArr[4] = 1; _s99_canSkip[0] = 0; _s99_canSkip[1] = 0; _s99_canSkip[2] = 0; @@ -51,19 +51,19 @@ void GnapEngine::scene47_initCutscene1() { } void GnapEngine::scene47_initCutscene2() { - _s99_dword_47F370[0] = 0x306; - _s99_dword_47F370[1] = 0x309; - _s99_dword_47F370[2] = 0x307; - _s99_dword_47F370[3] = 0x308; - _s99_dword_47F370[4] = 0x30A; - _s99_dword_47F2F0[0] = 0x8E; - _s99_dword_47F2F0[1] = 0x90; - _s99_dword_47F2F0[2] = 0x8F; - _s99_dword_47F2F0[3] = 0x91; - _s99_dword_47F330[0] = 2; - _s99_dword_47F330[1] = 1; - _s99_dword_47F330[2] = 1; - _s99_dword_47F330[3] = 1; + _s99_sequenceIdArr[0] = 0x306; + _s99_sequenceIdArr[1] = 0x309; + _s99_sequenceIdArr[2] = 0x307; + _s99_sequenceIdArr[3] = 0x308; + _s99_sequenceIdArr[4] = 0x30A; + _s99_resourceIdArr[0] = 0x8E; + _s99_resourceIdArr[1] = 0x90; + _s99_resourceIdArr[2] = 0x8F; + _s99_resourceIdArr[3] = 0x91; + _s99_sequenceCountArr[0] = 2; + _s99_sequenceCountArr[1] = 1; + _s99_sequenceCountArr[2] = 1; + _s99_sequenceCountArr[3] = 1; _s99_canSkip[0] = 0; _s99_canSkip[1] = 0; _s99_canSkip[2] = 0; @@ -72,27 +72,27 @@ void GnapEngine::scene47_initCutscene2() { } void GnapEngine::scene47_initCutscene3() { - _s99_dword_47F370[0] = 0x320; - _s99_dword_47F370[1] = 0x321; - _s99_dword_47F2F0[0] = 0x142; - _s99_dword_47F2F0[1] = 0x143; - _s99_dword_47F330[0] = 1; - _s99_dword_47F330[1] = 1; + _s99_sequenceIdArr[0] = 0x320; + _s99_sequenceIdArr[1] = 0x321; + _s99_resourceIdArr[0] = 0x142; + _s99_resourceIdArr[1] = 0x143; + _s99_sequenceCountArr[0] = 1; + _s99_sequenceCountArr[1] = 1; _s99_canSkip[0] = 0; _s99_canSkip[1] = 0; _s99_itemsCount = 2; } void GnapEngine::scene47_initCutscene4() { - _s99_dword_47F370[0] = 0x30C; - _s99_dword_47F370[1] = 0x30D; - _s99_dword_47F370[2] = 0x30B; - _s99_dword_47F2F0[0] = 0x142; - _s99_dword_47F2F0[1] = 0x141; - _s99_dword_47F2F0[2] = 0x177; - _s99_dword_47F330[0] = 1; - _s99_dword_47F330[1] = 1; - _s99_dword_47F330[2] = 1; + _s99_sequenceIdArr[0] = 0x30C; + _s99_sequenceIdArr[1] = 0x30D; + _s99_sequenceIdArr[2] = 0x30B; + _s99_resourceIdArr[0] = 0x142; + _s99_resourceIdArr[1] = 0x141; + _s99_resourceIdArr[2] = 0x177; + _s99_sequenceCountArr[0] = 1; + _s99_sequenceCountArr[1] = 1; + _s99_sequenceCountArr[2] = 1; _s99_canSkip[0] = 0; _s99_canSkip[1] = 0; _s99_canSkip[2] = 0; @@ -100,24 +100,24 @@ void GnapEngine::scene47_initCutscene4() { } void GnapEngine::scene47_initCutscene5() { - _s99_dword_47F370[0] = 0x30E; - _s99_dword_47F370[1] = 0x30F; - _s99_dword_47F370[2] = 0x310; - _s99_dword_47F370[3] = 0x311; - _s99_dword_47F2F0[0] = 0x206; - _s99_dword_47F2F0[1] = 0x207; - _s99_dword_47F330[0] = 3; - _s99_dword_47F330[1] = 1; + _s99_sequenceIdArr[0] = 0x30E; + _s99_sequenceIdArr[1] = 0x30F; + _s99_sequenceIdArr[2] = 0x310; + _s99_sequenceIdArr[3] = 0x311; + _s99_resourceIdArr[0] = 0x206; + _s99_resourceIdArr[1] = 0x207; + _s99_sequenceCountArr[0] = 3; + _s99_sequenceCountArr[1] = 1; _s99_canSkip[0] = 0; _s99_canSkip[1] = 0; _s99_itemsCount = 2; } void GnapEngine::scene47_initCutscene6() { - _s99_dword_47F370[0] = 0x31E; - _s99_dword_47F370[1] = 0x31F; - _s99_dword_47F2F0[0] = 0x2FA; - _s99_dword_47F330[0] = 2; + _s99_sequenceIdArr[0] = 0x31E; + _s99_sequenceIdArr[1] = 0x31F; + _s99_resourceIdArr[0] = 0x2FA; + _s99_sequenceCountArr[0] = 2; _s99_canSkip[0] = 0; _s99_itemsCount = 1; } @@ -125,41 +125,41 @@ void GnapEngine::scene47_initCutscene6() { void GnapEngine::scene47_initCutscene7() { int v0, v4, v2, v3; - _s99_dword_47F370[0] = 0x316; - _s99_dword_47F370[1] = 0x31A; - _s99_dword_47F370[2] = 0x314; - _s99_dword_47F370[3] = 0x31B; + _s99_sequenceIdArr[0] = 0x316; + _s99_sequenceIdArr[1] = 0x31A; + _s99_sequenceIdArr[2] = 0x314; + _s99_sequenceIdArr[3] = 0x31B; int v1 = 4; if (!isFlag(3)) { - _s99_dword_47F370[4] = 0x31C; + _s99_sequenceIdArr[4] = 0x31C; v1 = 5; } if (!isFlag(26)) - _s99_dword_47F370[v1++] = 0x31D; + _s99_sequenceIdArr[v1++] = 0x31D; v4 = v1; - _s99_dword_47F370[v1] = 0x319; + _s99_sequenceIdArr[v1] = 0x319; v0 = v1 + 1; v3 = v0; - _s99_dword_47F370[v0++] = 0x317; - _s99_dword_47F370[v0++] = 0x312; - _s99_dword_47F370[v0] = 0x31A; + _s99_sequenceIdArr[v0++] = 0x317; + _s99_sequenceIdArr[v0++] = 0x312; + _s99_sequenceIdArr[v0] = 0x31A; v2 = v0 + 1; if (!isFlag(3)) - _s99_dword_47F370[v2++] = 0x31C; + _s99_sequenceIdArr[v2++] = 0x31C; if (!isFlag(26)) - _s99_dword_47F370[v2++] = 0x31D; - _s99_dword_47F370[v2] = 0x313; - _s99_dword_47F370[v2 + 1] = 0x315; - _s99_dword_47F2F0[0] = 0x2B8; - _s99_dword_47F2F0[1] = 0x20C; - _s99_dword_47F2F0[2] = 0x2B8; - _s99_dword_47F2F0[3] = 0x20B; - _s99_dword_47F2F0[4] = 0x20B; - _s99_dword_47F330[0] = v4; - _s99_dword_47F330[1] = 1; - _s99_dword_47F330[2] = v2 - v3; - _s99_dword_47F330[3] = 1; - _s99_dword_47F330[4] = 1; + _s99_sequenceIdArr[v2++] = 0x31D; + _s99_sequenceIdArr[v2] = 0x313; + _s99_sequenceIdArr[v2 + 1] = 0x315; + _s99_resourceIdArr[0] = 0x2B8; + _s99_resourceIdArr[1] = 0x20C; + _s99_resourceIdArr[2] = 0x2B8; + _s99_resourceIdArr[3] = 0x20B; + _s99_resourceIdArr[4] = 0x20B; + _s99_sequenceCountArr[0] = v4; + _s99_sequenceCountArr[1] = 1; + _s99_sequenceCountArr[2] = v2 - v3; + _s99_sequenceCountArr[3] = 1; + _s99_sequenceCountArr[4] = 1; _s99_canSkip[0] = 0; _s99_canSkip[1] = 0; _s99_canSkip[2] = 0; diff --git a/engines/gnap/scenes/scene48.cpp b/engines/gnap/scenes/scene48.cpp index 3b24d57a8c..3ea0f323d8 100644 --- a/engines/gnap/scenes/scene48.cpp +++ b/engines/gnap/scenes/scene48.cpp @@ -27,45 +27,45 @@ namespace Gnap { void GnapEngine::scene48_initCutscene() { - _s99_dword_47F370[0] = 390; - _s99_dword_47F370[1] = 391; - _s99_dword_47F370[2] = 392; - _s99_dword_47F370[3] = 393; - _s99_dword_47F370[4] = 394; - _s99_dword_47F370[5] = 395; - _s99_dword_47F370[6] = 396; - _s99_dword_47F370[7] = 397; - _s99_dword_47F370[8] = 398; - _s99_dword_47F370[9] = 399; - _s99_dword_47F370[10] = 400; - _s99_dword_47F370[11] = 401; - _s99_dword_47F370[12] = 402; - _s99_dword_47F2F0[0] = 238; - _s99_dword_47F2F0[1] = 42; - _s99_dword_47F2F0[2] = 2; - _s99_dword_47F2F0[3] = 37; - _s99_dword_47F2F0[4] = 35; - _s99_dword_47F2F0[5] = 38; - _s99_dword_47F2F0[6] = 39; - _s99_dword_47F2F0[7] = 40; - _s99_dword_47F2F0[8] = 41; - _s99_dword_47F2F0[9] = 36; - _s99_dword_47F2F0[10] = 41; - _s99_dword_47F2F0[11] = 388; - _s99_dword_47F2F0[12] = 387; - _s99_dword_47F330[0] = 1; - _s99_dword_47F330[1] = 1; - _s99_dword_47F330[2] = 1; - _s99_dword_47F330[3] = 1; - _s99_dword_47F330[4] = 1; - _s99_dword_47F330[5] = 1; - _s99_dword_47F330[6] = 1; - _s99_dword_47F330[7] = 1; - _s99_dword_47F330[8] = 1; - _s99_dword_47F330[9] = 1; - _s99_dword_47F330[10] = 1; - _s99_dword_47F330[11] = 1; - _s99_dword_47F330[12] = 1; + _s99_sequenceIdArr[0] = 390; + _s99_sequenceIdArr[1] = 391; + _s99_sequenceIdArr[2] = 392; + _s99_sequenceIdArr[3] = 393; + _s99_sequenceIdArr[4] = 394; + _s99_sequenceIdArr[5] = 395; + _s99_sequenceIdArr[6] = 396; + _s99_sequenceIdArr[7] = 397; + _s99_sequenceIdArr[8] = 398; + _s99_sequenceIdArr[9] = 399; + _s99_sequenceIdArr[10] = 400; + _s99_sequenceIdArr[11] = 401; + _s99_sequenceIdArr[12] = 402; + _s99_resourceIdArr[0] = 238; + _s99_resourceIdArr[1] = 42; + _s99_resourceIdArr[2] = 2; + _s99_resourceIdArr[3] = 37; + _s99_resourceIdArr[4] = 35; + _s99_resourceIdArr[5] = 38; + _s99_resourceIdArr[6] = 39; + _s99_resourceIdArr[7] = 40; + _s99_resourceIdArr[8] = 41; + _s99_resourceIdArr[9] = 36; + _s99_resourceIdArr[10] = 41; + _s99_resourceIdArr[11] = 388; + _s99_resourceIdArr[12] = 387; + _s99_sequenceCountArr[0] = 1; + _s99_sequenceCountArr[1] = 1; + _s99_sequenceCountArr[2] = 1; + _s99_sequenceCountArr[3] = 1; + _s99_sequenceCountArr[4] = 1; + _s99_sequenceCountArr[5] = 1; + _s99_sequenceCountArr[6] = 1; + _s99_sequenceCountArr[7] = 1; + _s99_sequenceCountArr[8] = 1; + _s99_sequenceCountArr[9] = 1; + _s99_sequenceCountArr[10] = 1; + _s99_sequenceCountArr[11] = 1; + _s99_sequenceCountArr[12] = 1; _s99_canSkip[0] = 0; _s99_canSkip[1] = 0; _s99_canSkip[2] = 0; diff --git a/engines/gnap/scenes/scene54.cpp b/engines/gnap/scenes/scene54.cpp index 76bc66b9f3..6feb445490 100644 --- a/engines/gnap/scenes/scene54.cpp +++ b/engines/gnap/scenes/scene54.cpp @@ -27,25 +27,25 @@ namespace Gnap { void GnapEngine::scene54_initCutscene1() { - _s99_dword_47F370[0] = 0x1BE; - _s99_dword_47F370[1] = 0x1BF; - _s99_dword_47F370[2] = 0x1BA; - _s99_dword_47F370[3] = 0x1BB; - _s99_dword_47F370[4] = 0x1BD; - _s99_dword_47F370[5] = 0x1BC; - _s99_dword_47F2F0[0] = 0x3C; - _s99_dword_47F2F0[1] = 0x43; - _s99_dword_47F2F0[2] = 0x44; + _s99_sequenceIdArr[0] = 0x1BE; + _s99_sequenceIdArr[1] = 0x1BF; + _s99_sequenceIdArr[2] = 0x1BA; + _s99_sequenceIdArr[3] = 0x1BB; + _s99_sequenceIdArr[4] = 0x1BD; + _s99_sequenceIdArr[5] = 0x1BC; + _s99_resourceIdArr[0] = 0x3C; + _s99_resourceIdArr[1] = 0x43; + _s99_resourceIdArr[2] = 0x44; if (isFlag(20)) - _s99_dword_47F2F0[3] = 0x47; + _s99_resourceIdArr[3] = 0x47; else - _s99_dword_47F2F0[3] = 0x46; - _s99_dword_47F2F0[4] = 0x45; - _s99_dword_47F330[0] = 1; - _s99_dword_47F330[1] = 1; - _s99_dword_47F330[2] = 1; - _s99_dword_47F330[3] = 2; - _s99_dword_47F330[4] = 1; + _s99_resourceIdArr[3] = 0x46; + _s99_resourceIdArr[4] = 0x45; + _s99_sequenceCountArr[0] = 1; + _s99_sequenceCountArr[1] = 1; + _s99_sequenceCountArr[2] = 1; + _s99_sequenceCountArr[3] = 2; + _s99_sequenceCountArr[4] = 1; _s99_canSkip[0] = 0; _s99_canSkip[1] = 0; _s99_canSkip[2] = 0; @@ -55,56 +55,56 @@ void GnapEngine::scene54_initCutscene1() { } void GnapEngine::scene54_initCutscene2() { - _s99_dword_47F370[0] = 0x1C9; - _s99_dword_47F370[1] = 0x1C7; - _s99_dword_47F370[2] = 0x1CC; - _s99_dword_47F370[3] = 0x1C8; - _s99_dword_47F370[4] = 0x1CB; - _s99_dword_47F370[5] = 0x1C0; - _s99_dword_47F370[6] = 0x1CA; - _s99_dword_47F370[7] = 0x1CE; - _s99_dword_47F370[8] = 0x1CD; - _s99_dword_47F370[9] = 0x1C1; - _s99_dword_47F370[10] = 0x1C2; - _s99_dword_47F370[11] = 0x1C3; - _s99_dword_47F370[12] = 0x1C4; - _s99_dword_47F370[13] = 0x1C6; - _s99_dword_47F370[14] = 0x1C5; - _s99_dword_47F370[15] = 0x1D0; - _s99_dword_47F370[16] = 0x1D0; - _s99_dword_47F370[17] = 0x1D0; - _s99_dword_47F2F0[0] = 0xD5; - _s99_dword_47F2F0[1] = 0x14C; - _s99_dword_47F2F0[2] = 0xD5; - _s99_dword_47F2F0[3] = 0xBF; - _s99_dword_47F2F0[4] = 0xD6; - _s99_dword_47F2F0[5] = 0x154; - _s99_dword_47F2F0[6] = 0x155; - _s99_dword_47F2F0[7] = 0xB9; - _s99_dword_47F2F0[8] = 0xBA; - _s99_dword_47F2F0[9] = 0x17B; - _s99_dword_47F2F0[10] = 0x17A; - _s99_dword_47F2F0[11] = 0x17C; - _s99_dword_47F2F0[12] = 0x17A; - _s99_dword_47F2F0[13] = 0x1B7; - _s99_dword_47F2F0[14] = 0x1B8; - _s99_dword_47F2F0[15] = 0x1B9; - _s99_dword_47F330[0] = 2; - _s99_dword_47F330[1] = 1; - _s99_dword_47F330[2] = 2; - _s99_dword_47F330[3] = 1; - _s99_dword_47F330[4] = 1; - _s99_dword_47F330[5] = 1; - _s99_dword_47F330[6] = 1; - _s99_dword_47F330[7] = 1; - _s99_dword_47F330[8] = 1; - _s99_dword_47F330[9] = 1; - _s99_dword_47F330[10] = 1; - _s99_dword_47F330[11] = 1; - _s99_dword_47F330[12] = 1; - _s99_dword_47F330[13] = 1; - _s99_dword_47F330[14] = 1; - _s99_dword_47F330[15] = 1; + _s99_sequenceIdArr[0] = 0x1C9; + _s99_sequenceIdArr[1] = 0x1C7; + _s99_sequenceIdArr[2] = 0x1CC; + _s99_sequenceIdArr[3] = 0x1C8; + _s99_sequenceIdArr[4] = 0x1CB; + _s99_sequenceIdArr[5] = 0x1C0; + _s99_sequenceIdArr[6] = 0x1CA; + _s99_sequenceIdArr[7] = 0x1CE; + _s99_sequenceIdArr[8] = 0x1CD; + _s99_sequenceIdArr[9] = 0x1C1; + _s99_sequenceIdArr[10] = 0x1C2; + _s99_sequenceIdArr[11] = 0x1C3; + _s99_sequenceIdArr[12] = 0x1C4; + _s99_sequenceIdArr[13] = 0x1C6; + _s99_sequenceIdArr[14] = 0x1C5; + _s99_sequenceIdArr[15] = 0x1D0; + _s99_sequenceIdArr[16] = 0x1D0; + _s99_sequenceIdArr[17] = 0x1D0; + _s99_resourceIdArr[0] = 0xD5; + _s99_resourceIdArr[1] = 0x14C; + _s99_resourceIdArr[2] = 0xD5; + _s99_resourceIdArr[3] = 0xBF; + _s99_resourceIdArr[4] = 0xD6; + _s99_resourceIdArr[5] = 0x154; + _s99_resourceIdArr[6] = 0x155; + _s99_resourceIdArr[7] = 0xB9; + _s99_resourceIdArr[8] = 0xBA; + _s99_resourceIdArr[9] = 0x17B; + _s99_resourceIdArr[10] = 0x17A; + _s99_resourceIdArr[11] = 0x17C; + _s99_resourceIdArr[12] = 0x17A; + _s99_resourceIdArr[13] = 0x1B7; + _s99_resourceIdArr[14] = 0x1B8; + _s99_resourceIdArr[15] = 0x1B9; + _s99_sequenceCountArr[0] = 2; + _s99_sequenceCountArr[1] = 1; + _s99_sequenceCountArr[2] = 2; + _s99_sequenceCountArr[3] = 1; + _s99_sequenceCountArr[4] = 1; + _s99_sequenceCountArr[5] = 1; + _s99_sequenceCountArr[6] = 1; + _s99_sequenceCountArr[7] = 1; + _s99_sequenceCountArr[8] = 1; + _s99_sequenceCountArr[9] = 1; + _s99_sequenceCountArr[10] = 1; + _s99_sequenceCountArr[11] = 1; + _s99_sequenceCountArr[12] = 1; + _s99_sequenceCountArr[13] = 1; + _s99_sequenceCountArr[14] = 1; + _s99_sequenceCountArr[15] = 1; _s99_canSkip[0] = 0; _s99_canSkip[1] = 0; _s99_canSkip[2] = 0; |