diff options
| author | Scott Percival | 2019-11-28 23:04:12 +0800 |
|---|---|---|
| committer | Scott Percival | 2019-12-02 21:57:09 +0800 |
| commit | 97caeed249f48f3d4316d9451e0b23c39855ee41 (patch) | |
| tree | 80b8cae1d85a3a920837e8aa91d903fdb7552508 | |
| parent | cc62053b5f4b1a1eec8bf0ab4f5e34b670d5c1b8 (diff) | |
| download | scummvm-rg350-97caeed249f48f3d4316d9451e0b23c39855ee41.tar.gz scummvm-rg350-97caeed249f48f3d4316d9451e0b23c39855ee41.tar.bz2 scummvm-rg350-97caeed249f48f3d4316d9451e0b23c39855ee41.zip | |
DIRECTOR: Change kTheLast to a TheFieldType
| -rw-r--r-- | engines/director/lingo/lingo-the.cpp | 9 | ||||
| -rw-r--r-- | engines/director/lingo/lingo-the.h | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp index 4ba8eec34e..fb95284a95 100644 --- a/engines/director/lingo/lingo-the.cpp +++ b/engines/director/lingo/lingo-the.cpp @@ -65,7 +65,6 @@ TheEntity entities[] = { { kTheKeyDownScript, "keyDownScript", false }, // D2 p { kTheKeyUpScript, "keyUpScript", false }, // D4 p { kTheLabelList, "labelList", false }, // D3 f - { kTheLast, "last", false }, // D4 f { kTheLastClick, "lastClick", false }, // D2 f { kTheLastEvent, "lastEvent", false }, // D2 f { kTheLastFrame, "lastFrame", false }, // D4 p @@ -128,7 +127,7 @@ TheEntity entities[] = { { kTheStillDown, "stillDown", false }, // D2 f { kTheSwitchColorDepth, "switchColorDepth", false }, // D2 p { kTheTicks, "ticks", false }, // D2 f - { kTheTimeoutKeydown, "timeoutKeydown", false }, // D2 p + { kTheTimeoutKeyDown, "timeoutKeyDown", false }, // D2 p { kTheTimeoutLapsed, "timeoutLapsed", false }, // D2 p { kTheTimeoutLength, "timeoutLength", false }, // D2 p { kTheTimeoutMouse, "timeoutMouse", false }, // D2 p @@ -224,7 +223,7 @@ TheEntityField fields[] = { // Field fields { kTheField, "textAlign", kTheTextAlign }, // D3 p { kTheField, "textFont", kTheTextFont }, // D3 p - { kTheField, "textHeight", kTheTextheight }, // D3 p + { kTheField, "textHeight", kTheTextHeight }, // D3 p { kTheField, "textSize", kTheTextSize }, // D3 p { kTheField, "textStyle", kTheTextStyle }, // D3 p @@ -247,11 +246,15 @@ TheEntityField fields[] = { { kTheCastMembers, "number", kTheNumber }, // D3 p { kTheChars, "number", kTheNumber }, // D3 p + { kTheChars, "last", kTheLast }, // D4 f { kTheItems, "number", kTheNumber }, // D3 p + { kTheItems, "last", kTheLast }, // D4 f { kTheLines, "number", kTheNumber }, // D3 p + { kTheLines, "last", kTheLast }, // D4 f { kTheMenuItems,"number", kTheNumber }, // D3 p { kTheMenus, "number", kTheNumber }, // D3 p { kTheWords, "number", kTheNumber }, // D3 p + { kTheWords, "last", kTheLast }, // D4 f { kTheDate, "short", kTheShort }, // D3 f { kTheDate, "long", kTheLong }, // D3 f diff --git a/engines/director/lingo/lingo-the.h b/engines/director/lingo/lingo-the.h index 173efe6bbe..9cedbbbc48 100644 --- a/engines/director/lingo/lingo-the.h +++ b/engines/director/lingo/lingo-the.h @@ -63,7 +63,6 @@ enum TheEntityType { kTheKeyDownScript, kTheKeyUpScript, kTheLabelList, - kTheLast, kTheLastClick, kTheLastEvent, kTheLastFrame, @@ -127,7 +126,7 @@ enum TheEntityType { kTheSwitchColorDepth, kTheTicks, kTheTime, - kTheTimeoutKeydown, + kTheTimeoutKeyDown, kTheTimeoutLapsed, kTheTimeoutLength, kTheTimeoutMouse, @@ -170,6 +169,7 @@ enum TheFieldType { kTheHilite, kTheImmediate, kTheInk, + kTheLast, kTheLeft, kTheLineSize, kTheLoaded, @@ -209,7 +209,7 @@ enum TheFieldType { kTheText, kTheTextAlign, kTheTextFont, - kTheTextheight, + kTheTextHeight, kTheTextSize, kTheTextStyle, kTheTitle, |