aboutsummaryrefslogtreecommitdiff
path: root/scumm/smush
diff options
context:
space:
mode:
authorMax Horn2002-08-25 22:54:43 +0000
committerMax Horn2002-08-25 22:54:43 +0000
commitbacdd936f2bb2259430fd6658ff3ef4a0ce57b91 (patch)
tree7e58a8af88c29478dca0bb970054254ebd849b6f /scumm/smush
parent1673f0174e7aa443f9a15640c9cc650e85d9f3fb (diff)
downloadscummvm-rg350-bacdd936f2bb2259430fd6658ff3ef4a0ce57b91.tar.gz
scummvm-rg350-bacdd936f2bb2259430fd6658ff3ef4a0ce57b91.tar.bz2
scummvm-rg350-bacdd936f2bb2259430fd6658ff3ef4a0ce57b91.zip
trying to reduce file interdependencies a bit
svn-id: r4861
Diffstat (limited to 'scumm/smush')
-rw-r--r--scumm/smush/brenderer.h1
-rw-r--r--scumm/smush/player.cpp4
-rw-r--r--scumm/smush/player.h5
-rw-r--r--scumm/smush/renderer.h2
-rw-r--r--scumm/smush/scumm_renderer.cpp1
-rw-r--r--scumm/smush/scumm_renderer.h5
6 files changed, 9 insertions, 9 deletions
diff --git a/scumm/smush/brenderer.h b/scumm/smush/brenderer.h
index 80b0bb54ce..e45b3e13eb 100644
--- a/scumm/smush/brenderer.h
+++ b/scumm/smush/brenderer.h
@@ -26,7 +26,6 @@
#include "renderer.h"
#include "palette.h"
-#include "rect.h"
/*! @brief base class for easily creating ::renderer instances
diff --git a/scumm/smush/player.cpp b/scumm/smush/player.cpp
index 25254fbacf..e13344f194 100644
--- a/scumm/smush/player.cpp
+++ b/scumm/smush/player.cpp
@@ -23,7 +23,9 @@
#include "common/util.h"
#include "player.h"
+#include "mixer.h"
#include "renderer.h"
+#include "frenderer.h"
#include "channel.h"
#include "chunk_type.h"
#include "rect.h"
@@ -107,7 +109,7 @@ public:
value[data_end - data_start] = 0;
char * line_start = value;
char * line_end;
- while (line_end = strchr(line_start, '\n')) {
+ while ((line_end = strchr(line_start, '\n'))) {
line_start = line_end+1;
if (line_start[0] == '/' && line_start[1] == '/') {
line_start += 2;
diff --git a/scumm/smush/player.h b/scumm/smush/player.h
index 131ad4c530..6cd6395f2e 100644
--- a/scumm/smush/player.h
+++ b/scumm/smush/player.h
@@ -25,17 +25,16 @@
#include "config.h"
#include "rect.h"
-#include "mixer.h"
#include "chunk.h"
#include "palette.h"
#include "codec1.h"
#include "codec37.h"
#include "codec44.h"
#include "codec47.h"
-#include "frenderer.h"
+class FontRenderer;
+class Mixer;
class Renderer;
-
class StringResource;
/*! @brief the SMUSH player class
diff --git a/scumm/smush/renderer.h b/scumm/smush/renderer.h
index 361ca70397..89b18ca76e 100644
--- a/scumm/smush/renderer.h
+++ b/scumm/smush/renderer.h
@@ -24,9 +24,9 @@
#include "config.h"
+#include "palette.h"
#include "rect.h"
-class Palette;
class Mixer;
/*! @brief interface for general output (rendering)
diff --git a/scumm/smush/scumm_renderer.cpp b/scumm/smush/scumm_renderer.cpp
index 3e357091c2..89f82fa283 100644
--- a/scumm/smush/scumm_renderer.cpp
+++ b/scumm/smush/scumm_renderer.cpp
@@ -23,6 +23,7 @@
#include "common/util.h"
#include "scumm_renderer.h"
#include "channel.h"
+#include "mixer.h"
class scumm_mixer : public Mixer {
private:
diff --git a/scumm/smush/scumm_renderer.h b/scumm/smush/scumm_renderer.h
index 48d8eaaca0..a9d6e18ff4 100644
--- a/scumm/smush/scumm_renderer.h
+++ b/scumm/smush/scumm_renderer.h
@@ -35,11 +35,10 @@
#endif
#include "brenderer.h"
-#include "mixer.h"
-#include "rect.h"
-#include "blitter.h"
class scumm_mixer;
+class Scumm;
+class Mixer;
class ScummRenderer : public BaseRenderer {
private: