DIRECTOR: Lingo: Stubbed "sound*" built-ins

1 files changed, 230 insertions, 225 deletions

diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp
index dc48bc6e7a..5197d002dd 100644
--- a/engines/director/lingo/lingo-lex.cpp
+++ b/engines/director/lingo/lingo-lex.cpp
@@ -364,8 +364,8 @@ static void yy_fatal_error (yyconst char msg[]  );
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 61
-#define YY_END_OF_BUFFER 62
+#define YY_NUM_RULES 62
+#define YY_END_OF_BUFFER 63
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -373,31 +373,31 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_accept[207] =
+static yyconst flex_int16_t yy_accept[211] =
     {   0,
-        0,    0,   62,   60,    3,   58,   58,   60,   60,   57,
-       57,   57,   56,   57,   57,   54,   54,   54,   54,   54,
-       54,   54,   54,   54,   54,   54,   54,   54,   54,   54,
-       54,   54,    2,    2,    3,   58,    0,    0,    0,    0,
-        0,   59,   53,    1,   55,   56,   52,   50,   51,   54,
-       54,   54,   54,   54,   54,   54,   54,   54,   54,   18,
-        8,   54,   54,   54,   24,   54,   54,   54,   30,   31,
-       54,   33,   54,   54,   54,   54,   54,   54,   54,   54,
-       44,   54,   54,    2,    2,    0,    1,   55,    4,   54,
-       54,   54,   54,   12,   54,   54,   54,   54,    0,   54,
-
-       54,   54,   54,   54,   26,   54,   54,   29,   54,   54,
-       54,   36,   54,   38,   54,   54,   54,   54,   54,   54,
-        0,   54,    6,    7,   11,   14,   54,   54,   54,    0,
-       54,   54,   21,   22,   54,   54,   54,   28,   32,   34,
-       54,   54,   54,   54,    0,   43,   48,   54,   46,   10,
-       54,   54,   15,   54,   17,   54,   54,   23,   54,   27,
-       54,   54,   54,   54,   42,   42,   49,   54,    0,   54,
-       54,   16,   54,   54,   25,   54,   37,   45,   39,    0,
-       42,   47,    0,   54,   13,   54,   54,   54,    0,   42,
-        9,    5,   19,   54,   35,    0,   42,   54,    0,    0,
-
-       20,   41,    0,    0,   40,    0
+        0,    0,   63,   61,    3,   59,   59,   61,   61,   58,
+       58,   58,   57,   58,   58,   55,   55,   55,   55,   55,
+       55,   55,   55,   55,   55,   55,   55,   55,   55,   55,
+       55,   55,    2,    2,    3,   59,    0,    0,    0,    0,
+        0,   60,   54,    1,   56,   57,   53,   51,   52,   55,
+       55,   55,   55,   55,   55,   55,   55,   55,   55,   18,
+        8,   55,   55,   55,   24,   55,   55,   55,   30,   31,
+       55,   33,   55,   55,   55,   55,   55,   55,   55,   55,
+       55,   45,   55,   55,    2,    2,    0,    1,   56,    4,
+       55,   55,   55,   55,   12,   55,   55,   55,   55,    0,
+
+       55,   55,   55,   55,   55,   26,   55,   55,   29,   55,
+       55,   55,   36,   55,   38,   55,   55,   55,   55,   55,
+       55,   55,    0,   55,    6,    7,   11,   14,   55,   55,
+       55,    0,   55,   55,   21,   22,   55,   55,   55,   28,
+       32,   34,   55,   55,   55,   55,   55,    0,   44,   49,
+       55,   47,   10,   55,   55,   15,   55,   17,   55,   55,
+       23,   55,   27,   55,   55,   39,   55,   55,   43,   43,
+       50,   55,    0,   55,   55,   16,   55,   55,   25,   55,
+       37,   46,   40,    0,   43,   48,    0,   55,   13,   55,
+       55,   55,    0,   43,    9,    5,   19,   55,   35,    0,
+
+       43,   55,    0,    0,   20,   42,    0,    0,   41,    0
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
@@ -443,63 +443,63 @@ static yyconst flex_int32_t yy_meta[63] =
         5,    5
     } ;
 
