[Scummvm-git-logs] scummvm master -> 146d33f2f5f8be3e130946e349ef24a13ab7c662
npjg
noreply at scummvm.org
Mon Jan 13 03:35:16 UTC 2025
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
cda195fe73 MEDIASTATION: Factor all script constants into their own file
146d33f2f5 MEDIASTATION: Clean up include statements
Commit: cda195fe7356dbe80755d3d1e110170dabbd860d
https://github.com/scummvm/scummvm/commit/cda195fe7356dbe80755d3d1e110170dabbd860d
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2025-01-12T22:28:15-05:00
Commit Message:
MEDIASTATION: Factor all script constants into their own file
This is on the leadup to adding converting script constants to strings to help improve script debugging output.
Changed paths:
engines/mediastation/assets/canvas.h
engines/mediastation/assets/font.h
engines/mediastation/assets/hotspot.h
engines/mediastation/assets/image.h
engines/mediastation/assets/palette.h
engines/mediastation/assets/path.h
engines/mediastation/assets/screen.h
engines/mediastation/assets/sound.h
engines/mediastation/assets/sprite.h
engines/mediastation/assets/text.h
engines/mediastation/assets/timer.h
engines/mediastation/mediascript/builtins.h
engines/mediastation/mediascript/codechunk.h
engines/mediastation/mediascript/eventhandler.h
engines/mediastation/mediascript/operand.h
engines/mediastation/mediascript/variable.h
engines/mediastation/mediastation.cpp
diff --git a/engines/mediastation/assets/canvas.h b/engines/mediastation/assets/canvas.h
index 029a1e015a3..cf3a6d86e00 100644
--- a/engines/mediastation/assets/canvas.h
+++ b/engines/mediastation/assets/canvas.h
@@ -25,6 +25,7 @@
#include "mediastation/asset.h"
#include "mediastation/assetheader.h"
#include "mediastation/mediascript/operand.h"
+#include "mediastation/mediascript/builtins.h"
namespace MediaStation {
diff --git a/engines/mediastation/assets/font.h b/engines/mediastation/assets/font.h
index 56207d79f75..57af138f110 100644
--- a/engines/mediastation/assets/font.h
+++ b/engines/mediastation/assets/font.h
@@ -26,6 +26,7 @@
#include "mediastation/assetheader.h"
#include "mediastation/bitmap.h"
#include "mediastation/mediascript/operand.h"
+#include "mediastation/mediascript/builtins.h"
namespace MediaStation {
diff --git a/engines/mediastation/assets/hotspot.h b/engines/mediastation/assets/hotspot.h
index 99b1cc8caf7..714382846de 100644
--- a/engines/mediastation/assets/hotspot.h
+++ b/engines/mediastation/assets/hotspot.h
@@ -25,6 +25,7 @@
#include "mediastation/asset.h"
#include "mediastation/assetheader.h"
#include "mediastation/mediascript/operand.h"
+#include "mediastation/mediascript/builtins.h"
namespace MediaStation {
diff --git a/engines/mediastation/assets/image.h b/engines/mediastation/assets/image.h
index b6ff979efc3..9d3b91604d9 100644
--- a/engines/mediastation/assets/image.h
+++ b/engines/mediastation/assets/image.h
@@ -30,6 +30,7 @@
#include "mediastation/bitmap.h"
#include "mediastation/assetheader.h"
#include "mediastation/mediascript/operand.h"
+#include "mediastation/mediascript/builtins.h"
namespace MediaStation {
diff --git a/engines/mediastation/assets/palette.h b/engines/mediastation/assets/palette.h
index 059194f5df2..0fff673b4e3 100644
--- a/engines/mediastation/assets/palette.h
+++ b/engines/mediastation/assets/palette.h
@@ -25,6 +25,7 @@
#include "mediastation/assetheader.h"
#include "mediastation/asset.h"
#include "mediastation/mediascript/operand.h"
+#include "mediastation/mediascript/builtins.h"
namespace MediaStation {
diff --git a/engines/mediastation/assets/path.h b/engines/mediastation/assets/path.h
index 69eba91462f..b21cd818de2 100644
--- a/engines/mediastation/assets/path.h
+++ b/engines/mediastation/assets/path.h
@@ -25,6 +25,7 @@
#include "mediastation/assetheader.h"
#include "mediastation/asset.h"
#include "mediastation/mediascript/operand.h"
+#include "mediastation/mediascript/builtins.h"
namespace MediaStation {
diff --git a/engines/mediastation/assets/screen.h b/engines/mediastation/assets/screen.h
index 5028bc68b86..933d9f24dc6 100644
--- a/engines/mediastation/assets/screen.h
+++ b/engines/mediastation/assets/screen.h
@@ -25,6 +25,7 @@
#include "mediastation/assetheader.h"
#include "mediastation/asset.h"
#include "mediastation/mediascript/operand.h"
+#include "mediastation/mediascript/builtins.h"
namespace MediaStation {
diff --git a/engines/mediastation/assets/sound.h b/engines/mediastation/assets/sound.h
index 666d09ced19..f84e901a512 100644
--- a/engines/mediastation/assets/sound.h
+++ b/engines/mediastation/assets/sound.h
@@ -31,6 +31,7 @@
#include "mediastation/subfile.h"
#include "mediastation/assetheader.h"
#include "mediastation/mediascript/operand.h"
+#include "mediastation/mediascript/builtins.h"
namespace MediaStation {
diff --git a/engines/mediastation/assets/sprite.h b/engines/mediastation/assets/sprite.h
index 55380a783da..b34191cf767 100644
--- a/engines/mediastation/assets/sprite.h
+++ b/engines/mediastation/assets/sprite.h
@@ -26,6 +26,7 @@
#include "mediastation/assetheader.h"
#include "mediastation/bitmap.h"
#include "mediastation/mediascript/operand.h"
+#include "mediastation/mediascript/builtins.h"
namespace MediaStation {
diff --git a/engines/mediastation/assets/text.h b/engines/mediastation/assets/text.h
index 4b2eff653cc..cc1a0996179 100644
--- a/engines/mediastation/assets/text.h
+++ b/engines/mediastation/assets/text.h
@@ -25,6 +25,7 @@
#include "mediastation/asset.h"
#include "mediastation/assetheader.h"
#include "mediastation/mediascript/operand.h"
+#include "mediastation/mediascript/builtins.h"
namespace MediaStation {
diff --git a/engines/mediastation/assets/timer.h b/engines/mediastation/assets/timer.h
index 9bbd844cf75..0a53f8dabd4 100644
--- a/engines/mediastation/assets/timer.h
+++ b/engines/mediastation/assets/timer.h
@@ -24,6 +24,7 @@
#include "mediastation/assetheader.h"
#include "mediastation/mediascript/operand.h"
+#include "mediastation/mediascript/builtins.h"
namespace MediaStation {
diff --git a/engines/mediastation/mediascript/builtins.h b/engines/mediastation/mediascript/builtins.h
index 40ad73880ec..0ad15b85814 100644
--- a/engines/mediastation/mediascript/builtins.h
+++ b/engines/mediastation/mediascript/builtins.h
@@ -24,6 +24,52 @@
namespace MediaStation {
+enum InstructionType {
+ kInstructionTypeEmpty = 0x0000,
+ kInstructionTypeFunctionCall = 0x0067,
+ kInstructionTypeOperand = 0x0066,
+ kInstructionTypeVariableRef = 0x0065
+};
+
+enum Opcode {
+ kOpcodeIfElse = 202,
+ kOpcodeAssignVariable = 203,
+ kOpcodeOr = 204,
+ kOpcodeAnd = 206,
+ kOpcodeEquals = 207,
+ kOpcodeNotEquals = 208,
+ kOpcodeLessThan = 209,
+ kOpcodeGreaterThan = 210,
+ kOpcodeLessThanOrEqualTo = 211,
+ kOpcodeGreaterThanOrEqualTo = 212,
+ kOpcodeAdd = 213,
+ kOpcodeSubtract = 214,
+ kOpcodeMultiply = 215,
+ kOpcodeDivide = 216,
+ kOpcodeModulo = 217,
+ kOpcodeUnk2 = 218, // TODO: Likely something with ## constants like ##DOWN?
+ kOpcodeCallRoutine = 219,
+ // Method calls are like routine calls, but they have an implicit "self"
+ // parameter that is always the first. For example:
+ // @self . mouseActivate ( TRUE ) ;
+ kOpcodeCallMethod = 220,
+ // This seems to appear at the start of a function to declare the number of
+ // local variables used in the function. It seems to be the `Declare`
+ // keyword. In the observed examples, the number of variables to create is
+ // given, then the next instructions are variable assignments for that number
+ // of variables.
+ kOpcodeDeclareVariables = 221,
+ kOpcodeWhile = 224,
+ kOpcodeReturn = 222,
+ kOpcodeUnk1 = 223
+};
+
+enum VariableScope {
+ kVariableScopeLocal = 1,
+ kVariableScopeParameter = 2,
+ kVariableScopeGlobal = 4
+};
+
enum BuiltInFunction {
// TODO: Figure out if effectTransitionOnSync = 13 is consistent across titles?
kEffectTransitionFunction = 12, // PARAMS: 1
@@ -114,6 +160,109 @@ enum BuiltInMethod {
kCloseLensMethod = 347, // PARAMS: 0
};
+enum EventType {
+ // TIMER EVENTS.
+ kTimerEvent = 5,
+
+ // HOTSPOT EVENTS.
+ kMouseDownEvent = 6,
+ kMouseUpEvent = 7,
+ kMouseMovedEvent = 8,
+ kMouseEnteredEvent = 9,
+ kMouseExitedEvent = 10,
+ kKeyDownEvent = 13, // PARAMS: 1 - ASCII code.
+
+ // SOUND EVENTS.
+ kSoundEndEvent = 14,
+ kSoundAbortEvent = 19,
+ kSoundFailureEvent = 20,
+ kSoundStoppedEvent = 29,
+ kSoundBeginEvent = 30,
+
+ // MOVIE EVENTS.
+ kMovieEndEvent = 15,
+ kMovieAbortEvent = 21,
+ kMovieFailureEvent = 22,
+ kMovieStoppedEvent = 31,
+ kMovieBeginEvent = 32,
+
+ //SPRITE EVENTS.
+ // Just "MovieEnd" in source.
+ kSpriteMovieEndEvent = 23,
+
+ // SCREEN EVENTS.
+ kEntryEvent = 17,
+ kExitEvent = 27,
+
+ // CONTEXT EVENTS.
+ kLoadCompleteEvent = 44, // PARAMS: 1 - Context ID
+
+ // TEXT EVENTS.
+ kInputEvent = 37,
+ kErrorEvent = 38,
+
+ // CAMERA EVENTS.
+ kPanAbortEvent = 43,
+ kPanEndEvent = 42,
+
+ // PATH EVENTS.
+ kStepEvent = 28,
+ kPathStoppedEvent = 33,
+ kPathEndEvent = 16
+};
+
+enum EventHandlerArgumentType {
+ kNullEventHandlerArgument = 0,
+ kAsciiCodeEventHandlerArgument = 1, // TODO: Why is this datum type a float?
+ kTimeEventHandlerArgument = 3,
+ kUnk1EventHandlerArgument = 4, // Appars to happen with MovieStart?
+ kContextEventHandlerArgument = 5
+};
+
+enum OperandType {
+ kOperandTypeEmpty = 0, // a flag for C++ code, not real operand type.
+ // TODO: Figure out the difference between these two.
+ kOperandTypeLiteral1 = 151,
+ kOperandTypeLiteral2 = 153,
+ // TODO: Figure out the difference between these two.
+ kOperandTypeFloat1 = 152,
+ kOperandTypeFloat2 = 157,
+ kOperandTypeString = 154,
+ // TODO: This only seems to be used in effectTransition:
+ // effectTransition ( $FadeToPalette )
+ // compiles to:
+ // [219, 102, 1]
+ // [155, 301]
+ kOperandTypeDollarSignVariable = 155,
+ kOperandTypeAssetId = 156,
+ kOperandTypeVariableDeclaration = 158,
+ kOperandTypeFunction = 160
+};
+
+enum VariableType {
+ // This is an invalid type used for initialization only.
+ kVariableTypeEmpty = 0x0000,
+
+ // This is an "array", but the IMT sources
+ // use the term "collection".
+ kVariableTypeCollection = 0x0007,
+ kVariableTypeString = 0x0006,
+ kVariableTypeAssetId = 0x0005,
+ // These seem to be used in Dalmatians, but I don't know what they are
+ // used for.
+ kVariableTypeUnk1 = 0x0004,
+ // These seem to be constants of some sort? This is what some of these
+ // IDs look like in PROFILE._ST:
+ // - $downEar 10026
+ // - $sitDown 10027
+ // Seems like these can also reference variables:
+ // - var_6c14_bool_FirstThingLev3 315
+ // - var_6c14_NextEncouragementSound 316
+ kVariableTypeUnk2 = 0x0003,
+ kVariableTypeBoolean = 0x0002,
+ kVariableTypeLiteral = 0x0001
+};
+
} // End of namespace MediaStation
#endif
\ No newline at end of file
diff --git a/engines/mediastation/mediascript/codechunk.h b/engines/mediastation/mediascript/codechunk.h
index caa4fbe00e3..864d693c114 100644
--- a/engines/mediastation/mediascript/codechunk.h
+++ b/engines/mediastation/mediascript/codechunk.h
@@ -31,52 +31,6 @@
namespace MediaStation {
-enum InstructionType {
- kInstructionTypeEmpty = 0x0000,
- kInstructionTypeFunctionCall = 0x0067,
- kInstructionTypeOperand = 0x0066,
- kInstructionTypeVariableRef = 0x0065
-};
-
-enum Opcode {
- kOpcodeIfElse = 202,
- kOpcodeAssignVariable = 203,
- kOpcodeOr = 204,
- kOpcodeAnd = 206,
- kOpcodeEquals = 207,
- kOpcodeNotEquals = 208,
- kOpcodeLessThan = 209,
- kOpcodeGreaterThan = 210,
- kOpcodeLessThanOrEqualTo = 211,
- kOpcodeGreaterThanOrEqualTo = 212,
- kOpcodeAdd = 213,
- kOpcodeSubtract = 214,
- kOpcodeMultiply = 215,
- kOpcodeDivide = 216,
- kOpcodeModulo = 217,
- kOpcodeUnk2 = 218, // TODO: Likely something with ## constants like ##DOWN?
- kOpcodeCallRoutine = 219,
- // Method calls are like routine calls, but they have an implicit "self"
- // parameter that is always the first. For example:
- // @self . mouseActivate ( TRUE ) ;
- kOpcodeCallMethod = 220,
- // This seems to appear at the start of a function to declare the number of
- // local variables used in the function. It seems to be the `Declare`
- // keyword. In the observed examples, the number of variables to create is
- // given, then the next instructions are variable assignments for that number
- // of variables.
- kOpcodeDeclareVariables = 221,
- kOpcodeWhile = 224,
- kOpcodeReturn = 222,
- kOpcodeUnk1 = 223
-};
-
-enum VariableScope {
- kVariableScopeLocal = 1,
- kVariableScopeParameter = 2,
- kVariableScopeGlobal = 4
-};
-
class CodeChunk {
public:
CodeChunk(Common::SeekableReadStream &chunk);
diff --git a/engines/mediastation/mediascript/eventhandler.h b/engines/mediastation/mediascript/eventhandler.h
index c73c6f2313c..4f076e728fa 100644
--- a/engines/mediastation/mediascript/eventhandler.h
+++ b/engines/mediastation/mediascript/eventhandler.h
@@ -25,68 +25,10 @@
#include "mediastation/datafile.h"
#include "mediastation/datum.h"
#include "mediastation/mediascript/codechunk.h"
+#include "mediastation/mediascript/builtins.h"
namespace MediaStation {
-enum EventType {
- // TIMER EVENTS.
- kTimerEvent = 5,
-
- // HOTSPOT EVENTS.
- kMouseDownEvent = 6,
- kMouseUpEvent = 7,
- kMouseMovedEvent = 8,
- kMouseEnteredEvent = 9,
- kMouseExitedEvent = 10,
- kKeyDownEvent = 13, // PARAMS: 1 - ASCII code.
-
- // SOUND EVENTS.
- kSoundEndEvent = 14,
- kSoundAbortEvent = 19,
- kSoundFailureEvent = 20,
- kSoundStoppedEvent = 29,
- kSoundBeginEvent = 30,
-
- // MOVIE EVENTS.
- kMovieEndEvent = 15,
- kMovieAbortEvent = 21,
- kMovieFailureEvent = 22,
- kMovieStoppedEvent = 31,
- kMovieBeginEvent = 32,
-
- //SPRITE EVENTS.
- // Just "MovieEnd" in source.
- kSpriteMovieEndEvent = 23,
-
- // SCREEN EVENTS.
- kEntryEvent = 17,
- kExitEvent = 27,
-
- // CONTEXT EVENTS.
- kLoadCompleteEvent = 44, // PARAMS: 1 - Context ID
-
- // TEXT EVENTS.
- kInputEvent = 37,
- kErrorEvent = 38,
-
- // CAMERA EVENTS.
- kPanAbortEvent = 43,
- kPanEndEvent = 42,
-
- // PATH EVENTS.
- kStepEvent = 28,
- kPathStoppedEvent = 33,
- kPathEndEvent = 16
-};
-
-enum EventHandlerArgumentType {
- kNullEventHandlerArgument = 0,
- kAsciiCodeEventHandlerArgument = 1, // TODO: Why is this datum type a float?
- kTimeEventHandlerArgument = 3,
- kUnk1EventHandlerArgument = 4, // Appars to happen with MovieStart?
- kContextEventHandlerArgument = 5
-};
-
class EventHandler {
public:
EventHandler(Chunk &chunk);
diff --git a/engines/mediastation/mediascript/operand.h b/engines/mediastation/mediascript/operand.h
index a833258afcc..78b4f2087f7 100644
--- a/engines/mediastation/mediascript/operand.h
+++ b/engines/mediastation/mediascript/operand.h
@@ -24,32 +24,13 @@
#include "common/array.h"
+#include "mediastation/mediascript/builtins.h"
#include "mediastation/mediascript/variable.h"
namespace MediaStation {
class Asset;
-enum OperandType {
- kOperandTypeEmpty = 0, // a flag for C++ code, not real operand type.
- // TODO: Figure out the difference between these two.
- kOperandTypeLiteral1 = 151,
- kOperandTypeLiteral2 = 153,
- // TODO: Figure out the difference between these two.
- kOperandTypeFloat1 = 152,
- kOperandTypeFloat2 = 157,
- kOperandTypeString = 154,
- // TODO: This only seems to be used in effectTransition:
- // effectTransition ( $FadeToPalette )
- // compiles to:
- // [219, 102, 1]
- // [155, 301]
- kOperandTypeDollarSignVariable = 155,
- kOperandTypeAssetId = 156,
- kOperandTypeVariableDeclaration = 158,
- kOperandTypeFunction = 160
-};
-
class Operand {
public:
Operand() : _type(kOperandTypeEmpty) {}
diff --git a/engines/mediastation/mediascript/variable.h b/engines/mediastation/mediascript/variable.h
index 725ad02b621..416b9af29b0 100644
--- a/engines/mediastation/mediascript/variable.h
+++ b/engines/mediastation/mediascript/variable.h
@@ -31,30 +31,6 @@ namespace MediaStation {
class Operand;
-enum VariableType {
- // This is an invalid type used for initialization only.
- kVariableTypeEmpty = 0x0000,
-
- // This is an "array", but the IMT sources
- // use the term "collection".
- kVariableTypeCollection = 0x0007,
- kVariableTypeString = 0x0006,
- kVariableTypeAssetId = 0x0005,
- // These seem to be used in Dalmatians, but I don't know what they are
- // used for.
- kVariableTypeUnk1 = 0x0004,
- // These seem to be constants of some sort? This is what some of these
- // IDs look like in PROFILE._ST:
- // - $downEar 10026
- // - $sitDown 10027
- // Seems like these can also reference variables:
- // - var_6c14_bool_FirstThingLev3 315
- // - var_6c14_NextEncouragementSound 316
- kVariableTypeUnk2 = 0x0003,
- kVariableTypeBoolean = 0x0002,
- kVariableTypeLiteral = 0x0001
-};
-
class Variable {
public:
uint32 _id = 0;
diff --git a/engines/mediastation/mediastation.cpp b/engines/mediastation/mediastation.cpp
index dc66ad89c01..0c2435b88b8 100644
--- a/engines/mediastation/mediastation.cpp
+++ b/engines/mediastation/mediastation.cpp
@@ -35,6 +35,7 @@
#include "mediastation/context.h"
#include "mediastation/asset.h"
#include "mediastation/assets/movie.h"
+#include "mediastation/mediascript/builtins.h"
namespace MediaStation {
Commit: 146d33f2f5f8be3e130946e349ef24a13ab7c662
https://github.com/scummvm/scummvm/commit/146d33f2f5f8be3e130946e349ef24a13ab7c662
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2025-01-12T22:28:15-05:00
Commit Message:
MEDIASTATION: Clean up include statements
These had become seriously unmaintained, with a lot of unnecessary
includes, as well as relying on indirect inclusion for others.
This change generally clarifies the dependencies of each
compilation unit clear while removing unused includes.
Changed paths:
engines/mediastation/assetheader.h
engines/mediastation/assets/font.h
engines/mediastation/assets/image.h
engines/mediastation/assets/movie.h
engines/mediastation/assets/sprite.h
engines/mediastation/assets/text.h
engines/mediastation/assets/timer.h
engines/mediastation/bitmap.h
engines/mediastation/boot.cpp
engines/mediastation/boot.h
engines/mediastation/chunk.h
engines/mediastation/context.h
engines/mediastation/contextparameters.h
engines/mediastation/datafile.h
engines/mediastation/datum.cpp
engines/mediastation/datum.h
engines/mediastation/mediascript/eventhandler.h
engines/mediastation/mediascript/function.cpp
engines/mediastation/mediascript/function.h
engines/mediastation/mediascript/operand.h
engines/mediastation/mediascript/variable.h
engines/mediastation/subfile.cpp
engines/mediastation/subfile.h
diff --git a/engines/mediastation/assetheader.h b/engines/mediastation/assetheader.h
index 6489afbcea1..4f0b2713840 100644
--- a/engines/mediastation/assetheader.h
+++ b/engines/mediastation/assetheader.h
@@ -22,6 +22,8 @@
#ifndef MEDIASTATION_ASSET_HEADER_H
#define MEDIASTATION_ASSET_HEADER_H
+#include "common/str.h"
+#include "common/rect.h"
#include "common/hashmap.h"
#include "graphics/palette.h"
diff --git a/engines/mediastation/assets/font.h b/engines/mediastation/assets/font.h
index 57af138f110..4810ad45ebc 100644
--- a/engines/mediastation/assets/font.h
+++ b/engines/mediastation/assets/font.h
@@ -25,6 +25,7 @@
#include "mediastation/asset.h"
#include "mediastation/assetheader.h"
#include "mediastation/bitmap.h"
+#include "mediastation/chunk.h"
#include "mediastation/mediascript/operand.h"
#include "mediastation/mediascript/builtins.h"
diff --git a/engines/mediastation/assets/image.h b/engines/mediastation/assets/image.h
index 9d3b91604d9..d4518ac5af9 100644
--- a/engines/mediastation/assets/image.h
+++ b/engines/mediastation/assets/image.h
@@ -22,11 +22,8 @@
#ifndef MEDIASTATION_IMAGE_H
#define MEDIASTATION_IMAGE_H
-#include "graphics/managed_surface.h"
-
#include "mediastation/asset.h"
#include "mediastation/chunk.h"
-#include "mediastation/subfile.h"
#include "mediastation/bitmap.h"
#include "mediastation/assetheader.h"
#include "mediastation/mediascript/operand.h"
diff --git a/engines/mediastation/assets/movie.h b/engines/mediastation/assets/movie.h
index 6f6e45267b7..d35f89de183 100644
--- a/engines/mediastation/assets/movie.h
+++ b/engines/mediastation/assets/movie.h
@@ -22,8 +22,11 @@
#ifndef MEDIASTATION_MOVIE_H
#define MEDIASTATION_MOVIE_H
+#include "common/array.h"
#include "audio/audiostream.h"
+#include "mediastation/subfile.h"
+#include "mediastation/chunk.h"
#include "mediastation/assetheader.h"
#include "mediastation/bitmap.h"
#include "mediastation/mediascript/builtins.h"
diff --git a/engines/mediastation/assets/sprite.h b/engines/mediastation/assets/sprite.h
index b34191cf767..eafa096e4dc 100644
--- a/engines/mediastation/assets/sprite.h
+++ b/engines/mediastation/assets/sprite.h
@@ -22,8 +22,12 @@
#ifndef MEDIASTATION_SPRITE_H
#define MEDIASTATION_SPRITE_H
+#include "common/rect.h"
+#include "common/array.h"
+
#include "mediastation/asset.h"
#include "mediastation/assetheader.h"
+#include "mediastation/chunk.h"
#include "mediastation/bitmap.h"
#include "mediastation/mediascript/operand.h"
#include "mediastation/mediascript/builtins.h"
diff --git a/engines/mediastation/assets/text.h b/engines/mediastation/assets/text.h
index cc1a0996179..2c6dee0fe9c 100644
--- a/engines/mediastation/assets/text.h
+++ b/engines/mediastation/assets/text.h
@@ -22,6 +22,8 @@
#ifndef MEDIASTATION_TEXT_H
#define MEDIASTATION_TEXT_H
+#include "common/str.h"
+
#include "mediastation/asset.h"
#include "mediastation/assetheader.h"
#include "mediastation/mediascript/operand.h"
diff --git a/engines/mediastation/assets/timer.h b/engines/mediastation/assets/timer.h
index 0a53f8dabd4..5d008a37bd4 100644
--- a/engines/mediastation/assets/timer.h
+++ b/engines/mediastation/assets/timer.h
@@ -22,6 +22,7 @@
#ifndef MEDIASTATION_TIMER_H
#define MEDIASTATION_TIMER_H
+#include "mediastation/asset.h"
#include "mediastation/assetheader.h"
#include "mediastation/mediascript/operand.h"
#include "mediastation/mediascript/builtins.h"
diff --git a/engines/mediastation/bitmap.h b/engines/mediastation/bitmap.h
index 7604f7a6e77..dca3986e506 100644
--- a/engines/mediastation/bitmap.h
+++ b/engines/mediastation/bitmap.h
@@ -22,6 +22,7 @@
#ifndef MEDIASTATION_BITMAP_H
#define MEDIASTATION_BITMAP_H
+#include "common/rect.h"
#include "graphics/managed_surface.h"
#include "mediastation/chunk.h"
diff --git a/engines/mediastation/boot.cpp b/engines/mediastation/boot.cpp
index 353664722fe..4427ea86987 100644
--- a/engines/mediastation/boot.cpp
+++ b/engines/mediastation/boot.cpp
@@ -21,8 +21,6 @@
#include "mediastation/boot.h"
#include "mediastation/datum.h"
-#include "mediastation/subfile.h"
-#include "mediastation/chunk.h"
#include "mediastation/debugchannels.h"
namespace MediaStation {
diff --git a/engines/mediastation/boot.h b/engines/mediastation/boot.h
index 8337d80e28f..b74fe001226 100644
--- a/engines/mediastation/boot.h
+++ b/engines/mediastation/boot.h
@@ -22,8 +22,14 @@
#ifndef MEDIASTATION_BOOT_H
#define MEDIASTATION_BOOT_H
-#include "mediastation/datafile.h"
+#include "common/path.h"
+#include "common/str.h"
+#include "common/array.h"
+#include "common/hashmap.h"
+
#include "mediastation/subfile.h"
+#include "mediastation/chunk.h"
+#include "mediastation/datafile.h"
namespace MediaStation {
diff --git a/engines/mediastation/chunk.h b/engines/mediastation/chunk.h
index 46478bf981f..b553b049e18 100644
--- a/engines/mediastation/chunk.h
+++ b/engines/mediastation/chunk.h
@@ -22,6 +22,7 @@
#ifndef MEDIASTATION_CHUNK_H
#define MEDIASTATION_CHUNK_H
+#include "common/stream.h"
#include "common/file.h"
namespace MediaStation {
diff --git a/engines/mediastation/context.h b/engines/mediastation/context.h
index 71a4e20b834..6b3e19b7746 100644
--- a/engines/mediastation/context.h
+++ b/engines/mediastation/context.h
@@ -22,6 +22,10 @@
#ifndef MEDIASTATION_CONTEXT_H
#define MEDIASTATION_CONTEXT_H
+#include "graphics/palette.h"
+#include "common/path.h"
+#include "common/hashmap.h"
+
#include "mediastation/datafile.h"
#include "mediastation/contextparameters.h"
#include "mediastation/assetheader.h"
diff --git a/engines/mediastation/contextparameters.h b/engines/mediastation/contextparameters.h
index 2bd95946f04..034970b1ada 100644
--- a/engines/mediastation/contextparameters.h
+++ b/engines/mediastation/contextparameters.h
@@ -22,7 +22,10 @@
#ifndef MEDIASTATION_CONTEXTPARAMETERS_H
#define MEDIASTATION_CONTEXTPARAMETERS_H
-#include "mediastation/mediastation.h"
+#include "common/str.h"
+#include "common/hashmap.h"
+
+#include "mediastation/chunk.h"
#include "mediastation/mediascript/variable.h"
#include "mediastation/mediascript/function.h"
diff --git a/engines/mediastation/datafile.h b/engines/mediastation/datafile.h
index a84849f5120..d4e97b2df7e 100644
--- a/engines/mediastation/datafile.h
+++ b/engines/mediastation/datafile.h
@@ -22,7 +22,8 @@
#ifndef MEDIASTATION_DATAFILE_H
#define MEDIASTATION_DATAFILE_H
-#include "common/file.h"
+#include "common/path.h"
+#include "common/stream.h"
namespace MediaStation {
diff --git a/engines/mediastation/datum.cpp b/engines/mediastation/datum.cpp
index a591513984c..56f6381ca87 100644
--- a/engines/mediastation/datum.cpp
+++ b/engines/mediastation/datum.cpp
@@ -19,8 +19,6 @@
*
*/
-#include "mediastation/mediastation.h"
-#include "mediastation/chunk.h"
#include "mediastation/datum.h"
#include "mediastation/debugchannels.h"
diff --git a/engines/mediastation/datum.h b/engines/mediastation/datum.h
index 9bde4fea84f..ba7bed3f7d5 100644
--- a/engines/mediastation/datum.h
+++ b/engines/mediastation/datum.h
@@ -23,7 +23,9 @@
#define MEDIASTATION_DATUM_H
#include "common/str.h"
+#include "common/array.h"
#include "common/rect.h"
+#include "common/stream.h"
#include "mediastation/chunk.h"
diff --git a/engines/mediastation/mediascript/eventhandler.h b/engines/mediastation/mediascript/eventhandler.h
index 4f076e728fa..462dcef65c4 100644
--- a/engines/mediastation/mediascript/eventhandler.h
+++ b/engines/mediastation/mediascript/eventhandler.h
@@ -22,7 +22,7 @@
#ifndef MEDIASTATION_MEDIASCRIPT_EVENTHANDLER_H
#define MEDIASTATION_MEDIASCRIPT_EVENTHANDLER_H
-#include "mediastation/datafile.h"
+#include "mediastation/chunk.h"
#include "mediastation/datum.h"
#include "mediastation/mediascript/codechunk.h"
#include "mediastation/mediascript/builtins.h"
diff --git a/engines/mediastation/mediascript/function.cpp b/engines/mediastation/mediascript/function.cpp
index 6a51ecd4152..3dc5dd8a868 100644
--- a/engines/mediastation/mediascript/function.cpp
+++ b/engines/mediastation/mediascript/function.cpp
@@ -19,8 +19,6 @@
*
*/
-#include "common/array.h"
-
#include "mediastation/datum.h"
#include "mediastation/mediascript/function.h"
#include "mediastation/debugchannels.h"
diff --git a/engines/mediastation/mediascript/function.h b/engines/mediastation/mediascript/function.h
index 4db14d8cb18..70bdeab49fc 100644
--- a/engines/mediastation/mediascript/function.h
+++ b/engines/mediastation/mediascript/function.h
@@ -22,7 +22,9 @@
#ifndef MEDIASTATION_MEDIASCRIPT_FUNCTION_H
#define MEDIASTATION_MEDIASCRIPT_FUNCTION_H
-#include "mediastation/datafile.h"
+#include "common/array.h"
+
+#include "mediastation/chunk.h"
#include "mediastation/mediascript/codechunk.h"
namespace MediaStation {
diff --git a/engines/mediastation/mediascript/operand.h b/engines/mediastation/mediascript/operand.h
index 78b4f2087f7..961a1fc204e 100644
--- a/engines/mediastation/mediascript/operand.h
+++ b/engines/mediastation/mediascript/operand.h
@@ -22,7 +22,7 @@
#ifndef MEDIASTATION_MEDIASCRIPT_OPERAND_H
#define MEDIASTATION_MEDIASCRIPT_OPERAND_H
-#include "common/array.h"
+#include "common/str.h"
#include "mediastation/mediascript/builtins.h"
#include "mediastation/mediascript/variable.h"
diff --git a/engines/mediastation/mediascript/variable.h b/engines/mediastation/mediascript/variable.h
index 416b9af29b0..8dea315341e 100644
--- a/engines/mediastation/mediascript/variable.h
+++ b/engines/mediastation/mediascript/variable.h
@@ -22,8 +22,10 @@
#ifndef MEDIASTATION_MEDIASCRIPT_VARIABLE_DECLARATION_H
#define MEDIASTATION_MEDIASCRIPT_VARIABLE_DECLARATION_H
+#include "common/str.h"
+#include "common/array.h"
+
#include "mediastation/chunk.h"
-#include "mediastation/datafile.h"
#include "mediastation/datum.h"
#include "mediastation/mediascript/builtins.h"
diff --git a/engines/mediastation/subfile.cpp b/engines/mediastation/subfile.cpp
index 173fd9fbdf1..49d562ee140 100644
--- a/engines/mediastation/subfile.cpp
+++ b/engines/mediastation/subfile.cpp
@@ -19,8 +19,6 @@
*
*/
-#include "mediastation/mediastation.h"
-#include "mediastation/chunk.h"
#include "mediastation/subfile.h"
#include "mediastation/debugchannels.h"
diff --git a/engines/mediastation/subfile.h b/engines/mediastation/subfile.h
index 194edccbf72..5bfbbe369fd 100644
--- a/engines/mediastation/subfile.h
+++ b/engines/mediastation/subfile.h
@@ -22,6 +22,8 @@
#ifndef MEDIASTATION_SUBFILE_H
#define MEDIASTATION_SUBFILE_H
+#include "common/stream.h"
+
#include "mediastation/chunk.h"
namespace MediaStation {
More information about the Scummvm-git-logs
mailing list