The usual cleanup. Removed the "run from CD" check.

This pretty much concludes the first stage of the engine cleanup. All of
the files, except for console/debugging stuff and possibly some header
files, have been changed to use the ScummVM brace style.

As for the console, that one could probably do with some rewriting, in
which case cleaning it up first would just be unnecessary work.

The next stages of the cleanup should include renaming of variables and
functions to follow the ScummVM coding standards, and turning everything
into C++ classes. And so on.

Of course, the driver directory should go through a similar cleanup as
well.

This has all been enormously tedious, so don't count on me doing any of
these things at the moment. Particularly not turning everything into C++
classes. I'm really not that familiar with C++. :-)

svn-id: r10340

1 files changed, 9 insertions, 7 deletions

diff --git a/sword2/sword2.h b/sword2/sword2.h
index 4c39b114b4..f3b45b24ee 100644
--- a/sword2/sword2.h
+++ b/sword2/sword2.h
@@ -20,23 +20,23 @@
 #ifndef	_SWORD2
 #define	_SWORD2
 
-//#include "src\driver96.h"
 #include "driver/d_sound.h"
 
+// Bodge for PCF76 version so that their demo CD can be labelled "PCF76"
+// rather than "RBSII1"
 
-#ifdef _PCF76	// Bodge for PCF76 version so that their demo CD can be labelled "PCF76" rather than "RBSII1"
+#ifdef _PCF76
 	#define CD1_LABEL	"PCF76"
 #else
 	#define CD1_LABEL	"RBSII1"
 #endif
 
+#define	CD2_LABEL		"RBSII2"
 
-#define	CD2_LABEL	"RBSII2"
+void Close_game();
 
-void	Close_game();	//Tony11Oct96
-
-void PauseGame(void);		// James17jun97
-void UnpauseGame(void);		// James17jun97
+void PauseGame(void);
+void UnpauseGame(void);
 
 #define HEAD_LEN 8
 
@@ -49,6 +49,7 @@ enum BSGameId {
 };
 
 // TODO move stuff into class
+
 class Sword2State : public Engine {
 public:
 	Sword2State(GameDetector *detector, OSystem *syst);
@@ -61,6 +62,7 @@ public:
 	byte _gameId;
 	char *_game_name; // target name for saves
 	Sword2Sound *_sound;
+
 private:
 	bool _quit;
 	uint32 _bootParam;