[Scummvm-cvs-logs] CVS: scummvm/base engine.cpp,1.31,1.32 engine.h,1.17,1.18 gameDetector.cpp,1.95,1.96 gameDetector.h,1.30,1.31

[Max Horn]

Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11669/base

Modified Files:
	engine.cpp engine.h gameDetector.cpp gameDetector.h 
Log Message:
Reducing header dependencies a bit

Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/engine.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- engine.cpp	27 Dec 2004 21:54:19 -0000	1.31
+++ engine.cpp	27 Dec 2004 22:08:18 -0000	1.32
@@ -23,10 +23,12 @@
 #include <malloc.h>
 #endif
 #include "base/engine.h"
+#include "base/gameDetector.h"
 #include "common/config-manager.h"
 #include "common/file.h"
 #include "common/timer.h"
 #include "common/scaler.h"	// For GFX_NORMAL
+#include "common/system.h"
 #include "sound/mixer.h"
 
 /* FIXME - BIG HACK for MidiEmu */

Index: engine.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/engine.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- engine.h	27 Nov 2004 00:25:57 -0000	1.17
+++ engine.h	27 Dec 2004 22:08:18 -0000	1.18
@@ -23,9 +23,10 @@
 
 #include "common/scummsys.h"
 #include "common/str.h"
-#include "common/system.h"
-#include "base/gameDetector.h"
 
+class GameDetector;
+class OSystem;
+class SaveFileManager;
 class SoundMixer;
 class Timer;
 

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- gameDetector.cpp	27 Dec 2004 21:54:19 -0000	1.95
+++ gameDetector.cpp	27 Dec 2004 22:08:18 -0000	1.96
@@ -46,6 +46,9 @@
 #endif
 #endif
 
+extern int gDebugLevel;
+
+
 // DONT FIXME: DO NOT ORDER ALPHABETICALLY, THIS IS ORDERED BY IMPORTANCE/CATEGORY! :)
 #ifdef __PALM_OS__
 static const char USAGE_STRING[] = "NoUsageString"; // save more data segment space

Index: gameDetector.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- gameDetector.h	27 Dec 2004 21:54:19 -0000	1.30
+++ gameDetector.h	27 Dec 2004 22:08:18 -0000	1.31
@@ -38,8 +38,6 @@
 	GF_DEFAULT_TO_1X_SCALER = 1 << 30
 };
 
-extern int gDebugLevel;
-
 struct GameSettings {
 	const char *name;
 	const char *description;