Skip to content
Permalink
Browse files

DIRECTOR: Change kTheLast to a TheFieldType

  • Loading branch information
moralrecordings committed Nov 28, 2019
1 parent cc62053 commit 97caeed249f48f3d4316d9451e0b23c39855ee41
Showing with 9 additions and 6 deletions.
  1. +6 −3 engines/director/lingo/lingo-the.cpp
  2. +3 −3 engines/director/lingo/lingo-the.h
@@ -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
@@ -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,

0 comments on commit 97caeed

Please sign in to comment.
You can’t perform that action at this time.