[Scummvm-cvs-logs] CVS: scummvm/scumm charset.h,2.35,2.36 gfx.h,1.98,1.99 player_v1.cpp,1.23,1.24 scumm.h,1.527,1.528

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Tue Jan 11 05:26:10 CET 2005


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

Modified Files:
	charset.h gfx.h player_v1.cpp scumm.h 
Log Message:
On Fingolfin's suggestion I put back the inclusion of util.h into Rect, for
MIN() and MAX(). I then removed util.h from a bunch of files which I don't
think need it any more. (Please let me know if I got too blood-thirsty!)

This reverts some of the changes I made this morning.


Index: charset.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.h,v
retrieving revision 2.35
retrieving revision 2.36
diff -u -d -r2.35 -r2.36
--- charset.h	11 Jan 2005 08:06:16 -0000	2.35
+++ charset.h	11 Jan 2005 13:25:01 -0000	2.36
@@ -22,7 +22,6 @@
 #define CHARSET_H
 
 #include "common/scummsys.h"
-#include "common/util.h"
 #include "common/rect.h"
 #include "scumm/gfx.h"
 

Index: gfx.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.h,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- gfx.h	1 Jan 2005 16:09:13 -0000	1.98
+++ gfx.h	11 Jan 2005 13:25:01 -0000	1.99
@@ -23,7 +23,6 @@
 #ifndef GFX_H
 #define GFX_H
 
-#include "common/rect.h"
 #include "graphics/surface.h"
 
 namespace Scumm {

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

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.527
retrieving revision 1.528
diff -u -d -r1.527 -r1.528
--- scumm.h	11 Jan 2005 08:06:17 -0000	1.527
+++ scumm.h	11 Jan 2005 13:25:01 -0000	1.528
@@ -26,7 +26,6 @@
 #include "base/engine.h"
 #include "common/file.h"
 #include "common/map.h"
-#include "common/util.h"
 #include "common/rect.h"
 #include "common/str.h"
 





More information about the Scummvm-git-logs mailing list