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

[fingolfin at users.sourceforge.net]

Revision: 47666
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47666&view=rev
Author:   fingolfin
Date:     2010-01-29 11:05:06 +0000 (Fri, 29 Jan 2010)

Log Message:
-----------
SCI: Reduce header interdependencies a bit

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/savegame.cpp
    scummvm/trunk/engines/sci/engine/script.cpp
    scummvm/trunk/engines/sci/engine/scriptdebug.cpp
    scummvm/trunk/engines/sci/engine/selector.h
    scummvm/trunk/engines/sci/engine/state.h
    scummvm/trunk/engines/sci/engine/vm.cpp
    scummvm/trunk/engines/sci/sci.cpp

Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp	2010-01-29 11:03:54 UTC (rev 47665)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp	2010-01-29 11:05:06 UTC (rev 47666)
@@ -36,6 +36,7 @@
 #include "sci/engine/message.h"
 #include "sci/engine/savegame.h"
 #include "sci/engine/vm_types.h"
+#include "sci/engine/script.h"	// for SCI_OBJ_EXPORTS and SCI_OBJ_SYNONYMS
 #include "sci/graphics/gui.h"
 #include "sci/sound/audio.h"
 #ifdef USE_OLD_MUSIC_FUNCTIONS
@@ -702,6 +703,7 @@
 	}
 }
 
+// TODO: Move thie function to a more appropriate place, such as vm.cpp or script.cpp
 void SegManager::reconstructScripts(EngineState *s) {
 	uint i;
 	SegmentObj *mobj;

Modified: scummvm/trunk/engines/sci/engine/script.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/script.cpp	2010-01-29 11:03:54 UTC (rev 47665)
+++ scummvm/trunk/engines/sci/engine/script.cpp	2010-01-29 11:05:06 UTC (rev 47666)
@@ -26,6 +26,9 @@
 #include "sci/sci.h"
 #include "sci/resource.h"
 #include "sci/engine/state.h"
+#include "sci/engine/kernel.h"
+#include "sci/engine/script.h"
+
 #include "common/util.h"
 
 namespace Sci {

Modified: scummvm/trunk/engines/sci/engine/scriptdebug.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/scriptdebug.cpp	2010-01-29 11:03:54 UTC (rev 47665)
+++ scummvm/trunk/engines/sci/engine/scriptdebug.cpp	2010-01-29 11:05:06 UTC (rev 47666)
@@ -29,6 +29,8 @@
 #include "sci/console.h"
 #include "sci/debug.h"
 #include "sci/engine/state.h"
+#include "sci/engine/kernel.h"
+#include "sci/engine/script.h"
 
 namespace Sci {
 

Modified: scummvm/trunk/engines/sci/engine/selector.h
===================================================================
--- scummvm/trunk/engines/sci/engine/selector.h	2010-01-29 11:03:54 UTC (rev 47665)
+++ scummvm/trunk/engines/sci/engine/selector.h	2010-01-29 11:05:06 UTC (rev 47666)
@@ -30,6 +30,7 @@
 
 #include "sci/engine/vm_types.h"	// for reg_t
 #include "sci/engine/vm.h"
+#include "sci/engine/kernel.h"		// for Kernel::_selectorCache
 
 namespace Sci {
 

Modified: scummvm/trunk/engines/sci/engine/state.h
===================================================================
--- scummvm/trunk/engines/sci/engine/state.h	2010-01-29 11:03:54 UTC (rev 47665)
+++ scummvm/trunk/engines/sci/engine/state.h	2010-01-29 11:05:06 UTC (rev 47666)
@@ -37,8 +37,6 @@
 
 #include "sci/sci.h"
 #include "sci/resource.h"
-#include "sci/engine/kernel.h"	// for kfunct_sig_pair_t
-#include "sci/engine/script.h"
 #include "sci/engine/seg_manager.h"
 
 #include "sci/parser/vocabulary.h"

Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp	2010-01-29 11:03:54 UTC (rev 47665)
+++ scummvm/trunk/engines/sci/engine/vm.cpp	2010-01-29 11:05:06 UTC (rev 47666)
@@ -35,6 +35,7 @@
 #include "sci/engine/kernel.h"
 #include "sci/engine/kernel_types.h"
 #include "sci/engine/seg_manager.h"
+#include "sci/engine/script.h"
 #include "sci/engine/gc.h"
 
 namespace Sci {

Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp	2010-01-29 11:03:54 UTC (rev 47665)
+++ scummvm/trunk/engines/sci/sci.cpp	2010-01-29 11:05:06 UTC (rev 47666)
@@ -35,6 +35,7 @@
 
 #include "sci/engine/state.h"
 #include "sci/engine/kernel.h"
+#include "sci/engine/script.h"	// for script_adjust_opcode_formats & script_free_breakpoints
 
 #include "sci/sound/audio.h"
 #include "sci/sound/soundcmd.h"


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