DIRECTOR: Lingo: Add Menu, MenuItem, key, script entity enum

2 files changed, 70 insertions, 14 deletions

diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index 778c9670a3..168e9ee717 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -29,19 +29,39 @@ static struct TheEntityProto {
 	const char *name;
 	bool hasID;
 } entities[] = {
-	{ kTheFrame,		"frame",		false },
-	{ kThePathName,		"pathname",		false },
-	{ kTheMovie,		"movie",		false },
-	{ kTheMouseH,		"mouseh",		false },
-	{ kTheMouseV,		"mousev",		false },
-	{ kTheSprite,		"sprite",		true  },
-	{ kTheCast,			"cast",			true  },
-	{ kThePerFrameHook,	"perframehook",	false },
-	{ kTheTicks,		"ticks",		false },
-	{ kTheTimer,		"timer",		false },
-	{ kTheTimeoutLength,"timeoutlength",false },
-	{ kTheWindow,		"window",		false },
-
+	{ kTheFrame,			"frame",			false },
+	{ kThePathName,			"pathname",			false },
+	{ kTheMovie,			"movie",			false },
+	{ kTheMouseH,			"mouseh",			false },
+	{ kTheMouseV,			"mousev",			false },
+	{ kTheMouseDownScript,  "mouseDownScript",	false },
+	{ kTheMouseUpScript,  	"mouseUpScript",	false },
+	{ kTheClickOn,			"clickOn",			false },
+	{ kTheDoubleClick,		"doubleClick",		false },
+	{ kTheLastClick,		"lastClick",		false },
+	{ kTheLastFrame,		"lastFrame",		false },
+	{ kTheLastEvent,		"lastEvent",		false },
+	{ kTheMouseUp,			"mouseUp",			false },
+	{ kTheMouseDown,		"mouseDown",		false },
+	{ kTheRightMouseUp,		"rightMouseUp",		false },
+	{ kTheRightMouseDown,	"rightMouseDown",	false },
+	{ kTheStillDown,		"stillDown",		false },
+	{ kTheKey,				"key",				false },
+	{ kTheControlDown,		"controlDown",		false },
+	{ kTheCommandDown,		"commandDown",		false },
+	{ kTheShiftDown,		"shiftDown",		false },
+	{ kTheOptionDown,		"optionDown",		false },
+	{ kTheMenu,				"menu",				true  },
+	{ kTheMenus,			"menus",			false },
+	{ kTheMenuItem,			"menuitem",			true  },
+	{ kTheMenuItems,		"menuitems",		true  },
+	{ kTheSprite,			"sprite",			true  },
+	{ kTheCast,				"cast",				true  },
+	{ kThePerFrameHook,		"perframehook",		false },
+	{ kTheTicks,			"ticks",			false },
+	{ kTheTimer,			"timer",			false },
+	{ kTheTimeoutLength,	"timeoutlength",	false },
+	{ kTheWindow,			"window",			false },
 	{ kTheNOEntity, NULL, false }
 };
 
@@ -112,6 +132,16 @@ static struct TheEntityFieldProto {
 	{ kTheWindow,	"sourceRect",	kTheSourceRect },
 	{ kTheWindow,	"visible",		kTheVisible },
 
+	{ kTheMenuItem,	"checkmark",	kTheCheckMark },
+	{ kTheMenuItem, "enabled",		kTheEnabled },
+	{ kTheMenuItem, "name",			kTheName },
+	{ kTheMenuItem, "name",			kTheScript },
+
+	{ kTheMenu,		"name",			kTheName },
+
+	{ kTheMenuItems,"number",		kTheNumber },
+	{ kTheMenus,	"number",		kTheNumber },
+
 	{ kTheNOEntity, NULL, kTheNOField }
 };
 
diff --git a/engines/director/lingo/lingo-the.h b/engines/director/lingo/lingo-the.h
index fba9924778..6fc62f8736 100644
--- a/engines/director/lingo/lingo-the.h
+++ b/engines/director/lingo/lingo-the.h
@@ -29,22 +29,46 @@ enum TheEntity {
 	kTheNOEntity = 0,
 	kTheFrame = 1,
 	kThePathName,
+	kTheMenu,
+	kTheMenuItem,
+	kTheMenuItems,
+	kTheMenus,
 	kTheMovie,
 	kTheMouseH,
 	kTheMouseV,
+	kTheMouseDownScript,
+	kTheMouseUpScript,
+
 	kTheSprite,
 	kTheCast,
 	kThePerFrameHook,
 	kTheTicks,
 	kTheTimer,
 	kTheTimeoutLength,
-	kTheWindow
+	kTheWindow,
+
+	kTheClickOn,
+	kTheDoubleClick,
+	kTheLastClick,
+	kTheLastFrame,
+	kTheLastEvent,
+	kTheMouseDown,
+	kTheMouseUp,
+	kTheRightMouseUp,
+	kTheRightMouseDown,
+	kTheStillDown,
+	kTheKey,
+	kTheControlDown,
+	kTheCommandDown,
+	kTheShiftDown,
+	kTheOptionDown
 };
 
 enum TheField {
 	kTheNOField = 0,
 	kTheCastNum = 1,
 	kTheCastType,
+	kTheCheckMark,
 	kTheController,
 	kTheCursor,
 	kTheDepth,
@@ -57,6 +81,7 @@ enum TheField {
 	kTheBottom,
 	kTheConstraint,
 	kTheEditableText,
+	kTheEnabled,
 	kTheForeColor,
 	kTheFrameRate,
 	kTheFilename,
@@ -84,6 +109,7 @@ enum TheField {
 	kTheStopTime,
 	kTheStretch,
 	kTheStartTime,
+	kTheScript,
 	kTheScriptNum,
 	kTheScriptText,
 	kTheSize,