[Scummvm-cvs-logs] SF.net SVN: scummvm:[40451] scummvm/trunk/engines/sci

[fingolfin at users.sourceforge.net]

Revision: 40451
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40451&view=rev
Author:   fingolfin
Date:     2009-05-11 13:31:17 +0000 (Mon, 11 May 2009)

Log Message:
-----------
SCI: Reduced header deps

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kernel.h
    scummvm/trunk/engines/sci/engine/scriptconsole.cpp
    scummvm/trunk/engines/sci/engine/state.h
    scummvm/trunk/engines/sci/gfx/operations.cpp
    scummvm/trunk/engines/sci/sci.cpp
    scummvm/trunk/engines/sci/sci.h
    scummvm/trunk/engines/sci/scicore/sciconsole.cpp

Modified: scummvm/trunk/engines/sci/engine/kernel.h
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.h	2009-05-11 10:56:59 UTC (rev 40450)
+++ scummvm/trunk/engines/sci/engine/kernel.h	2009-05-11 13:31:17 UTC (rev 40451)
@@ -32,7 +32,6 @@
 
 #include "sci/engine/kdebug.h"
 #include "sci/uinput.h"
-#include "sci/scicore/sciconsole.h" /* sciprintf() */
 
 namespace Sci {
 

Modified: scummvm/trunk/engines/sci/engine/scriptconsole.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/scriptconsole.cpp	2009-05-11 10:56:59 UTC (rev 40450)
+++ scummvm/trunk/engines/sci/engine/scriptconsole.cpp	2009-05-11 13:31:17 UTC (rev 40451)
@@ -28,6 +28,7 @@
 
 #include "sci/sci_memory.h"
 #include "sci/engine/state.h"
+#include "sci/scicore/sciconsole.h"
 
 namespace Sci {
 

Modified: scummvm/trunk/engines/sci/engine/state.h
===================================================================
--- scummvm/trunk/engines/sci/engine/state.h	2009-05-11 10:56:59 UTC (rev 40450)
+++ scummvm/trunk/engines/sci/engine/state.h	2009-05-11 13:31:17 UTC (rev 40451)
@@ -37,8 +37,7 @@
 
 #include "sci/scicore/vocabulary.h"
 #include "sci/scicore/resource.h"
-#include "sci/scicore/sciconsole.h"
-#include "sci/scicore/versions.h"
+	#include "sci/scicore/versions.h"
 #include "sci/engine/kernel.h"	// for kfunct_sig_pair_t
 #include "sci/engine/script.h"
 #include "sci/engine/seg_manager.h"

Modified: scummvm/trunk/engines/sci/gfx/operations.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/operations.cpp	2009-05-11 10:56:59 UTC (rev 40450)
+++ scummvm/trunk/engines/sci/gfx/operations.cpp	2009-05-11 13:31:17 UTC (rev 40451)
@@ -29,6 +29,7 @@
 #include "sci/gfx/operations.h"
 #include "sci/gfx/font.h"
 #include "sci/sci.h"	// for g_engine, evil hack
+#include "sci/console.h"
 
 #include "common/system.h"
 #include "common/events.h"

Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp	2009-05-11 10:56:59 UTC (rev 40450)
+++ scummvm/trunk/engines/sci/sci.cpp	2009-05-11 13:31:17 UTC (rev 40451)
@@ -30,6 +30,8 @@
 #include "engines/advancedDetector.h"
 #include "sci/sci.h"
 #include "sci/console.h"
+#include "sci/scicore/sciconsole.h"
+
 #include "sci/engine/state.h"
 #include "sci/engine/kernel.h"
 
@@ -303,6 +305,10 @@
 	return Common::kNoError;
 }
 
+GUI::Debugger *SciEngine::getDebugger() {
+	return _console;
+}
+
 const char* SciEngine::getGameID() const {
 	return _gameDescription->desc.gameid;
 }

Modified: scummvm/trunk/engines/sci/sci.h
===================================================================
--- scummvm/trunk/engines/sci/sci.h	2009-05-11 10:56:59 UTC (rev 40450)
+++ scummvm/trunk/engines/sci/sci.h	2009-05-11 13:31:17 UTC (rev 40451)
@@ -29,11 +29,12 @@
 #include "engines/engine.h"
 #include "engines/advancedDetector.h"
 
-#include "sci/console.h"
 #include "sci/scicore/resource.h"
 
 namespace Sci {
 
+struct Console;
+
 // our engine debug levels
 enum kDebugLevels {
 	kDebugLevelError      = 1 << 0,
@@ -79,7 +80,7 @@
 
 	// Engine APIs
 	virtual Common::Error run();
-	virtual GUI::Debugger *getDebugger() { return _console; }
+	virtual GUI::Debugger *getDebugger();
 
 	const char* getGameID() const;
 	int getResourceVersion() const;

Modified: scummvm/trunk/engines/sci/scicore/sciconsole.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/sciconsole.cpp	2009-05-11 10:56:59 UTC (rev 40450)
+++ scummvm/trunk/engines/sci/scicore/sciconsole.cpp	2009-05-11 13:31:17 UTC (rev 40451)
@@ -28,6 +28,7 @@
 
 #include "sci/sci_memory.h"
 #include "sci/engine/state.h"
+#include "sci/scicore/sciconsole.h"
 
 namespace Sci {
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.