-static yyconst flex_int16_t yy_base[212] =
+static yyconst flex_int16_t yy_base[216] =
     {   0,
-        0,   61,  155,  520,   65,   69,   73,   77,  148,  520,
-      140,  130,   54,   70,   99,   58,    0,   58,   59,   69,
-       74,   70,   70,   71,   88,  105,  107,  110,   81,  134,
-      109,  123,  170,  177,  181,  520,  190,  145,  194,   77,
-      102,  520,  520,    0,   82,  132,  520,  520,  520,    0,
-      133,  139,  173,  145,  184,  180,  187,  190,  160,   99,
-        0,  175,  182,  194,  182,  200,  179,  184,    0,    0,
-      200,    0,  205,  202,  190,  196,  193,  206,  227,  229,
-        0,  232,  220,  260,  266,  222,    0,   80,    0,  224,
-      239,  233,  247,    0,  239,  241,  249,  263,  280,  253,
-
-      273,  258,  257,  267,    0,  267,  261,    0,  268,  259,
-      265,    0,  283,    0,  280,  274,  304,  281,  291,  298,
-      303,  308,    0,    0,    0,    0,  298,  314,  319,  302,
-      320,  307,    0,    0,  311,  313,  317,    0,    0,    0,
-      319,  328,  313,  316,  351,    0,    0,  325,  328,  369,
-      329,  326,    0,  339,  520,  339,  340,    0,  357,    0,
-      350,  346,  361,  350,  382,  384,    0,  358,  389,  365,
-      355,    0,  378,  378,    0,  365,    0,    0,    0,  396,
-      408,    0,  384,  376,    0,  392,  398,  386,  399,  423,
-      520,    0,    0,  388,    0,  425,  429,  394,  441,  447,
-
-        0,  449,  413,  455,  457,  520,  499,  501,  506,  510,
-      514
+        0,   61,  205,  519,   65,   69,   73,   77,  179,  519,
+      143,  137,   54,   70,  118,   58,    0,   58,   59,   69,
+       74,   70,   70,   71,   88,  105,  107,  110,   81,  142,
+      117,  125,  151,  174,  178,  519,  185,  191,  198,   77,
+      102,  519,  519,    0,   82,  132,  519,  519,  519,    0,
+       94,  123,  170,  135,  166,  175,  187,  192,  164,   99,
+        0,  180,  186,  191,  182,  206,  182,  187,    0,    0,
+      203,    0,  210,  207,  195,  202,  201,  206,  214,  231,
+      229,    0,  234,  223,  257,  272,  231,    0,   80,    0,
+      233,  235,  240,  249,    0,  237,  239,  255,  267,  283,
+
+      253,  270,  266,  266,  262,    0,  269,  266,    0,  273,
+      263,  267,    0,  284,    0,  279,  281,  276,  310,  284,
+      293,  291,  301,  312,    0,    0,    0,    0,  304,  314,
+      319,  308,  324,  310,    0,    0,  315,  316,  327,    0,
+        0,    0,  324,  333,  331,  318,  320,  352,    0,    0,
+      336,  339,  161,  340,  335,    0,  344,  519,  343,  344,
+        0,  360,    0,  353,  349,    0,  360,  351,  384,  390,
+        0,  358,  394,  364,  359,    0,  381,  382,    0,  376,
+        0,    0,    0,  409,  414,    0,  382,  380,    0,  394,
+      401,  390,  404,  423,  519,    0,    0,  396,    0,  428,
+
+      430,  399,  445,  446,    0,  452,  419,  457,  458,  519,
+      498,  500,  505,  509,  513
     } ;
 
