diff options
Diffstat (limited to 'engines/mads')
| -rw-r--r-- | engines/mads/dragonsphere/dragonsphere_scenes1.cpp | 74 | ||||
| -rw-r--r-- | engines/mads/phantom/phantom_scenes1.cpp | 134 | ||||
| -rw-r--r-- | engines/mads/phantom/phantom_scenes2.cpp | 74 | ||||
| -rw-r--r-- | engines/mads/phantom/phantom_scenes3.cpp | 56 | ||||
| -rw-r--r-- | engines/mads/phantom/phantom_scenes4.cpp | 188 | ||||
| -rw-r--r-- | engines/mads/phantom/phantom_scenes5.cpp | 108 |
6 files changed, 317 insertions, 317 deletions
diff --git a/engines/mads/dragonsphere/dragonsphere_scenes1.cpp b/engines/mads/dragonsphere/dragonsphere_scenes1.cpp index a4c89d6a2d..ed446c4e04 100644 --- a/engines/mads/dragonsphere/dragonsphere_scenes1.cpp +++ b/engines/mads/dragonsphere/dragonsphere_scenes1.cpp @@ -226,7 +226,7 @@ void Scene101::step() { void Scene101::actions() { if (_action.isObject(NOUN_BED)) { - int sprIdx = _scene->_sprites.addSprites("*ob001i", false); + int sprIdx = _scene->_sprites.addSprites("*ob001i"); int seqIdx = _scene->_sequences.addStampCycle(sprIdx, false, 1); _scene->_sequences.setDepth(seqIdx, 0); _scene->_sequences.setPosition(seqIdx, Common::Point(10, 50)); @@ -264,13 +264,13 @@ void Scene102::setup() { } void Scene102::enter() { - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('p', 0), false); - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('p', 1), false); - _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('y', 0), false); - _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('y', 1), false); - _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('x', -1), false); - _globals._spriteIndexes[7] = _scene->_sprites.addSprites("*KGRD_6", false); - _globals._spriteIndexes[8] = _scene->_sprites.addSprites(formAnimName('y', 2), false); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('p', 0)); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('p', 1)); + _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('y', 0)); + _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('y', 1)); + _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('x', -1)); + _globals._spriteIndexes[7] = _scene->_sprites.addSprites("*KGRD_6"); + _globals._spriteIndexes[8] = _scene->_sprites.addSprites(formAnimName('y', 2)); _globals._sequenceIndexes[4] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[4], false, 7, 0); _globals._sequenceIndexes[5] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[5], false, 7, 0); @@ -678,17 +678,17 @@ void Scene103::setup() { void Scene103::enter() { _vm->_disableFastwalk = true; - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('y', 1), false); - _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('y', 2), false); - _globals._spriteIndexes[8] = _scene->_sprites.addSprites(formAnimName('y', 7), false); - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('y', 0), false); - _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('y', 3), false); - _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('y', 4), false); - _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('y', 5), false); - _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('y', 6), false); - _globals._spriteIndexes[9] = _scene->_sprites.addSprites(formAnimName('x', 0), false); - _globals._spriteIndexes[10] = _scene->_sprites.addSprites(formAnimName('x', 1), false); - _globals._spriteIndexes[11] = _scene->_sprites.addSprites("*KGRD_9", false); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('y', 1)); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('y', 2)); + _globals._spriteIndexes[8] = _scene->_sprites.addSprites(formAnimName('y', 7)); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('y', 0)); + _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('y', 3)); + _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('y', 4)); + _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('y', 5)); + _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('y', 6)); + _globals._spriteIndexes[9] = _scene->_sprites.addSprites(formAnimName('x', 0)); + _globals._spriteIndexes[10] = _scene->_sprites.addSprites(formAnimName('x', 1)); + _globals._spriteIndexes[11] = _scene->_sprites.addSprites("*KGRD_9"); _globals._sequenceIndexes[2] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[2], false, 7, 0, 0); _globals._sequenceIndexes[3] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[3], false, 7, 0, 4); @@ -1152,8 +1152,8 @@ void Scene104::enter() { _vm->_gameConv->get(1); if (_globals[kPlayerPersona] == 1) { - _scene->_sprites.addSprites(formAnimName('e', 8), false); - _scene->_sprites.addSprites(formAnimName('b', 5), false); + _scene->_sprites.addSprites(formAnimName('e', 8)); + _scene->_sprites.addSprites(formAnimName('b', 5)); } _scene->_hotspots.activate(NOUN_MACMORN, false); @@ -1180,13 +1180,13 @@ void Scene104::enter() { _anim6ActvFl = false; - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('x', 0), false); - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 1), false); - _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('x', 2), false); - _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('x', 3), false); - _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('x', 5), false); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('x', 0)); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 1)); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('x', 2)); + _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('x', 3)); + _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('x', 5)); + _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('x', 4)); - _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('x', 4), false); if (_globals[kNoLoadWalker]) { _scene->drawToBackground(_globals._spriteIndexes[6], 5, Common::Point(-32000, -32000), 0, 100); _scene->_sprites.remove(_globals._spriteIndexes[6]); @@ -1195,11 +1195,11 @@ void Scene104::enter() { if (_globals[kPlayerPersona] == 0) { _scene->_hotspots.activateAtPos(NOUN_TABLE, false, Common::Point(139, 132)); - _globals._spriteIndexes[7] = _scene->_sprites.addSprites("*KGRD_8", false); - _globals._spriteIndexes[8] = _scene->_sprites.addSprites("*KGRM1_8", false); - _globals._spriteIndexes[11] = _scene->_sprites.addSprites(formAnimName('y', 5), false); - _globals._spriteIndexes[10] = _scene->_sprites.addSprites(formAnimName('y', 4), false); - _globals._spriteIndexes[12] = _scene->_sprites.addSprites(formAnimName('y', 1), false); + _globals._spriteIndexes[7] = _scene->_sprites.addSprites("*KGRD_8"); + _globals._spriteIndexes[8] = _scene->_sprites.addSprites("*KGRM1_8"); + _globals._spriteIndexes[11] = _scene->_sprites.addSprites(formAnimName('y', 5)); + _globals._spriteIndexes[10] = _scene->_sprites.addSprites(formAnimName('y', 4)); + _globals._spriteIndexes[12] = _scene->_sprites.addSprites(formAnimName('y', 1)); if (_globals[kTapestryStatus] == 0 || _globals[kTapestryStatus] == 2) { _scene->_hotspots.activate(NOUN_WALL_PANEL, false); @@ -1225,19 +1225,19 @@ void Scene104::enter() { } } } else { - _globals._spriteIndexes[14] = _scene->_sprites.addSprites(formAnimName('e', 5), false); - _scene->_sprites.addSprites(formAnimName('b', 0), false); - _globals._spriteIndexes[13] = _scene->_sprites.addSprites(formAnimName('b', 3), false); + _globals._spriteIndexes[14] = _scene->_sprites.addSprites(formAnimName('e', 5)); + _scene->_sprites.addSprites(formAnimName('b', 0)); + _globals._spriteIndexes[13] = _scene->_sprites.addSprites(formAnimName('b', 3)); _scene->_hotspots.activateAtPos(NOUN_TABLE, false, Common::Point(140, 107)); _scene->_hotspots.activateAtPos(NOUN_TABLE, true, Common::Point(139, 132)); - _globals._spriteIndexes[10] = _scene->_sprites.addSprites(formAnimName('y', 4), false); + _globals._spriteIndexes[10] = _scene->_sprites.addSprites(formAnimName('y', 4)); if (_globals[kNoLoadWalker]) { _scene->drawToBackground(_globals._spriteIndexes[10], 1, Common::Point(-32000, -32000), 0, 100); _scene->_sprites.remove(_globals._spriteIndexes[10]); } - _globals._spriteIndexes[9] = _scene->_sprites.addSprites(formAnimName('y', 3), false); + _globals._spriteIndexes[9] = _scene->_sprites.addSprites(formAnimName('y', 3)); _globals._sequenceIndexes[9] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[9], false, -1); _scene->_sequences.setDepth(_globals._sequenceIndexes[9], 8); _doorwayHotspotId = _scene->_dynamicHotspots.add(NOUN_DOORWAY, VERB_WALK_THROUGH, SYNTAX_SINGULAR, _globals._sequenceIndexes[9], Common::Rect(0, 0, 0, 0)); diff --git a/engines/mads/phantom/phantom_scenes1.cpp b/engines/mads/phantom/phantom_scenes1.cpp index d1d77e3f43..11cf1c7189 100644 --- a/engines/mads/phantom/phantom_scenes1.cpp +++ b/engines/mads/phantom/phantom_scenes1.cpp @@ -884,23 +884,23 @@ void Scene103::enter() { if (_globals[kJacquesStatus] >= 1) { if (_game._objects.isInRoom(OBJ_KEY)) { - _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('x', 2), false); - _globals._spriteIndexes[8] = _scene->_sprites.addSprites("*RRD_9", false); + _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('x', 2)); + _globals._spriteIndexes[8] = _scene->_sprites.addSprites("*RRD_9"); } - _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('f', 3), false); - _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('c', 1), false); - _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('f', 1), false); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('f', 3)); + _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('c', 1)); + _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('f', 1)); } else { - _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('f', 0), false); - _globals._spriteIndexes[10] = _scene->_sprites.addSprites(formAnimName('a', 3), false); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('f', 0)); + _globals._spriteIndexes[10] = _scene->_sprites.addSprites(formAnimName('a', 3)); } - _globals._spriteIndexes[9] = _scene->_sprites.addSprites(formAnimName('x', 3), false); - _globals._spriteIndexes[11] = _scene->_sprites.addSprites(formAnimName('a', 2), false); - _globals._spriteIndexes[12] = _scene->_sprites.addSprites(formAnimName('f', 2), false); - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('x', 0), false); - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('x', 1), false); - _globals._spriteIndexes[2] = _scene->_sprites.addSprites("*RDR_6", false); + _globals._spriteIndexes[9] = _scene->_sprites.addSprites(formAnimName('x', 3)); + _globals._spriteIndexes[11] = _scene->_sprites.addSprites(formAnimName('a', 2)); + _globals._spriteIndexes[12] = _scene->_sprites.addSprites(formAnimName('f', 2)); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('x', 0)); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('x', 1)); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites("*RDR_6"); adjustRails(_scene->_initialVariant); @@ -2487,12 +2487,12 @@ void Scene104::enter() { _needToStandUp = false; } - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('a', 0), false); - _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('a', 6), false); - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('x', 0), false); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('a', 0)); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('a', 6)); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('x', 0)); if (_globals[kCurrentYear] == 1993) - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('z', 0), false); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('z', 0)); _vm->_gameConv->get(7); @@ -3624,14 +3624,14 @@ void Scene105::setup() { void Scene105::enter() { _scene->loadSpeech(8); - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 2), false); - _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('x', 3), false); - _globals._spriteIndexes[5] = _scene->_sprites.addSprites("*RRD_9", false); - _globals._spriteIndexes[6] = _scene->_sprites.addSprites("*RDR_9", false); - _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('a', 0), false); - _globals._spriteIndexes[8] = _scene->_sprites.addSprites(formAnimName('a', 1), false); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 2)); + _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('x', 3)); + _globals._spriteIndexes[5] = _scene->_sprites.addSprites("*RRD_9"); + _globals._spriteIndexes[6] = _scene->_sprites.addSprites("*RDR_9"); + _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('a', 0)); + _globals._spriteIndexes[8] = _scene->_sprites.addSprites(formAnimName('a', 1)); if (_globals[kCurrentYear] == 1993) - _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('z', -1), false); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('z', -1)); if ((_globals[kCurrentYear] == 1881) && (!_globals[kHintThatDaaeIsHome2])) { if ((_globals[kJacquesNameIsKnown] == 2) && (_globals[kMadameNameIsKnown] == 2) && @@ -3643,7 +3643,7 @@ void Scene105::enter() { } if ((_game._objects.isInRoom(OBJ_LANTERN)) && (_globals[kCurrentYear] == 1881)) { - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('x', 0), false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('x', 0)); _globals._sequenceIndexes[0] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[0], false, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[0], 14); } else { @@ -3651,7 +3651,7 @@ void Scene105::enter() { } if (_game._objects.isInRoom(OBJ_RED_FRAME)) { - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('x', 1), false); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('x', 1)); _globals._sequenceIndexes[1] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[1], false, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[1], 14); } else { @@ -4193,22 +4193,22 @@ void Scene106::enter() { if (_globals[kCurrentYear] == 1993) { if (!_game._objects.isInInventory(OBJ_SANDBAG)) { - _globals._spriteIndexes[5] = _scene->_sprites.addSprites("*RRD_9", false); - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('x', 0), false); + _globals._spriteIndexes[5] = _scene->_sprites.addSprites("*RRD_9"); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('x', 0)); } } else { - _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('z', -1), false); + _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('z', -1)); if (_game._objects.isInRoom(OBJ_CABLE_HOOK) && !_game._objects.isInInventory(OBJ_ROPE_WITH_HOOK)) { - _globals._spriteIndexes[5] = _scene->_sprites.addSprites("*RRD_9", false); - _globals._spriteIndexes[8] = _scene->_sprites.addSprites(formAnimName('p', 0), false); + _globals._spriteIndexes[5] = _scene->_sprites.addSprites("*RRD_9"); + _globals._spriteIndexes[8] = _scene->_sprites.addSprites(formAnimName('p', 0)); } } - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('a', 0), false); - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 1), false); - _globals._spriteIndexes[3] = _scene->_sprites.addSprites("*RDR_9", false); - _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('a', 1), false); - _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('a', 2), false); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('a', 0)); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 1)); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites("*RDR_9"); + _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('a', 1)); + _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('a', 2)); if ((_globals[kCurrentYear] == 1881) && (!_globals[kHintThatDaaeIsHome1])) { if ((_globals[kJacquesNameIsKnown] == 2) && (_globals[kMadameNameIsKnown] == 2) @@ -4753,11 +4753,11 @@ void Scene107::setup() { void Scene107::enter() { if (_globals[kCurrentYear] == 1993) - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('z', -1), false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('z', -1)); if (_game._objects.isInRoom(OBJ_YELLOW_FRAME)) { - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('f', 0), false); - _globals._spriteIndexes[1] = _scene->_sprites.addSprites("*RRD_9", false); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('f', 0)); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites("*RRD_9"); } if (_game._objects.isInRoom(OBJ_YELLOW_FRAME)) { @@ -5060,7 +5060,7 @@ void Scene108::enter() { _vm->_gameConv->get(2); if (_globals[kCurrentYear] == 1993) { - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('z', -1), false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('z', -1)); _scene->_hotspots.activate(NOUN_STOOL, false); int idx = _scene->_dynamicHotspots.add(NOUN_STOOL, VERB_WALK_TO, SYNTAX_SINGULAR, EXT_NONE, Common::Rect(250, 68, 250 + 8, 68 + 21)); _scene->_dynamicHotspots[idx]._articleNumber = PREP_ON; @@ -5626,14 +5626,14 @@ void Scene109::enter() { _anim2ActvFl = false; _anim3ActvFl = false; - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('x', 0), false); - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('x', 2), false); - _globals._spriteIndexes[8] = _scene->_sprites.addSprites("*RDR_6", false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('x', 0)); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('x', 2)); + _globals._spriteIndexes[8] = _scene->_sprites.addSprites("*RDR_6"); if (_globals[kCurrentYear] == 1881) { - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 1), false); - _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('x', 3), false); - _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('x', 4), false); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 1)); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('x', 3)); + _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('x', 4)); _scene->_hotspots.activate(NOUN_LIGHT_FIXTURE, false); _globals._sequenceIndexes[2] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[2], false, 1); @@ -5644,9 +5644,9 @@ void Scene109::enter() { _scene->_sequences.setDepth(_globals._sequenceIndexes[4], 14); _scene->_sequences.addTimer(1, 70); } else { - _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('z', 0), false); - _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('z', 1), false); - _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('z', 2), false); + _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('z', 0)); + _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('z', 1)); + _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('z', 2)); _scene->_hotspots.activate(NOUN_LAMP, false); _globals._sequenceIndexes[5] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[5], false, 1); @@ -6120,12 +6120,12 @@ void Scene110::setup() { } void Scene110::enter() { - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 0), false); - _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('x', 1), false); - _globals._spriteIndexes[1] = _scene->_sprites.addSprites("*RDR_9", false); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 0)); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('x', 1)); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites("*RDR_9"); if (_globals[kCurrentYear] == 1993) { - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('z', -1), false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('z', -1)); _scene->drawToBackground(_globals._spriteIndexes[0], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activate(NOUN_POSTER, false); _scene->_hotspots.activate(NOUN_WASTE_BASKET, false); @@ -6507,16 +6507,16 @@ void Scene111::enter() { _vm->_gameConv->get(14); - _globals._spriteIndexes[0] = _scene->_sprites.addSprites("*RDR_9", false); - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('a', 1), false); - _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('a', 3), false); - _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('x', 0), false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites("*RDR_9"); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('a', 1)); + _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('a', 3)); + _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('x', 0)); if (_globals[kCurrentYear] == 1881) - _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('a', 2), false); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('a', 2)); if (_globals[kCurrentYear] == 1993) { - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('z', -1), false); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('z', -1)); _scene->drawToBackground(_globals._spriteIndexes[1], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activate(NOUN_LAMP, false); int idx = _scene->_dynamicHotspots.add(NOUN_WALL, VERB_WALK_TO, SYNTAX_SINGULAR, EXT_NONE, Common::Rect(35, 82, 35 + 13, 82 + 11)); @@ -7747,14 +7747,14 @@ void Scene113::enter() { _scene->_hotspots.activate(NOUN_LIGHT_FIXTURE, false); if (_globals[kCurrentYear] == 1993) { - _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('z', -1), false); - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('f', 0), false); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('z', -1)); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('f', 0)); if (_game._objects.isInRoom(OBJ_SMALL_NOTE)) - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('f', 1), false); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('f', 1)); if ((_globals[kDoneBrieConv203] == 1) || (_globals[kDoneBrieConv203] == 3)) - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('c', 3), false); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('c', 3)); } if (_globals[kCurrentYear] == 1993) { @@ -9160,13 +9160,13 @@ void Scene114::setup() { void Scene114::enter() { if (_globals[kCurrentYear] == 1993) { - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('z', -1), false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('z', -1)); } else if (_game._objects.isInRoom(OBJ_ROPE) && !_game._objects.isInInventory(OBJ_ROPE_WITH_HOOK)) { - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('f', 0), false); - _globals._spriteIndexes[1] = _scene->_sprites.addSprites("*RDR_9", false); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('f', 0)); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites("*RDR_9"); } - _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('a', 0), false); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('a', 0)); if ((_game._objects.isInRoom(OBJ_ROPE)) && (_globals[kCurrentYear] == 1881) && !_game._objects.isInInventory(OBJ_ROPE_WITH_HOOK)) { _globals._sequenceIndexes[2] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[2], false, 1); diff --git a/engines/mads/phantom/phantom_scenes2.cpp b/engines/mads/phantom/phantom_scenes2.cpp index 5d0c3facd9..b00b0a2eb6 100644 --- a/engines/mads/phantom/phantom_scenes2.cpp +++ b/engines/mads/phantom/phantom_scenes2.cpp @@ -114,8 +114,8 @@ void Scene201::enter() { _needHoldFl = false; _vm->_gameConv->get(16); - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('x', 0), false); - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('f', 0), false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('x', 0)); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('f', 0)); if (_globals[kTicketPeoplePresent]) { _globals._animationIndexes[1] = _scene->loadAnimation(formAnimName('s', 1), 0); @@ -654,9 +654,9 @@ void Scene202::enter() { _vm->_gameConv->get(17); _vm->_gameConv->get(9); - _globals._spriteIndexes[1] = _scene->_sprites.addSprites("*RDR_9", false); - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('x', 0), false); - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('f', 0), false); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites("*RDR_9"); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('x', 0)); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('f', 0)); if (_globals[kTicketPeoplePresent] == 2) { _globals._animationIndexes[0] = _scene->loadAnimation(formAnimName('b', 0), 0); @@ -1556,13 +1556,13 @@ void Scene203::enter() { _scene->_hotspots.activate(NOUN_PARCHMENT, false); _scene->_hotspots.activate(NOUN_NOTICE, false); - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('p', 1), false); - _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('p', 0), false); - _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('x', 0), false); - _globals._spriteIndexes[4] = _scene->_sprites.addSprites("*RDR_6", false); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('p', 1)); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('p', 0)); + _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('x', 0)); + _globals._spriteIndexes[4] = _scene->_sprites.addSprites("*RDR_6"); if (_globals[kCurrentYear] == 1993) { - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('z', -1), false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('z', -1)); _vm->_gameConv->get(5); } else { _vm->_gameConv->get(8); @@ -3325,10 +3325,10 @@ void Scene204::enter() { _scene->_hotspots.activate(NOUN_BOOK, false); _vm->_gameConv->get(22); - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('p', 0), false); - _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('x', 6), false); - _globals._spriteIndexes[4] = _scene->_sprites.addSprites("*RALRH_9", false); - _globals._spriteIndexes[5] = _scene->_sprites.addSprites("*RDRR_6", false); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('p', 0)); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('x', 6)); + _globals._spriteIndexes[4] = _scene->_sprites.addSprites("*RALRH_9"); + _globals._spriteIndexes[5] = _scene->_sprites.addSprites("*RDRR_6"); if (_game._objects.isInRoom(OBJ_BOOK) || (_globals[kCurrentYear] == 1881) || _endGameFl) { _globals._sequenceIndexes[2] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[2], false, 1); @@ -3338,7 +3338,7 @@ void Scene204::enter() { } if ((_globals[kCurrentYear] == 1993) || _endGameFl) { - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('z', -1), false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('z', -1)); _scene->drawToBackground(_globals._spriteIndexes[0], 1, Common::Point(-32000, -32000), 0, 100); _scene->_sprites.remove(_globals._spriteIndexes[0]); _scene->_hotspots.activate(NOUN_CANDLE, false); @@ -3378,10 +3378,10 @@ void Scene204::enter() { } if ((_scene->_priorSceneId == 306) || (_endGameFl)) { - _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('f', 0), false); + _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('f', 0)); _scene->drawToBackground(_globals._spriteIndexes[6], 1, Common::Point(-32000, -32000), 0, 100); } else if (_globals[kCurrentYear] == 1993) { - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('f', 1), false); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('f', 1)); _scene->drawToBackground(_globals._spriteIndexes[1], 1, Common::Point(-32000, -32000), 0, 100); _scene->_sprites.remove(_globals._spriteIndexes[1]); } @@ -4269,9 +4269,9 @@ void Scene205::enter() { _noConversationHold = false; _giveTicketFl = false; - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('f', 0), false); - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('f', 1), false); - _globals._spriteIndexes[2] = _scene->_sprites.addSprites("*RDR_9", false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('f', 0)); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('f', 1)); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites("*RDR_9"); _scene->_hotspots.activate(NOUN_MONSIEUR_RICHARD, false); _scene->_hotspots.activate(NOUN_MADAME_GIRY, false); @@ -5866,11 +5866,11 @@ void Scene206::enter() { _scene->loadSpeech(1); _vm->_gameConv->get(26); - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('x', 0), false); - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('x', 1), false); - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 2), false); - _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('x', 3), false); - _globals._spriteIndexes[5] = _scene->_sprites.addSprites("*RDR_9", false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('x', 0)); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('x', 1)); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 2)); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('x', 3)); + _globals._spriteIndexes[5] = _scene->_sprites.addSprites("*RDR_9"); if (_scene->_priorSceneId != 308) { if (_globals[kPanelIn206] == 0) { @@ -5890,7 +5890,7 @@ void Scene206::enter() { } if (_game._objects.isInRoom(OBJ_CRUMPLED_NOTE)) { - _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('p', 0), false); + _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('p', 0)); _globals._sequenceIndexes[4] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[4], false, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[4], 10); } else @@ -6360,9 +6360,9 @@ void Scene207::enter() { _skip1Fl = false; _anim0ActvFl = false; - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('a', 0), false); - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('c', 0), false); - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 0), false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('a', 0)); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('c', 0)); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 0)); _globals._sequenceIndexes[1] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[1], false, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[1], 10); @@ -6569,14 +6569,14 @@ void Scene208::enter() { _skip1Fl = false; _skip2Fl = false; - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('x', 0), false); - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('x', 1), false); - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 2), false); - _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('x', 3), false); - _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('x', 4), false); - _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('x', 5), false); - _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('x', 6), false); - _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('x', 7), false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('x', 0)); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('x', 1)); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 2)); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('x', 3)); + _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('x', 4)); + _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('x', 5)); + _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('x', 6)); + _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('x', 7)); _scene->_userInterface.emptyConversationList(); _scene->_userInterface.setup(kInputConversation); diff --git a/engines/mads/phantom/phantom_scenes3.cpp b/engines/mads/phantom/phantom_scenes3.cpp index 33a30a88bb..516376f8ae 100644 --- a/engines/mads/phantom/phantom_scenes3.cpp +++ b/engines/mads/phantom/phantom_scenes3.cpp @@ -121,17 +121,17 @@ void Scene301::enter() { _scene->_hotspots.activate(NOUN_CABLE, false); _scene->_hotspots.activate(NOUN_STOOL, false); - _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('a', 0), false); + _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('a', 0)); if (_globals[kCurrentYear] == 1993) { - _globals._spriteIndexes[8] = _scene->_sprites.addSprites(formAnimName('a', 1), false); - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('z', 0), false); - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('z', 1), false); - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('z', 2), false); - _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('z', 3), false); - _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('z', 4), false); - _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('z', 5), false); - _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('z', 6), false); + _globals._spriteIndexes[8] = _scene->_sprites.addSprites(formAnimName('a', 1)); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('z', 0)); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('z', 1)); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('z', 2)); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('z', 3)); + _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('z', 4)); + _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('z', 5)); + _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('z', 6)); _lightingHotspotId = _scene->_dynamicHotspots.add(NOUN_LIGHTING_INSTRUMENT, VERB_WALK_TO, SYNTAX_SINGULAR, EXT_NONE, Common::Rect(50, 116, 50 + 19, 116 + 10)); _scene->_dynamicHotspots.setPosition(_lightingHotspotId, Common::Point(67, 129), FACING_NORTHWEST); @@ -178,7 +178,7 @@ void Scene301::enter() { } if (!_game._visitedScenes._sceneRevisited) { - _globals._spriteIndexes[9] = _scene->_sprites.addSprites(formAnimName('x', 0), false); + _globals._spriteIndexes[9] = _scene->_sprites.addSprites(formAnimName('x', 0)); _globals._sequenceIndexes[9] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[9], false, 7, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[9], 5); _scene->_sequences.setAnimRange(_globals._sequenceIndexes[9], -1, -2); @@ -469,8 +469,8 @@ void Scene302::setup() { } void Scene302::enter() { - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('p', 0), false); - _globals._spriteIndexes[1] = _scene->_sprites.addSprites("*RRD_9", false); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('p', 0)); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites("*RRD_9"); if (_game._objects.isInRoom(OBJ_BLUE_FRAME)) { _globals._sequenceIndexes[2] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[2], false, 1); @@ -479,7 +479,7 @@ void Scene302::enter() { _scene->_hotspots.activate(NOUN_BLUE_FRAME, false); if (_globals[kCurrentYear] == 1993) { - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('z', -1), false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('z', -1)); _scene->drawToBackground(_globals._spriteIndexes[0], 1, Common::Point(-32000, -32000), 0, 100); } @@ -684,8 +684,8 @@ void Scene303::enter() { _vm->_gameConv->get(26); if (_globals[kCurrentYear] == 1993) { - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('z', -1), false); - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('p', 0), false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('z', -1)); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('p', 0)); } if ((_game._objects.isInRoom(OBJ_LARGE_NOTE)) && (_globals[kCurrentYear] == 1993)) { @@ -1004,7 +1004,7 @@ void Scene304::enter() { _vm->_gameConv->get(23); if (!_globals[kRightDoorIsOpen504]) { - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('f', 1), false); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('f', 1)); _globals._sequenceIndexes[1] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[1], false, -1); _scene->_sequences.setDepth(_globals._sequenceIndexes[1], 1); @@ -1016,7 +1016,7 @@ void Scene304::enter() { _scene->_userInterface.setup(kInputLimitedSentences); if (_scene->_priorSceneId == 305) { - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('f', 0), false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('f', 0)); _scene->drawToBackground(_globals._spriteIndexes[0], 1, Common::Point(-32000, -32000), 0, 100); _game._player._stepEnabled = false; @@ -1026,7 +1026,7 @@ void Scene304::enter() { } else { - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('f', 0), false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('f', 0)); _scene->drawToBackground(_globals._spriteIndexes[0], 1, Common::Point(-32000, -32000), 0, 100); _globals._animationIndexes[1] = _scene->loadAnimation(formAnimName('f', 1), 0); @@ -1599,10 +1599,10 @@ void Scene307::setup() { } void Scene307::enter() { - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('p', 0), false); - _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('x', 0), false); - _globals._spriteIndexes[1] = _scene->_sprites.addSprites("*RRD_9", false); - _globals._spriteIndexes[4] = _scene->_sprites.addSprites("*RDR_9", false); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('p', 0)); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('x', 0)); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites("*RRD_9"); + _globals._spriteIndexes[4] = _scene->_sprites.addSprites("*RDR_9"); if (_globals[kRightDoorIsOpen504]) _scene->_hotspots.activate(NOUN_DOOR, true); @@ -1905,8 +1905,8 @@ void Scene308::enter() { _skip2Fl = false; _vm->_gameConv->get(26); - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('a', 0), false); - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('b', 0), false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('a', 0)); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('b', 0)); _scene->_userInterface.setup(kInputLimitedSentences); _game._player._visible = false; @@ -2243,9 +2243,9 @@ void Scene309::enter() { _boatStatus = 1; _vm->_gameConv->get(26); - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('x', 0), false); - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 1), false); - _globals._spriteIndexes[1] = _scene->_sprites.addSprites("*RDR_9", false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('x', 0)); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 1)); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites("*RDR_9"); if (_scene->_priorSceneId == RETURNING_FROM_LOADING) { _globals._sequenceIndexes[0] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[0], false, -1); @@ -2587,7 +2587,7 @@ void Scene310::enter() { warning("TODO: Switch to letter box view. See definition of MADS_MENU_Y"); for (int i = 0; i < 4; i++) { - _globals._spriteIndexes[i] = _scene->_sprites.addSprites(formAnimName('f', i), false); + _globals._spriteIndexes[i] = _scene->_sprites.addSprites(formAnimName('f', i)); _globals._sequenceIndexes[i] = -1; } diff --git a/engines/mads/phantom/phantom_scenes4.cpp b/engines/mads/phantom/phantom_scenes4.cpp index 3e7c1e78bc..f82b5993f8 100644 --- a/engines/mads/phantom/phantom_scenes4.cpp +++ b/engines/mads/phantom/phantom_scenes4.cpp @@ -103,26 +103,26 @@ void Scene401::enter() { _scene->_hotspots.activate(NOUN_SKULL, false); _scene->_hotspots.activate(NOUN_POT, false); - _globals._spriteIndexes[8] = _scene->_sprites.addSprites("*RRD_9", false); - _globals._spriteIndexes[9] = _scene->_sprites.addSprites(formAnimName('f', 0), false); - _globals._spriteIndexes[10] = _scene->_sprites.addSprites(formAnimName('f', 1), false); - _globals._spriteIndexes[11] = _scene->_sprites.addSprites(formAnimName('f', 2), false); - _globals._spriteIndexes[12] = _scene->_sprites.addSprites(formAnimName('f', 3), false); + _globals._spriteIndexes[8] = _scene->_sprites.addSprites("*RRD_9"); + _globals._spriteIndexes[9] = _scene->_sprites.addSprites(formAnimName('f', 0)); + _globals._spriteIndexes[10] = _scene->_sprites.addSprites(formAnimName('f', 1)); + _globals._spriteIndexes[11] = _scene->_sprites.addSprites(formAnimName('f', 2)); + _globals._spriteIndexes[12] = _scene->_sprites.addSprites(formAnimName('f', 3)); if (_game.exitCatacombs(0) == -1) { - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('c', 1), false); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('c', 1)); _scene->drawToBackground(_globals._spriteIndexes[1], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activate(NOUN_ARCHWAY_TO_NORTH, false); } if (_game.exitCatacombs(3) == -1) { - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('c', 0), false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('c', 0)); _scene->drawToBackground(_globals._spriteIndexes[0], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activate(NOUN_ARCHWAY_TO_WEST, false); } if (_game.exitCatacombs(1) == -1) { - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('c', 2), false); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('c', 2)); _scene->drawToBackground(_globals._spriteIndexes[2], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activate(NOUN_ARCHWAY_TO_EAST, false); } @@ -131,25 +131,25 @@ void Scene401::enter() { _scene->_hotspots.activate(NOUN_MORE_CATACOMBS, false); if (_globals[kCatacombsMisc] & MAZE_EVENT_RAT_NEST) { - _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('c', 4), false); + _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('c', 4)); _scene->drawToBackground(_globals._spriteIndexes[4], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activate(NOUN_RATS_NEST, true); } if (_globals[kCatacombsMisc] & MAZE_EVENT_SKULL) { - _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('c', 5), false); + _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('c', 5)); _scene->drawToBackground(_globals._spriteIndexes[5], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activate(NOUN_SKULL, true); } if (_globals[kCatacombsMisc] & MAZE_EVENT_POT) { - _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('c', 6), false); + _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('c', 6)); _scene->drawToBackground(_globals._spriteIndexes[6], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activate(NOUN_POT, true); } if (_globals[kCatacombsMisc] & MAZE_EVENT_BRICK) { - _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('c', 7), false); + _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('c', 7)); _scene->drawToBackground(_globals._spriteIndexes[7], 1, Common::Point(-32000, -32000), 0, 100); } @@ -601,20 +601,20 @@ void Scene403::enter() { _scene->_hotspots.activate(NOUN_PLANK, false); _scene->_hotspots.activate(NOUN_GATE, false); - _globals._spriteIndexes[8] = _scene->_sprites.addSprites("*RRD_9", false); - _globals._spriteIndexes[9] = _scene->_sprites.addSprites(formAnimName('f', 0), false); - _globals._spriteIndexes[10] = _scene->_sprites.addSprites(formAnimName('f', 1), false); - _globals._spriteIndexes[11] = _scene->_sprites.addSprites(formAnimName('f', 2), false); - _globals._spriteIndexes[12] = _scene->_sprites.addSprites(formAnimName('f', 3), false); + _globals._spriteIndexes[8] = _scene->_sprites.addSprites("*RRD_9"); + _globals._spriteIndexes[9] = _scene->_sprites.addSprites(formAnimName('f', 0)); + _globals._spriteIndexes[10] = _scene->_sprites.addSprites(formAnimName('f', 1)); + _globals._spriteIndexes[11] = _scene->_sprites.addSprites(formAnimName('f', 2)); + _globals._spriteIndexes[12] = _scene->_sprites.addSprites(formAnimName('f', 3)); if (_game.exitCatacombs(0) == -1) { - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('c', 1), false); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('c', 1)); _scene->drawToBackground(_globals._spriteIndexes[1], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activate(NOUN_ARCHWAY_TO_NORTH, false); } if (_game.exitCatacombs(3) == -1) { - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('c', 0), false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('c', 0)); _scene->drawToBackground(_globals._spriteIndexes[0], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activate(NOUN_ARCHWAY_TO_WEST, false); } @@ -622,42 +622,42 @@ void Scene403::enter() { if (_game.exitCatacombs(1) == -1) { _scene->_hotspots.activate(NOUN_MORE_CATACOMBS, false); _scene->_hotspots.activate(NOUN_GATE, true); - _globals._spriteIndexes[13] = _scene->_sprites.addSprites(formAnimName('c', 9), false); + _globals._spriteIndexes[13] = _scene->_sprites.addSprites(formAnimName('c', 9)); _scene->drawToBackground(_globals._spriteIndexes[13], 1, Common::Point(-32000, -32000), 0, 100); } if (_globals[kCatacombsMisc] & MAZE_EVENT_HOLE) { - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('c', 3), false); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('c', 3)); _scene->drawToBackground(_globals._spriteIndexes[2], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activate(NOUN_HOLE, true); } if (_globals[kCatacombsMisc] & MAZE_EVENT_WEB) { - _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('c', 4), false); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('c', 4)); _scene->drawToBackground(_globals._spriteIndexes[3], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activate(NOUN_WEB, true); } if (_globals[kCatacombsMisc] & MAZE_EVENT_BRICK) { - _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('c', 5), false); + _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('c', 5)); _scene->drawToBackground(_globals._spriteIndexes[4], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activateAtPos(NOUN_EXPOSED_BRICK, false, Common::Point(178, 35)); } if (_globals[kCatacombsMisc] & MAZE_EVENT_RAT_NEST) { - _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('c', 6), false); + _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('c', 6)); _scene->drawToBackground(_globals._spriteIndexes[5], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activate(NOUN_RATS_NEST, true); } if (_globals[kCatacombsMisc] & MAZE_EVENT_SKULL) { - _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('c', 7), false); + _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('c', 7)); _scene->drawToBackground(_globals._spriteIndexes[6], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activate(NOUN_SKULL, true); } if (_globals[kCatacombsMisc] & MAZE_EVENT_PLANK) { - _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('c', 8), false); + _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('c', 8)); _scene->drawToBackground(_globals._spriteIndexes[7], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activate(NOUN_PLANK, true); } @@ -1098,27 +1098,27 @@ void Scene404::enter() { _anim0ActvFl = false; - _globals._spriteIndexes[9] = _scene->_sprites.addSprites("*RRD_9", false); - _globals._spriteIndexes[10] = _scene->_sprites.addSprites(formAnimName('f', 0), false); - _globals._spriteIndexes[11] = _scene->_sprites.addSprites(formAnimName('f', 1), false); - _globals._spriteIndexes[12] = _scene->_sprites.addSprites(formAnimName('f', 2), false); - _globals._spriteIndexes[13] = _scene->_sprites.addSprites(formAnimName('f', 3), false); + _globals._spriteIndexes[9] = _scene->_sprites.addSprites("*RRD_9"); + _globals._spriteIndexes[10] = _scene->_sprites.addSprites(formAnimName('f', 0)); + _globals._spriteIndexes[11] = _scene->_sprites.addSprites(formAnimName('f', 1)); + _globals._spriteIndexes[12] = _scene->_sprites.addSprites(formAnimName('f', 2)); + _globals._spriteIndexes[13] = _scene->_sprites.addSprites(formAnimName('f', 3)); if (_game.exitCatacombs(0) == -1) { - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('c', 1), false); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('c', 1)); _scene->drawToBackground(_globals._spriteIndexes[1], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activate(NOUN_ARCHWAY_TO_NORTH, false); } if (_game.exitCatacombs(3) == -1) { - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('c', 0), false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('c', 0)); _scene->drawToBackground(_globals._spriteIndexes[0], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activate(NOUN_ARCHWAY_TO_WEST, false); } if (_game.exitCatacombs(1) == -1) { - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('c', 2), false); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('c', 2)); _scene->drawToBackground(_globals._spriteIndexes[2], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activate(NOUN_ARCHWAY_TO_EAST, false); } @@ -1127,30 +1127,30 @@ void Scene404::enter() { _scene->_hotspots.activate(NOUN_MORE_CATACOMBS, false); if (_globals[kCatacombsMisc] & MAZE_EVENT_RAT_NEST) { - _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('c', 3), false); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('c', 3)); _scene->drawToBackground(_globals._spriteIndexes[3], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activate(NOUN_RATS_NEST, true); } if (_globals[kCatacombsMisc] & MAZE_EVENT_WEB) { - _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('c', 4), false); + _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('c', 4)); _scene->drawToBackground(_globals._spriteIndexes[4], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activate(NOUN_WEB, true); } if (_globals[kCatacombsMisc] & MAZE_EVENT_POT) { - _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('c', 5), false); + _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('c', 5)); _scene->drawToBackground(_globals._spriteIndexes[5], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activate(NOUN_BROKEN_POT, true); } if (_globals[kCatacombsMisc] & MAZE_EVENT_BLOCK) { - _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('c', 7), false); + _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('c', 7)); _scene->drawToBackground(_globals._spriteIndexes[7], 1, Common::Point(-32000, -32000), 0, 100); } if (_globals[kCatacombsMisc] & MAZE_EVENT_FALLEN_BLOCK) { - _globals._spriteIndexes[8] = _scene->_sprites.addSprites(formAnimName('c', 8), false); + _globals._spriteIndexes[8] = _scene->_sprites.addSprites(formAnimName('c', 8)); _scene->drawToBackground(_globals._spriteIndexes[8], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activate(NOUN_BLOCK, true); } @@ -1587,11 +1587,11 @@ void Scene406::setup() { void Scene406::enter() { _game.initCatacombs(); - _globals._spriteIndexes[0] = _scene->_sprites.addSprites("*RRD_9", false); - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('f', 0), false); - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('f', 1), false); - _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('f', 2), false); - _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('f', 3), false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites("*RRD_9"); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('f', 0)); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('f', 1)); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('f', 2)); + _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('f', 3)); if (_scene->_priorSceneId != RETURNING_FROM_LOADING) { switch (_globals[kCatacombsFrom]) { @@ -1993,11 +1993,11 @@ void Scene407::setup() { void Scene407::enter() { _game.initCatacombs(); - _globals._spriteIndexes[0] = _scene->_sprites.addSprites("*RRD_9", false); - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('f', 0), false); - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('f', 1), false); - _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('f', 2), false); - _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('f', 3), false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites("*RRD_9"); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('f', 0)); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('f', 1)); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('f', 2)); + _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('f', 3)); if (_game.exitCatacombs(3) == -1) { _scene->_hotspots.activateAtPos(NOUN_MORE_CATACOMBS, false, Common::Point(9, 46)); @@ -2463,14 +2463,14 @@ void Scene408::enter() { _game.initCatacombs(); _scene->_hotspots.activate(NOUN_COBWEB, false); - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('c', 0), false); - _globals._spriteIndexes[1] = _scene->_sprites.addSprites("*RRD_9", false); - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('f', 0), false); - _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('f', 1), false); - _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('f', 2), false); - _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('f', 3), false); - _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('c', 1), false); - _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('c', 2), false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('c', 0)); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites("*RRD_9"); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('f', 0)); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('f', 1)); + _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('f', 2)); + _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('f', 3)); + _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('c', 1)); + _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('c', 2)); if (_game.exitCatacombs(0) == -1) { _scene->drawToBackground(_globals._spriteIndexes[0], 1, Common::Point(-32000, -32000), 0, 100); @@ -2510,9 +2510,9 @@ void Scene408::enter() { } if (_globals[kCatacombsMisc] & MAZE_EVENT_WEB) { - _globals._spriteIndexes[8] = _scene->_sprites.addSprites(formAnimName('x', -1), false); + _globals._spriteIndexes[8] = _scene->_sprites.addSprites(formAnimName('x', -1)); if (!_globals[kCobwebIsCut]) { - _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('c', 1), false); + _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('c', 1)); _globals._sequenceIndexes[6] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[6], false, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[6], 10); _scene->_hotspots.activate(NOUN_COBWEB, true); @@ -2533,7 +2533,7 @@ void Scene408::enter() { } if (_globals[kCatacombsMisc] & MAZE_EVENT_BRICK) { - _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('c', 2), false); + _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('c', 2)); _scene->drawToBackground(_globals._spriteIndexes[7], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activate(NOUN_EXPOSED_BRICK, false); } @@ -2931,18 +2931,18 @@ void Scene409::enter() { _scene->loadSpeech(3); _scene->_hotspots.activate(NOUN_SWORD, false); - _globals._spriteIndexes[8] = _scene->_sprites.addSprites("*RDR_9", false); - _globals._spriteIndexes[0] = _scene->_sprites.addSprites("*RRD_9", false); - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('f', 0), false); - _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('f', 1), false); - _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('f', 2), false); - _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('f', 3), false); - _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('x', 0), false); - _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('a', 0), false); + _globals._spriteIndexes[8] = _scene->_sprites.addSprites("*RDR_9"); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites("*RRD_9"); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('f', 0)); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('f', 1)); + _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('f', 2)); + _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('f', 3)); + _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('x', 0)); + _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('a', 0)); if (_game._objects.isInRoom(OBJ_SWORD)) { - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('p', 0), false); - _globals._spriteIndexes[0] = _scene->_sprites.addSprites("*RRD_9", false); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('p', 0)); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites("*RRD_9"); _globals._sequenceIndexes[1] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[1], false, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[1], 14); _scene->_hotspots.activate(NOUN_SWORD, true); @@ -3523,11 +3523,11 @@ void Scene410::setup() { void Scene410::enter() { _game._player._visible = false; - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('l', 0), false); - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('l', 1), false); - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('l', 2), false); - _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('a', 0), false); - _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('f', 0), false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('l', 0)); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('l', 1)); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('l', 2)); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('a', 0)); + _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('f', 0)); for (int i = 1; i < 27; i++) { Common::Point pos; @@ -4171,60 +4171,60 @@ void Scene453::enter() { _scene->_hotspots.activate(NOUN_HOLE, false); _scene->_hotspots.activate(NOUN_GATE, false); - _globals._spriteIndexes[8] = _scene->_sprites.addSprites("*RRD_9", false); - _globals._spriteIndexes[9] = _scene->_sprites.addSprites(formAnimName('f', 0), false); - _globals._spriteIndexes[10] = _scene->_sprites.addSprites(formAnimName('f', 1), false); - _globals._spriteIndexes[11] = _scene->_sprites.addSprites(formAnimName('f', 2), false); - _globals._spriteIndexes[12] = _scene->_sprites.addSprites(formAnimName('f', 3), false); + _globals._spriteIndexes[8] = _scene->_sprites.addSprites("*RRD_9"); + _globals._spriteIndexes[9] = _scene->_sprites.addSprites(formAnimName('f', 0)); + _globals._spriteIndexes[10] = _scene->_sprites.addSprites(formAnimName('f', 1)); + _globals._spriteIndexes[11] = _scene->_sprites.addSprites(formAnimName('f', 2)); + _globals._spriteIndexes[12] = _scene->_sprites.addSprites(formAnimName('f', 3)); if (_game.exitCatacombs(0) == -1) { - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('c', 1), false); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('c', 1)); _scene->drawToBackground(_globals._spriteIndexes[1], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activate(NOUN_ARCHWAY_TO_NORTH, false); } if (_game.exitCatacombs(3) == -1) { - _globals._spriteIndexes[13] = _scene->_sprites.addSprites(formAnimName('c', 8), false); + _globals._spriteIndexes[13] = _scene->_sprites.addSprites(formAnimName('c', 8)); _scene->drawToBackground(_globals._spriteIndexes[13], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activate(NOUN_MORE_CATACOMBS, false); _scene->_hotspots.activate(NOUN_GATE, true); } if (_game.exitCatacombs(1) == -1) { - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('c', 2), false); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('c', 2)); _scene->drawToBackground(_globals._spriteIndexes[2], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activate(NOUN_ARCHWAY_TO_EAST, false); } if (_globals[kCatacombsMisc] & MAZE_EVENT_DRAIN) { - _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('c', 3), false); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('c', 3)); _scene->drawToBackground(_globals._spriteIndexes[3], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activate(NOUN_DRAIN, true); } if (_globals[kCatacombsMisc] & MAZE_EVENT_RAT_NEST) { - _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('c', 4), false); + _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('c', 4)); _scene->drawToBackground(_globals._spriteIndexes[4], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activate(NOUN_SKULL, true); _scene->_hotspots.activate(NOUN_RATS_NEST, true); } if (_globals[kCatacombsMisc] & MAZE_EVENT_WEB) { - _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('c', 5), false); + _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('c', 5)); _scene->drawToBackground(_globals._spriteIndexes[5], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activate(NOUN_WEB, true); } if (_globals[kCatacombsMisc] & MAZE_EVENT_BRICK) { - _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('c', 6), false); + _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('c', 6)); _scene->drawToBackground(_globals._spriteIndexes[6], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activateAtPos(NOUN_EXPOSED_BRICK, false, Common::Point(138, 35)); _scene->_hotspots.activateAtPos(NOUN_EXPOSED_BRICK, false, Common::Point(84, 27)); } if (_globals[kCatacombsMisc] & MAZE_EVENT_STONE) { - _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('c', 7), false); + _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('c', 7)); _scene->drawToBackground(_globals._spriteIndexes[7], 1, Common::Point(-32000, -32000), 0, 100); _scene->_hotspots.activate(NOUN_HOLE, true); _scene->_hotspots.activate(NOUN_STONE, true); @@ -4648,12 +4648,12 @@ void Scene456::setup() { void Scene456::enter() { _game.initCatacombs(); - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('c', 1), false); - _globals._spriteIndexes[1] = _scene->_sprites.addSprites("*RRD_9", false); - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('f', 0), false); - _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('f', 1), false); - _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('f', 2), false); - _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('f', 3), false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('c', 1)); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites("*RRD_9"); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('f', 0)); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('f', 1)); + _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('f', 2)); + _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('f', 3)); if (_game.exitCatacombs(1) == -1) { _scene->drawToBackground(_globals._spriteIndexes[0], 1, Common::Point(-32000, -32000), 0, 100); diff --git a/engines/mads/phantom/phantom_scenes5.cpp b/engines/mads/phantom/phantom_scenes5.cpp index 9a5b8e4178..84f5962bcd 100644 --- a/engines/mads/phantom/phantom_scenes5.cpp +++ b/engines/mads/phantom/phantom_scenes5.cpp @@ -94,15 +94,15 @@ void Scene501::enter() { _vm->_gameConv->get(26); - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('x', 0), false); - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('x', 1), false); - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 2), false); - _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('a', 1), false); - _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('a', 0), false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('x', 0)); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('x', 1)); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 2)); + _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('a', 1)); + _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('a', 0)); _globals._spriteIndexes[6] = _scene->_sprites.addSprites("*CHR_6", PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); _globals._spriteIndexes[6] = _scene->_sprites.addSprites("*CHR_9", PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); _globals._spriteIndexes[6] = _scene->_sprites.addSprites("*CHR_8", PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); - _globals._spriteIndexes[3] = _scene->_sprites.addSprites("*RDRR_6", false); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites("*RDRR_6"); _globals._sequenceIndexes[0] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[0], false, 6); _scene->_sequences.setDepth(_globals._sequenceIndexes[0], 14); @@ -734,22 +734,22 @@ void Scene502::enter() { _scene->_hotspots.activate(NOUN_ROPE, false); _scene->_hotspots.activateAtPos(NOUN_TRAP_DOOR, false, Common::Point(225, 28)); - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('x', 2), false); - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('x', 3), false); - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 4), false); - _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('x', 5), false); - _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('a', 2), false); - _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('x', 0), false); - _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('x', 1), false); - _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('a', 1), false); - _globals._spriteIndexes[8] = _scene->_sprites.addSprites(formAnimName('a', 3), false); - _globals._spriteIndexes[9] = _scene->_sprites.addSprites(formAnimName('x', 6), false); - _globals._spriteIndexes[10] = _scene->_sprites.addSprites(formAnimName('a', 0), false); - _globals._spriteIndexes[11] = _scene->_sprites.addSprites(formAnimName('j', 0), false); - _globals._spriteIndexes[12] = _scene->_sprites.addSprites(formAnimName('k', 0), false); - _globals._spriteIndexes[13] = _scene->_sprites.addSprites(formAnimName('l', 0), false); - _globals._spriteIndexes[14] = _scene->_sprites.addSprites(formAnimName('m', 0), false); - _globals._spriteIndexes[16] = _scene->_sprites.addSprites(formAnimName('h', 0), false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('x', 2)); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('x', 3)); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 4)); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('x', 5)); + _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('a', 2)); + _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('x', 0)); + _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('x', 1)); + _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('a', 1)); + _globals._spriteIndexes[8] = _scene->_sprites.addSprites(formAnimName('a', 3)); + _globals._spriteIndexes[9] = _scene->_sprites.addSprites(formAnimName('x', 6)); + _globals._spriteIndexes[10] = _scene->_sprites.addSprites(formAnimName('a', 0)); + _globals._spriteIndexes[11] = _scene->_sprites.addSprites(formAnimName('j', 0)); + _globals._spriteIndexes[12] = _scene->_sprites.addSprites(formAnimName('k', 0)); + _globals._spriteIndexes[13] = _scene->_sprites.addSprites(formAnimName('l', 0)); + _globals._spriteIndexes[14] = _scene->_sprites.addSprites(formAnimName('m', 0)); + _globals._spriteIndexes[16] = _scene->_sprites.addSprites(formAnimName('h', 0)); if (_scene->_priorSceneId != RETURNING_FROM_LOADING) { _globals._sequenceIndexes[5] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[5], false, 1); @@ -1861,8 +1861,8 @@ void Scene504::enter() { _vm->_gameConv->get(26); - _globals._spriteIndexes[14] = _scene->_sprites.addSprites("*RDR_9", false); - _globals._spriteIndexes[15] = _scene->_sprites.addSprites(formAnimName('x', 8), false); + _globals._spriteIndexes[14] = _scene->_sprites.addSprites("*RDR_9"); + _globals._spriteIndexes[15] = _scene->_sprites.addSprites(formAnimName('x', 8)); if (!_game._objects.isInRoom(OBJ_MUSIC_SCORE)) { _globals._sequenceIndexes[15] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[15], false, 1); @@ -1870,13 +1870,13 @@ void Scene504::enter() { _scene->_hotspots.activate(NOUN_MUSIC_SCORE, false); } - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('x', 2), false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('x', 2)); _globals._spriteIndexes[13] = _scene->_sprites.addSprites(formAnimName('x', 7), PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); if (_globals[kFightStatus] == 0) - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('x', 1), false); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('x', 1)); - _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('x', 3), false); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('x', 3)); if ((_scene->_priorSceneId == 505) || ((_scene->_priorSceneId == 504) && _globals[kRightDoorIsOpen504])) { if ((_globals[kFightStatus] == 0) && (_globals[kCoffinStatus] == 2)) { @@ -1884,14 +1884,14 @@ void Scene504::enter() { _scene->drawToBackground(_globals._spriteIndexes[0], 1, Common::Point(-32000, -32000), 0, 100); _globals._spriteIndexes[13] = _scene->_sprites.addSprites(formAnimName('x', 7), PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); - _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('b', 0), false); + _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('b', 0)); _globals._spriteIndexes[6] = _scene->_sprites.addSprites("*CHR_6", PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); _globals._spriteIndexes[6] = _scene->_sprites.addSprites("*FACERAL", PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); _globals._spriteIndexes[6] = _scene->_sprites.addSprites("*FACEXDFR", PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); _globals._spriteIndexes[6] = _scene->_sprites.addSprites("*FACEPHN", PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); - _globals._spriteIndexes[11] = _scene->_sprites.addSprites(formAnimName('a', 5), false); + _globals._spriteIndexes[11] = _scene->_sprites.addSprites(formAnimName('a', 5)); _globals._spriteIndexes[10] = _scene->_sprites.addSprites(formAnimName('a', 3), PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('a', 6), PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); _globals._spriteIndexes[8] = _scene->_sprites.addSprites(formAnimName('a', 7), PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); @@ -1931,7 +1931,7 @@ void Scene504::enter() { _scene->drawToBackground(_globals._spriteIndexes[13], 1, Common::Point(-32000, -32000), 0, 100); _anim5ActvFl = true; - _globals._spriteIndexes[6] = _scene->_sprites.addSprites("*CHR_2", false); + _globals._spriteIndexes[6] = _scene->_sprites.addSprites("*CHR_2"); _globals._spriteIndexes[6] = _scene->_sprites.addSprites("*FACERAL", PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); _globals._spriteIndexes[6] = _scene->_sprites.addSprites("*FACEXDFR",PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); _globals._spriteIndexes[6] = _scene->_sprites.addSprites("*FACEPHN", PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); @@ -1959,7 +1959,7 @@ void Scene504::enter() { _globals._sequenceIndexes[1] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[1], false, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[1], 14); - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 0), false); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 0)); _globals._sequenceIndexes[2] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[2], false, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[2], 14); _scene->drawToBackground(_globals._spriteIndexes[0], 1, Common::Point(-32000, -32000), 0, 100); @@ -1970,7 +1970,7 @@ void Scene504::enter() { _globals._sequenceIndexes[1] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[1], false, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[1], 14); - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 0), false); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 0)); _globals._sequenceIndexes[2] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[2], false, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[2], 14); @@ -1983,7 +1983,7 @@ void Scene504::enter() { if (_scene->_priorSceneId == RETURNING_FROM_LOADING) { if (!_globals[kRightDoorIsOpen504]) { - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 0), false); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 0)); _globals._sequenceIndexes[2] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[2], false, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[2], 14); } @@ -2024,13 +2024,13 @@ void Scene504::enter() { _scene->_hotspots.activate(NOUN_CHRISTINE, true); _scene->drawToBackground(_globals._spriteIndexes[0], 1, Common::Point(-32000, -32000), 0, 100); - _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('b', 0), false); + _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('b', 0)); _globals._spriteIndexes[6] = _scene->_sprites.addSprites("*CHR_6", PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); _globals._spriteIndexes[6] = _scene->_sprites.addSprites("*FACERAL", PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); _globals._spriteIndexes[6] = _scene->_sprites.addSprites("*FACEXDFR", PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); _globals._spriteIndexes[6] = _scene->_sprites.addSprites("*FACEPHN", PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); - _globals._spriteIndexes[11] = _scene->_sprites.addSprites(formAnimName('a', 5), false); + _globals._spriteIndexes[11] = _scene->_sprites.addSprites(formAnimName('a', 5)); _globals._spriteIndexes[10] = _scene->_sprites.addSprites(formAnimName('a', 3), PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('a', 6), PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); _globals._spriteIndexes[8] = _scene->_sprites.addSprites(formAnimName('a', 7), PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); @@ -2064,7 +2064,7 @@ void Scene504::enter() { _scene->drawToBackground(_globals._spriteIndexes[0], 1, Common::Point(-32000, -32000), 0, 100); _scene->drawToBackground(_globals._spriteIndexes[13], 1, Common::Point(-32000, -32000), 0, 100); - _globals._spriteIndexes[6] = _scene->_sprites.addSprites("*CHR_3", false); + _globals._spriteIndexes[6] = _scene->_sprites.addSprites("*CHR_3"); _globals._spriteIndexes[6] = _scene->_sprites.addSprites("*FACERAL", PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); _globals._spriteIndexes[6] = _scene->_sprites.addSprites("*FACEXDFR", PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); _globals._spriteIndexes[6] = _scene->_sprites.addSprites("*FACEPHN", PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); @@ -2090,7 +2090,7 @@ void Scene504::enter() { _scene->drawToBackground(_globals._spriteIndexes[13], 1, Common::Point(-32000, -32000), 0, 100); _anim5ActvFl = true; - _globals._spriteIndexes[6] = _scene->_sprites.addSprites("*CHR_3", false); + _globals._spriteIndexes[6] = _scene->_sprites.addSprites("*CHR_3"); _globals._spriteIndexes[6] = _scene->_sprites.addSprites("*FACERAL", PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); _globals._spriteIndexes[6] = _scene->_sprites.addSprites("*FACEXDFR",PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); _globals._spriteIndexes[6] = _scene->_sprites.addSprites("*FACEPHN", PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); @@ -3191,15 +3191,15 @@ void Scene505::enter() { _scene->_hotspots.activateAtPos(NOUN_LID, false, Common::Point(216, 44)); _scene->_hotspots.activate(NOUN_CHRISTINE, false); - _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('x', 6), false); - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('a', 1), false); - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('x', 0), false); - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 1), false); - _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('x', 2), false); - _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('x', 3), false); - _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('x', 4), false); - _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('x', 5), false); - _globals._spriteIndexes[8] = _scene->_sprites.addSprites(formAnimName('a', 4), false); + _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('x', 6)); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('a', 1)); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('x', 0)); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 1)); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('x', 2)); + _globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('x', 3)); + _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('x', 4)); + _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('x', 5)); + _globals._spriteIndexes[8] = _scene->_sprites.addSprites(formAnimName('a', 4)); if (_scene->_priorSceneId == RETURNING_FROM_LOADING) { if (_vm->_gameConv->_restoreRunning == 20) { @@ -3942,15 +3942,15 @@ void Scene506::enter() { _vm->_gameConv->get(26); - _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('x', 0), false); - _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('x', 1), false); - _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 2), false); - _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('x', 3), false); - _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('p', 0), false); - _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('a', 1), false); - _globals._spriteIndexes[8] = _scene->_sprites.addSprites(formAnimName('a', 0), false); + _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('x', 0)); + _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('x', 1)); + _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('x', 2)); + _globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('x', 3)); + _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('p', 0)); + _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('a', 1)); + _globals._spriteIndexes[8] = _scene->_sprites.addSprites(formAnimName('a', 0)); _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('b', 0), PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); - _globals._spriteIndexes[4] = _scene->_sprites.addSprites("*RDR_9", false); + _globals._spriteIndexes[4] = _scene->_sprites.addSprites("*RDR_9"); _globals._spriteIndexes[6] = _scene->_sprites.addSprites("*CHR_6", PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); _globals._spriteIndexes[6] = _scene->_sprites.addSprites("*CHR_3", PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); _globals._spriteIndexes[6] = _scene->_sprites.addSprites("*CHR_2", PALFLAG_ALL_TO_CLOSEST | PALFLAG_ANY_TO_CLOSEST); |