[Scummvm-cvs-logs] CVS: scummvm/scumm base-costume.h,1.12,1.13 bundle.cpp,1.44,1.45 bundle.h,1.20,1.21 imuse.h,1.35,1.36 imuse_digi.h,1.6,1.7 saveload.h,1.18,1.19 sound.h,1.42,1.43

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv461

Modified Files:
	base-costume.h bundle.cpp bundle.h imuse.h imuse_digi.h 
	saveload.h sound.h 
Log Message:
#include cleanup (explicityl specify the location for headers from common/, so that we at some point can get rid of -Icommon; exception is made for stdafx.h, since a) we might want to rename it and b) might want to move it to the top level)

Index: base-costume.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/base-costume.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- base-costume.h	8 Jul 2003 10:49:13 -0000	1.12
+++ base-costume.h	1 Aug 2003 12:18:40 -0000	1.13
@@ -23,7 +23,7 @@
 #ifndef BASE_COSTUME_H
 #define BASE_COSTUME_H
 
-#include "scummsys.h"
+#include "common/scummsys.h"
 #include "actor.h"		// for CostumeData
 
 #if !defined(__GNUC__)

Index: bundle.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/bundle.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- bundle.cpp	19 Jul 2003 14:26:25 -0000	1.44
+++ bundle.cpp	1 Aug 2003 12:18:40 -0000	1.45
@@ -19,10 +19,9 @@
  */
 
 #include "stdafx.h"
-#include "scumm.h"
-#include "scummsys.h"
-#include "bundle.h"
-#include "file.h"
+#include "common/scummsys.h"
+#include "scumm/scumm.h"
+#include "scumm/bundle.h"
 
 static const int16 imcTable[] = {
 	0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x0010, 0x0011,

Index: bundle.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/bundle.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- bundle.h	27 Jun 2003 00:10:17 -0000	1.20
+++ bundle.h	1 Aug 2003 12:18:40 -0000	1.21
@@ -21,8 +21,8 @@
 #ifndef BUNDLE_H
 #define BUNDLE_H
 
-#include "scummsys.h"
-#include "file.h"
+#include "common/scummsys.h"
+#include "common/file.h"
 
 class Bundle {
 

Index: imuse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- imuse.h	5 Jul 2003 15:19:11 -0000	1.35
+++ imuse.h	1 Aug 2003 12:18:40 -0000	1.36
@@ -23,7 +23,7 @@
 #ifndef IMUSE_H
 #define IMUSE_H
 
-#include "scummsys.h"
+#include "common/scummsys.h"
 #include "common/system.h"
 
 class IMuseInternal;

Index: imuse_digi.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- imuse_digi.h	27 Jul 2003 12:25:56 -0000	1.6
+++ imuse_digi.h	1 Aug 2003 12:18:40 -0000	1.7
@@ -23,7 +23,7 @@
 #ifndef IMUSE_DIGI_H
 #define IMUSE_DIGI_H
 
-#include "scummsys.h"
+#include "common/scummsys.h"
 
 #define MAX_DIGITAL_CHANNELS 8
 #define MAX_IMUSE_JUMPS 1

Index: saveload.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- saveload.h	15 Jun 2003 01:42:15 -0000	1.18
+++ saveload.h	1 Aug 2003 12:18:40 -0000	1.19
@@ -22,7 +22,7 @@
 #ifndef SAVELOAD_H
 #define SAVELOAD_H
 
-#include "scummsys.h"
+#include "common/scummsys.h"
 
 // Support for "old" savegames (made with 2501 CVS build)
 // Can be useful for other ports too :)

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- sound.h	31 Jul 2003 20:24:10 -0000	1.42
+++ sound.h	1 Aug 2003 12:18:40 -0000	1.43
@@ -21,7 +21,7 @@
 #ifndef SOUND_H
 #define SOUND_H
 
-#include "scummsys.h"
+#include "common/scummsys.h"
 #include "sound/mixer.h"
 
 class Bundle;