-static yyconst flex_int16_t yy_def[212] =
+static yyconst flex_int16_t yy_def[216] =
     {   0,
-      206,    1,  206,  206,  206,  206,  206,  206,  207,  206,
-      206,  206,  206,  206,  206,  208,  208,  208,  208,  208,
-      208,  208,  208,  208,  208,  208,  208,  208,  208,  208,
-      208,  208,  206,  206,  206,  206,  206,  206,  206,  206,
-      207,  206,  206,  209,  206,  206,  206,  206,  206,  208,
-      208,  208,  208,  208,  208,  208,  208,  208,  208,  208,
-      208,  208,  208,  208,  208,  208,  208,  208,  208,  208,
-      208,  208,  208,  208,  208,  208,  208,  208,  208,  208,
-      208,  208,  208,  206,  206,  206,  209,  206,  208,  208,
-      208,  208,  208,  208,  208,  208,  208,  208,  206,  208,
-
-      208,  208,  208,  208,  208,  208,  208,  208,  208,  208,
-      208,  208,  208,  208,  208,  208,  208,  208,  208,  208,
-      206,  208,  208,  208,  208,  208,  208,  208,  208,  206,
-      208,  208,  208,  208,  208,  208,  208,  208,  208,  208,
-      208,  208,  208,  208,  210,  208,  208,  208,  208,  206,
-      208,  208,  208,  208,  206,  208,  208,  208,  208,  208,
-      208,  208,  208,  208,  210,  210,  208,  208,  206,  208,
-      208,  208,  208,  208,  208,  208,  208,  208,  208,  206,
-      210,  208,  206,  208,  208,  208,  208,  208,  206,  210,
-      206,  208,  208,  208,  208,  206,  210,  208,  211,  206,
-
-      208,  211,  206,  206,  211,    0,  206,  206,  206,  206,
-      206
+      210,    1,  210,  210,  210,  210,  210,  210,  211,  210,
+      210,  210,  210,  210,  210,  212,  212,  212,  212,  212,
+      212,  212,  212,  212,  212,  212,  212,  212,  212,  212,
+      212,  212,  210,  210,  210,  210,  210,  210,  210,  210,
+      211,  210,  210,  213,  210,  210,  210,  210,  210,  212,
+      212,  212,  212,  212,  212,  212,  212,  212,  212,  212,
+      212,  212,  212,  212,  212,  212,  212,  212,  212,  212,
+      212,  212,  212,  212,  212,  212,  212,  212,  212,  212,
+      212,  212,  212,  212,  210,  210,  210,  213,  210,  212,
+      212,  212,  212,  212,  212,  212,  212,  212,  212,  210,
+
+      212,  212,  212,  212,  212,  212,  212,  212,  212,  212,
+      212,  212,  212,  212,  212,  212,  212,  212,  212,  212,
+      212,  212,  210,  212,  212,  212,  212,  212,  212,  212,
+      212,  210,  212,  212,  212,  212,  212,  212,  212,  212,
+      212,  212,  212,  212,  212,  212,  212,  214,  212,  212,
+      212,  212,  210,  212,  212,  212,  212,  210,  212,  212,
+      212,  212,  212,  212,  212,  212,  212,  212,  214,  214,
+      212,  212,  210,  212,  212,  212,  212,  212,  212,  212,
+      212,  212,  212,  210,  214,  212,  210,  212,  212,  212,
+      212,  212,  210,  214,  210,  212,  212,  212,  212,  210,
+
+      214,  212,  215,  210,  212,  215,  210,  210,  215,    0,
+      210,  210,  210,  210,  210
     } ;
 
-static yyconst flex_int16_t yy_nxt[583] =
+static yyconst flex_int16_t yy_nxt[582] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,    4,
        13,   14,   10,   15,   16,   17,   18,   19,   20,   21,
@@ -510,64 +510,64 @@ static yyconst flex_int16_t yy_nxt[583] =
        17,   17,   33,   45,   46,   34,   35,   36,   36,   37,
        38,   39,   39,   38,   38,   39,   39,   38,   37,   36,
        36,   37,   47,   48,   51,   52,   53,   40,   57,   61,
