[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.14,1.15 scummvm.cpp,1.14,1.15 sound.cpp,1.6,1.7

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv17501/scumm

Modified Files:
	scumm.h scummvm.cpp sound.cpp 
Log Message:
reducing some header dependencies

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- scumm.h	13 Sep 2002 11:54:59 -0000	1.14
+++ scumm.h	13 Sep 2002 12:20:55 -0000	1.15
@@ -25,7 +25,7 @@
 
 #include "common/engine.h"
 #include "common/timer.h"
-#include "scumm/bundle.h"
+#include "common/file.h"
 
 class GameDetector;
 class Gui;
@@ -34,6 +34,7 @@
 class IMuse;
 class Actor;
 class Sound;
+class Bundle;
 struct ScummDebugger;
 struct Serializer;
 struct FindObjectInRoom;

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- scummvm.cpp	10 Sep 2002 07:34:27 -0000	1.14
+++ scummvm.cpp	13 Sep 2002 12:20:55 -0000	1.15
@@ -26,6 +26,7 @@
 #include "sound/mididrv.h"
 #include "scumm/sound.h"
 #include "scumm/imuse.h"
+#include "scumm/bundle.h"
 #include "actor.h"
 #include "debug.h"
 #include "gameDetector.h"

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sound.cpp	13 Sep 2002 11:59:42 -0000	1.6
+++ sound.cpp	13 Sep 2002 12:20:55 -0000	1.7
@@ -21,13 +21,14 @@
  */
 
 #include "stdafx.h"
-#include "scumm/scumm.h"
+#include "scumm.h"
 #include "sound.h"
 #include "sound/mididrv.h"
-#include "scumm/imuse.h"
-#include "scumm/actor.h"
-#include "config-file.h"
-#include "util.h"
+#include "imuse.h"
+#include "actor.h"
+#include "bundle.h"
+#include "common/config-file.h"
+#include "common/util.h"
 
 #ifdef _WIN32_WCE
 extern void *bsearch(const void *, const void *, size_t,