Moved more stuff into classes, changed some static allocation to dynamic,

and removed some of the references to global variables.

At this point I believe everything in the main game engine has been moved
into classes - not necessarily the correct ones, but still... However,
there is some stuff in the driver directory that need to be taken care of
as well.

svn-id: r11207

1 files changed, 15 insertions, 20 deletions

diff --git a/sword2/sword2.h b/sword2/sword2.h
index 8abc60d0c7..9d218ffb02 100644
--- a/sword2/sword2.h
+++ b/sword2/sword2.h
@@ -55,13 +55,6 @@ namespace Sword2 {
 
 #define	CD2_LABEL		"RBSII2"
 
-void Close_game();
-
-void PauseGame(void);
-void UnpauseGame(void);
-
-void sleepUntil(int32 time);
-
 // TODO move stuff into class
 
 class Sword2Engine : public Engine {
@@ -140,12 +133,14 @@ private:
 
 	uint32 calcChecksum(uint8 *buffer, uint32 size);
 
+	void pauseGame(void);
+	void unpauseGame(void);
+
 public:
 	Sword2Engine(GameDetector *detector, OSystem *syst);
 	~Sword2Engine();
 	void go(void);
 	void parseEvents(void);
-	void Start_game(void);
 	int32 InitialiseGame(void);
 	GameDetector *_detector;
 	uint32 _features;
@@ -202,18 +197,6 @@ public:
 
 	int32 initBackground(int32 res, int32 new_palette);
 
-	_event_unit _eventList[MAX_events];
-
-	void initEventSystem(void);
-	void sendEvent(uint32 id, uint32 interact_id);
-	void setPlayerActionEvent(uint32 id, uint32 interact_id);
-	void startEvent(void);
-	bool checkEventWaiting(void);
-	void clearEvent(uint32 id);
-	void killAllIdsEvents(uint32 id);
-
-	uint32 countEvents(void);
-
 	// These two are set by fnPassGraph() and fnPassMega().
 	// FIXME: _engineGraph isn't used at all, is it?
 
@@ -372,6 +355,18 @@ public:
 
 	void triggerFx(uint8 j);
 
+	bool _gamePaused;
+	bool _graphicsLevelFudged;
+	bool _stepOneCycle;		// for use while game paused
+
+	void startGame(void);
+	void gameCycle(void);
+	void closeGame(void);
+
+	void sleepUntil(int32 time);
+
+	uint32 readFile(const char *name, mem **membloc, uint32 uid);
+
 	void errorString(const char *buf_input, char *buf_output);
 	void initialiseFontResourceFlags(void);
 	void initialiseFontResourceFlags(uint8 language);