-       88,   40,   88,   54,   59,   55,   62,   60,   63,   76,
-
-       99,   86,   64,   99,   58,   56,   65,   42,   51,   52,
-       53,   49,   40,   57,   61,   66,   40,   54,   59,   55,
-       62,   60,   63,   67,   76,   86,   69,   64,   58,   56,
-       80,   65,   68,   70,   73,   71,   81,   72,   44,   66,
-       74,   45,   46,   75,   82,   83,   38,   43,   67,   38,
-       89,   69,   77,   42,  206,   80,   68,   70,   73,   71,
-       81,   72,   78,   40,   74,   90,   79,   75,  206,   82,
-       83,   84,   36,   36,   85,   89,   93,   77,   85,   36,
-       36,   85,   35,   36,   36,   37,   78,   98,   40,   90,
-       79,   37,   36,   36,   37,   38,   39,   39,   38,   91,
-
-       93,   94,   95,   96,   97,  206,  100,  101,   92,  102,
-      103,   98,   40,  206,  104,  107,  108,  105,  109,  110,
-      111,  206,  112,   91,  113,  114,   94,   95,   96,   97,
-      100,  101,   92,  102,  106,  103,  115,   40,  104,  107,
-      108,  116,  105,  109,  110,  111,  112,  117,  113,  114,
-      118,  206,  120,  121,  119,  206,  122,  123,  106,  124,
-      115,   84,   36,   36,   85,  125,  116,   85,   36,   36,
-       85,  126,  117,  127,  128,  118,  120,  121,  129,  119,
-      122,   99,  123,  124,   99,  131,  134,  135,  136,  137,
-      125,  132,  206,  138,  139,  126,  140,  127,  128,  141,
-
-      133,  142,  143,  129,  144,  145,  206,  147,  145,  131,
-      134,  135,  130,  136,  137,  148,  132,  138,  139,  149,
-      140,  150,  151,  141,  133,  152,  142,  143,  144,  155,
-      146,  147,  153,  154,  156,  160,  130,  157,  158,  148,
-      159,  161,  162,  167,  149,  163,  150,  151,  164,  152,
-      168,  170,  145,  155,  146,  145,  171,  153,  154,  156,
-      160,  157,  158,  172,  159,  173,  161,  162,  167,  163,
-      169,  174,  164,  169,  175,  168,  170,  176,  177,  178,
-      171,  179,  166,  180,  182,  180,  180,  172,  180,  173,
-      169,  184,  185,  169,  186,  174,  187,  180,  188,  175,
-
-      180,  176,  177,  191,  178,  179,  166,  192,  182,  180,
-      193,  183,  180,  181,  194,  184,  185,  195,  196,  186,
-      198,  187,  188,  189,  180,  201,  199,  180,  191,  199,
-      200,  192,  204,  200,  206,  193,  183,  181,  190,  194,
-      206,  195,  199,  196,  198,  199,  206,  189,  200,  201,
-      206,  200,  206,  206,  206,  197,  205,  204,  205,  205,
-      206,  205,  190,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  203,  206,  206,  206,  206,  197,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  203,   41,
-
-       41,  206,   41,   41,   50,   50,   87,   87,  206,   87,
-       87,  165,  206,  206,  165,  202,  206,  206,  202,    3,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206
+       89,   40,   89,   54,   59,   55,   62,   60,   63,   76,
+
+      100,   87,   64,  100,   58,   56,   65,   42,   51,   52,
+       53,   90,   40,   57,   61,   66,   40,   54,   59,   55,
+       62,   60,   63,   67,   76,   87,   69,   64,   58,   56,
+       49,   65,   68,   70,   73,   71,   90,   72,   81,   66,
+       74,   45,   46,   75,   82,   44,   83,   84,   67,   91,
+       43,   69,   85,   36,   36,   86,   68,   70,   73,   71,
+       77,   72,  173,   81,   74,  173,   94,   75,   82,   78,
+       79,   83,   84,   91,   80,   86,   36,   36,   86,   35,
+       36,   36,   37,   95,   42,   77,   37,   36,   36,   37,
+       94,   99,   38,   78,   79,   38,   92,   96,   80,   38,
+
+       39,   39,   38,   97,  210,   93,   98,  104,   95,   40,
+      210,  101,  102,  103,  105,   99,   40,  210,  108,  109,
+       92,  110,   96,  106,  111,  112,  210,  113,   97,   93,
+      114,   98,  104,  115,   40,  101,  102,  103,  105,  116,
+      107,   40,  108,  109,  117,  118,  110,  119,  106,  111,
+      112,  113,  120,  125,  114,  122,  121,  115,   85,   36,
+       36,   86,  123,  116,  107,  124,  126,  127,  117,  128,
+      118,  129,  119,   86,   36,   36,   86,  120,  125,  122,
+      130,  121,  131,  138,  100,  133,  123,  100,  134,  124,
+      126,  139,  127,  128,  136,  129,  137,  135,  140,  141,
+
+      142,  143,  144,  146,  130,  145,  147,  131,  138,  133,
+      150,  148,  152,  134,  148,  132,  139,  151,  136,  153,
+      137,  135,  140,  141,  142,  143,  154,  144,  146,  145,
+      147,  155,  156,  157,  150,  158,  149,  152,  159,  132,
+      160,  151,  161,  162,  153,  163,  164,  165,  166,  210,
+      167,  154,  168,  148,  171,  155,  148,  156,  157,  158,
+      149,  172,  174,  159,  160,  175,  161,  162,  176,  177,
+      163,  164,  165,  166,  167,  178,  168,  179,  182,  171,
+      180,  181,  183,  170,  186,  184,  172,  174,  184,  175,
+      188,  184,  176,  177,  184,  173,  189,  190,  173,  178,
+
+      191,  195,  179,  182,  180,  181,  183,  170,  186,  192,
+      184,  196,  197,  184,  188,  184,  187,  198,  184,  185,
+      189,  199,  190,  200,  184,  191,  195,  184,  202,  203,
+      205,  204,  203,  192,  204,  196,  193,  197,  208,  210,
+      210,  187,  198,  185,  194,  199,  203,  204,  200,  203,
+      204,  210,  202,  210,  205,  201,  210,  210,  209,  209,
+      193,  209,  209,  208,  210,  210,  210,  210,  194,  210,
+      210,  210,  210,  207,  210,  210,  210,  210,  210,  201,
+      210,  210,  210,  210,  210,  210,  210,  210,  210,  210,
+      210,  210,  210,  210,  210,  210,  210,  207,   41,   41,
+
+      210,   41,   41,   50,   50,   88,   88,  210,   88,   88,
+      169,  210,  210,  169,  206,  210,  210,  206,    3,  210,
+      210,  210,  210,  210,  210,  210,  210,  210,  210,  210,
+      210,  210,  210,  210,  210,  210,  210,  210,  210,  210,
+      210,  210,  210,  210,  210,  210,  210,  210,  210,  210,
+      210,  210,  210,  210,  210,  210,  210,  210,  210,  210,
+      210,  210,  210,  210,  210,  210,  210,  210,  210,  210,
+      210,  210,  210,  210,  210,  210,  210,  210,  210,  210,
+      210
     } ;
 
