aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/director/lingo/lingo-events.cpp12
-rw-r--r--engines/director/lingo/lingo-lex.l8
-rw-r--r--engines/director/lingo/lingo-the.cpp17
3 files changed, 7 insertions, 30 deletions
diff --git a/engines/director/lingo/lingo-events.cpp b/engines/director/lingo/lingo-events.cpp
index fe64b80e29..2a04a57e88 100644
--- a/engines/director/lingo/lingo-events.cpp
+++ b/engines/director/lingo/lingo-events.cpp
@@ -34,9 +34,9 @@ struct EventHandlerType {
const char *name;
} static const eventHandlerDescs[] = {
{ kEventPrepareMovie, "prepareMovie" },
- { kEventStartMovie, "startMovie" }, // D3?
- { kEventStepMovie, "stepMovie" }, // D3?
- { kEventStopMovie, "stopMovie" }, // D3?
+ { kEventStartMovie, "startMovie" }, // D3
+ { kEventStepMovie, "stepMovie" }, // D3
+ { kEventStopMovie, "stopMovie" }, // D3
{ kEventNew, "newSprite" },
{ kEventBeginSprite, "beginSprite" },
@@ -44,7 +44,7 @@ struct EventHandlerType {
{ kEventEnterFrame, "enterFrame" }, // D4
{ kEventPrepareFrame, "prepareFrame" },
- { kEventIdle, "idle" },
+ { kEventIdle, "idle" }, // D3
{ kEventStepFrame, "stepFrame"},
{ kEventExitFrame, "exitFrame" }, // D4
@@ -58,8 +58,8 @@ struct EventHandlerType {
{ kEventKeyUp, "keyUp" }, // D4
{ kEventKeyDown, "keyDown" }, // D2 w D4 (as when from D2)
- { kEventMouseUp, "mouseUp" }, // D2 w D3?
- { kEventMouseDown, "mouseDown" }, // D2 w D3?
+ { kEventMouseUp, "mouseUp" }, // D2 w D3
+ { kEventMouseDown, "mouseDown" }, // D2 w D3
{ kEventRightMouseDown, "rightMouseDown" },
{ kEventRightMouseUp, "rightMouseUp" },
{ kEventMouseEnter, "mouseEnter" },
diff --git a/engines/director/lingo/lingo-lex.l b/engines/director/lingo/lingo-lex.l
index fc554259a9..13a1db9c00 100644
--- a/engines/director/lingo/lingo-lex.l
+++ b/engines/director/lingo/lingo-lex.l
@@ -163,14 +163,6 @@ whitespace [\t ]
(?i:set) { count(); return tSET; }
(?i:starts) { count(); return tSTARTS; }
(?i:tell) { count(); return tTELL; }
-(?i:the[ \t]+last[\t ]+of[\t ]+) {
- count();
-
- yylval.e[0] = g_lingo->_theEntities["last"]->entity;
- yylval.e[1] = 0; // No field
-
- return THEENTITYWITHID;
- }
(?i:the[ \t]+sqrt[\t ]+of[\t ]+) {
count();
diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index 97d8687626..091ea4c601 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -41,7 +41,6 @@ TheEntity entities[] = {
{ kTheCast, "cast", true, 2 }, // D2
{ kTheCastMembers, "castmembers", false, 3 }, // D3
{ kTheCenterStage, "centerStage", false, 2 }, // D2 p
- { kTheChars, "chars", false, 3 }, // D3
{ kTheCheckBoxAccess, "checkBoxAccess", false, 2 }, // D2 p
{ kTheCheckBoxType, "checkBoxType", false, 2 }, // D2 p
{ kTheClickLoc, "clickLoc", false, 4 }, // D4 function
@@ -64,7 +63,6 @@ TheEntity entities[] = {
{ kTheFreeBytes, "freeBytes", false, 2 }, // D2 f
{ kTheFullColorPermit, "fullColorPermit", false, 2 }, // D2 p
{ kTheImageDirect, "imageDirect", false, 2 }, // D2 p
- { kTheItems, "items", false, 3 }, // D3
{ kTheItemDelimiter, "itemDelimiter", false, 4 }, // D4 p
{ kTheKey, "key", false, 2 }, // D2 f
{ kTheKeyCode, "keyCode", false, 2 }, // D2 f
@@ -76,12 +74,10 @@ TheEntity entities[] = {
{ kTheLastFrame, "lastFrame", false, 4 }, // D4 p
{ kTheLastKey, "lastKey", false, 2 }, // D2 f
{ kTheLastRoll, "lastRoll", false, 2 }, // D2 f
- { kTheLines, "lines", false, 3 }, // D3
{ kTheMachineType, "machineType", false, 2 }, // D2 f
{ kTheMaxInteger, "maxInteger", false, 3 }, // D3.1 f
{ kTheMemorySize, "memorySize", false, 2 }, // D2 f
{ kTheMenu, "menu", true, 3 }, // D3 p
- { kTheMenus, "menus", false, 3 }, // D3 p
{ kTheMenuItem, "menuitem", true, 3 }, // D3 p
{ kTheMenuItems, "menuitems", false, 3 }, // D3 f
{ kTheMouseCast, "mouseCast", false, 3 }, // D3 f
@@ -147,7 +143,6 @@ TheEntity entities[] = {
{ kTheUpdateMovieEnabled,"updateMovieEnabled",false,4 },// D4 p
{ kTheWindow, "window", true, 4 }, // D4
{ kTheWindowList, "windowList", false, 4 }, // D4 p
- { kTheWords, "words", false, 3 }, // D3
{ kTheNOEntity, NULL, false, 0 }
};
@@ -178,7 +173,6 @@ TheEntityField fields[] = {
{ kTheSprite, "trails", kTheTrails, 3 },// D3.1 p
{ kTheSprite, "type", kTheType, 2 },// D2 p
{ kTheSprite, "visible", kTheVisible, 4 },// D4 p
- { kTheSprite, "volume", kTheVolume, 3 },// D3.1 p
{ kTheSprite, "width", kTheWidth, 2 },// D2 p
// Common cast fields
@@ -214,6 +208,7 @@ TheEntityField fields[] = {
{ kTheSprite, "startTime", kTheStartTime, 3 },// D3.1 p
{ kTheSprite, "stopTime", kTheStopTime, 3 },// D3.1 p
{ kTheCast, "video", kTheVideo, 4 },// D4 p
+ { kTheSprite, "volume", kTheVolume, 3 },// D3.1 p
// Bitmap fields
{ kTheCast, "depth", kTheDepth, 4 },// D4 p
@@ -251,16 +246,6 @@ TheEntityField fields[] = {
{ kTheMenu, "name", kTheName, 3 },// D3 p
{ kTheCastMembers, "number", kTheNumber, 3 },// D3 p
- { kTheChars, "number", kTheNumber, 3 },// D3 p
- { kTheChars, "last", kTheLast, 4 },// D4 f
- { kTheItems, "number", kTheNumber, 3 },// D3 p
- { kTheItems, "last", kTheLast, 4 },// D4 f
- { kTheLines, "number", kTheNumber, 3 },// D3 p
- { kTheLines, "last", kTheLast, 4 },// D4 f
- { kTheMenuItems,"number", kTheNumber, 3 },// D3 p
- { kTheMenus, "number", kTheNumber, 3 },// D3 p
- { kTheWords, "number", kTheNumber, 3 },// D3 p
- { kTheWords, "last", kTheLast, 4 },// D4 f
{ kTheDate, "short", kTheShort, 3 },// D3 f
{ kTheDate, "long", kTheLong, 3 },// D3 f
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 07:21:02 +0000