[Scummvm-cvs-logs] CVS: scummvm/scumm charset.h,2.34,2.35 player_v1.cpp,1.22,1.23 scumm.h,1.526,1.527

[Torbjörn Andersson]

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

Modified Files:
	charset.h player_v1.cpp scumm.h 
Log Message:
This is probably not the optimal fix, but at least ScummVM compiles again.


Index: charset.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.h,v
retrieving revision 2.34
retrieving revision 2.35
diff -u -d -r2.34 -r2.35
--- charset.h	10 Jan 2005 22:35:38 -0000	2.34
+++ charset.h	11 Jan 2005 08:06:16 -0000	2.35
@@ -22,8 +22,8 @@
 #define CHARSET_H
 
 #include "common/scummsys.h"
-#include "common/rect.h"
 #include "common/util.h"
+#include "common/rect.h"
 #include "scumm/gfx.h"
 
 namespace Scumm {

Index: player_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v1.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- player_v1.cpp	1 Jan 2005 16:09:14 -0000	1.22
+++ player_v1.cpp	11 Jan 2005 08:06:17 -0000	1.23
@@ -22,8 +22,8 @@
 
 #include "stdafx.h"
 #include "base/engine.h"
-#include "scumm/player_v1.h"
 #include "scumm/scumm.h"
+#include "scumm/player_v1.h"
 
 namespace Scumm {
 

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.526
retrieving revision 1.527
diff -u -d -r1.526 -r1.527
--- scumm.h	10 Jan 2005 22:51:26 -0000	1.526
+++ scumm.h	11 Jan 2005 08:06:17 -0000	1.527
@@ -26,9 +26,9 @@
 #include "base/engine.h"
 #include "common/file.h"
 #include "common/map.h"
+#include "common/util.h"
 #include "common/rect.h"
 #include "common/str.h"
-#include "common/util.h"
 
 #include "scumm/gfx.h"
 #include "scumm/script.h"