From e9c8232da864891fafcceb217b291a50096738ce Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 13 Aug 2011 19:49:54 +1000 Subject: TSAGE: Split up the hard-coded logic files for Ringworld and Blue Force into separate sub-folderes --- engines/tsage/ringworld/ringworld_scenes6.h | 330 ++++++++++++++++++++++++++++ 1 file changed, 330 insertions(+) create mode 100644 engines/tsage/ringworld/ringworld_scenes6.h (limited to 'engines/tsage/ringworld/ringworld_scenes6.h') diff --git a/engines/tsage/ringworld/ringworld_scenes6.h b/engines/tsage/ringworld/ringworld_scenes6.h new file mode 100644 index 0000000000..db6efd0e18 --- /dev/null +++ b/engines/tsage/ringworld/ringworld_scenes6.h @@ -0,0 +1,330 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef TSAGE_RINGWORLD_SCENES6_H +#define TSAGE_RINGWORLD_SCENES6_H + +#include "common/scummsys.h" +#include "tsage/ringworld/ringworld_logic.h" +#include "tsage/events.h" +#include "tsage/core.h" +#include "tsage/scenes.h" +#include "tsage/globals.h" + +namespace tSage { + +class Scene5000 : public Scene { + /* Actions */ + class Action1 : public Action { + public: + virtual void signal(); + virtual void dispatch(); + }; + class Action2 : public Action { + public: + virtual void signal(); + }; + class Action3 : public Action { + public: + virtual void signal(); + }; + class Action4 : public Action { + public: + virtual void signal(); + }; + class Action5 : public Action { + public: + virtual void signal(); + }; + class Action6 : public Action { + public: + virtual void signal(); + }; + + /* Hotspots */ + class Hotspot7 : public SceneObject { + public: + virtual void doAction(int action); + }; + class Hotspot8 : public SceneObject { + public: + virtual void doAction(int action); + }; + class HotspotGroup1 : public SceneObject { + public: + virtual void doAction(int action); + }; +public: + SequenceManager _sequenceManager; + ASound _soundHandler; + SpeakerSText _speakerSText; + SpeakerQText _speakerQText; + Action1 _action1; + Action2 _action2; + Action3 _action3; + Action4 _action4; + Action5 _action5; + Action6 _action6; + DisplayHotspot _hotspot1; + SceneObject _hotspot2, _hotspot3, _hotspot4, _hotspot5, _hotspot6; + Hotspot7 _hotspot7; + Hotspot8 _hotspot8; + HotspotGroup1 _hotspot9, _hotspot10, _hotspot11; + DisplayHotspot _hotspot12, _hotspot13, _hotspot14, _hotspot15; + DisplayHotspot _hotspot16, _hotspot17, _hotspot18; + + Scene5000(); + virtual void postInit(SceneObjectList *OwnerList = NULL); + virtual void signal(); + virtual void dispatch(); +}; + +class Scene5100 : public Scene { + /* Actions */ + class Action1 : public Action { + public: + virtual void signal(); + }; + class Action2 : public Action { + public: + virtual void signal(); + }; + class Action3 : public Action { + public: + virtual void signal(); + }; + class Action4 : public Action { + public: + virtual void signal(); + }; + class Action5 : public Action { + public: + virtual void signal(); + }; + class Action6 : public Action { + public: + virtual void signal(); + }; + + /* Hotspots */ + class HotspotGroup1 : public SceneObject { + public: + virtual void doAction(int action); + }; + class HotspotGroup2 : public SceneObject { + public: + virtual void doAction(int action); + }; + class Hotspot4 : public SceneObject { + public: + virtual void doAction(int action); + }; + class Hotspot9 : public SceneObject { + public: + virtual void doAction(int action); + }; + class Hotspot17 : public SceneObject { + public: + virtual void doAction(int action); + }; + class Hotspot18 : public SceneHotspot { + public: + int _index1; + int _index2; + + virtual void doAction(int action); + }; + class Hotspot19 : public SceneObject { + public: + virtual void doAction(int action); + }; + class Hotspot20 : public SceneObject { + public: + virtual void doAction(int action); + }; +public: + SequenceManager _sequenceManager; + ASound _soundHandler; + SpeakerMText _speakerMText; + SpeakerQText _speakerQText; + SpeakerSText _speakerSText; + SpeakerBatText _speakerBatText; + SpeakerGameText _speakerGameText; + Action1 _action1; + Action2 _action2; + Action3 _action3; + Action4 _action4; + Action5 _action5; + HotspotGroup1 _hotspot1, _hotspot2, _hotspot3; + Hotspot4 _hotspot4; + HotspotGroup2 _hotspot5, _hotspot6, _hotspot7; + SceneObject _hotspot8; + Hotspot9 _hotspot9; + SceneObject _hotspot10, _hotspot11, _hotspot12, _hotspot13, _hotspot14, _hotspot15; + DisplayHotspot _hotspot16; + Hotspot17 _hotspot17; + Hotspot18 _hotspot18; + Hotspot19 _hotspot19; + Hotspot20 _hotspot20; + DisplayHotspot _hotspot21; + + Scene5100(); + virtual void postInit(SceneObjectList *OwnerList = NULL); + virtual void signal(); + virtual void dispatch(); +}; + +class Scene5200 : public Scene { + /* Actions */ + class Action1 : public Action { + public: + virtual void signal(); + }; + class Action2 : public Action { + public: + virtual void signal(); + }; + class Action3 : public Action { + public: + virtual void signal(); + }; + class Action4 : public Action { + public: + virtual void signal(); + }; + + /* Hotspots */ + class Hotspot9 : public SceneObjectExt { + public: + virtual void doAction(int action); + }; + class Hotspot10 : public SceneObjectExt { + public: + virtual void doAction(int action); + }; + class Hotspot14 : public SceneObject { + public: + virtual void doAction(int action); + }; +public: + ASound _soundHandler; + SpeakerFLL _speakerFLL; + SpeakerFLText _speakerFLText; + SpeakerQL _speakerQL; + SpeakerQText _speakerQText; + SpeakerGameText _speakerGameText; + Action1 _action1; + Action2 _action2; + Action3 _action3; + Action4 _action4; + + SceneObject _hotspot1, _hotspot2, _hotspot3, _hotspot4, _hotspot5, _hotspot6, _hotspot7; + SceneObject _hotspot8; + Hotspot9 _hotspot9; + Hotspot10 _hotspot10; + DisplayHotspot _hotspot11, _hotspot12, _hotspot13; + Hotspot14 _hotspot14; + + Scene5200(); + virtual void stripCallback(int v); + virtual void postInit(SceneObjectList *OwnerList = NULL); + virtual void dispatch(); +}; + +class Scene5300 : public Scene { + /* Actions */ + class Action1 : public Action { + public: + virtual void signal(); + }; + class Action2 : public Action { + public: + virtual void signal(); + }; + class Action3 : public Action { + public: + virtual void signal(); + }; + + /* Hotspots */ + class Hotspot1 : public SceneObject { + public: + virtual void doAction(int action); + }; + class Hotspot2 : public SceneObject { + public: + virtual void doAction(int action); + }; + class Hotspot5 : public SceneObject { + public: + virtual void doAction(int action); + }; + class Hotspot6 : public SceneObject { + public: + virtual void doAction(int action); + }; + class Hotspot7 : public SceneObject { + public: + virtual void doAction(int action); + }; + class Hotspot8 : public SceneObject { + public: + virtual void doAction(int action); + }; +public: + ASound _soundHandler; + SequenceManager _sequenceManager; + SpeakerQR _speakerQR; + SpeakerQL _speakerQL; + SpeakerQText _speakerQText; + SpeakerBatR _speakerBatR; + SpeakerBatText _speakerBatText; + SpeakerSR _speakerSR; + SpeakerSL _speakerSL; + SpeakerSText _speakerSText; + SpeakerGameText _speakerGameText; + Action1 _action1; + Action2 _action2; + Action3 _action3; + Hotspot1 _hotspot1; + Hotspot2 _hotspot2; + DisplayHotspot _hotspot3; + SceneObject _hotspot4; + Hotspot5 _hotspot5; + Hotspot6 _hotspot6; + Hotspot7 _hotspot7; + Hotspot8 _hotspot8; + int _field1B0A; + + Scene5300(); + virtual void postInit(SceneObjectList *OwnerList = NULL); + virtual void signal(); + virtual void synchronize(Serializer &s) { + Scene::synchronize(s); + s.syncAsSint16LE(_field1B0A); + } +}; + + +} // End of namespace tSage + +#endif -- cgit v1.2.3 From da76e6133680d23b01ca2d361fae1f95018dab10 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 14 Aug 2011 20:18:32 +1000 Subject: TSAGE: Separated Ringworld and Blue Force game logic into their own namespaces --- engines/tsage/ringworld/ringworld_scenes6.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'engines/tsage/ringworld/ringworld_scenes6.h') diff --git a/engines/tsage/ringworld/ringworld_scenes6.h b/engines/tsage/ringworld/ringworld_scenes6.h index db6efd0e18..976c477077 100644 --- a/engines/tsage/ringworld/ringworld_scenes6.h +++ b/engines/tsage/ringworld/ringworld_scenes6.h @@ -30,7 +30,9 @@ #include "tsage/scenes.h" #include "tsage/globals.h" -namespace tSage { +namespace tSage_Ringworld { + +using namespace tSage; class Scene5000 : public Scene { /* Actions */ @@ -325,6 +327,6 @@ public: }; -} // End of namespace tSage +} // End of namespace tSage_Ringworld #endif -- cgit v1.2.3 From 28aef23a60e4a1bb943a40e1087e2d0de69d9de1 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Mon, 15 Aug 2011 19:26:15 +1000 Subject: TSAGE: Changed Ringworld/Blue Force namespaces to be embedded namespaces within tSage --- engines/tsage/ringworld/ringworld_scenes6.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'engines/tsage/ringworld/ringworld_scenes6.h') diff --git a/engines/tsage/ringworld/ringworld_scenes6.h b/engines/tsage/ringworld/ringworld_scenes6.h index 976c477077..839d73ca69 100644 --- a/engines/tsage/ringworld/ringworld_scenes6.h +++ b/engines/tsage/ringworld/ringworld_scenes6.h @@ -30,7 +30,9 @@ #include "tsage/scenes.h" #include "tsage/globals.h" -namespace tSage_Ringworld { +namespace tSage { + +namespace Ringworld { using namespace tSage; @@ -326,7 +328,8 @@ public: } }; +} // End of namespace Ringworld -} // End of namespace tSage_Ringworld +} // End of namespace tSage #endif -- cgit v1.2.3 From 697230709be6b9460b4a3ac9bc8d9c7f065562d2 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Mon, 15 Aug 2011 20:47:59 +1000 Subject: TSAGE: Corrected casing of tSage namespace to be TsAGE This matches the casing of the original engine name. --- engines/tsage/ringworld/ringworld_scenes6.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engines/tsage/ringworld/ringworld_scenes6.h') diff --git a/engines/tsage/ringworld/ringworld_scenes6.h b/engines/tsage/ringworld/ringworld_scenes6.h index 839d73ca69..79e604a177 100644 --- a/engines/tsage/ringworld/ringworld_scenes6.h +++ b/engines/tsage/ringworld/ringworld_scenes6.h @@ -30,11 +30,11 @@ #include "tsage/scenes.h" #include "tsage/globals.h" -namespace tSage { +namespace TsAGE { namespace Ringworld { -using namespace tSage; +using namespace TsAGE; class Scene5000 : public Scene { /* Actions */ @@ -330,6 +330,6 @@ public: } // End of namespace Ringworld -} // End of namespace tSage +} // End of namespace TsAGE #endif -- cgit v1.2.3