From 84184aabc00251374a181fe296487619afa779ed Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 14 Apr 2011 14:12:27 +0200
Subject: ALL: colour -> color

---
 engines/tsage/globals.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/tsage/globals.h')

diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index 59afe140a0..bd60d25bf8 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -52,8 +52,8 @@ public:
 	SynchronisedList<SceneObjectList *> _sceneObjects_queue;
 	SceneText _sceneText;
 	int _gfxFontNumber;
-	GfxColours _gfxColours;
-	GfxColours _fontColours;
+	GfxColors _gfxColors;
+	GfxColors _fontColors;
 	SoundManager _soundManager;
 	Common::Point _dialogCentre;
 	WalkRegions _walkRegions;
-- 
cgit v1.2.3


From 2e095e25f2435f0d066d2826176e394bda5c4a9c Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 14 Apr 2011 14:34:28 +0200
Subject: ALL: centre -> center

---
 engines/tsage/globals.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/tsage/globals.h')

diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index bd60d25bf8..6fe8e6295a 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -55,7 +55,7 @@ public:
 	GfxColors _gfxColors;
 	GfxColors _fontColors;
 	SoundManager _soundManager;
-	Common::Point _dialogCentre;
+	Common::Point _dialogCenter;
 	WalkRegions _walkRegions;
 	SynchronisedList<EventHandler *> _sceneListeners;
 	bool _flags[256];
-- 
cgit v1.2.3


From 1d58ccac8172d81c4e4a983e148ebd7929b9a5a5 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 25 Apr 2011 17:06:35 +1000
Subject: TSAGE: Combined the resource files into a single generic overall
 ResourceManager

---
 engines/tsage/globals.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'engines/tsage/globals.h')

diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index 6fe8e6295a..b8ff441117 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -95,6 +95,10 @@ public:
 
 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
-- 
cgit v1.2.3


From c68641584b8fb45d53307040f0b18d39fe42cf24 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 25 Apr 2011 19:39:45 +1000
Subject: TSAGE: Added framework for playing the Ringworld demo

---
 engines/tsage/globals.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/tsage/globals.h')

diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index b8ff441117..9e9ddd58d7 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;
@@ -61,7 +61,7 @@ public:
 	bool _flags[256];
 	Player _player;
 	SoundHandler _soundHandler;
-	InvObjectList _inventory;
+	InvObjectList *_inventory;
 	Region _paneRegions[2];
 	int _paneRefreshFlag[2];
 	Common::Point _sceneOffset;
-- 
cgit v1.2.3


From 3430a3f347c2430540bf3de17715e8fbc5d1a795 Mon Sep 17 00:00:00 2001
From: md5
Date: Wed, 4 May 2011 11:41:47 +0300
Subject: TSAGE: Switched to American English, after the relevant discussion on
 -devel: serialiser -> serializer synchronise -> synchronize

---
 engines/tsage/globals.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/tsage/globals.h')

diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index 9e9ddd58d7..661ff4f768 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -90,7 +90,7 @@ 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;
-- 
cgit v1.2.3


From 340d08bc304bcc9315634f3c26486742b2dae0bb Mon Sep 17 00:00:00 2001
From: md5
Date: Wed, 4 May 2011 11:47:12 +0300
Subject: TSAGE: Some more conversions to US English

---
 engines/tsage/globals.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/tsage/globals.h')

diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index 661ff4f768..3a6fab5b70 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -49,7 +49,7 @@ public:
 	SceneItemList _sceneItems;
 	SceneObjectList _sceneObjectsInstance;
 	SceneObjectList *_sceneObjects;
-	SynchronisedList<SceneObjectList *> _sceneObjects_queue;
+	SynchronizedList<SceneObjectList *> _sceneObjects_queue;
 	SceneText _sceneText;
 	int _gfxFontNumber;
 	GfxColors _gfxColors;
@@ -57,7 +57,7 @@ public:
 	SoundManager _soundManager;
 	Common::Point _dialogCenter;
 	WalkRegions _walkRegions;
-	SynchronisedList<EventHandler *> _sceneListeners;
+	SynchronizedList<EventHandler *> _sceneListeners;
 	bool _flags[256];
 	Player _player;
 	SoundHandler _soundHandler;
-- 
cgit v1.2.3