[Scummvm-cvs-logs] CVS: scummvm/sword2 sword2.cpp,1.80,1.81 sword2.h,1.35,1.36

[Max Horn]

Update of /cvsroot/scummvm/scummvm/sword2
In directory sc8-pr-cvs1:/tmp/cvs-serv4333/sword2

Modified Files:
	sword2.cpp sword2.h 
Log Message:
cut down on unnecessary GameDetector references

Index: sword2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- sword2.cpp	8 Nov 2003 19:47:20 -0000	1.80
+++ sword2.cpp	10 Nov 2003 01:04:12 -0000	1.81
@@ -54,7 +54,7 @@
 	/* Broken Sword 2 */
 	{"sword2", "Broken Sword II", MDT_ADLIB | MDT_NATIVE, GF_DEFAULT_TO_1X_SCALER, "players.clu" },
 	{"sword2alt", "Broken Sword II (alt)", MDT_ADLIB | MDT_NATIVE, GF_DEFAULT_TO_1X_SCALER, "r2ctlns.ocx" },
-	{"sword2demo", "Broken Sword II (Demo)", MDT_ADLIB | MDT_NATIVE, GF_DEFAULT_TO_1X_SCALER | GF_DEMO, "players.clu" },
+	{"sword2demo", "Broken Sword II (Demo)", MDT_ADLIB | MDT_NATIVE, GF_DEFAULT_TO_1X_SCALER | Sword2::GF_DEMO, "players.clu" },
 	{NULL, NULL, MDT_NONE, 0, NULL}
 };
 
@@ -102,9 +102,8 @@
 Display *g_display = NULL;
 
 Sword2Engine::Sword2Engine(GameDetector *detector, OSystem *syst)
-	: Engine(detector, syst) {
+	: Engine(syst) {
 
-	_detector = detector;
 	g_sword2 = this;
 	_debugger = NULL;
 	_features = detector->_game.features;

Index: sword2.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- sword2.h	8 Nov 2003 18:15:34 -0000	1.35
+++ sword2.h	10 Nov 2003 01:04:12 -0000	1.36
@@ -37,12 +37,14 @@
 #include "sword2/driver/d_sound.h"
 #include "sword2/driver/d_draw.h"
 
+class GameDetector;
+
+namespace Sword2 {
+
 enum {
 	GF_DEMO	= 1 << 0
 };
 
-namespace Sword2 {
-
 // Bodge for PCF76 version so that their demo CD can be labelled "PCF76"
 // rather than "RBSII1"
 
@@ -141,7 +143,6 @@
 	void go(void);
 	void parseEvents(void);
 	int32 InitialiseGame(void);
-	GameDetector *_detector;
 	uint32 _features;
 	char *_targetName; // target name for saves