Merge remote-tracking branch 'origin/master' into soltys_wip2

1 files changed, 39 insertions, 4 deletions

diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index 7cfec718e2..2d409b6343 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -31,7 +31,7 @@
 #include "tsage/sound.h"
 #include "tsage/saveload.h"
 
-namespace tSage {
+namespace TsAGE {
 
 class Globals : public SavedObject {
 private:
@@ -40,7 +40,7 @@ public:
 	GfxSurface _screenSurface;
 	GfxManager _gfxManagerInstance;
 	Common::List<GfxManager *> _gfxManagers;
-	SceneHandler _sceneHandler;
+	SceneHandler *_sceneHandler;
 	Game *_game;
 	EventsClass _events;
 	SceneManager _sceneManager;
@@ -54,7 +54,7 @@ public:
 	int _gfxFontNumber;
 	GfxColors _gfxColors;
 	GfxColors _fontColors;
-	byte _unkColor1, _unkColor2, _unkColor3;
+	byte _color1, _color2, _color3;
 	SoundManager _soundManager;
 	Common::Point _dialogCenter;
 	WalkRegions _walkRegions;
@@ -98,10 +98,45 @@ public:
 
 extern Globals *_globals;
 
+#define GLOBALS (*_globals)
+#define BF_GLOBALS (*((::TsAGE::BlueForce::BlueForceGlobals *)_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
+
+namespace BlueForce {
+
+using namespace TsAGE;
+
+class BlueForceGlobals: public Globals {
+public:
+	ASoundExt _sound1, _sound2, _sound3;
+	int _v4CEA2;
+	int _v4CEA8;
+	int _v4CEF2;
+	int _v4CEF4;
+	int _v4CF9E;
+	int _v4E238;
+	int _v501FC;
+	int _v51C42;
+	int _v51C44;
+	int _interfaceY;
+	int _bikiniHutState;
+	int _mapLocationId;
+	uint8 _globalFlags[12];
+
+	BlueForceGlobals();
+	virtual Common::String getClassName() { return "BFGlobals"; }
+	virtual void synchronize(Serializer &s);
+
+	void setFlag(int v);
+	bool getFlag(int v);
+};
+
+} // End of namespace BlueForce
+
+} // End of namespace TsAGE
 
 #endif