aboutsummaryrefslogtreecommitdiff
path: root/engines/tsage/globals.h
diff options
context:
space:
mode:
Diffstat (limited to 'engines/tsage/globals.h')
-rw-r--r--engines/tsage/globals.h20
1 files changed, 12 insertions, 8 deletions
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index 59afe140a0..3a6fab5b70 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -41,7 +41,7 @@ public:
GfxManager _gfxManagerInstance;
Common::List<GfxManager *> _gfxManagers;
SceneHandler _sceneHandler;
- Game _game;
+ Game *_game;
EventsClass _events;
SceneManager _sceneManager;
ScenePalette _scenePalette;
@@ -49,19 +49,19 @@ public:
SceneItemList _sceneItems;
SceneObjectList _sceneObjectsInstance;
SceneObjectList *_sceneObjects;
- SynchronisedList<SceneObjectList *> _sceneObjects_queue;
+ SynchronizedList<SceneObjectList *> _sceneObjects_queue;
SceneText _sceneText;
int _gfxFontNumber;
- GfxColours _gfxColours;
- GfxColours _fontColours;
+ GfxColors _gfxColors;
+ GfxColors _fontColors;
SoundManager _soundManager;
- Common::Point _dialogCentre;
+ Common::Point _dialogCenter;
WalkRegions _walkRegions;
- SynchronisedList<EventHandler *> _sceneListeners;
+ SynchronizedList<EventHandler *> _sceneListeners;
bool _flags[256];
Player _player;
SoundHandler _soundHandler;
- InvObjectList _inventory;
+ InvObjectList *_inventory;
Region _paneRegions[2];
int _paneRefreshFlag[2];
Common::Point _sceneOffset;
@@ -90,11 +90,15 @@ public:
GfxManager &gfxManager() { return **_gfxManagers.begin(); }
virtual Common::String getClassName() { return "Globals"; }
- virtual void synchronise(Serialiser &s);
+ virtual void synchronize(Serializer &s);
};
extern Globals *_globals;
+// Note: Currently this can't be part of the _globals structure, since it needs to be constructed
+// prior to many of the fields in Globals execute their constructors
+extern ResourceManager *_resourceManager;
+
} // End of namespace tSage
#endif