aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2020-01-01 02:54:45 +0100
committerEugene Sandulenko2020-01-01 02:54:45 +0100
commit7121a915d85a49a1e1111e282a1fee992152e5ea (patch)
tree47e01e5a92d5f2535683f10177a47df383d358e7
parent3258dd98791c8e5645e7b801472cddbf3d1eda54 (diff)
downloadscummvm-rg350-7121a915d85a49a1e1111e282a1fee992152e5ea.tar.gz
scummvm-rg350-7121a915d85a49a1e1111e282a1fee992152e5ea.tar.bz2
scummvm-rg350-7121a915d85a49a1e1111e282a1fee992152e5ea.zip
DIRECTOR: Move more enums to types.h
-rw-r--r--engines/director/lingo/lingo.h39
-rw-r--r--engines/director/types.h40
2 files changed, 40 insertions, 39 deletions
diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index dcc1bfa5ad..a6d45b6cea 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -44,45 +44,6 @@ struct LingoV4TheEntity;
class DirectorEngine;
class Frame;
-enum LEvent {
- kEventPrepareMovie,
- kEventStartMovie,
- kEventStepMovie,
- kEventStopMovie,
-
- kEventNew,
- kEventBeginSprite,
- kEventEndSprite,
-
- kEventNone,
- kEventEnterFrame,
- kEventPrepareFrame,
- kEventIdle,
- kEventStepFrame,
- kEventExitFrame,
- kEventTimeout,
-
- kEventActivateWindow,
- kEventDeactivateWindow,
- kEventMoveWindow,
- kEventResizeWindow,
- kEventOpenWindow,
- kEventCloseWindow,
-
- kEventKeyUp,
- kEventKeyDown,
- kEventMouseUp,
- kEventMouseDown,
- kEventRightMouseUp,
- kEventRightMouseDown,
- kEventMouseEnter,
- kEventMouseLeave,
- kEventMouseUpOutSide,
- kEventMouseWithin,
-
- kEventStart
-};
-
enum LexerDefineState {
kStateNone,
kStateInDef,
diff --git a/engines/director/types.h b/engines/director/types.h
index dad660d08c..0ed33550a4 100644
--- a/engines/director/types.h
+++ b/engines/director/types.h
@@ -135,6 +135,46 @@ enum InkType {
kInkTypeDark
};
+enum LEvent {
+ kEventPrepareMovie,
+ kEventStartMovie,
+ kEventStepMovie,
+ kEventStopMovie,
+
+ kEventNew,
+ kEventBeginSprite,
+ kEventEndSprite,
+
+ kEventNone,
+ kEventEnterFrame,
+ kEventPrepareFrame,
+ kEventIdle,
+ kEventStepFrame,
+ kEventExitFrame,
+ kEventTimeout,
+
+ kEventActivateWindow,
+ kEventDeactivateWindow,
+ kEventMoveWindow,
+ kEventResizeWindow,
+ kEventOpenWindow,
+ kEventCloseWindow,
+
+ kEventKeyUp,
+ kEventKeyDown,
+ kEventMouseUp,
+ kEventMouseDown,
+ kEventRightMouseUp,
+ kEventRightMouseDown,
+ kEventMouseEnter,
+ kEventMouseLeave,
+ kEventMouseUpOutSide,
+ kEventMouseWithin,
+
+ kEventStart
+};
+
+
const char *scriptType2str(ScriptType scr);
} // End of namespace Director