[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.384,1.385 intern.h,2.536,2.537 saveload.cpp,1.247,1.248 script_v100he.cpp,2.179,2.180 script_v90he.cpp,2.286,2.287 scumm.cpp,1.611,1.612

[Max Horn]

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

Modified Files:
	actor.cpp intern.h saveload.cpp script_v100he.cpp 
	script_v90he.cpp scumm.cpp 
Log Message:
Reduce header dependencies (for quicker recompiles)

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -d -r1.384 -r1.385
--- actor.cpp	22 Oct 2005 04:08:48 -0000	1.384
+++ actor.cpp	22 Oct 2005 23:08:14 -0000	1.385
@@ -32,6 +32,7 @@
 #include "scumm/resource.h"
 #include "scumm/saveload.h"
 #include "scumm/sound.h"
+#include "scumm/sprite_he.h"
 #include "scumm/usage_bits.h"
 #include "scumm/util.h"
 

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.536
retrieving revision 2.537
diff -u -d -r2.536 -r2.537
--- intern.h	22 Oct 2005 22:54:59 -0000	2.536
+++ intern.h	22 Oct 2005 23:08:14 -0000	2.537
@@ -25,7 +25,6 @@
 
 #include "scumm/scumm.h"
 #include "scumm/floodfill_he.h"
-#include "scumm/sprite_he.h"
 #include "scumm/wiz_he.h"
 
 namespace Scumm {
@@ -33,6 +32,7 @@
 #ifndef DISABLE_HE
 class ResExtractor;
 class LogicHE;
+class Sprite;
 #endif
 
 class NutRenderer; // V8 Font Renderer

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -d -r1.247 -r1.248
--- saveload.cpp	22 Oct 2005 22:54:59 -0000	1.247
+++ saveload.cpp	22 Oct 2005 23:08:14 -0000	1.248
@@ -36,6 +36,7 @@
 #include "scumm/saveload.h"
 #include "scumm/scumm.h"
 #include "scumm/sound.h"
+#include "scumm/sprite_he.h"
 #include "scumm/verbs.h"
 
 #include "sound/audiocd.h"

Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.179
retrieving revision 2.180
diff -u -d -r2.179 -r2.180
--- script_v100he.cpp	21 Oct 2005 12:06:03 -0000	2.179
+++ script_v100he.cpp	22 Oct 2005 23:08:14 -0000	2.180
@@ -30,6 +30,7 @@
 #include "scumm/resource_v7he.h"
 #include "scumm/scumm.h"
 #include "scumm/sound.h"
+#include "scumm/sprite_he.h"
 #include "scumm/util.h"
 
 namespace Scumm {

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.286
retrieving revision 2.287
diff -u -d -r2.286 -r2.287
--- script_v90he.cpp	22 Oct 2005 09:49:34 -0000	2.286
+++ script_v90he.cpp	22 Oct 2005 23:08:14 -0000	2.287
@@ -31,6 +31,7 @@
 #include "scumm/resource_v7he.h"
 #include "scumm/scumm.h"
 #include "scumm/sound.h"
+#include "scumm/sprite_he.h"
 #include "scumm/util.h"
 
 namespace Scumm {

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.611
retrieving revision 1.612
diff -u -d -r1.611 -r1.612
--- scumm.cpp	22 Oct 2005 00:04:34 -0000	1.611
+++ scumm.cpp	22 Oct 2005 23:08:14 -0000	1.612
@@ -50,8 +50,9 @@
 #include "scumm/player_v2a.h"
 #include "scumm/player_v3a.h"
 #include "scumm/resource_v7he.h"
-#include "scumm/sound.h"
 #include "scumm/scumm.h"
+#include "scumm/sound.h"
+#include "scumm/sprite_he.h"
 #include "scumm/util.h"
 
 #ifdef PALMOS_68K