aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Iskrich2016-06-07 17:43:49 +0300
committerEugene Sandulenko2016-08-03 23:40:36 +0200
commita0276402d0f68e51187249c7c47f375e7bf73f32 (patch)
tree21f2afefa1234cf5d789ea94ca8287c795f0628d
parentcd0e04f672656bdf32e23334e4768d4bece56636 (diff)
downloadscummvm-rg350-a0276402d0f68e51187249c7c47f375e7bf73f32.tar.gz
scummvm-rg350-a0276402d0f68e51187249c7c47f375e7bf73f32.tar.bz2
scummvm-rg350-a0276402d0f68e51187249c7c47f375e7bf73f32.zip
DIRECTOR: Add user actions, sprite, movie events to lingo events
-rw-r--r--engines/director/lingo/lingo.cpp20
-rw-r--r--engines/director/lingo/lingo.h19
2 files changed, 39 insertions, 0 deletions
diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index 94e23fa403..ca2aaf81c2 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -28,6 +28,14 @@ struct EventHandlerType {
LEvent handler;
const char *name;
} static const eventHanlerDescs[] = {
+ { kEventPrepareMovie, "prepareMovie" },
+ { kEventStartMovie, "startMovie" },
+ { kEventStopMovie, "stopMovie" },
+
+ { kEventNew, "newSprite" },
+ { kEventBeginSprite, "beginSprite" },
+ { kEventEndSprite, "endSprite" },
+
{ kEventEnterFrame, "enterFrame" },
{ kEventPrepareFrame, "prepareFrame" },
{ kEventExitFrame, "exitFrame" },
@@ -39,6 +47,18 @@ struct EventHandlerType {
{ kEventOpenWindow, "openWindow" },
{ kEventCloseWindow, "closeWindow" },
{ kEventStart, "start" },
+
+ { kEventKeyUp, "keyUp" },
+ { kEventKeyDown, "keyDown" },
+ { kEventMouseUp, "mouseUp" },
+ { kEventMouseDown, "mouseDown" },
+ { kEventRightMouseDown, "rightMouseDown" },
+ { kEventRightMouseUp, "rightMouseUp" },
+ { kEventMouseEnter, "mouseEnter" },
+ { kEventMouseLeave, "mouseLeave" },
+ { kEventMouseUpOutSide, "mouseUpOutSide" },
+ { kEventMouseWithin "mouseWithin" },
+
{ kEventNone, 0 },
};
diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index b3810a6470..7aa11fb863 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -29,6 +29,14 @@
namespace Director {
enum LEvent {
+ kEventPrepareMovie,
+ kEventStartMovie,
+ kEventStopMovie,
+
+ kEventNew,
+ kEventBeginSprite,
+ kEventEndSprite,
+
kEventNone,
kEventEnterFrame,
kEventPrepareFrame,
@@ -41,6 +49,17 @@ enum LEvent {
kEventOpenWindow,
kEventCloseWindow,
+ kEventKeyUp,
+ kEventKeyDown,
+ kEventMouseUp,
+ kEventMouseDown,
+ kEventRightMouseUp,
+ kEventRightMouseDown,
+ kEventMouseEnter,
+ kEventMouseLeave,
+ kEventMouseUpOutSide,
+ kEventMouseWithin,
+
kEventStart
};