-static yyconst flex_int16_t yy_chk[583] =
+static yyconst flex_int16_t yy_chk[582] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -578,61 +578,61 @@ static yyconst flex_int16_t yy_chk[583] =
         1,    1,    2,   13,   13,    2,    5,    5,    5,    5,
         6,    6,    6,    6,    7,    7,    7,    7,    8,    8,
         8,    8,   14,   14,   16,   18,   19,    6,   21,   23,
-       88,    7,   45,   20,   22,   20,   23,   22,   24,   29,
+       89,    7,   45,   20,   22,   20,   23,   22,   24,   29,
 
        60,   40,   25,   60,   21,   20,   25,   41,   16,   18,
-       19,   15,    6,   21,   23,   25,    7,   20,   22,   20,
+       19,   51,    6,   21,   23,   25,    7,   20,   22,   20,
        23,   22,   24,   26,   29,   40,   27,   25,   21,   20,
-       31,   25,   26,   27,   28,   27,   31,   27,   12,   25,
-       28,   46,   46,   28,   32,   32,   38,   11,   26,   38,
-       51,   27,   30,    9,    3,   31,   26,   27,   28,   27,
-       31,   27,   30,   38,   28,   52,   30,   28,    0,   32,
-       32,   33,   33,   33,   33,   51,   54,   30,   34,   34,
-       34,   34,   35,   35,   35,   35,   30,   59,   38,   52,
-       30,   37,   37,   37,   37,   39,   39,   39,   39,   53,
-
-       54,   55,   56,   57,   58,    0,   62,   62,   53,   63,
-       64,   59,   39,    0,   65,   67,   68,   66,   71,   73,
-       74,    0,   75,   53,   76,   77,   55,   56,   57,   58,
-       62,   62,   53,   63,   66,   64,   78,   39,   65,   67,
-       68,   79,   66,   71,   73,   74,   75,   80,   76,   77,
-       82,    0,   83,   86,   82,    0,   90,   91,   66,   92,
-       78,   84,   84,   84,   84,   93,   79,   85,   85,   85,
-       85,   95,   80,   96,   97,   82,   83,   86,   98,   82,
-       90,   99,   91,   92,   99,  100,  102,  103,  104,  106,
-       93,  101,    0,  107,  109,   95,  110,   96,   97,  111,
-
-      101,  113,  115,   98,  116,  117,    0,  118,  117,  100,
-      102,  103,   99,  104,  106,  119,  101,  107,  109,  120,
-      110,  121,  122,  111,  101,  127,  113,  115,  116,  130,
-      117,  118,  128,  129,  131,  137,   99,  132,  135,  119,
-      136,  141,  142,  148,  120,  143,  121,  122,  144,  127,
-      149,  151,  145,  130,  117,  145,  152,  128,  129,  131,
-      137,  132,  135,  154,  136,  156,  141,  142,  148,  143,
-      150,  157,  144,  150,  159,  149,  151,  161,  162,  163,
-      152,  164,  145,  165,  168,  166,  165,  154,  166,  156,
-      169,  170,  171,  169,  173,  157,  174,  180,  176,  159,
-
-      180,  161,  162,  183,  163,  164,  145,  184,  168,  181,
-      186,  169,  181,  166,  187,  170,  171,  188,  189,  173,
-      194,  174,  176,  180,  190,  198,  196,  190,  183,  196,
-      197,  184,  203,  197,    0,  186,  169,  166,  181,  187,
-        0,  188,  199,  189,  194,  199,    0,  180,  200,  198,
-      202,  200,    0,  202,    0,  190,  204,  203,  205,  204,
-        0,  205,  181,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,  200,    0,    0,    0,    0,  190,
+       15,   25,   26,   27,   28,   27,   51,   27,   31,   25,
+       28,   46,   46,   28,   31,   12,   32,   32,   26,   52,
+       11,   27,   33,   33,   33,   33,   26,   27,   28,   27,
+       30,   27,  153,   31,   28,  153,   54,   28,   31,   30,
+       30,   32,   32,   52,   30,   34,   34,   34,   34,   35,
+       35,   35,   35,   55,    9,   30,   37,   37,   37,   37,
+       54,   59,   38,   30,   30,   38,   53,   56,   30,   39,
+
+       39,   39,   39,   57,    3,   53,   58,   64,   55,   38,
+        0,   62,   62,   63,   65,   59,   39,    0,   67,   68,
+       53,   71,   56,   66,   73,   74,    0,   75,   57,   53,
+       76,   58,   64,   77,   38,   62,   62,   63,   65,   78,
+       66,   39,   67,   68,   79,   80,   71,   81,   66,   73,
+       74,   75,   83,   92,   76,   84,   83,   77,   85,   85,
+       85,   85,   87,   78,   66,   91,   93,   94,   79,   96,
+       80,   97,   81,   86,   86,   86,   86,   83,   92,   84,
+       98,   83,   99,  105,  100,  101,   87,  100,  102,   91,
+       93,  107,   94,   96,  103,   97,  104,  102,  108,  110,
+
+      111,  112,  114,  117,   98,  116,  118,   99,  105,  101,
+      120,  119,  122,  102,  119,  100,  107,  121,  103,  123,
+      104,  102,  108,  110,  111,  112,  124,  114,  117,  116,
+      118,  129,  130,  131,  120,  132,  119,  122,  133,  100,
+      134,  121,  137,  138,  123,  139,  143,  144,  145,    0,
+      146,  124,  147,  148,  151,  129,  148,  130,  131,  132,
+      119,  152,  154,  133,  134,  155,  137,  138,  157,  159,
+      139,  143,  144,  145,  146,  160,  147,  162,  167,  151,
+      164,  165,  168,  148,  172,  169,  152,  154,  169,  155,
+      174,  170,  157,  159,  170,  173,  175,  177,  173,  160,
+
+      178,  187,  162,  167,  164,  165,  168,  148,  172,  180,
+      184,  188,  190,  184,  174,  185,  173,  191,  185,  170,
+      175,  192,  177,  193,  194,  178,  187,  194,  198,  200,
+      202,  201,  200,  180,  201,  188,  184,  190,  207,    0,
+        0,  173,  191,  170,  185,  192,  203,  204,  193,  203,
+      204,    0,  198,  206,  202,  194,  206,    0,  208,  209,
+      184,  208,  209,  207,    0,    0,    0,    0,  185,    0,
+        0,    0,    0,  204,    0,    0,    0,    0,    0,  194,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,  200,  207,
-
-      207,    0,  207,  207,  208,  208,  209,  209,    0,  209,
-      209,  210,    0,    0,  210,  211,    0,    0,  211,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206
+        0,    0,    0,    0,    0,    0,    0,  204,  211,  211,
+
+        0,  211,  211,  212,  212,  213,  213,    0,  213,  213,
+      214,    0,    0,  214,  215,    0,    0,  215,  210,  210,
+      210,  210,  210,  210,  210,  210,  210,  210,  210,  210,
+      210,  210,  210,  210,  210,  210,  210,  210,  210,  210,
+      210,  210,  210,  210,  210,  210,  210,  210,  210,  210,
+      210,  210,  210,  210,  210,  210,  210,  210,  210,  210,
+      210,  210,  210,  210,  210,  210,  210,  210,  210,  210,
+      210,  210,  210,  210,  210,  210,  210,  210,  210,  210,
+      210
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -948,13 +948,13 @@ yy_match:
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 207 )
+				if ( yy_current_state >= 211 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 520 );
+		while ( yy_base[yy_current_state] != 519 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -1173,11 +1173,16 @@ YY_RULE_SETUP
 case 39:
 YY_RULE_SETUP
 #line 110 "engines/director/lingo/lingo-lex.l"
-{ count(); return tSTARTS; }
+{ count(); return tSOUND; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
 #line 111 "engines/director/lingo/lingo-lex.l"
+{ count(); return tSTARTS; }
+	YY_BREAK
+case 41:
+YY_RULE_SETUP
+#line 112 "engines/director/lingo/lingo-lex.l"
 {
 		count();
 
@@ -1187,9 +1192,9 @@ YY_RULE_SETUP
 		return THEENTITYWITHID;
 	}
 	YY_BREAK
-case 41:
+case 42:
 YY_RULE_SETUP
-#line 119 "engines/director/lingo/lingo-lex.l"
+#line 120 "engines/director/lingo/lingo-lex.l"
 {
 		count();
 
@@ -1231,9 +1236,9 @@ YY_RULE_SETUP
 		warning("Unhandled the entity %s", ptr);
 	}
 	YY_BREAK
-case 42:
+case 43:
 YY_RULE_SETUP
-#line 159 "engines/director/lingo/lingo-lex.l"
+#line 160 "engines/director/lingo/lingo-lex.l"
 {
 		count();
 
@@ -1254,64 +1259,64 @@ YY_RULE_SETUP
 		warning("Unhandled the entity %s", ptr);
 	}
 	YY_BREAK
-case 43:
-YY_RULE_SETUP
-#line 178 "engines/director/lingo/lingo-lex.l"
-{ count(); return tTHEN; }
-	YY_BREAK
 case 44:
 YY_RULE_SETUP
 #line 179 "engines/director/lingo/lingo-lex.l"
-{ count(); return tTO; }
+{ count(); return tTHEN; }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
 #line 180 "engines/director/lingo/lingo-lex.l"
-{ count(); return tSPRITE; }
+{ count(); return tTO; }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
 #line 181 "engines/director/lingo/lingo-lex.l"
-{ count(); return tWITH; }
+{ count(); return tSPRITE; }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
 #line 182 "engines/director/lingo/lingo-lex.l"
-{ count(); return tWITHIN; }
+{ count(); return tWITH; }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
 #line 183 "engines/director/lingo/lingo-lex.l"
-{ count(); return tWHEN; }
+{ count(); return tWITHIN; }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
 #line 184 "engines/director/lingo/lingo-lex.l"
-{ count(); return tWHILE; }
+{ count(); return tWHEN; }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 186 "engines/director/lingo/lingo-lex.l"
-{ count(); return tNEQ; }
+#line 185 "engines/director/lingo/lingo-lex.l"
+{ count(); return tWHILE; }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
 #line 187 "engines/director/lingo/lingo-lex.l"
-{ count(); return tGE; }
+{ count(); return tNEQ; }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
 #line 188 "engines/director/lingo/lingo-lex.l"
-{ count(); return tLE; }
+{ count(); return tGE; }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
 #line 189 "engines/director/lingo/lingo-lex.l"
-{ count(); return tCONCAT; }
+{ count(); return tLE; }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 191 "engines/director/lingo/lingo-lex.l"
+#line 190 "engines/director/lingo/lingo-lex.l"
+{ count(); return tCONCAT; }
+	YY_BREAK
+case 55:
+YY_RULE_SETUP
+#line 192 "engines/director/lingo/lingo-lex.l"
 {
 		count();
 		yylval.s = new Common::String(yytext);
@@ -1339,43 +1344,43 @@ YY_RULE_SETUP
 		return ID;
 	}
 	YY_BREAK
-case 55:
-YY_RULE_SETUP
-#line 217 "engines/director/lingo/lingo-lex.l"
-{ count(); yylval.f = atof(yytext); return FLOAT; }
-	YY_BREAK
 case 56:
 YY_RULE_SETUP
 #line 218 "engines/director/lingo/lingo-lex.l"
-{ count(); yylval.i = strtol(yytext, NULL, 10); return INT; }
+{ count(); yylval.f = atof(yytext); return FLOAT; }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
 #line 219 "engines/director/lingo/lingo-lex.l"
-{ count(); return *yytext; }
+{ count(); yylval.i = strtol(yytext, NULL, 10); return INT; }
 	YY_BREAK
 case 58:
-/* rule 58 can match eol */
 YY_RULE_SETUP
 #line 220 "engines/director/lingo/lingo-lex.l"
-{ return '\n'; }
+{ count(); return *yytext; }
 	YY_BREAK
 case 59:
+/* rule 59 can match eol */
 YY_RULE_SETUP
 #line 221 "engines/director/lingo/lingo-lex.l"
-{ count(); yylval.s = new Common::String(&yytext[1]); yylval.s->deleteLastChar(); return STRING; }
+{ return '\n'; }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
 #line 222 "engines/director/lingo/lingo-lex.l"
-
+{ count(); yylval.s = new Common::String(&yytext[1]); yylval.s->deleteLastChar(); return STRING; }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 224 "engines/director/lingo/lingo-lex.l"
+#line 223 "engines/director/lingo/lingo-lex.l"
+
+	YY_BREAK
+case 62:
+YY_RULE_SETUP
+#line 225 "engines/director/lingo/lingo-lex.l"
 ECHO;
 	YY_BREAK
-#line 1379 "engines/director/lingo/lingo-lex.cpp"
+#line 1384 "engines/director/lingo/lingo-lex.cpp"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -1668,7 +1673,7 @@ static int yy_get_next_buffer (void)
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 207 )
+			if ( yy_current_state >= 211 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1696,11 +1701,11 @@ static int yy_get_next_buffer (void)
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 207 )
+		if ( yy_current_state >= 211 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 206);
+	yy_is_jam = (yy_current_state == 210);
 
 	return yy_is_jam ? 0 : yy_current_state;
 }
@@ -2375,7 +2380,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 224 "engines/director/lingo/lingo-lex.l"
+#line 225 "engines/director/lingo/lingo-lex.l"