From bf3200c3f8f022d567f30660d03bb058c0841147 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Wed, 9 Oct 2013 20:48:33 -0400 Subject: TSAGE: Formatting for R2R scene descriptions --- engines/tsage/ringworld2/ringworld2_logic.cpp | 2 +- engines/tsage/ringworld2/ringworld2_scenes0.cpp | 6 ++++++ engines/tsage/ringworld2/ringworld2_scenes1.cpp | 9 ++++++++- engines/tsage/ringworld2/ringworld2_scenes2.cpp | 4 ++++ engines/tsage/ringworld2/ringworld2_scenes3.cpp | 4 ++++ 5 files changed, 23 insertions(+), 2 deletions(-) (limited to 'engines/tsage') diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp index f0d7739f54..fc06b204cd 100644 --- a/engines/tsage/ringworld2/ringworld2_logic.cpp +++ b/engines/tsage/ringworld2/ringworld2_logic.cpp @@ -112,6 +112,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) { // Cutscene - trip in space return new Scene1010(); case 1020: + // Cutscene - trip in space 2 return new Scene1020(); case 1100: // Canyon @@ -171,7 +172,6 @@ Scene *Ringworld2Game::createScene(int sceneNumber) { // Flup Tube Corridor Maze return new Scene1950(); /* Scene group #2 */ - // case 2000: // Spill Mountains return new Scene2000(); diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp index 1626c4ade2..bdac160163 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp @@ -31,6 +31,11 @@ namespace TsAGE { namespace Ringworld2 { +/*-------------------------------------------------------------------------- + * Scene 50 - Waking up cutscene + * + *--------------------------------------------------------------------------*/ + void Scene50::Action1::signal() { switch (_actionIndex++) { case 0: @@ -5534,6 +5539,7 @@ void Scene500::signal() { * Scene 525 - Cutscene - Walking in hall * *--------------------------------------------------------------------------*/ + void Scene525::postInit(SceneObjectList *OwnerList) { loadScene(525); R2_GLOBALS._uiElements._active = false; diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp index 2a38d0009c..9c623d77c2 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp @@ -534,9 +534,10 @@ void Scene1010::signal() { } /*-------------------------------------------------------------------------- - * Scene 1020 - + * Scene 1020 - Cutscene - trip in space 2 * *--------------------------------------------------------------------------*/ + void Scene1020::postInit(SceneObjectList *OwnerList) { loadScene(1020); SceneExt::postInit(); @@ -663,6 +664,7 @@ void Scene1020::dispatch() { * Scene 1100 - * *--------------------------------------------------------------------------*/ + Scene1100::Scene1100() { _nextStripNum = 0; _paletteRefreshStatus = 0; @@ -6874,6 +6876,7 @@ void Scene1337::subD1A48(int arg1) { * Scene 1500 - Cutscene: Ship landing * *--------------------------------------------------------------------------*/ + void Scene1500::postInit(SceneObjectList *OwnerList) { loadScene(1500); R2_GLOBALS._uiElements._active = false; @@ -7032,6 +7035,7 @@ void Scene1500::dispatch() { * Scene 1525 - Cutscene - Ship * *--------------------------------------------------------------------------*/ + void Scene1525::postInit(SceneObjectList *OwnerList) { loadScene(1525); R2_GLOBALS._uiElements._active = false; @@ -7074,6 +7078,7 @@ void Scene1525::signal() { * Scene 1530 - Cutscene - Elevator * *--------------------------------------------------------------------------*/ + void Scene1530::postInit(SceneObjectList *OwnerList) { if (R2_GLOBALS._sceneManager._previousScene == 1000) loadScene(1650); @@ -9277,6 +9282,7 @@ void Scene1550::enterArea() { * Scene 1575 - * *--------------------------------------------------------------------------*/ + Scene1575::Scene1575() { _field412 = 0; _field414 = 0; @@ -9657,6 +9663,7 @@ void Scene1575::dispatch() { * Scene 1580 - Inside wreck * *--------------------------------------------------------------------------*/ + Scene1580::Scene1580() { _field412 = 0; } diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp index a8e534d5cb..510855b162 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp @@ -1038,6 +1038,7 @@ void Scene2000::synchronize(Serializer &s) { * Scene 2350 - Balloon Launch Platform * *--------------------------------------------------------------------------*/ + bool Scene2350::Actor2::startAction(CursorType action, Event &event) { if (action != R2_SENSOR_PROBE) return(SceneActor::startAction(action, event)); @@ -1215,6 +1216,7 @@ void Scene2350::process(Event &event) { * Scene 2400 - Spill Mountains: Large empty room * *--------------------------------------------------------------------------*/ + void Scene2400::Exit1::changeScene() { Scene2400 *scene = (Scene2400 *)R2_GLOBALS._sceneManager._scene; @@ -1905,6 +1907,7 @@ void Scene2440::signal() { * Scene 2445 - Spill Mountains: * *--------------------------------------------------------------------------*/ + void Scene2445::postInit(SceneObjectList *OwnerList) { loadScene(2445); SceneExt::postInit(); @@ -2980,6 +2983,7 @@ void Scene2535::signal() { * Scene 2600 - Spill Mountains: Exit * *--------------------------------------------------------------------------*/ + Scene2600::Scene2600(): SceneExt() { _rotation = NULL; } diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp index c64665a839..5cca1ee483 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp @@ -934,6 +934,7 @@ void Scene3175::signal() { * Scene 3200 - Cutscene : Guards - Discussion * *--------------------------------------------------------------------------*/ + void Scene3200::postInit(SceneObjectList *OwnerList) { loadScene(3200); R2_GLOBALS._uiElements._active = false; @@ -962,6 +963,7 @@ void Scene3200::signal() { * Scene 3210 - Cutscene : Captain and Private - Discussion * *--------------------------------------------------------------------------*/ + void Scene3210::postInit(SceneObjectList *OwnerList) { loadScene(3210); R2_GLOBALS._uiElements._active = false; @@ -988,6 +990,7 @@ void Scene3210::signal() { * Scene 3220 - Cutscene : Guards in cargo zone * *--------------------------------------------------------------------------*/ + void Scene3220::postInit(SceneObjectList *OwnerList) { loadScene(3220); R2_GLOBALS._uiElements._active = false; @@ -1014,6 +1017,7 @@ void Scene3220::signal() { * Scene 3230 - Cutscene : Guards on duty * *--------------------------------------------------------------------------*/ + void Scene3230::postInit(SceneObjectList *OwnerList) { loadScene(3230); R2_GLOBALS._uiElements._active = false; -- cgit v1.2.3