added a static method setDefaultDirectory to class File; used this to simplify some code; added a global g_sound pointer in bs2, this cuts down on uses of g_sword2 (of course both should be removed on the long run); some other minor tweaks/fixes

svn-id: r10278

1 files changed, 19 insertions, 16 deletions

diff --git a/sword2/sword2.h b/sword2/sword2.h
index cf3ab1946d..4c39b114b4 100644
--- a/sword2/sword2.h
+++ b/sword2/sword2.h
@@ -50,24 +50,27 @@ enum BSGameId {
 
 // TODO move stuff into class
 class Sword2State : public Engine {
-		void errorString(const char *buf_input, char *buf_output);
-	public:
-		Sword2State(GameDetector *detector, OSystem *syst);
-		void go(void);
-		void parseEvents(void);
-		void Start_game(void);
-		int32 InitialiseGame(void);
-		GameDetector *_detector;
-		uint32 _features;
-		byte _gameId;
-		char *_game_name; // target name for saves
-		Sword2Sound *_sound;
-	private:
-		bool _quit;
-		uint32 _bootParam;
-		int32 _saveSlot;
+public:
+	Sword2State(GameDetector *detector, OSystem *syst);
+	void go(void);
+	void parseEvents(void);
+	void Start_game(void);
+	int32 InitialiseGame(void);
+	GameDetector *_detector;
+	uint32 _features;
+	byte _gameId;
+	char *_game_name; // target name for saves
+	Sword2Sound *_sound;
+private:
+	bool _quit;
+	uint32 _bootParam;
+	int32 _saveSlot;
+
+public:
+	void errorString(const char *buf_input, char *buf_output);
 };
 
 extern Sword2State *g_sword2;
+extern Sword2Sound *g_sound;
 
 #endif