diff options
| author | Max Horn | 2004-01-13 14:22:29 +0000 |
|---|---|---|
| committer | Max Horn | 2004-01-13 14:22:29 +0000 |
| commit | c39aa04c318b991337daecf7e348ad6044656b36 (patch) | |
| tree | 2d8ef3b7529910c835f34251dfddaa76181e94b6 | |
| parent | 34960cf375d2c7a5ea3b4c044a3479f9c88b48c2 (diff) | |
| download | scummvm-rg350-c39aa04c318b991337daecf7e348ad6044656b36.tar.gz scummvm-rg350-c39aa04c318b991337daecf7e348ad6044656b36.tar.bz2 scummvm-rg350-c39aa04c318b991337daecf7e348ad6044656b36.zip | |
cut down pointless header interdependencies
svn-id: r12360
| -rw-r--r-- | sword2/anims.cpp | 1 | ||||
| -rw-r--r-- | sword2/driver/animation.cpp | 2 | ||||
| -rw-r--r-- | sword2/driver/animation.h | 3 | ||||
| -rw-r--r-- | sword2/driver/d_draw.h | 2 | ||||
| -rw-r--r-- | sword2/driver/render.cpp | 1 |
5 files changed, 6 insertions, 3 deletions
diff --git a/sword2/anims.cpp b/sword2/anims.cpp index 9cc9dcff90..22e8a55d54 100644 --- a/sword2/anims.cpp +++ b/sword2/anims.cpp @@ -28,6 +28,7 @@ #include "sword2/sword2.h" #include "sword2/defs.h" #include "sword2/interpreter.h" +#include "sword2/driver/animation.h" namespace Sword2 { diff --git a/sword2/driver/animation.cpp b/sword2/driver/animation.cpp index cbb03be40b..514da5ceb7 100644 --- a/sword2/driver/animation.cpp +++ b/sword2/driver/animation.cpp @@ -21,9 +21,11 @@ #include "common/stdafx.h" #include "sword2/sword2.h" +#include "sword2/driver/animation.h" #include "sword2/driver/menu.h" #include "sword2/driver/render.h" + #include "common/file.h" namespace Sword2 { diff --git a/sword2/driver/animation.h b/sword2/driver/animation.h index f1cd1ac1d8..31f03aa34d 100644 --- a/sword2/driver/animation.h +++ b/sword2/driver/animation.h @@ -97,10 +97,11 @@ private: void closeTextObject(MovieTextObject *obj); void drawTextObject(MovieTextObject *obj); + int32 playDummy(const char *filename, MovieTextObject *text[], uint8 *musicOut); + public: MoviePlayer(Sword2Engine *vm) : _vm(vm), _textSurface(NULL) {} int32 play(const char *filename, MovieTextObject *text[], uint8 *musicOut); - int32 playDummy(const char *filename, MovieTextObject *text[], uint8 *musicOut); }; } // End of namespace Sword2 diff --git a/sword2/driver/d_draw.h b/sword2/driver/d_draw.h index 49cc544124..a442f2d220 100644 --- a/sword2/driver/d_draw.h +++ b/sword2/driver/d_draw.h @@ -22,8 +22,6 @@ #include "common/rect.h" -#include "animation.h" - namespace Sword2 { // This is the maximum mouse cursor size in the SDL backend diff --git a/sword2/driver/render.cpp b/sword2/driver/render.cpp index 048f1dc85e..1b13d8302e 100644 --- a/sword2/driver/render.cpp +++ b/sword2/driver/render.cpp @@ -19,6 +19,7 @@ #include "common/stdafx.h" #include "sword2/sword2.h" +#include "sword2/driver/animation.h" #include "sword2/driver/menu.h" #include "sword2/driver/render.h" |