diff options
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes1.cpp | 59 | ||||
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes1.h | 18 |
2 files changed, 39 insertions, 38 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp index 9c623d77c2..b8343636a7 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp @@ -661,7 +661,7 @@ void Scene1020::dispatch() { } /*-------------------------------------------------------------------------- - * Scene 1100 - + * Scene 1100 - Canyon * *--------------------------------------------------------------------------*/ @@ -805,16 +805,16 @@ void Scene1100::postInit(SceneObjectList *OwnerList) { scalePalette(65, 65, 65); - _actor2.postInit(); - _actor2.setup(1100, 1, 1); - _actor2.fixPriority(10); + _canyonDweller2.postInit(); + _canyonDweller2.setup(1100, 1, 1); + _canyonDweller2.fixPriority(10); R2_GLOBALS._scrollFollower = NULL; - _item3.setDetails(Rect(56, 47, 68, 83), 1100, 7, -1, -1, 1, NULL); - _item4.setDetails(Rect(167, 132, 183, 167), 1100, 7, -1, -1, 1, NULL); - _item5.setDetails(Rect(26, 112, 87, 145), 1100, 13, -1, -1, 1, NULL); - _item7.setDetails(Rect(4, 70, 79, 167), 1100, 16, -1, -1, 1, NULL); + _fuana1.setDetails(Rect(56, 47, 68, 83), 1100, 7, -1, -1, 1, NULL); + _fauna2.setDetails(Rect(167, 132, 183, 167), 1100, 7, -1, -1, 1, NULL); + _bouldersBlockingCave.setDetails(Rect(26, 112, 87, 145), 1100, 13, -1, -1, 1, NULL); + _trail.setDetails(Rect(4, 70, 79, 167), 1100, 16, -1, -1, 1, NULL); R2_GLOBALS._sound1.stop(); @@ -823,7 +823,7 @@ void Scene1100::postInit(SceneObjectList *OwnerList) { R2_GLOBALS._player._characterIndex = R2_QUINN; R2_GLOBALS._player._characterScene[R2_QUINN] = 1100; R2_GLOBALS._player._characterScene[R2_SEEKER] = 1100; - _actor2.setPosition(Common::Point(150, 30)); + _canyonDweller2.setPosition(Common::Point(150, 30)); R2_GLOBALS._sound1.play(93); R2_GLOBALS._player.postInit(); R2_GLOBALS._player.hide(); @@ -852,18 +852,18 @@ void Scene1100::postInit(SceneObjectList *OwnerList) { _trooper._numFrames = 5; _trooper.setDetails(1100, 22, 23, 24, 1, (SceneItem *) NULL); - _actor1.postInit(); - _actor1.setup(1512, 1, 1); - _actor1.setPosition(Common::Point(187, -25)); - _actor1.fixPriority(48); - _actor1._moveDiff.y = 1; - _actor1.setDetails(1100, 37, -1, -1, 1, (SceneItem *) NULL); + _canyonDweller1.postInit(); + _canyonDweller1.setup(1512, 1, 1); + _canyonDweller1.setPosition(Common::Point(187, -25)); + _canyonDweller1.fixPriority(48); + _canyonDweller1._moveDiff.y = 1; + _canyonDweller1.setDetails(1100, 37, -1, -1, 1, (SceneItem *) NULL); _sceneMode = 20; setAction(&_sequenceManager1, this, 1, &R2_GLOBALS._player, NULL); } else if (R2_GLOBALS._sceneManager._previousScene == 1000) { - _actor2.setPosition(Common::Point(50, 30)); + _canyonDweller2.setPosition(Common::Point(50, 30)); _paletteRefreshStatus = 0; _palette1.loadPalette(1101); R2_GLOBALS._player.postInit(); @@ -903,7 +903,7 @@ void Scene1100::postInit(SceneObjectList *OwnerList) { setAction(&_sequenceManager1, this, 1, &R2_GLOBALS._player, NULL); } else { - _actor2.setPosition(Common::Point(180, 30)); + _canyonDweller2.setPosition(Common::Point(180, 30)); if (R2_GLOBALS.getFlag(52)) R2_GLOBALS._sound1.play(98); else @@ -973,16 +973,17 @@ void Scene1100::postInit(SceneObjectList *OwnerList) { _trooper.fixPriority(200); } - _actor1.postInit(); - _actor1.setup(1512, 1, 1); - _actor1.setPosition(Common::Point(187, 45)); - _actor1.fixPriority(48); - _actor1._moveDiff.y = 1; - _actor1.setDetails(1100, 37, -1, -1, 1, (SceneItem *) NULL); + _canyonDweller1.postInit(); + _canyonDweller1.setup(1512, 1, 1); + _canyonDweller1.setPosition(Common::Point(187, 45)); + _canyonDweller1.fixPriority(48); + _canyonDweller1._moveDiff.y = 1; + _canyonDweller1.setDetails(1100, 37, -1, -1, 1, (SceneItem *) NULL); } - _item6.setDetails(Rect(123, 69, 222, 105), 1100, 13, -1, -1, 1, NULL); - _item2.setDetails(Rect(0, 0, 480, 46), 1100, 0, -1, -1, 1, NULL); - _item1.setDetails(Rect(0, 0, 480, 200), 1100, 40, 41, 42, 1, NULL); + + _boulders.setDetails(Rect(123, 69, 222, 105), 1100, 13, -1, -1, 1, NULL); + _sky.setDetails(Rect(0, 0, 480, 46), 1100, 0, -1, -1, 1, NULL); + _background.setDetails(Rect(0, 0, 480, 200), 1100, 40, 41, 42, 1, NULL); } void Scene1100::remove() { @@ -1116,7 +1117,7 @@ void Scene1100::signal() { case 20: { Common::Point pt(187, -13); NpcMover *mover = new NpcMover(); - _actor1.addMover(mover, &pt, this); + _canyonDweller1.addMover(mover, &pt, this); } break; case 21: { @@ -1124,7 +1125,7 @@ void Scene1100::signal() { _trooper.animate(ANIM_MODE_5, NULL); Common::Point pt(187, 45); NpcMover *mover = new NpcMover(); - _actor1.addMover(mover, &pt, this); + _canyonDweller1.addMover(mover, &pt, this); } break; case 22: @@ -1263,7 +1264,7 @@ void Scene1100::signal() { R2_GLOBALS._sound1.play(101); Common::Point pt(187, -13); NpcMover *mover = new NpcMover(); - _actor1.addMover(mover, &pt, this); + _canyonDweller1.addMover(mover, &pt, this); } break; default: diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h index 824df607b3..88989f6119 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes1.h +++ b/engines/tsage/ringworld2/ringworld2_scenes1.h @@ -94,15 +94,15 @@ public: SpeakerQuinn1100 _quinnSpeaker; SpeakerChief1100 _chiefSpeaker; ScenePalette _palette1; - NamedHotspot _item1; - NamedHotspot _item2; - NamedHotspot _item3; - NamedHotspot _item4; - NamedHotspot _item5; - NamedHotspot _item6; - NamedHotspot _item7; - SceneActor _actor1; - SceneActor _actor2; + NamedHotspot _background; + NamedHotspot _sky; + NamedHotspot _fuana1; + NamedHotspot _fauna2; + NamedHotspot _bouldersBlockingCave; + NamedHotspot _boulders; + NamedHotspot _trail; + SceneActor _canyonDweller1; + SceneActor _canyonDweller2; SceneActor _shipFormation; SceneActor _shipFormationShadow; SceneActor _shotImpact1; |