aboutsummaryrefslogtreecommitdiff
path: root/engines/director/score.h
diff options
context:
space:
mode:
Diffstat (limited to 'engines/director/score.h')
-rw-r--r--engines/director/score.h33
1 files changed, 15 insertions, 18 deletions
diff --git a/engines/director/score.h b/engines/director/score.h
index dd5ca03d93..2b605b8360 100644
--- a/engines/director/score.h
+++ b/engines/director/score.h
@@ -23,18 +23,20 @@
#ifndef DIRECTOR_SCORE_H
#define DIRECTOR_SCORE_H
-#include "common/substream.h"
-#include "common/rect.h"
-#include "director/archive.h"
-#include "director/cast.h"
-#include "director/images.h"
-#include "director/stxt.h"
+#include "common/hash-str.h"
+
+#include "director/types.h"
namespace Graphics {
class ManagedSurface;
class Font;
}
+namespace Common {
+ class ReadStreamEndian;
+ class SeekableSubReadStreamEndian;
+}
+
namespace Director {
class Archive;
@@ -44,7 +46,14 @@ class DirectorSound;
class Frame;
struct Label;
class Lingo;
+struct Resource;
class Sprite;
+class Stxt;
+class BitmapCast;
+class ButtonCast;
+class ScriptCast;
+class ShapeCast;
+class TextCast;
struct ZoomBox {
Common::Rect start;
@@ -55,18 +64,6 @@ struct ZoomBox {
uint32 nextTime;
};
-enum ScriptType {
- kMovieScript = 0,
- kSpriteScript = 1,
- kFrameScript = 2,
- kCastScript = 3,
- kGlobalScript = 4,
- kNoneScript = -1,
- kMaxScriptType = 4 // Sync with score.cpp:45, array scriptTypes[]
-};
-
-const char *scriptType2str(ScriptType scr);
-
class Score {
public:
Score(DirectorEngine *vm);