diff options
author | Paul Gilbert | 2013-07-31 21:01:04 -0400 |
---|---|---|
committer | Paul Gilbert | 2013-07-31 21:01:04 -0400 |
commit | 07d8e5643b11e109da5f3e9fabaed023e5717457 (patch) | |
tree | 00953bde6aecc9d3cb89223bc990258bd832f1bc /engines/tsage | |
parent | b0ce97bccf77a9bf1690816df29e14778bfb1d3e (diff) | |
download | scummvm-rg350-07d8e5643b11e109da5f3e9fabaed023e5717457.tar.gz scummvm-rg350-07d8e5643b11e109da5f3e9fabaed023e5717457.tar.bz2 scummvm-rg350-07d8e5643b11e109da5f3e9fabaed023e5717457.zip |
HOPKINS: Reverted to saving Breakout high scores in a separate file
Diffstat (limited to 'engines/tsage')
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_logic.cpp | 13 | ||||
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_logic.h | 10 | ||||
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes0.cpp | 13 | ||||
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes0.h | 9 | ||||
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes1.h | 13 |
5 files changed, 38 insertions, 20 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp index ac6ba523f6..d9bb50453c 100644 --- a/engines/tsage/ringworld2/ringworld2_logic.cpp +++ b/engines/tsage/ringworld2/ringworld2_logic.cpp @@ -2454,6 +2454,19 @@ void ScannerDialog::proc12(int visage, int stripFrameNum, int frameNum, int posX } } +/*--------------------------------------------------------------------------*/ + +FinePositionedObject::FinePositionedObject(): SceneObject() { + _x100 = _y100 = 0; +} + +void FinePositionedObject::synchronize(Serializer &s) { + EventHandler::synchronize(s); + + s.syncAsSint32LE(_x100); + s.syncAsSint32LE(_y100); +} + } // End of namespace Ringworld2 } // End of namespace TsAGE diff --git a/engines/tsage/ringworld2/ringworld2_logic.h b/engines/tsage/ringworld2/ringworld2_logic.h index 2cf48f3cf3..371ec6be23 100644 --- a/engines/tsage/ringworld2/ringworld2_logic.h +++ b/engines/tsage/ringworld2/ringworld2_logic.h @@ -514,6 +514,16 @@ public: void proc12(int visage, int stripFrameNum, int frameNum, int posX, int posY); }; +class FinePositionedObject: public SceneObject { +public: + int _x100, _y100; +public: + FinePositionedObject(); + + virtual Common::String getClassName() { return "FinePositionedObject"; } + virtual void synchronize(Serializer &s); +}; + } // End of namespace Ringworld2 } // End of namespace TsAGE diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp index 4018921791..b977ea1516 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp @@ -2312,19 +2312,6 @@ void Scene205::Action1::textLoop() { /*--------------------------------------------------------------------------*/ -Scene205::Object::Object(): SceneObject() { - _x100 = _y100 = 0; -} - -void Scene205::Object::synchronize(Serializer &s) { - EventHandler::synchronize(s); - - s.syncAsSint32LE(_x100); - s.syncAsSint32LE(_y100); -} - -/*--------------------------------------------------------------------------*/ - Scene205::Scene205(): SceneExt() { _yp = 0; _textIndex = 1; diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h index 80dab89b32..b7268da788 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes0.h +++ b/engines/tsage/ringworld2/ringworld2_scenes0.h @@ -273,13 +273,8 @@ class Scene205: public SceneExt { }; /* Objects */ - class Object: public SceneObject { - public: - int _x100, _y100; - public: - Object(); - - virtual void synchronize(Serializer &s); + class Object: public FinePositionedObject { + // TODO: More derived logic }; private: void setup(); diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h index 0da6b3f93d..f3e94369a7 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes1.h +++ b/engines/tsage/ringworld2/ringworld2_scenes1.h @@ -39,6 +39,19 @@ namespace Ringworld2 { using namespace TsAGE; +class Scene1000 : public SceneExt { +public: + SequenceManager _sequenceManager1; + SequenceManager _sequenceManager2; + SpeakerGameText _gameTextSpeaker; + +public: + virtual void postInit(SceneObjectList *OwnerList = NULL); + virtual void remove(); + virtual void signal(); + virtual void dispatch(); +}; + class Scene1010 : public SceneExt { public: SequenceManager _sequenceManager; |