diff options
| author | Torbjörn Andersson | 2005-01-11 13:25:02 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2005-01-11 13:25:02 +0000 |
| commit | 4dda4eb31bbada527082b59295af0a20003d23e6 (patch) | |
| tree | 93e1a452e33c07a588e0be42eee4afb21d65f165 /scumm | |
| parent | c5e83de099dcffca0f5c0d791305c0189467e9d9 (diff) | |
| download | scummvm-rg350-4dda4eb31bbada527082b59295af0a20003d23e6.tar.gz scummvm-rg350-4dda4eb31bbada527082b59295af0a20003d23e6.tar.bz2 scummvm-rg350-4dda4eb31bbada527082b59295af0a20003d23e6.zip | |
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.
svn-id: r16541
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/charset.h | 1 | ||||
| -rw-r--r-- | scumm/gfx.h | 1 | ||||
| -rw-r--r-- | scumm/player_v1.cpp | 2 | ||||
| -rw-r--r-- | scumm/scumm.h | 1 |
4 files changed, 1 insertions, 4 deletions
diff --git a/scumm/charset.h b/scumm/charset.h index c2e5d1474b..e546d16b73 100644 --- a/scumm/charset.h +++ b/scumm/charset.h @@ -22,7 +22,6 @@ #define CHARSET_H #include "common/scummsys.h" -#include "common/util.h" #include "common/rect.h" #include "scumm/gfx.h" diff --git a/scumm/gfx.h b/scumm/gfx.h index ff75e5fafa..4762b3678c 100644 --- a/scumm/gfx.h +++ b/scumm/gfx.h @@ -23,7 +23,6 @@ #ifndef GFX_H #define GFX_H -#include "common/rect.h" #include "graphics/surface.h" namespace Scumm { diff --git a/scumm/player_v1.cpp b/scumm/player_v1.cpp index f3a013a59c..151f0345d6 100644 --- a/scumm/player_v1.cpp +++ b/scumm/player_v1.cpp @@ -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 { diff --git a/scumm/scumm.h b/scumm/scumm.h index 9adf3e2f69..c065f12cef 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -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" |