[Scummvm-cvs-logs] CVS: scummvm/scumm bundle.h,1.20,1.20.2.1 bundle.cpp,1.44,1.44.2.1 base-costume.h,1.12,1.12.2.1

[Max Horn]

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

Modified Files:
      Tag: branch-0-5-0
	bundle.h bundle.cpp base-costume.h 
Log Message:
sync of some minor changes

Index: bundle.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/bundle.h,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -d -r1.20 -r1.20.2.1
--- bundle.h	27 Jun 2003 00:10:17 -0000	1.20
+++ bundle.h	5 Aug 2003 12:30:55 -0000	1.20.2.1
@@ -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: bundle.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/bundle.cpp,v
retrieving revision 1.44
retrieving revision 1.44.2.1
diff -u -d -r1.44 -r1.44.2.1
--- bundle.cpp	19 Jul 2003 14:26:25 -0000	1.44
+++ bundle.cpp	5 Aug 2003 12:30:55 -0000	1.44.2.1
@@ -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: base-costume.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/base-costume.h,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -d -r1.12 -r1.12.2.1
--- base-costume.h	8 Jul 2003 10:49:13 -0000	1.12
+++ base-costume.h	5 Aug 2003 12:30:55 -0000	1.12.2.1
@@ -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__)