From 71e59a5502fcd9a3ba89f140834d0f650a456715 Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Wed, 11 Aug 2010 22:37:45 +0000
Subject: [PATCH] A bunch of m32script additions, fixes and general stuff,
 among them: local vars/arrays, inline quotes and prettier error messages.

git-svn-id: https://svn.eduke32.com/eduke32@1691 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/build/include/editor.h    |    2 +
 polymer/eduke32/build/include/m32script.h |   45 +-
 polymer/eduke32/build/src/build.c         |   19 +-
 polymer/eduke32/build/src/config.c        |    8 +-
 polymer/eduke32/samples/a.m32             |  247 ++---
 polymer/eduke32/samples/tests.m32         |  152 +++
 polymer/eduke32/source/astub.c            |  112 ++-
 polymer/eduke32/source/m32def.c           | 1057 +++++++++++++--------
 polymer/eduke32/source/m32def.h           |   16 +-
 polymer/eduke32/source/m32exec.c          |  224 +++--
 polymer/eduke32/source/m32structures.c    |   27 +-
 polymer/eduke32/source/m32vars.c          |  443 ++++-----
 12 files changed, 1395 insertions(+), 957 deletions(-)
 create mode 100644 polymer/eduke32/samples/tests.m32

diff --git a/polymer/eduke32/build/include/editor.h b/polymer/eduke32/build/include/editor.h
index 0d1cf3f35..c68cf0f01 100644
--- a/polymer/eduke32/build/include/editor.h
+++ b/polymer/eduke32/build/include/editor.h
@@ -62,6 +62,8 @@ extern char *mapster32_fullpath;
 extern char *testplay_addparam;
 
 extern int32_t m32_osd_tryscript;
+extern int32_t showheightindicators;
+extern int32_t showambiencesounds;
 
 extern int32_t ExtInit(void);
 extern int32_t ExtPreInit(int32_t argc,const char **argv);
diff --git a/polymer/eduke32/build/include/m32script.h b/polymer/eduke32/build/include/m32script.h
index 62ba98ecb..525b8e8ed 100644
--- a/polymer/eduke32/build/include/m32script.h
+++ b/polymer/eduke32/build/include/m32script.h
@@ -34,8 +34,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define MAXQUOTELEN 128
 
 // Some misc #defines
-#define NO       0
-#define YES      1
+//#define NO       0
+//#define YES      1
 
 typedef int32_t instype;
 typedef int32_t ofstype;
@@ -59,7 +59,7 @@ extern void Gv_Init(void);
 
 extern int32_t __fastcall Gv_GetVarX(register int32_t id);
 extern void __fastcall Gv_SetVarX(register int32_t id, register int32_t lValue);
-extern int32_t __fastcall Gv_GetVarN(register int32_t id);  // 'N' for "no side-effects"... vars only!
+extern int32_t __fastcall Gv_GetVarN(register int32_t id);  // 'N' for "no side-effects"... vars and locals only!
 
 extern void SetGAMEPalette(void);
 extern void SetWATERPalette(void);
@@ -101,6 +101,7 @@ enum GameEvent_t {
 extern ofstype aEventOffsets[MAXEVENTS];
 extern int32_t aEventSizes[MAXEVENTS];
 extern uint8_t aEventEnabled[MAXEVENTS];
+extern uint16_t aEventNumLocals[MAXEVENTS];
 
 
 enum GamevarFlags_t {
@@ -109,18 +110,20 @@ enum GamevarFlags_t {
     MAXVARLABEL        = MAXLABELLEN, //26,
 
     GAMEVAR_PERBLOCK   = 0x00000001, // per-block (state, event, or top-level) variable
-    GAMEVAR_USER_MASK  = (0x00000001),
+    GAMEVAR_USER_MASK = GAMEVAR_PERBLOCK,
 
     GAMEVAR_RESET      = 0x00000008, // marks var for to default
     GAMEVAR_DEFAULT    = 0x00000100, // allow override
-    GAMEVAR_SECRET     = 0x00000200, // don't dump...
 
     GAMEVAR_SYSTEM     = 0x00000800, // cannot change mode flags...(only default value)
     GAMEVAR_READONLY   = 0x00001000, // values are read-only (no setvar allowed)
+
     GAMEVAR_INTPTR     = 0x00002000, // plValues is a pointer to an int32_t
     GAMEVAR_FLOATPTR   = 0x00004000, // plValues is a pointer to a float
     GAMEVAR_SHORTPTR   = 0x00008000, // plValues is a pointer to a short
     GAMEVAR_CHARPTR    = 0x00010000, // plValues is a pointer to a char
+    GAMEVAR_PTR_MASK = GAMEVAR_INTPTR|GAMEVAR_FLOATPTR|GAMEVAR_SHORTPTR|GAMEVAR_CHARPTR,
+
 //    GAMEVAR_NORESET    = 0x00020000, // var values are not reset when restoring map state
     GAMEVAR_SPECIAL    = 0x00040000, // flag for structure member shortcut vars
 };
@@ -128,13 +131,14 @@ enum GamevarFlags_t {
 enum GamearrayFlags_t {
     MAXGAMEARRAYS      = (MAXGAMEVARS>>2), // must be lower than MAXGAMEVARS
     MAXARRAYLABEL      = MAXVARLABEL,
-    GAMEARRAY_NORMAL   = 0,
+
     GAMEARRAY_READONLY = 0x00001000,
 
+    GAMEARRAY_NORMAL   = 0,
     GAMEARRAY_OFCHAR   = 0x00000001,
     GAMEARRAY_OFSHORT  = 0x00000002,
     GAMEARRAY_OFINT    = 0x00000004,
-    GAMEARRAY_TYPEMASK = 0x00000007,
+    GAMEARRAY_TYPE_MASK = GAMEARRAY_OFCHAR|GAMEARRAY_OFSHORT|GAMEARRAY_OFINT,
 
     GAMEARRAY_VARSIZE = 0x00000020,
 
@@ -169,6 +173,7 @@ extern uint32_t m32_drawlinepat;
 
 extern int32_t g_iReturnVar;
 extern int32_t m32_sortvar1, m32_sortvar2;
+extern int32_t m32_script_expertmode;  // if true, make read-only vars writable
 
 //extern int32_t g_numRealPalettes;
 //extern int32_t g_scriptDebug;
@@ -228,9 +233,31 @@ extern int32_t zoom;
 extern int32_t halfxdim16, midydim16;
 
 
+// gamevar bytecode format:
+
+//  FEDC|BA09|8765|4321|FEDC|BA09|8765|4321
+//                     |       .. .... ....  gamevar ID
+//                     |      .              constant bit (checked first) / get-payload-var bit for array or struct
+//                     |     .               negate bit
+//                     |   .                 array bit  \___\  if both set:
+//                     |  .                  struct bit /   /  local var
+//  .... .... .... ....|                     optional payload
+
+
+
+#define M32_FLAG_CONSTANT (MAXGAMEVARS)
 #define M32_FLAG_NEGATE (MAXGAMEVARS<<1)
+
+#define M32_FLAG_VAR (0)
 #define M32_FLAG_ARRAY (MAXGAMEVARS<<2)
-#define M32_FLAG_SPECIAL (MAXGAMEVARS<<3)
+#define M32_FLAG_STRUCT (MAXGAMEVARS<<3)
+#define M32_FLAG_LOCAL (M32_FLAG_ARRAY|M32_FLAG_STRUCT)
+#define M32_VARTYPE_MASK (M32_FLAG_ARRAY|M32_FLAG_STRUCT)
+
+#define M32_FLAG_CONSTANTINDEX M32_FLAG_CONSTANT
+// if set, fetch index for array or struct array from 16 high bits as a constant (otherwise: gamevar)
+
+#define M32_BITS_MASK (0x0000ffff-(MAXGAMEVARS-1))
 
 // IDs of special vars
 #define M32_SPRITE_VAR_ID 0
@@ -244,6 +271,8 @@ extern int32_t halfxdim16, midydim16;
 #define M32_HITAG_VAR_ID 7
 #define M32_TEXTURE_VAR_ID 8
 
+#define M32_LOCAL_ARRAY_ID 0
+
 #define M32_PRINTERROR(Text, ...) OSD_Printf(OSD_ERROR "Line %d, %s: " Text "\n", g_errorLineNum, keyw[g_tw], ## __VA_ARGS__)
 
 #endif
diff --git a/polymer/eduke32/build/src/build.c b/polymer/eduke32/build/src/build.c
index da7c799ab..4de2dd746 100644
--- a/polymer/eduke32/build/src/build.c
+++ b/polymer/eduke32/build/src/build.c
@@ -486,8 +486,6 @@ int32_t app_main(int32_t argc, const char **argv)
 
     totalclock = 0;
 
-    OSD_Exec("m32_autoexec.cfg");
-
     updatesector(pos.x,pos.y,&cursectnum);
 
     if (cursectnum == -1)
@@ -507,6 +505,10 @@ int32_t app_main(int32_t argc, const char **argv)
             Bprintf("%d * %d not supported in this graphics mode\n",xdim2d,ydim2d);
             exit(0);
         }
+
+        // executed once per init, but after setgamemode so that OSD has the right width
+        OSD_Exec("m32_autoexec.cfg");
+
         overheadeditor();
         keystatus[buildkeys[BK_MODE2D_3D]] = 0;
 
@@ -527,6 +529,10 @@ int32_t app_main(int32_t argc, const char **argv)
             Bprintf("%d * %d not supported in this graphics mode\n",xdim,ydim);
             exit(0);
         }
+
+        // executed once per init, but after setgamemode so that OSD has the right width
+        OSD_Exec("m32_autoexec.cfg");
+
         setbrightness(GAMMA_CALC,palette,0);
     }
 CANCEL:
@@ -2463,13 +2469,8 @@ void overheadeditor(void)
 
             for (i=0; i<numwalls; i++)     //make new red lines?
             {
-                if (wall[i].x == dax && wall[i].y == day)
-                {
-                    checksectorpointer((int16_t)i,sectorofwall((int16_t)i));
-                    fixrepeats((int16_t)i);
-                    asksave = 1;
-                }
-                else if (POINT2(i).x == dax && POINT2(i).y == day)
+                if ((wall[i].x == dax && wall[i].y == day)
+                      || (POINT2(i).x == dax && POINT2(i).y == day))
                 {
                     checksectorpointer((int16_t)i,sectorofwall((int16_t)i));
                     fixrepeats((int16_t)i);
diff --git a/polymer/eduke32/build/src/config.c b/polymer/eduke32/build/src/config.c
index a1235d157..0fe2af8fd 100644
--- a/polymer/eduke32/build/src/config.c
+++ b/polymer/eduke32/build/src/config.c
@@ -66,7 +66,6 @@ extern int32_t remapinit;
 extern double msens;
 extern int32_t editorgridextent, grid, autogrid;
 static int32_t default_grid=3;
-extern int32_t showheightindicators;
 extern int32_t graphicsmode;
 extern int32_t AmbienceToggle;
 extern int32_t ParentalLock;
@@ -236,6 +235,8 @@ int32_t loadsetup(const char *fn)
 
     if (readconfig(fp, "showheightindicators", val, VL) > 0)
         showheightindicators = min(max(Batoi(val),0),2);
+    if (readconfig(fp, "showambiencesounds", val, VL) > 0)
+        showheightindicators = min(max(Batoi(val),0),2);
 
     if (readconfig(fp, "graphicsmode", val, VL) > 0)
         graphicsmode = min(max(Batoi(val),0),2);
@@ -417,6 +418,9 @@ int32_t writesetup(const char *fn)
              "; Height indicators (0:none, 1:only 2-sided&different, 2:all)\n"
              "showheightindicators = %d\n"
              "\n"
+             "; Ambience sound circles (0:none, 1:only in current sector, 2:all)\n"
+             "showambiencesounds = %d\n"
+             "\n"
              "; 2D mode display type (0:classic, 1:textured, 2:textured/animated)\n"
              "graphicsmode = %d\n\n"
              "; Ambient sounds in 3D mode (0:off, 1:on)\n"
@@ -499,7 +503,7 @@ int32_t writesetup(const char *fn)
 #endif
              option[3], msens, unrealedlook, pk_uedaccel, quickmapcycling,
              revertCTRL,scrollamount,pk_turnaccel,pk_turndecel,autosave,
-             showheightindicators,graphicsmode,AmbienceToggle,ParentalLock,
+             showheightindicators,showambiencesounds,graphicsmode,AmbienceToggle,ParentalLock,
              !!m32_osd_tryscript,
 #if 1
              keys[0], keys[1], keys[2], keys[3], keys[4], keys[5],
diff --git a/polymer/eduke32/samples/a.m32 b/polymer/eduke32/samples/a.m32
index 1c64fd0c1..5ca673549 100644
--- a/polymer/eduke32/samples/a.m32
+++ b/polymer/eduke32/samples/a.m32
@@ -4,7 +4,6 @@
 include names.h
 
 // flag 1: per-block (top-level, event, or state) variable
-gamevar h 0 1
 gamevar i 0 1
 gamevar j 0 1
 gamevar k 0 1
@@ -14,17 +13,9 @@ gamevar p 0 1
 gamevar q 0 1
 gamevar r 0 1
 
-gamearray xx 10
-gamearray yy 10
-
-gamevar c 0 0
-gamevar d 0 0
 gamevar x 0 0
 gamevar y 0 0
-gamevar x2 0 0
-gamevar y2 0 0
 gamevar z 0 0
-gamevar frac 0 0
 
 gamevar gi 0 0
 gamevar gj 0 0
@@ -45,37 +36,16 @@ gamevar dayx 65536 0
 
 gamevar drawcol 9 0
 
-define TQUOTE 3
 
-definequote 0 OK
-definequote 1 DAMN
+define TQUOTE 0
+definequote TQUOTE  >>> write on me! <<<
 
-definequote 2 BU:%d ABS:%d
-definequote TQUOTE write on me!
+//light       
+define LIGHTQUOTE 1
+//                                  x  y  z       r  g  b                mins maxs
+definequote LIGHTQUOTE light  %d   %d %d %d  %d  %d %d %d   %d %d %d %d   %d %d   %d %d
+//                            sec          range       radius fade ang horiz    prio tile
 
-definequote 4 ASPECT: VR=%d, YX=%d
-definequote 5 ALPHA KEY: %d (SCANCODE: %d)
-
-definequote 6 time: %d ms
-
-definequote 7 door sector not an island sector!
-definequote 8 door sector has no SE sprite!
-
-//light                   x  y  z       r  g  b                mins maxs
-definequote 9 light  %d   %d %d %d  %d  %d %d %d   %d %d %d %d   %d %d   %d %d
-//                   sec          range       radius fade ang horiz    prio tile
-definequote 10 --PRLIGHTS--
-definequote 11 --ENDPRLIGHTS--
-
-definequote 12 RED: 
-definequote 13 GREEN: 
-definequote 14 BLUE: 
-
-definequote 15 x/yoffset: %d %d
-definequote 16 RGB color: %d %d %d
-definequote 17 PICNUM: 
-
-definequote 18 NUMBER KEY: %d (SCANCODE: %d)
 
 // Corruption checker
 definequote 19 PANIC!!! SECTOR OR WALL LIMIT EXCEEDED!!!
@@ -86,66 +56,18 @@ definequote 23 WALL[%d].POINT2=%d out of range: sector[%d].wallptr=%d, endwall=%
 definequote 24 WALL[%d].NEXTWALL=%d out of range: numwalls=%d!!!
 definequote 25 WALL[%d].NEXTSECTOR=%d out of range: numsectors=%d!!!
 
-definequote 26 FLOAT ACCESS TEST
-
 definequote 27 OVERRIDE POLYMER PARALLAX & SPECULAR: OFF
 definequote 28 OVERRIDE POLYMER PARALLAX & SPECULAR: ON
 
-definequote 29 PARALLAX SCALE: %f
-definequote 30 PARALLAX BIAS: %f
-definequote 31 SPECULAR FACTOR: %f
-definequote 32 SPECULAR POWER: %f
-
-definequote 33 PAL: %d
-
 define PRSCALE 1000
-// NOTE: inline constants >=32768 are sometimes broken ATM (when loading a second time?).
-// This should always work
 define MAXSPECULAR 100000
 
 gamearray ar 128
 gamearray parm 8
 
-// various tests of m32-script features
-defstate tests
-// array test
-    getarraysize ar tmp
-    resizearray ar 65536
-    getticks parm[2]
-    for j range 65536
-        set ar[j] j
-    set i 0
-    for j range 65536
-        add i ar[j]
-    getticks parm[3]
-    resizearray ar tmp
-    ife i 2147450880 quote 0 else quote 1
-    sub parm[3] parm[2]
-    qsprintf TQUOTE 6 parm[3]
-    quote TQUOTE
-
-// iteration and break test
-    for i range 10
-    {
-        addlogvar i
-        ife i 5 break
-    }
-    ife i 5 quote 0 else quote 1
-
-    quote 26
-    set tmp pr_parallaxscale
-
-    set gi tmp set gj tmp set gk tmp
-    al gi al gj al gk
-    ftoi gi 20 ftoi gj 200 ftoi gk 2000
-    al gi al gj al gk
-    mul gk 2
-    itof gk 2000
-ends
-
 // prints out maphack light definitions based on SE lights in map
 defstate printlights
-    print 10
+    print "--PRLIGHTS--"
     for i allsprites, ifactor SECTOREFFECTOR, ifge .lotag 49, ifle .lotag 50
     {
         ife .lotag 50
@@ -166,13 +88,13 @@ defstate printlights
             else
                 set l 2
         }
-        //                                   range     r   g   b
-        qsprintf TQUOTE 9 .sectnum .x .y .z .hitag .xvel .yvel .zvel
-                   j k    .ang .extra .xoffset .yoffset l    .owner
-        //    radius fade      horiz  minshade maxshade prio tile
+        //                                            range     r   g   b
+        qsprintf TQUOTE LIGHTQUOTE .sectnum .x .y .z .hitag .xvel .yvel .zvel
+                                   j k    .ang .extra .xoffset .yoffset l    .owner
+        //                    radius fade      horiz  minshade maxshade prio tile
         print TQUOTE
     }
-    print 11
+    print "--ENDPRLIGHTS--"
 ends
 
 // convenient polymer SE light manipulation with keypad keys
@@ -245,7 +167,7 @@ defstate fiddlewithlights
             ftoi k PRSCALE  // must convert to scaled integer, scale is 1:PRSCALE
             add k j, clamp k -10000 10000
             itof k PRSCALE  // convert back
-            qsprintf TQUOTE 29 k, quote TQUOTE
+            qsprintf TQUOTE "PARALLAX SCALE: %f" k, quote TQUOTE
             set pr_parallaxscale k
             break;
         }
@@ -253,23 +175,23 @@ defstate fiddlewithlights
         {
             set k pr_parallaxbias
             ftoi k PRSCALE, add k j, clamp k -10000 10000, itof k PRSCALE
-            qsprintf TQUOTE 30 k, quote TQUOTE
+            qsprintf TQUOTE "PARALLAX BIAS: %f" k, quote TQUOTE
             set pr_parallaxbias k
             break;
         }
         case 3:
         {
             set k pr_specularfactor
-            ftoi k PRSCALE, add k j, clamp k -10000 MAXSPECULAR, itof k PRSCALE
-            qsprintf TQUOTE 31 k, quote TQUOTE
+            ftoi k PRSCALE, add k j, clamp k 0 MAXSPECULAR, itof k PRSCALE
+            qsprintf TQUOTE "SPECULAR FACTOR: %f" k, quote TQUOTE
             set pr_specularfactor k
             break;
         }
         case 4:
         {
             set k pr_specularpower
-            ftoi k PRSCALE, add k j, clamp k -10000 MAXSPECULAR, itof k PRSCALE
-            qsprintf TQUOTE 32 k, quote TQUOTE
+            ftoi k PRSCALE, add k j, clamp k 0 MAXSPECULAR, itof k PRSCALE
+            qsprintf TQUOTE "SPECULAR POWER: %f" k, quote TQUOTE
             set pr_specularpower k
             break;
         }
@@ -282,36 +204,39 @@ defstate fiddlewithlights
     {
         set i searchwall, seti i  // set current sprite = targeted sprite
 
-        // horiz
-        ifeithershift set j 1 else set j 10
-        ifhitkey KEY_gUP add .extra j
-        else ifhitkey KEY_gKP5 sub .extra j
-        clamp .extra -500 500
+        ife .lotag 50
+        {
+            // horiz
+            ifeithershift set j 1 else set j 10
+            ifhitkey KEY_gUP add .extra j
+            else ifhitkey KEY_gKP5 sub .extra j
+            clamp .extra -500 500
 
-        // angle
-        set j 128
-        ifeitherctrl set j 4
-        ifeithershift { ifeitherctrl set j 1 else set j 32 }
-        ifhitkey KEY_gLEFT sub .ang j
-        else ifhitkey KEY_gRIGHT add .ang j
+            // angle
+            set j 128
+            ifeitherctrl set j 4
+            ifeithershift { ifeitherctrl set j 1 else set j 32 }
+            ifhitkey KEY_gLEFT sub .ang j
+            else ifhitkey KEY_gRIGHT add .ang j
+
+            // radius
+            ifeitherctrl
+            {
+                ifholdkey KEY_gMINUS add .shade 9
+                else ifholdkey KEY_gPLUS sub .shade 9
+
+                clamp .shade -118 117
+            }
+        }
 
         // range
         ifeithershift set j 10
         else ifeitherctrl set j 1000
         else set j 100
-        ifhitkey KEY_gPGUP add .hitag j
-        else ifhitkey KEY_gHOME sub .hitag j
+        ifhitkey KEY_KP9 add .hitag j
+        else ifhitkey KEY_KP7 sub .hitag j
         clamp .hitag 0 16000
 
-        // radius
-        ifeitherctrl
-        {
-            ifholdkey KEY_gMINUS add .shade 9
-            else ifholdkey KEY_gPLUS sub .shade 9
-
-            clamp .shade -118 117
-        }
-
         // min/max shade
         ifeithershift set j -1 else set j 1
         ifeitherctrl
@@ -330,7 +255,7 @@ defstate fiddlewithlights
 
             ife k 1
             {
-                qsprintf TQUOTE 15 .xoffset .yoffset
+                qsprintf TQUOTE "XY offset: %d %d" .xoffset .yoffset
                 quote TQUOTE
             }
         }
@@ -338,15 +263,15 @@ defstate fiddlewithlights
         // color/picnum
         ifeitheralt
         {
-            ifhitkey KEY_gEND
+            ifhitkey KEY_KP1
             {
-                getnumber256 .xvel 12 255
-                getnumber256 .yvel 13 255
-                getnumber256 .zvel 14 255
+                getnumber256 .xvel "RED:" 255
+                getnumber256 .yvel "GREEN:" 255
+                getnumber256 .zvel "BLUE:" 255
             }
-            else ifhitkey KEY_gDOWN
+            else ifhitkey KEY_KP2
             {
-                getnumber256 .owner 17 -MAXTILES
+                getnumber256 .owner "PICNUM:" -MAXTILES
             }
         }
         else
@@ -355,9 +280,9 @@ defstate fiddlewithlights
             ifeithershift inv j
 
             set k 0
-            ifhitkey KEY_gEND { add .xvel j, set k 1 }
-            ifhitkey KEY_gDOWN { add .yvel j, set k 1 }
-            ifhitkey KEY_gPGDN { add .zvel j, set k 1 }
+            ifhitkey KEY_KP1 { add .xvel j, set k 1 }
+            ifhitkey KEY_KP2 { add .yvel j, set k 1 }
+            ifhitkey KEY_KP3 { add .zvel j, set k 1 }
 
             ife k 1
             {
@@ -365,35 +290,13 @@ defstate fiddlewithlights
                 clamp .yvel 1 255
                 clamp .zvel 1 255
 
-                qsprintf TQUOTE 16 .xvel .yvel .zvel
+                qsprintf TQUOTE "RGB color: %d %d %d" .xvel .yvel .zvel
                 quote TQUOTE
             }
         }
     }
 ends
 
-/*
-defstate testkeyavail
-    for i range 27
-    {
-        ifholdkey alphakeys[i]
-        {
-            qsprintf TQUOTE 5 i alphakeys[i]
-            quote TQUOTE
-        }
-    }
-
-    for i range 10
-    {
-        ifholdkey numberkeys[i]
-        {
-            qsprintf TQUOTE 18 i numberkeys[i]
-            quote TQUOTE
-        }
-    }
-ends
-*/
-
 // rotate highlighted sprites around selected (closest to mouse) sprite
 // global parameter: dang
 defstate rotselspr
@@ -488,7 +391,12 @@ onevent EVENT_DRAW2DSCREEN
 */
 
 ////////// polymer light 2d projections //////////
-    set tmp drawlinepat
+    var c d h x2 y2 oldpat
+
+    array xx 2
+    array yy 2
+
+    set oldpat drawlinepat
     set drawlinepat 0x11111111
     for i spritesofsector cursectnum
     {
@@ -548,7 +456,7 @@ onevent EVENT_DRAW2DSCREEN
             }
         }
     }
-    set drawlinepat tmp
+    set drawlinepat oldpat
 endevent
 
 // LOCATORS auto-incrementer
@@ -727,25 +635,6 @@ ends
 onevent EVENT_ANALYZESPRITES
     state tduprot
     state tduplin
-/*
-    ife searchstat 3
-    for i drawnsprites
-    {
-        ife tsprite[i].owner searchwall
-        {
-            qsprintf TQUOTE 33 tsprite[i].pal
-            quote TQUOTE
-            break
-        }
-
-
-//        switch sprite[j].picnum
-//        case LIZTROOP spritepal 1 break
-//        case PIGCOP spritepal 2 break
-//        case BOSS1 spritepal 6 break
-//        endswitch
-    }
-*/
 endevent
 
 onevent EVENT_KEYS3D
@@ -790,7 +679,7 @@ onevent EVENT_KEYS3D
 //        }
         ifn tmp 0
         {
-            quote 7
+            quote "door sector not an island sector!"
             return
         }
 
@@ -805,7 +694,7 @@ onevent EVENT_KEYS3D
         }
         ifl l 0
         {
-            quote 8
+            quote "door sector has no SE sprite!"
             return
         }
 
@@ -868,7 +757,7 @@ onevent EVENT_KEYS3D
         ifl davr 32768 set davr 32768
         ifg davr 256000 set davr 256000
         setaspect davr yxaspect
-        qsprintf TQUOTE 4 davr yxaspect
+        qsprintf TQUOTE "ASPECT: VR=%d, YX=%d" davr yxaspect
         quote TQUOTE
     }
 endevent
@@ -917,10 +806,10 @@ ends
 
 // Map corruption checker
 
-gamevar ewall 0 0
-gamevar endwall 0 0
-
 defstate corruptchk
+    var ewall
+    var endwall
+
     ifle numsectors MAXSECTORS ifle numwalls MAXWALLS nullop else
     { quote 19 printmessage16 19 return }
 
diff --git a/polymer/eduke32/samples/tests.m32 b/polymer/eduke32/samples/tests.m32
new file mode 100644
index 000000000..5dc737d2e
--- /dev/null
+++ b/polymer/eduke32/samples/tests.m32
@@ -0,0 +1,152 @@
+
+// load a.m32 first
+
+defstate testkeyavail
+    for i range 27
+    {
+        ifholdkey alphakeys[i]
+        {
+            qsprintf TQUOTE "ALPHA KEY: %d (SCANCODE: %d)" i alphakeys[i]
+            quote TQUOTE
+        }
+    }
+
+    for i range 10
+    {
+        ifholdkey numberkeys[i]
+        {
+            qsprintf TQUOTE "NUMBER KEY: %d (SCANCODE: %d)" i numberkeys[i]
+            quote TQUOTE
+        }
+    }
+ends
+
+
+// various tests of m32-script features
+
+defstate arraytest
+    getarraysize ar tmp
+    resizearray ar 65536
+    getticks parm[2]
+    for j range 65536
+        set ar[j] j
+    set i 0
+    for j range 65536
+        add i ar[j]
+    getticks parm[3]
+    resizearray ar tmp
+    ife i 2147450880 quote "OK" else quote "DAMN"
+    sub parm[3] parm[2]
+    qsprintf TQUOTE "time: %d ms" parm[3]
+    quote TQUOTE
+ends
+
+defstate itertest
+// iteration and break test
+    for i range 10
+    {
+        addlogvar i
+        ife i 5 break
+    }
+    ife i 5 quote "OK" else quote "DAMN"
+
+    quote "FLOAT ACCESS TEST"
+    set tmp pr_parallaxscale
+
+    set gi tmp set gj tmp set gk tmp
+    al gi al gj al gk
+    ftoi gi 20 ftoi gj 200 ftoi gk 2000
+    al gi al gj al gk
+    mul gk 2
+    itof gk 2000
+ends
+
+define TEST_ZERO 0
+define TEST_PLUS_ONE 1
+define TEST_MINUS_ONE -1
+
+define MOST_POSITIVE_DIRECT 32767
+define MOST_NEGATIVE_DIRECT -32768
+define LEAST_POSITIVE_INDIRECT 32768
+define LEAST_NEGATIVE_INDIRECT -32769
+
+define HEX_MOST_POSITIVE_DIRECT 0x7fff
+define HEX_MOST_NEGATIVE_DIRECT 0xffff8000
+define HEX_LEAST_POSITIVE_INDIRECT 0x8000
+define HEX_LEAST_NEGATIVE_INDIRECT 0xffff7fff
+
+define MAX_CONSTANT 2147483647
+define MIN_CONSTANT -2147483648
+
+// tests various combinations of constants and labels
+defstate consttest
+    quote " --- Constants test ---", quote " "
+
+    quote "Shoud be 0:"
+    set i 0, set j TEST_ZERO
+    qsprintf TQUOTE "%d %d  %d %d" 0 TEST_ZERO  i j
+    quote TQUOTE, quote " "
+
+    quote "Shoud be 1:"
+    set i 1, set j TEST_PLUS_ONE
+    qsprintf TQUOTE "%d %d  %d %d" 1 TEST_PLUS_ONE  i j
+    quote TQUOTE, quote " "
+
+    quote "Shoud be -1:"
+    set i -1, set j TEST_MINUS_ONE
+    qsprintf TQUOTE "%d %d  %d %d" -1 TEST_MINUS_ONE  i j
+    quote TQUOTE, quote " "
+
+
+    quote "Shoud be 32767:"
+    set i 32767, set j MOST_POSITIVE_DIRECT
+    qsprintf TQUOTE "%d %d  %d %d" 32767 MOST_POSITIVE_DIRECT  i j
+    quote TQUOTE, quote " "
+
+    quote "Shoud be -32768:"
+    set i -32768, set j MOST_NEGATIVE_DIRECT
+    qsprintf TQUOTE "%d %d  %d %d" -32768 MOST_NEGATIVE_DIRECT  i j
+    quote TQUOTE, quote " "
+
+    quote "Shoud be 32768:"
+    set i 32768, set j LEAST_POSITIVE_INDIRECT
+    qsprintf TQUOTE "%d %d  %d %d" 32768 LEAST_POSITIVE_INDIRECT  i j
+    quote TQUOTE, quote " "
+
+    quote "Shoud be -32769:"
+    set i -32769, set j LEAST_NEGATIVE_INDIRECT
+    qsprintf TQUOTE "%d %d  %d %d" -32769 LEAST_NEGATIVE_INDIRECT  i j
+    quote TQUOTE, quote " "
+
+    quote "Hex tests:"
+    quote "Shoud be 32767:"
+    set i 0x7fff, set j HEX_MOST_POSITIVE_DIRECT
+    qsprintf TQUOTE "%d %d  %d %d" 0x7fff HEX_MOST_POSITIVE_DIRECT  i j
+    quote TQUOTE, quote " "
+
+    quote "Shoud be -32768:"
+    set i 0xffff8000, set j HEX_MOST_NEGATIVE_DIRECT
+    qsprintf TQUOTE "%d %d  %d %d" 0xffff8000 HEX_MOST_NEGATIVE_DIRECT  i j
+    quote TQUOTE, quote " "
+
+    quote "Shoud be 32768:"
+    set i 0x8000, set j HEX_LEAST_POSITIVE_INDIRECT
+    qsprintf TQUOTE "%d %d  %d %d" 0x8000 HEX_LEAST_POSITIVE_INDIRECT  i j
+    quote TQUOTE, quote " "
+
+    quote "Shoud be -32769:"
+    set i 0xffff7fff, set j HEX_LEAST_NEGATIVE_INDIRECT
+    qsprintf TQUOTE "%d %d  %d %d" 0xffff7fff HEX_LEAST_NEGATIVE_INDIRECT  i j
+    quote TQUOTE, quote " "
+
+    quote "min/max tests:"
+    quote "Shoud be 2147483647:"
+    set i 2147483647, set j MAX_CONSTANT
+    qsprintf TQUOTE "%d %d  %d %d" 2147483647 MAX_CONSTANT  i j
+    quote TQUOTE, quote " "
+
+    quote "Shoud be -2147483648:"
+    set i -2147483648, set j MIN_CONSTANT
+    qsprintf TQUOTE "%d %d  %d %d" -2147483648 MIN_CONSTANT  i j
+    quote TQUOTE, quote " "
+ends
diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c
index bdba16ca1..9414a56b8 100644
--- a/polymer/eduke32/source/astub.c
+++ b/polymer/eduke32/source/astub.c
@@ -94,6 +94,8 @@ static struct strllist
 const char *scripthist[SCRIPTHISTSIZ];
 int32_t scripthistend = 0;
 
+int32_t showambiencesounds=2;
+
 //////////////////// Key stuff ////////////////////
 
 #define eitherALT   (keystatus[KEYSC_LALT] || keystatus[KEYSC_RALT])
@@ -7318,19 +7320,6 @@ static int32_t osdcmd_testplay_addparam(const osdfuncparm_t *parm)
     return OSDCMD_OK;
 }
 
-static int32_t osdcmd_showheightindicators(const osdfuncparm_t *parm)
-{
-    extern int32_t showheightindicators;
-
-    if (parm->numparms == 1)
-        showheightindicators = clamp(atoi(parm->parms[0]), 0, 2);
-
-    OSD_Printf("height indicators: %s\n",
-               showheightindicators==0 ? "none" :
-               (showheightindicators==1 ? "two-sided walls only" : "all"));
-
-    return OSDCMD_OK;
-}
 
 //PK vvv ------------
 static int32_t osdcmd_vars_pk(const osdfuncparm_t *parm)
@@ -7368,20 +7357,55 @@ static int32_t osdcmd_vars_pk(const osdfuncparm_t *parm)
     }
     else if (!Bstrcasecmp(parm->name, "pk_uedaccel"))
     {
-        if (showval)
-            OSD_Printf("UnrealEd mouse navigation acceleration is %d\n", pk_uedaccel);
-        else
+        if (parm->numparms==1)
         {
             pk_uedaccel = atoi(parm->parms[0]);
             pk_uedaccel = pk_uedaccel<0 ? 0:pk_uedaccel;
             pk_uedaccel = pk_uedaccel>5 ? 5:pk_uedaccel;
         }
+
+        if (parm->numparms <= 1)
+            OSD_Printf("UnrealEd mouse navigation acceleration is %d\n", pk_uedaccel);
+        else
+            return OSDCMD_SHOWHELP;
     }
     else if (!Bstrcasecmp(parm->name, "osd_tryscript"))
     {
         m32_osd_tryscript = !m32_osd_tryscript;
         OSD_Printf("Try M32 script execution on invalid OSD command: %s\n", m32_osd_tryscript?"on":"off");
     }
+    else if (!Bstrcasecmp(parm->name, "script_expertmode"))
+    {
+        m32_script_expertmode = !m32_script_expertmode;
+        if (m32_script_expertmode)
+            OSD_Printf("M32 Script expert mode ENABLED.  Be sure to know what you are doing!\n");
+        else
+            OSD_Printf("M32 Script expert mode DISABLED.\n");
+    }
+    else if (!Bstrcasecmp(parm->name, "show_heightindicators"))
+    {
+        static const char *how[3] = {"none", "two-sided walls only", "all"};
+
+        if (parm->numparms == 1)
+            showheightindicators = clamp(atoi(parm->parms[0]), 0, 2);
+
+        if (parm->numparms <= 1)
+            OSD_Printf("height indicators: %s\n", how[showheightindicators]);
+        else
+            return OSDCMD_SHOWHELP;
+    }
+    else if (!Bstrcasecmp(parm->name, "show_ambiencesounds"))
+    {
+        static const char *how[3] = {"none", "current sector only", "all"};
+
+        if (parm->numparms == 1)
+            showambiencesounds = clamp(atoi(parm->parms[0]), 0, 2);
+
+        if (parm->numparms <= 1)
+            OSD_Printf("ambience sound circles: %s\n", how[showambiencesounds]);
+        else
+            return OSDCMD_SHOWHELP;
+    }
     return OSDCMD_OK;
 }
 
@@ -7615,18 +7639,19 @@ static int32_t registerosdcommands(void)
 
     OSD_RegisterFunction("noclip","noclip: toggles clipping mode", osdcmd_noclip);
 
-    OSD_RegisterFunction("quit","quit: exits the game immediately", osdcmd_quit);
-    OSD_RegisterFunction("exit","exit: exits the game immediately", osdcmd_quit);
+    OSD_RegisterFunction("quit","quit: exits the editor immediately", osdcmd_quit);
+    OSD_RegisterFunction("exit","exit: exits the editor immediately", osdcmd_quit);
 
     OSD_RegisterFunction("sensitivity","sensitivity <value>: changes the mouse sensitivity", osdcmd_sensitivity);
 
     //PK
-    OSD_RegisterFunction("pk_turnaccel", "pk_turnaccel: sets turning acceleration", osdcmd_vars_pk);
-    OSD_RegisterFunction("pk_turndecel", "pk_turndecel: sets turning deceleration", osdcmd_vars_pk);
-    OSD_RegisterFunction("pk_uedaccel", "pk_uedaccel: sets UnrealEd movement speed factor (0-5, exponentially)", osdcmd_vars_pk);
-    OSD_RegisterFunction("pk_quickmapcycling", "pk_quickmapcycling: allows cycling of maps with (Shift-)Ctrl-X", osdcmd_vars_pk);
-    OSD_RegisterFunction("testplay_addparam", "testplay_addparam \"string\": set additional parameters for test playing", osdcmd_testplay_addparam);
-    OSD_RegisterFunction("showheightindicators", "showheightindicators [012]: toggles height indicators in 2D mode", osdcmd_showheightindicators);
+    OSD_RegisterFunction("pk_turnaccel", "pk_turnaccel <value>: sets turning acceleration+deceleration", osdcmd_vars_pk);
+    OSD_RegisterFunction("pk_turndecel", "pk_turndecel <value>: sets turning deceleration", osdcmd_vars_pk);
+    OSD_RegisterFunction("pk_uedaccel", "pk_uedaccel <value>: sets UnrealEd movement speed factor (0-5, exponentially)", osdcmd_vars_pk);
+    OSD_RegisterFunction("pk_quickmapcycling", "pk_quickmapcycling: toggles quick cycling of maps with (Shift-)Ctrl-X", osdcmd_vars_pk);
+    OSD_RegisterFunction("testplay_addparam", "testplay_addparam \"string\": sets additional parameters for test playing", osdcmd_testplay_addparam);
+    OSD_RegisterFunction("show_heightindicators", "show_heightindicators <0, 1 or 2>: sets display of height indicators in 2D mode", osdcmd_vars_pk);
+    OSD_RegisterFunction("show_ambiencesounds", "show_ambiencesounds <0, 1 or 2>: sets display of MUSICANDSFX circles in 2D mode", osdcmd_vars_pk);
 #ifdef POLYMOST
     OSD_RegisterFunction("tint", "tint <pal> <r> <g> <b> <flags>: queries or sets hightile tinting", osdcmd_tint);
 #endif
@@ -7634,10 +7659,11 @@ static int32_t registerosdcommands(void)
     // M32 script
     OSD_RegisterFunction("include", "include <filnames...>: compiles one or more M32 script files", osdcmd_include);
     OSD_RegisterFunction("do", "do (m32 script ...): executes M32 script statements", osdcmd_do);
-    OSD_RegisterFunction("scriptinfo", "scriptinfo: shows information about compiled M32 script", osdcmd_scriptinfo);
+    OSD_RegisterFunction("script_info", "script_info: shows information about compiled M32 script", osdcmd_scriptinfo);
+    OSD_RegisterFunction("script_expertmode", "script_expertmode: toggles M32 script expert mode", osdcmd_vars_pk);
     OSD_RegisterFunction("enableevent", "enableevent <all|EVENT_...|(event number)>", osdcmd_endisableevent);
     OSD_RegisterFunction("disableevent", "disableevent <all|EVENT_...|(event number)>", osdcmd_endisableevent);
-    OSD_RegisterFunction("osd_tryscript", "osd_tryscript: Toggles execution of M32 script on invalid OSD command", osdcmd_vars_pk);
+    OSD_RegisterFunction("osd_tryscript", "osd_tryscript: toggles execution of M32 script on invalid OSD command", osdcmd_vars_pk);
 //    OSD_RegisterFunction("disasm", "disasm [s|e] <state or event number>", osdcmd_disasm);
     return 0;
 }
@@ -9008,22 +9034,26 @@ void ExtPreCheckKeys(void) // just before drawrooms
         }
     }
 
-    for (i=0; i<numsprites; i++)
-        if (sprite[i].picnum == 5 /*&& zoom >= 256*/ && sprite[i].sectnum != MAXSECTORS)
-        {
-            xp1 = mulscale14(sprite[i].x-pos.x,zoom);
-            yp1 = mulscale14(sprite[i].y-pos.y,zoom);
+    if (showambiencesounds)
+        for (i=0; i<numsprites; i++)
+            if (sprite[i].picnum == MUSICANDSFX /*&& zoom >= 256*/ && sprite[i].sectnum != MAXSECTORS)
+            {
+                if (showambiencesounds==1 && sprite[i].sectnum!=cursectnum)
+                    continue;
 
-            radius = mulscale14(sprite[i].hitag,zoom);
-            col = 6;
-            if (i+16384 == pointhighlight)
-                if (totalclock & 32) col += (2<<2);
-            drawlinepat = 0xf0f0f0f0;
-            drawcircle16(halfxdim16+xp1, midydim16+yp1, radius, editorcolors[(int32_t)col]);
-            drawlinepat = 0xffffffff;
-            //            radius = mulscale15(sprite[i].hitag,zoom);
-            //          drawcircle16(halfxdim16+xp1, midydim16+yp1, radius, col);
-        }
+                xp1 = mulscale14(sprite[i].x-pos.x,zoom);
+                yp1 = mulscale14(sprite[i].y-pos.y,zoom);
+
+                radius = mulscale14(sprite[i].hitag,zoom);
+                col = 6;
+                if (i+16384 == pointhighlight)
+                    if (totalclock & 32) col += (2<<2);
+                drawlinepat = 0xf0f0f0f0;
+                drawcircle16(halfxdim16+xp1, midydim16+yp1, radius, editorcolors[(int32_t)col]);
+                drawlinepat = 0xffffffff;
+                //            radius = mulscale15(sprite[i].hitag,zoom);
+                //          drawcircle16(halfxdim16+xp1, midydim16+yp1, radius, col);
+            }
 
     enddrawing();
 }
diff --git a/polymer/eduke32/source/m32def.c b/polymer/eduke32/source/m32def.c
index 5ffd6a356..da9d05199 100644
--- a/polymer/eduke32/source/m32def.c
+++ b/polymer/eduke32/source/m32def.c
@@ -29,10 +29,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "keys.h"
 
 char g_szScriptFileName[BMAX_PATH] = "(none)";  // file we're currently compiling
-static char g_szCurrentBlockName[256] = "(none)", g_szLastBlockName[256] = "NULL";
+static char g_szCurrentBlockName[BMAX_PATH] = "(none)", g_szLastBlockName[BMAX_PATH] = "NULL";
 
 ////// compiler state vvv
-static const char *textptr;
+static const char *textptr, *start_textptr, *g_curkwptr;
+static int32_t g_tw;
 int32_t g_totalLines, g_lineNumber;
 int32_t g_numCompilerErrors, g_numCompilerWarnings;
 
@@ -79,7 +80,7 @@ static int32_t statesinfo_allocsize = 512;
 static int32_t interactive_compilation = 0;
 
 static char tempbuf[2048];
-static char tlabel[MAXLABELLEN];
+static char tlabel[MAXLABELLEN], tlabel2[MAXLABELLEN];
 
 int32_t g_iReturnVar=0;
 int32_t m32_sortvar1, m32_sortvar2;
@@ -89,6 +90,7 @@ int32_t g_numQuoteRedefinitions = 0;
 
 ofstype aEventOffsets[MAXEVENTS];
 int32_t aEventSizes[MAXEVENTS];
+uint16_t aEventNumLocals[MAXEVENTS];
 
 gamevar_t aGameVars[MAXGAMEVARS];
 gamearray_t aGameArrays[MAXGAMEARRAYS];
@@ -101,6 +103,7 @@ int32_t g_gameArrayCount=0, g_systemArrayCount=0;
 
 
 void C_ReportError(int32_t iError);
+static void PrintErrorPosition();
 
 enum ScriptLabel_t
 {
@@ -506,6 +509,7 @@ const tokenmap_t iter_tokens[] =
 hashtable_t h_gamevars = { MAXGAMEVARS>>1, NULL };
 hashtable_t h_arrays   = { MAXGAMEARRAYS>>1, NULL };
 hashtable_t h_labels   = { 11262>>1, NULL };
+static hashtable_t h_localvars = { MAXGAMEVARS>>2, NULL };  // values: offset|(array?(size<<16):0)
 
 static hashtable_t h_states   = { 1264>>1, NULL };
 static hashtable_t h_keywords = { CON_END>>1, NULL };
@@ -522,6 +526,8 @@ static void C_InitHashes()
 
     hash_init(&h_gamevars);
     hash_init(&h_arrays);
+    hash_init(&h_localvars);
+
     hash_init(&h_labels);
     hash_init(&h_states);
 
@@ -550,6 +556,7 @@ static void C_InitHashes()
         hash_add(&h_iter, iter_tokens[i].token, iter_tokens[i].val, 0);
 }
 
+// returns:  0:success, 1:failure
 static int32_t C_SetScriptSize(int32_t size)
 {
     ofstype oscriptOfs = (unsigned)(g_scriptPtr-script);
@@ -597,15 +604,15 @@ static int32_t C_SetScriptSize(int32_t size)
     return 0;
 }
 
-static inline int32_t ispecial(char c)
+static inline int32_t char_whitespace(char c)
 {
     return c==' ' || c=='\t' || c=='\n' || c=='\r' || c=='(' || c==')' || c==',' || c==';';
 }
 
-static inline int32_t isaltok(char c)
+static inline int32_t char_alnumtok(char c)
 {
     return isalnum(c) || c == '#' || c == '{' || c == '}' || c == '/' || c == '\\' ||
-           c == '*' || c == '-' || c == '_' || c == '.';
+           c == '*' || c == '-' || c == '_' || c == '.' || c == '"';
 }
 
 static int32_t C_SkipComments(void)
@@ -614,7 +621,7 @@ static int32_t C_SkipComments(void)
 
     do
     {
-        if (ispecial(c))
+        if (char_whitespace(c))
         {
             textptr++;
             g_lineNumber += (c=='\n');
@@ -650,7 +657,10 @@ static int32_t C_SkipComments(void)
     }
     while ((c = *textptr));
 
-    if ((unsigned)(g_scriptPtr-script) > (unsigned)(g_scriptSize-32))
+    // Be sure to have enough space allocated for the command to be parsed next.
+    // Currently, the commands that potentially need the most space are
+    // various string handling function that accept inline strings.
+    if ((unsigned)(g_scriptPtr-script) > (unsigned)(g_scriptSize - max(40, MAXQUOTELEN/sizeof(instype)+8)))
         return C_SetScriptSize(g_scriptSize<<1);
 
     return 0;
@@ -668,29 +678,32 @@ static inline int32_t C_GetLabelNameID(const memberlabel_t *pLabel, hashtable_t
     return l;
 }
 
-static void C_GetNextLabelName(void)
+// returns:  1 on EOF or (checkkeyw and keyword encountered), 0 else
+static int32_t C_GetNextLabelName(int32_t checkkeyw)
 {
     int32_t i;
 
     C_SkipComments();
 
+    tlabel[0] = 0;
+
     if (*textptr == 0)
     {
         C_CUSTOMERROR("unexpected EOF where label was expected.");
-        return;
+        return 1;
     }
 
-    while (!isalnum(*textptr))
+    while (*textptr && (char_whitespace(*textptr) || *textptr=='-')) //!isalnum(*textptr))
     {
         g_lineNumber += (*textptr == 0x0a);
-
         textptr++;
-        if (!*textptr)
-            return;
     }
 
+    if (!isalpha(*textptr))
+        C_CUSTOMERROR("label names must start with an alphabetic character, encountered '%c'.", *textptr);
+
     i = 0;
-    while (!ispecial(*textptr) && *textptr!='['&& *textptr!=']')
+    while (*textptr && !char_whitespace(*textptr) && *textptr!='['&& *textptr!=']')
     {
         if (i < MAXLABELLEN-1)
             tlabel[i++] = *(textptr++);
@@ -699,8 +712,21 @@ static void C_GetNextLabelName(void)
     }
 
     tlabel[i] = 0;
+
+    if (checkkeyw)
+    {
+        if (hash_find(&h_keywords, tlabel)>=0)
+        {
+            g_numCompilerErrors++;
+            C_ReportError(ERROR_ISAKEYWORD);
+            return 1;
+        }
+    }
+
 //    if (!(g_numCompilerErrors || g_numCompilerWarnings) && g_scriptDebug > 1)
 //        initprintf("%s:%d: debug: got label `%s'.\n",g_szScriptFileName,g_lineNumber,tlabel);
+
+    return 0;
 }
 
 static int32_t C_CopyLabel(void)
@@ -724,6 +750,7 @@ static int32_t C_CopyLabel(void)
     return 0;
 }
 
+// returns: -1 on EOF or not a keyword, keyword index (==bytecode value) else
 static int32_t C_GetKeyword(void)
 {
     int32_t i;
@@ -736,15 +763,15 @@ static int32_t C_GetKeyword(void)
 
     temptextptr = textptr;
 
-    while (!isaltok(*temptextptr))
+    while (!char_alnumtok(*temptextptr))
     {
         temptextptr++;
         if (!*temptextptr)
-            return 0;
+            return -1;
     }
 
     i = 0;
-    while (isaltok(*temptextptr))
+    while (char_alnumtok(*temptextptr))
         tempbuf[i++] = *(temptextptr++);
     tempbuf[i] = 0;
 
@@ -762,7 +789,7 @@ static int32_t C_GetNextKeyword(void)
     if (*textptr == 0)
         return -1;
 
-    while (!isaltok(*textptr))
+    while (!char_alnumtok(*textptr))
     {
         g_lineNumber += (*textptr == 0x0a);
 
@@ -773,18 +800,20 @@ static int32_t C_GetNextKeyword(void)
     }
 
     l = 0;
-    while (isaltok(*(textptr+l)) && !(*(textptr + l) == '.'))
+    while (char_alnumtok(textptr[l]) && textptr[l] != '.')
     {
         tempbuf[l] = textptr[l];
         l++;
     }
-    while (isaltok(*(textptr+l)))
+    while (char_alnumtok(textptr[l]))
     {
         tempbuf[l] = textptr[l];
         l++;
     }
     tempbuf[l] = 0;
 
+    g_curkwptr = textptr;
+
     textptr += l;
 
     i = hash_find(&h_keywords, tempbuf);
@@ -839,12 +868,36 @@ static int32_t C_GetNextKeyword(void)
     return i;
 }
 
-#define GetGamevarID(szGameLabel) hash_find(&h_gamevars, szGameLabel)
-#define GetGamearrayID(szGameLabel) hash_find(&h_arrays, szGameLabel)
+static int32_t GetGamevarID(const char *szGameLabel, int32_t searchlocals)
+{
+    if (searchlocals)
+    {
+        int32_t retid = hash_find(&h_localvars, szGameLabel);
+        if (retid>=0 && retid<MAXGAMEVARS)  // it's a local variable
+            return M32_FLAG_LOCAL | retid;
+    }
+
+    return hash_find(&h_gamevars, szGameLabel);
+}
+
+static int32_t GetGamearrayID(const char *szGameLabel, int32_t searchlocals)
+{
+    if (searchlocals)
+    {
+        int32_t retid = hash_find(&h_localvars, szGameLabel);
+        if (retid > MAXGAMEVARS)  // it's a local array
+            return retid;
+    }
+    return hash_find(&h_arrays, szGameLabel);
+}
+
+// gamevar type restrictions
+#define GV_WRITABLE GAMEVAR_READONLY
+#define GV_SIMPLE GAMEVAR_SPECIAL
 
 static void C_GetNextVarType(int32_t type)
 {
-    int32_t i, id=0, flags=0, num, indirect=0;
+    int32_t i, id=0, flags=0, num, indirect=0; //, thenum;
 
     C_SkipComments();
 
@@ -856,10 +909,20 @@ static void C_GetNextVarType(int32_t type)
 
     g_wasConstant = 0;
 
-    // constant where gamevar expected
-    if ((type==0 || type==GAMEVAR_SPECIAL) && !cs.labelsOnly &&
+    if (*textptr == '"')
+    {
+        C_CUSTOMERROR("String literal encountered where not expected, skipping.");
+        while (*textptr && *textptr!='"' && *textptr!=0x0a)
+            textptr++;
+        if (*textptr == '"')
+            textptr++;
+        return;
+    }
+    else if (!(type&GV_WRITABLE) && !cs.labelsOnly &&
             (isdigit(textptr[0]) || (textptr[0]=='-' && isdigit(textptr[1]))))
     {
+        // literal numeric constant where gamevar expected
+
 //        if (!(g_numCompilerErrors || g_numCompilerWarnings) && g_scriptDebug)
 //            initprintf("%s:%d: debug: accepted constant %d in place of gamevar.\n",g_szScriptFileName,g_lineNumber,atol(textptr));
 
@@ -867,17 +930,23 @@ static void C_GetNextVarType(int32_t type)
             sscanf(textptr+2, "%" SCNx32, &num);
         else
             num = atoi(textptr);
-
-        if (type==GAMEVAR_SPECIAL && (num<0 || num>=65536))
+//thenum=num;
+        if (type==GV_SIMPLE && (num<0 || num>=65536))
             C_CUSTOMERROR("array index %d out of bounds. (max: 65535)",  num);
 
-        if (g_numCompilerErrors==0 && type!=GAMEVAR_SPECIAL && num != (int16_t)num)
+        if (g_numCompilerErrors==0 && type!=GV_SIMPLE && num != (int16_t)num)
         {
+            // Constant doesn't fit in 16 bits, make it indirect.
+            // Array indices are interpreted as unsigned, so they always fit into the high bits of the instruction.
+
             indirect = 1;
 
             for (i=g_numSavedConstants-1; i>=0; i--)
                 if (constants[i] == num)
+                {
+                    num = i;
                     break;
+                }
 
             if (i<0)
             {
@@ -900,38 +969,24 @@ static void C_GetNextVarType(int32_t type)
             }
         }
 
-        if (type!=GAMEVAR_SPECIAL)
+        if (type!=GV_SIMPLE)
             g_wasConstant = 1;
 
-        *g_scriptPtr++ = MAXGAMEVARS | (num<<16) | indirect;
+//printf("num:%d, idx:%d, indir:%d\n",thenum,num,indirect);
+        *g_scriptPtr++ = (num<<16) | M32_FLAG_CONSTANT | indirect;
 
-        while (!ispecial(*textptr) && *textptr != ']')
+        while (!char_whitespace(*textptr) && *textptr != ']')
             textptr++;
 
         return;
     }
-    else if (textptr[0]=='-' && textptr[1] != '.') //  && !isdigit(*(textptr+1))
+    else if (type != GV_SIMPLE && (textptr[0]=='.' || (textptr[0]=='-' && textptr[1]=='.')))
     {
-        if (type==0)
-        {
-//            if (!(g_numCompilerErrors || g_numCompilerWarnings) && g_scriptDebug)
-//                initprintf("%s:%d: debug: flagging gamevar as negative.\n",g_szScriptFileName,g_lineNumber,atol(textptr));
-            flags = M32_FLAG_NEGATE;
-        }
-        else
-        {
-            C_CUSTOMERROR("error: syntax error. Tried negating written-to variable.");
-            C_GetNextLabelName();
-            return;
-        }
-    }
-    else if (type != GAMEVAR_SPECIAL &&
-             (textptr[0]=='.' || (textptr[0]=='-' && textptr[1]=='.')))
-    {
-        int32_t lLabelID = -1, aridx = M32_THISACTOR_VAR_ID;
+        // current sprite shortcut access
 
-        flags |= M32_FLAG_SPECIAL;
+        int32_t lLabelID;
 
+        flags = M32_FLAG_STRUCT;
         if (*textptr=='-')
         {
             flags |= M32_FLAG_NEGATE;
@@ -941,7 +996,7 @@ static void C_GetNextVarType(int32_t type)
 
         /// now pointing at 'xxx'
 
-        C_GetNextLabelName();
+        C_GetNextLabelName(0);
         lLabelID = C_GetLabelNameID(SpriteLabels, &h_sprite, Bstrtolower(tlabel));
 
         if (lLabelID == -1)
@@ -951,21 +1006,41 @@ static void C_GetNextVarType(int32_t type)
             return;
         }
 
-        id = M32_SPRITE_VAR_ID;
-        *g_scriptPtr++ = ((aridx<<16) | id | (lLabelID<<2) | flags);
+        *g_scriptPtr++ = ((M32_THISACTOR_VAR_ID<<16) | flags | (lLabelID<<2) | M32_SPRITE_VAR_ID);
 
         return;
     }
-
-    C_GetNextLabelName();
-    if (hash_find(&h_keywords, tlabel)>=0)
+    else if (textptr[0]=='-' && textptr[1] != '.') //  && !isdigit(*(textptr+1))
     {
-        g_numCompilerErrors++;
-        C_ReportError(ERROR_ISAKEYWORD);
-        return;
+        // negation
+
+        if (type==0)
+        {
+//            if (!(g_numCompilerErrors || g_numCompilerWarnings) && g_scriptDebug)
+//                initprintf("%s:%d: debug: flagging gamevar as negative.\n",g_szScriptFileName,g_lineNumber,atol(textptr));
+            flags = M32_FLAG_NEGATE;
+        }
+        else
+        {
+            if (type==GV_WRITABLE)
+                C_CUSTOMERROR("syntax error. Tried negating written-to variable.");
+            else if (type==GV_SIMPLE)
+                C_CUSTOMERROR("syntax error. Tried negating variable in context that doesn't allow it.");
+            else  // type==GV_WRITABLE|GV_SIMPLE
+                C_CUSTOMERROR("syntax error. Tried negating written-to variable in context that doesn't allow it.");
+
+            C_GetNextLabelName(1);
+
+            return;
+        }
     }
 
+    // at this point, flags can be 0 or M32_FLAG_NEGATE
+
+    C_GetNextLabelName(1);
+
     C_SkipComments();  //skip comments and whitespace
+
     if (*textptr == '[')  //read of array as a gamevar
     {
         int32_t lLabelID = -1, aridx;
@@ -973,43 +1048,57 @@ static void C_GetNextVarType(int32_t type)
         textptr++;
         flags |= M32_FLAG_ARRAY;
 
-        if (type & GAMEVAR_SPECIAL)
+        if (type & GV_SIMPLE)
         {
             g_numCompilerErrors++;
             C_ReportError(ERROR_EXPECTEDSIMPLEVAR);
             return;
         }
 
-        id = GetGamearrayID(tlabel);
+        id = GetGamearrayID(tlabel, 1);
         if (id < 0)
         {
-            id = GetGamevarID(tlabel);
-            if (id >= 4)
-                id = -1;
+            id = GetGamevarID(tlabel, 0);
 
-            if (id < 0)
+            if (id < 0 || id >= 4)
             {
-                g_numCompilerErrors++;
-                C_ReportError(ERROR_NOTAGAMEARRAY);
+                C_CUSTOMERROR("symbol `%s' is neither an array name nor one of `(t)sprite', `sector' or `wall'.", tlabel);
                 return;
             }
 
             flags &= ~M32_FLAG_ARRAY; // not an array
-            flags |= M32_FLAG_SPECIAL;
+            flags |= M32_FLAG_STRUCT;
         }
-        else
+        else if (id<MAXGAMEARRAYS)  // simple (non-local) gamearrays
         {
-            if ((aGameArrays[id].dwFlags & GAMEARRAY_READONLY) && (type&GAMEVAR_READONLY))
+            if ((aGameArrays[id].dwFlags & GAMEARRAY_READONLY) && (type&GV_WRITABLE))
             {
                 C_ReportError(ERROR_ARRAYREADONLY);
                 g_numCompilerErrors++;
             }
         }
+        else  // local array
+        {
+            Bmemcpy(tlabel2, tlabel, MAXLABELLEN);
+            flags |= M32_FLAG_LOCAL;
+        }
 
-        C_GetNextVarType(GAMEVAR_SPECIAL);  // _SPECIAL signifies that we want only simple vars or a constant
+        // ---------- get index:
+        // GV_SIMPLE signifies that we want only simple vars or a constant
+        C_GetNextVarType(GV_SIMPLE);
         g_scriptPtr--;
         aridx = *g_scriptPtr;
 
+        if ((flags & M32_VARTYPE_MASK) == M32_FLAG_LOCAL)
+        {
+            if ((aridx & M32_BITS_MASK) != M32_FLAG_CONSTANTINDEX)
+                C_CUSTOMERROR("local arrays can only be indexed with constants.");
+
+            aridx = (int16_t)((aridx>>16)&0xffff);  // decode...
+        }
+
+        // ----------
+
         C_SkipComments();
 
         if (*textptr != ']')
@@ -1020,16 +1109,26 @@ static void C_GetNextVarType(int32_t type)
         }
         textptr++;
 
-        // writing arrays in this way is not supported because it would
-        // require too many changes to other code
-//        if (type)
-//        {
-//            g_numCompilerErrors++;
-//            C_ReportError(ERROR_INVALIDARRAYWRITE);
-//            return;
-//        }
+        // ----------
 
-        if (flags & M32_FLAG_SPECIAL)
+        if ((flags & M32_VARTYPE_MASK) == M32_FLAG_LOCAL)
+        {
+            // id: local ofs | (size<<16)
+            int32_t ar_ofs=id&(MAXGAMEVARS-1), ar_size=(id>>16)&0xffff;
+
+            if (aridx<0 || aridx>=ar_size)
+                C_CUSTOMERROR("local array index %d out of bounds. Size of local array `%s': %d.", aridx, tlabel2, ar_size);
+
+            *g_scriptPtr++ = (flags|(ar_ofs+aridx));
+        }
+        if ((flags & M32_VARTYPE_MASK) == M32_FLAG_ARRAY)
+        {
+            if ((aridx & M32_BITS_MASK) == M32_FLAG_CONSTANTINDEX)
+                *g_scriptPtr++ = (aridx | flags | id);
+            else  // simple or local gamevar
+                *g_scriptPtr++ = (aridx<<16 | flags | id);
+        }
+        else if ((flags & M32_VARTYPE_MASK) == M32_FLAG_STRUCT)
         {
             while (*textptr && *textptr != 0x0a && *textptr != '.')
                 textptr++;
@@ -1037,14 +1136,14 @@ static void C_GetNextVarType(int32_t type)
             if (*textptr != '.')
             {
                 static const char *types[4] = {"sprite","sector","wall","tsprite"};
-                C_CUSTOMERROR("error: syntax error. Expected `.<label>' after `%s[...]'", types[id&3]);
+                C_CUSTOMERROR("syntax error. Expected `.<label>' after `%s[...]'", types[id&3]);
                 return;
             }
             textptr++;
 
             /// now pointing at 'xxx'
 
-            C_GetNextLabelName();
+            C_GetNextLabelName(0);
 
             /*initprintf("found xxx label of '%s'\n",   label+(g_numLabels*MAXLABELLEN));*/
             if (id==M32_SPRITE_VAR_ID || id==M32_TSPRITE_VAR_ID)
@@ -1062,23 +1161,17 @@ static void C_GetNextVarType(int32_t type)
                 return;
             }
 
-            if ((aridx & 0x0000FFFF) == MAXGAMEVARS)  // constant
-                *g_scriptPtr++ = (aridx | id | (lLabelID<<2) | flags);
-            else  // simple gamevar
-                *g_scriptPtr++ = (aridx<<16 | id | (lLabelID<<2) | flags);
-        }
-        else // if (flags & M32_FLAG_ARRAY)
-        {
-            if ((aridx & 0x0000FFFF) == MAXGAMEVARS)  // constant
-                *g_scriptPtr++ = (aridx | id | flags);
-            else  // simple gamevar
-                *g_scriptPtr++ = (aridx<<16 | id | flags);
+            if ((aridx & M32_BITS_MASK) == M32_FLAG_CONSTANTINDEX)
+                *g_scriptPtr++ = (aridx | flags | (lLabelID<<2) | id);
+            else  // simple or local gamevar
+                *g_scriptPtr++ = (aridx<<16 | flags | (lLabelID<<2) | id);
         }
+
         return;
     }
 
 //    initprintf("not an array");
-    id = GetGamevarID(tlabel);
+    id = GetGamevarID(tlabel, 1);
     if (id < 0)   //gamevar not found
     {
         if (!type && !cs.labelsOnly)
@@ -1089,9 +1182,9 @@ static void C_GetNextVarType(int32_t type)
             {
 //                if (!(g_numCompilerErrors || g_numCompilerWarnings) && g_scriptDebug)
 //                    initprintf("%s:%d: debug: accepted defined label `%s' instead of gamevar.\n",g_szScriptFileName,g_lineNumber,label+(id*MAXLABELLEN));
-                num = labelval[id];
+                num = (1-!!(flags&M32_FLAG_NEGATE))*labelval[id];
 
-                if (type==GAMEVAR_SPECIAL && (num<0 || num>=65536))
+                if (type==GV_SIMPLE && (num<0 || num>=65536))
                 {
                     C_CUSTOMERROR("label %s=%d not suitable as array index. (max: 65535)", label+(id*MAXLABELLEN), num);
                 }
@@ -1101,10 +1194,14 @@ static void C_GetNextVarType(int32_t type)
                     num = id;
                 }
 
-                if (type!=GAMEVAR_SPECIAL)
+                if (type!=GV_SIMPLE)
                     g_wasConstant = 1;
 
-                *g_scriptPtr++ = MAXGAMEVARS | (num<<16) | indirect;
+                // note: For direct constants, the NEGATE flag is ignored since they're interpreted
+                //       as signed. For label-indirect constants however, the NEGATE flag is considered.
+                //       See m32vars.c --> Gv_GetVarX()
+                // note 2: demotions like int32_t -> int16_t are implementation-defined
+                *g_scriptPtr++ = M32_FLAG_CONSTANT | (num<<16) | flags | indirect;
                 return;
             }
         }
@@ -1114,23 +1211,27 @@ static void C_GetNextVarType(int32_t type)
         textptr++;
         return;
     }
-
-    if (type == GAMEVAR_READONLY && aGameVars[id].dwFlags & GAMEVAR_READONLY)
+    else if (id<MAXGAMEVARS)  // it's an ordinary var (not a local one)
     {
-        g_numCompilerErrors++;
-        C_ReportError(ERROR_VARREADONLY);
-        return;
-    }
-    else if (aGameVars[id].dwFlags & type)
-    {
-        g_numCompilerErrors++;
-        C_ReportError(ERROR_VARTYPEMISMATCH);
-        return;
+        if (type==GV_WRITABLE && (aGameVars[id].dwFlags & GV_WRITABLE))
+        {
+            g_numCompilerErrors++;
+            C_ReportError(ERROR_VARREADONLY);
+            return;
+        }
+        else if (aGameVars[id].dwFlags & type)
+        {
+//        g_numCompilerErrors++;
+            C_CUSTOMERROR("variable `%s' is of the wrong type: expected simple var.", tlabel);
+//        C_ReportError(ERROR_VARTYPEMISMATCH);
+            return;
+        }
     }
 //    if (!(g_numCompilerErrors || g_numCompilerWarnings) && g_scriptDebug > 1)
 //        initprintf("%s:%d: debug: accepted gamevar `%s'.\n",g_szScriptFileName,g_lineNumber,tlabel);
 
-    *g_scriptPtr++ = (id|flags);
+    // if it's a local, "id" ors M32_FLAG_LOCAL to the flags
+    *g_scriptPtr++ = (flags|id);
 }
 
 static inline void C_GetNextVar()
@@ -1150,19 +1251,83 @@ static inline void C_GetManyVars(int32_t num)
     C_GetManyVarsType(0,num);
 }
 
+// used in various quote commands: they either take a string
+// enclosed in double quotes or a variable that contains a quote number
+// returns:
+//   -1: error
+//    0: variable
+//    1: string, also does *g_scriptPtr++ = -1 and inlines
+//       the string in the code (terminator: (instype)0)
+static int32_t C_GetNextVarOrString()
+{
+    C_SkipComments();
+
+    if (*textptr == 0)
+    {
+        C_CUSTOMERROR("unexpected EOF where variable or string literal was expected.");
+        return -1;
+    }
+
+    if (*textptr == '"')
+    {
+        const char *beg = ++textptr;
+        int32_t nchars;
+
+        while (*textptr!='"')
+        {
+            switch (*textptr)
+            {
+            case 0x0a:
+                C_CUSTOMERROR("string literal must end on the same line.");
+                return -1;
+            case 0:
+                C_CUSTOMERROR("unexpected EOF inside string literal.");
+                return -1;
+            }
+
+            textptr++;
+        }
+
+        nchars = textptr-beg;
+
+        if (nchars >= MAXQUOTELEN)
+        {
+            nchars = MAXQUOTELEN-1;
+            C_CUSTOMWARNING("truncating string literal to %d characters.", nchars);
+        }
+
+        *g_scriptPtr++ = -1;  // special indicator meaning "inline string follows"
+
+        Bmemcpy((char *)g_scriptPtr, beg, nchars);
+        ((char *)g_scriptPtr)[nchars] = 0;
+
+        g_scriptPtr += (nchars + sizeof(instype)-1)/sizeof(instype);
+        *g_scriptPtr++ = 0;
+
+        textptr++;
+
+        return 1;
+    }
+    else
+    {
+        C_GetNextVar();
+        return 0;
+    }
+}
+
 static int32_t C_GetNextValue(int32_t type)
 {
-    int32_t i, l;
+    int32_t i, l, thesign=1;
 
     C_SkipComments();
 
     if (*textptr == 0)
     {
-        C_CUSTOMERROR("unexpected EOF where value was expected.");
+        C_CUSTOMERROR("unexpected EOF where constant label or value was expected.");
         return -1;
     }
 
-    while (!isaltok(*textptr))
+    while (!char_alnumtok(*textptr))
     {
         g_lineNumber += (*textptr == 0x0a);
 
@@ -1172,8 +1337,15 @@ static int32_t C_GetNextValue(int32_t type)
             return -1; // eof
     }
 
+    if (*textptr=='-' && !isdigit(textptr[1]))
+    {
+        // in case constant label is negated, e.g. -MAXSPRITES
+        thesign = -1;
+        textptr++;
+    }
+
     l = 0;
-    while (isaltok(*(textptr+l)))
+    while (char_alnumtok(*(textptr+l)))
     {
         tempbuf[l] = textptr[l];
         l++;
@@ -1201,7 +1373,7 @@ static int32_t C_GetNextValue(int32_t type)
 //                Bfree(gl);
 //            }
 
-            *(g_scriptPtr++) = labelval[i];
+            *(g_scriptPtr++) = thesign*labelval[i];
 
             textptr += l;
             return labeltype[i];
@@ -1220,7 +1392,7 @@ static int32_t C_GetNextValue(int32_t type)
         return -1;  // valid label name, but wrong type
     }
 
-    if (isdigit(*textptr) == 0 && *textptr != '-')
+    if (!isdigit(*textptr) && *textptr != '-')
     {
         C_ReportError(ERROR_PARAMUNDEFINED);
         g_numCompilerErrors++;
@@ -1245,7 +1417,7 @@ static int32_t C_GetNextValue(int32_t type)
         if (textptr[0] == '0' && textptr[1] == 'x') break; // kill the warning for hex
         if (!isdigit(textptr[i--]))
         {
-            C_CUSTOMWARNING("invalid character `%c' in definition!", textptr[i+1]);
+            C_CUSTOMERROR("invalid character `%c' in definition!", textptr[i+1]);
             break;
         }
     }
@@ -1335,6 +1507,7 @@ static int32_t C_CountCaseStatements()
 
     cs.numCases=0;
     cs.caseScriptPtr=NULL;
+
     //Bsprintf(g_szBuf,"CSS: %.12s",textptr); AddLog(g_szBuf);
     while (C_ParseCommand() == 0)
     {
@@ -1355,18 +1528,13 @@ static int32_t C_CountCaseStatements()
     return lCount;
 }
 
+// returns:  0:keep going,  1:done
 static int32_t C_ParseCommand(void)
 {
     int32_t i, j=0, k=0, done, tw;
     const char *temptextptr;
     instype *tempscrptr = NULL;
 
-///    if (quitevent)
-///    {
-///        initprintf("Aborted.\n");
-///        return 1;
-///    }
-
     if (g_numCompilerErrors >= ABORTERRCNT || (*textptr == '\0') || (*(textptr+1) == '\0'))
         return 1;
 
@@ -1377,6 +1545,7 @@ static int32_t C_ParseCommand(void)
 ///        Bsprintf(g_szBuf,"PC(): '%.25s'",textptr); AddLog(g_szBuf);
 
     tw = C_GetNextKeyword();
+    g_tw = tw;
     //    Bsprintf(tempbuf,"%s",keyw[tw]); AddLog(tempbuf);
 
     if (C_SkipComments())
@@ -1400,15 +1569,15 @@ static int32_t C_ParseCommand(void)
 
     case CON_DEFINE:
     {
-        C_GetNextLabelName();
-
-        if (hash_find(&h_keywords, tlabel) >= 0)
+        if (cs.currentStateIdx >=0 || cs.currentEvent >= 0)
         {
-            g_numCompilerErrors++;
-            C_ReportError(ERROR_ISAKEYWORD);
-            return 0;
+            C_CUSTOMERROR("Can only `define' at top level.");
+            return 1;
         }
 
+        if (C_GetNextLabelName(1))
+            return 1;
+
         // Check to see it's already defined
         i = hash_find(&h_gamevars, tlabel);
         if (i>=0)
@@ -1448,7 +1617,7 @@ static int32_t C_ParseCommand(void)
 
     case CON_INCLUDE:
         g_scriptPtr--;
-        while (!isaltok(*textptr))
+        while (!char_alnumtok(*textptr))
         {
             g_lineNumber += (*textptr == 0x0a);
 
@@ -1458,7 +1627,7 @@ static int32_t C_ParseCommand(void)
         }
 
         j = 0;
-        while (isaltok(*textptr))
+        while (char_alnumtok(*textptr))
         {
             tempbuf[j] = *(textptr++);
             j++;
@@ -1526,16 +1695,16 @@ static int32_t C_ParseCommand(void)
 
     case CON_DEFSTATE:
         g_scriptPtr--;
-        if (cs.parsingEventOfs < 0  && cs.currentStateIdx < 0)
+        if (cs.parsingEventOfs >= 0 || cs.currentStateIdx >= 0)
         {
-            C_GetNextLabelName();
-
-            if (hash_find(&h_keywords, tlabel)>=0)
-            {
-                g_numCompilerErrors++;
-                C_ReportError(ERROR_ISAKEYWORD);
+            g_numCompilerErrors++;
+            C_ReportError(ERROR_FOUNDWITHIN);
+            return 1;
+        }
+        else
+        {
+            if (C_GetNextLabelName(1))
                 return 1;
-            }
 
             if (hash_find(&h_gamevars, tlabel)>=0)
             {
@@ -1577,6 +1746,7 @@ static int32_t C_ParseCommand(void)
                 }
 
                 Bmemcpy(statesinfo[j].name, tlabel, MAXLABELLEN);
+                statesinfo[j].numlocals = 0;
                 Bsprintf(g_szCurrentBlockName, "%s", tlabel);
                 hash_add(&h_states, tlabel, j, 0);
             }
@@ -1584,133 +1754,133 @@ static int32_t C_ParseCommand(void)
             return 0;
         }
 
-        g_numCompilerErrors++;
-        C_ReportError(ERROR_FOUNDWITHIN);
-        return 1;
-
     case CON_ENDS:
         if (cs.currentStateIdx < 0)
         {
             C_CUSTOMERROR("found `ends' without open `state'.");
             return 1; //+
         }
-        else
+
+        hash_init(&h_localvars);
+
+        if (cs.numBraces > 0)
         {
-            if (cs.numBraces > 0)
-            {
-                C_ReportError(ERROR_OPENBRACKET);
-                g_numCompilerErrors++;
-            }
-            else if (cs.numBraces < 0)
-            {
-                C_ReportError(ERROR_CLOSEBRACKET);
-                g_numCompilerErrors++;
-            }
+            C_ReportError(ERROR_OPENBRACKET);
+            g_numCompilerErrors++;
+        }
+        else if (cs.numBraces < 0)
+        {
+            C_ReportError(ERROR_CLOSEBRACKET);
+            g_numCompilerErrors++;
+        }
 
-            if (cs.checkingSwitch > 0)
-            {
-                C_ReportError(ERROR_NOENDSWITCH);
-                g_numCompilerErrors++;
+        if (cs.checkingSwitch > 0)
+        {
+            C_ReportError(ERROR_NOENDSWITCH);
+            g_numCompilerErrors++;
 
-                cs.checkingSwitch = 0; // can't be checking anymore...
-            }
-
-            if (g_numCompilerErrors)
-            {
-                g_scriptPtr = script+cs.currentStateOfs;
-                cs.currentStateOfs = -1;
-                cs.currentStateIdx = -1;
-                Bsprintf(g_szCurrentBlockName,"(none)");
-                return 0;
-            }
-
-            j = cs.currentStateIdx;
-
-            if (cs.currentStateIdx == g_stateCount)  // we were defining a new state
-            {
-                statesinfo[j].ofs = cs.currentStateOfs;
-                statesinfo[j].codesize = (g_scriptPtr-script) - cs.currentStateOfs;
-
-                g_stateCount++;
-
-                initprintf("  Defined state `%s' (index %d).\n", g_szCurrentBlockName, j);
-//                initprintf("    o:%d s:%d\n", statesinfo[j].ofs, statesinfo[j].codesize);
-            }
-            else  // we were redefining a state
-            {
-                int32_t oofs = statesinfo[j].ofs;
-                int32_t nofs = cs.currentStateOfs;
-                int32_t osize = statesinfo[j].codesize;
-                int32_t nsize = (g_scriptPtr-script) - nofs;
-
-                if (nsize == osize)
-                {
-                    int ii, equal=2, linedif = 0, ow, nw;
-
-                    for (ii=0; ii<nsize; ii++)
-                    {
-                        ow = *(script+oofs+ii);
-                        nw = *(script+nofs+ii);
-                        if (ow != nw)
-                        {
-                            int32_t ld = (nw>>12) - (ow>>12);
-                            if (equal==2)
-                            {
-                                equal = 1;
-                                linedif = ld;
-                            }
-
-                            if (linedif != ld || ((nw&0xFFF) != (ow&0xFFF)))
-                            {
-                                equal = 0;
-                                break;
-                            }
-                        }
-                    }
-
-                    if (equal!=2)
-                        Bmemcpy(script+oofs, script+nofs, nsize*sizeof(instype));
-                    if (equal==0)
-                        initprintf("  Redefined state `%s' (index %d).\n", g_szCurrentBlockName, j);
-//                        initprintf("    oo:%d os:%d, no:%d ns:%d\n", oofs, osize, nofs, nsize);
-                }
-                else
-                {
-                    int32_t ii;
-                    uint32_t movedcodesize = g_scriptPtr - (script+oofs+osize);
-
-                    Bmemmove(script+oofs, script+oofs+osize, movedcodesize*sizeof(instype));
-
-                    for (ii=0; ii<g_stateCount; ii++)
-                    {
-                        if (statesinfo[ii].ofs > oofs)
-                            statesinfo[ii].ofs -= osize;
-                    }
-                    for (ii=0; ii<MAXEVENTS; ii++)
-                        if (/*ii != j &&*/ aEventOffsets[ii] > oofs)
-                            aEventOffsets[ii] -= osize;
-
-                    statesinfo[j].ofs = nofs-osize;
-                    statesinfo[j].codesize = nsize;
-
-                    initprintf("  Redefined state `%s' (index %d).\n", g_szCurrentBlockName, j);
-//                    initprintf("    oo:%d os:%d, no:%d ns:%d\n", oofs, osize, nofs, nsize);
-                }
-                g_scriptPtr -= osize;
-            }
-
-            g_didDefineSomething = 1;
+            cs.checkingSwitch = 0; // can't be checking anymore...
+        }
 
+        if (g_numCompilerErrors)
+        {
+            g_scriptPtr = script+cs.currentStateOfs;
             cs.currentStateOfs = -1;
             cs.currentStateIdx = -1;
-
             Bsprintf(g_szCurrentBlockName,"(none)");
+            return 0;
         }
+
+        j = cs.currentStateIdx;
+
+        if (cs.currentStateIdx == g_stateCount)  // we were defining a new state
+        {
+            statesinfo[j].ofs = cs.currentStateOfs;
+            statesinfo[j].codesize = (g_scriptPtr-script) - cs.currentStateOfs;
+
+            g_stateCount++;
+
+            initprintf("  Defined State %3d `%s'.\n", j, g_szCurrentBlockName);
+//                initprintf("    o:%d s:%d\n", statesinfo[j].ofs, statesinfo[j].codesize);
+        }
+        else  // we were redefining a state
+        {
+            int32_t oofs = statesinfo[j].ofs;
+            int32_t nofs = cs.currentStateOfs;
+            int32_t osize = statesinfo[j].codesize;
+            int32_t nsize = (g_scriptPtr-script) - nofs;
+
+            if (nsize == osize)
+            {
+                int ii, equal=2, linedif = 0, ow, nw;
+
+                for (ii=0; ii<nsize; ii++)
+                {
+                    ow = *(script+oofs+ii);
+                    nw = *(script+nofs+ii);
+                    if (ow != nw)
+                    {
+                        int32_t ld = (nw>>12) - (ow>>12);
+                        if (equal==2)
+                        {
+                            equal = 1;
+                            linedif = ld;
+                        }
+
+                        if (linedif != ld || ((nw&0xFFF) != (ow&0xFFF)))
+                        {
+                            equal = 0;
+                            break;
+                        }
+                    }
+                }
+
+                if (equal!=2)
+                    Bmemcpy(script+oofs, script+nofs, nsize*sizeof(instype));
+                if (equal==0)
+                    initprintf("  Redefined State %3d `%s'.\n", j, g_szCurrentBlockName);
+//                        initprintf("    oo:%d os:%d, no:%d ns:%d\n", oofs, osize, nofs, nsize);
+            }
+            else
+            {
+                int32_t ii;
+                uint32_t movedcodesize = g_scriptPtr - (script+oofs+osize);
+
+                Bmemmove(script+oofs, script+oofs+osize, movedcodesize*sizeof(instype));
+
+                for (ii=0; ii<g_stateCount; ii++)
+                {
+                    if (statesinfo[ii].ofs > oofs)
+                        statesinfo[ii].ofs -= osize;
+                }
+                for (ii=0; ii<MAXEVENTS; ii++)
+                    if (/*ii != j &&*/ aEventOffsets[ii] > oofs)
+                        aEventOffsets[ii] -= osize;
+
+                statesinfo[j].ofs = nofs-osize;
+                statesinfo[j].codesize = nsize;
+
+                initprintf("  Redefined State %3d `%s'.\n", j, g_szCurrentBlockName);
+//                    initprintf("    oo:%d os:%d, no:%d ns:%d\n", oofs, osize, nofs, nsize);
+            }
+            g_scriptPtr -= osize;
+        }
+
+        g_didDefineSomething = 1;
+
+        cs.currentStateOfs = -1;
+        cs.currentStateIdx = -1;
+
+        Bsprintf(g_szCurrentBlockName,"(none)");
+
         return 0;
 
+
     case CON_SORT:
-        C_GetNextLabelName();
-        i = GetGamearrayID(tlabel);
+        if (C_GetNextLabelName(1))
+            return 1;
+
+        i = GetGamearrayID(tlabel, 0);
         if (i >= 0)
         {
             *g_scriptPtr++ = i;
@@ -1730,25 +1900,14 @@ static int32_t C_ParseCommand(void)
 
         if (C_GetKeyword() >= 0)
         {
+            // default sorting state that compares values numerically
             *g_scriptPtr++ = -1;
             return 0;
         }
         // fall-through
     case CON_STATE:
-        C_GetNextLabelName();
-
-        if (hash_find(&h_keywords, tlabel)>=0)
-        {
-            g_numCompilerErrors++;
-            C_ReportError(ERROR_ISAKEYWORD);
+        if (C_GetNextLabelName(1))
             return 1;
-        }
-
-        if (hash_find(&h_gamevars, tlabel)>=0)
-        {
-            g_numCompilerWarnings++;
-            C_ReportError(WARNING_NAMEMATCHESVAR);
-        }
 
         j = hash_find(&h_states, tlabel);
         if (j>=0)
@@ -1768,6 +1927,7 @@ static int32_t C_ParseCommand(void)
         {
             C_ReportError(ERROR_FOUNDWITHIN);
             g_numCompilerErrors++;
+            return 1;
         }
 
         g_scriptPtr--;
@@ -1775,7 +1935,7 @@ static int32_t C_ParseCommand(void)
 
         C_SkipComments();
         j = 0;
-        while (isaltok(*(textptr+j)))
+        while (char_alnumtok(*(textptr+j)))
         {
             g_szCurrentBlockName[j] = textptr[j];
             j++;
@@ -1790,6 +1950,7 @@ static int32_t C_ParseCommand(void)
         j = *g_scriptPtr;  // event number
 
         cs.currentEvent = j;
+        aEventNumLocals[j] = 0;
         cs.parsingEventOfs = g_scriptPtr-script;
         //Bsprintf(g_szBuf,"Adding Event for %d at %lX",j, g_parsingEventPtr); AddLog(g_szBuf);
         if (j<0 || j >= MAXEVENTS)
@@ -1808,6 +1969,9 @@ static int32_t C_ParseCommand(void)
             C_CUSTOMERROR("found `endevent' without open `onevent'.");
             return 1;
         }
+
+        hash_init(&h_localvars);
+
         if (cs.numBraces > 0)
         {
             C_ReportError(ERROR_OPENBRACKET);
@@ -1818,6 +1982,7 @@ static int32_t C_ParseCommand(void)
             C_ReportError(ERROR_CLOSEBRACKET);
             g_numCompilerErrors++;
         }
+
         if (g_numCompilerErrors)
         {
             g_scriptPtr = script+cs.parsingEventOfs;
@@ -1861,7 +2026,7 @@ static int32_t C_ParseCommand(void)
                 if (equal!=2)
                     Bmemcpy(script+oofs, script+nofs, nsize*sizeof(instype));
                 if (equal==0)
-                    initprintf("  Redefined event `%s' (index %d).\n", g_szCurrentBlockName, j);
+                    initprintf("  Redefined Event %3d `%s'.\n", j, g_szCurrentBlockName);
 //                        initprintf("    oo:%d os:%d, no:%d ns:%d\n", oofs, osize, nofs, nsize);
             }
             else
@@ -1883,7 +2048,7 @@ static int32_t C_ParseCommand(void)
                 aEventOffsets[j] = nofs - osize;
                 aEventSizes[j] = nsize;
 
-                initprintf("  Redefined event `%s' (index %d).\n", g_szCurrentBlockName, j);
+                initprintf("  Redefined Event %3d `%s'.\n", j, g_szCurrentBlockName);
 //                initprintf("    oo:%d os:%d, no:%d ns:%d\n", oofs, osize, nofs, nsize);
             }
             g_scriptPtr -= osize;
@@ -1893,7 +2058,7 @@ static int32_t C_ParseCommand(void)
             aEventOffsets[j] = cs.parsingEventOfs;
             aEventSizes[j] = (g_scriptPtr-script) - cs.parsingEventOfs;
 
-            initprintf("  Defined event `%s' (index %d).\n", g_szCurrentBlockName, j);
+            initprintf("  Defined Event %3d `%s'.\n", j, g_szCurrentBlockName);
 //            initprintf("    o:%d s:%d\n", aEventOffsets[j], aEventSizes[j]);
         }
 
@@ -2150,7 +2315,7 @@ repeatcase:
 //        break;
 
     case CON_GETCURRADDRESS:
-        C_GetNextVarType(GAMEVAR_READONLY);
+        C_GetNextVarType(GV_WRITABLE);
         return 0;
 
     case CON_JUMP:
@@ -2250,13 +2415,13 @@ repeatcase:
 
         if (*textptr!='.')
         {
-            C_CUSTOMERROR("error: syntax error. Expected `.<label>' after `%s[...]'", keyw[tw]);
+            C_CUSTOMERROR("syntax error. Expected `.<label>' after `%s[...]'", keyw[tw]);
             return 0;
         }
         textptr++;
 
         /// now pointing at 'xxx'
-        C_GetNextLabelName();
+        C_GetNextLabelName(0);
         //printf("found xxx label of '%s'\n",   label+(g_numLabels*MAXLABELLEN));
 
         if (tw==CON_GETSECTOR || tw==CON_SETSECTOR)
@@ -2278,7 +2443,7 @@ repeatcase:
         // now at target VAR...
         // get the ID of the DEF
         if (tw==CON_GETSECTOR || tw==CON_GETWALL || tw==CON_GETSPRITE || tw==CON_GETTSPR)
-            C_GetNextVarType(GAMEVAR_READONLY);
+            C_GetNextVarType(GV_WRITABLE);
         else
             C_GetNextVar();
         break;
@@ -2287,70 +2452,59 @@ repeatcase:
     case CON_GAMEVAR:
         // syntax: gamevar <var1> <initial value> <flags>
         // defines var1 and sets initial value.
-        // flags are used to define usage
-        // (see top of this files for flags)
-        //printf("Got gamedef. Getting Label. '%.20s'\n",textptr);
+        // flags are used to define usage: 0:global, 1:per-block
 
-        if (isdigit(*textptr) || (*textptr == '-'))
+        g_scriptPtr--;
+
+        if (cs.currentStateIdx < 0 && cs.currentEvent < 0)
         {
-            C_CUSTOMERROR("error: syntax error. Expected identifier after `gamevar'");
-            C_GetNextLabelName();
-            C_GetNextValue(LABEL_DEFINE);
-            C_GetNextValue(LABEL_DEFINE);
-            g_scriptPtr -= 3; // we complete the process anyways just to skip past the fucked up section
-            return 0;
+            // global gamevar
+
+            if (C_GetNextLabelName(1))
+                return 1;
+
+            C_GetNextValue(LABEL_DEFINE); // get initial value
+            C_GetNextValue(LABEL_DEFINE); // get flags
+            //Bsprintf(g_szBuf,"Adding GameVar='%s', val=%l, flags=%lX",label+(g_numLabels*MAXLABELLEN), *(g_scriptPtr-2), *(g_scriptPtr-1)); AddLog(g_szBuf);
+
+            // global var: can't define default
+            if (g_numCompilerErrors==0)
+            {
+                Gv_NewVar(tlabel, *(g_scriptPtr-2), *(g_scriptPtr-1) & ~GAMEVAR_DEFAULT);
+                g_scriptPtr -= 2; // no need to save in script...
+            }
         }
-
-        C_GetNextLabelName();
-        //printf("Got Label '%.20s'\n",textptr);
-        // Check to see it's already defined
-
-        if (hash_find(&h_keywords, tlabel)>=0)
+        else  // local var
         {
-            g_numCompilerErrors++;
-            C_ReportError(ERROR_ISAKEYWORD);
-            return 0;
+            do
+            {
+                C_GetNextLabelName(1);
+
+                if (hash_find(&h_localvars, tlabel) >= 0)
+                    C_CUSTOMERROR("local variable `%s' already defined.", tlabel);
+                else
+                {
+                    uint16_t *numlocals = (cs.currentStateIdx >= 0) ? 
+                        &statesinfo[cs.currentStateIdx].numlocals : &aEventNumLocals[cs.currentEvent];
+
+                    if (((int32_t)(*numlocals))+1 > MAXGAMEVARS)
+                        C_CUSTOMERROR("too much local storage required (max: %d gamevar equivalents).", MAXGAMEVARS);
+                    else
+                    {
+                        hash_add(&h_localvars, tlabel, (int32_t)(*numlocals), 0);
+                        *numlocals += 1;
+                    }
+                }
+            } while (C_GetKeyword() < 0 && g_numCompilerErrors<ABORTERRCNT && *textptr);
         }
 
-        C_GetNextValue(LABEL_DEFINE); // get initial value
-        C_GetNextValue(LABEL_DEFINE); // get flags
-        //Bsprintf(g_szBuf,"Adding GameVar='%s', val=%l, flags=%lX",label+(g_numLabels*MAXLABELLEN), *(g_scriptPtr-2), *(g_scriptPtr-1)); AddLog(g_szBuf);
-///        if ((*(g_scriptPtr-1)&GAMEVAR_USER_MASK)==3)
-///        {
-///            g_numCompilerWarnings++;
-///            *(g_scriptPtr-1) ^= GAMEVAR_PERBLOCK;
-///            C_ReportError(WARNING_BADGAMEVAR);
-///        }
-
-        Gv_NewVar(tlabel, *(g_scriptPtr-2),
-                  /* can't define default or secret */
-                  *(g_scriptPtr-1) & ~(GAMEVAR_DEFAULT|GAMEVAR_SECRET));
-
         //AddLog("Added gamevar");
-        g_scriptPtr -= 3; // no need to save in script...
         return 0;
 
 // *** arrays
     case CON_GAMEARRAY:
-        if (isdigit(*textptr) || (*textptr == '-'))
-        {
-            C_CUSTOMERROR("error: syntax error. Expected identifier after `gamearray'");
-            C_GetNextLabelName();
-            C_GetNextValue(LABEL_DEFINE);
-            C_GetNextValue(LABEL_DEFINE);
-            g_scriptPtr -= 2; // we complete the process anyways just to skip past the fucked up section
-            return 0;
-        }
-
-        C_GetNextLabelName();
-        //printf("Got Label '%.20s'\n",textptr);
-        // Check to see it's already defined
-        if (hash_find(&h_keywords, tlabel) >= 0)
-        {
-            g_numCompilerErrors++;
-            C_ReportError(ERROR_ISAKEYWORD);
-            return 0;
-        }
+        if (C_GetNextLabelName(1))
+            return 1;
 
         if (hash_find(&h_gamevars, tlabel) >= 0)
         {
@@ -2359,15 +2513,34 @@ repeatcase:
         }
 
         C_GetNextValue(LABEL_DEFINE);
-        Gv_NewArray(tlabel, 0, *(g_scriptPtr-1), GAMEARRAY_NORMAL);
+
+        {
+            int32_t asize = *(g_scriptPtr-1);
+            if (cs.currentStateIdx < 0 && cs.currentEvent < 0)        
+                Gv_NewArray(tlabel, NULL, asize, GAMEARRAY_NORMAL);
+            else  // local array
+            {
+                uint16_t *numlocals = (cs.currentStateIdx >= 0) ?
+                    &statesinfo[cs.currentStateIdx].numlocals : &aEventNumLocals[cs.currentEvent];
+
+                if (((int32_t)(*numlocals))+asize > MAXGAMEVARS)
+                    C_CUSTOMERROR("too much local storage required (max: %d gamevar equivalents).", MAXGAMEVARS);
+                else
+                {
+                    hash_add(&h_localvars, tlabel, ((int32_t)(*numlocals))|(asize<<16), 0);
+                    *numlocals += asize;
+                }
+            }
+        }
 
         g_scriptPtr -= 2; // no need to save in script...
         return 0;
 
     case CON_COPY:
-        C_GetNextLabelName();
+        if (C_GetNextLabelName(1))
+            return 1;
 
-        i = GetGamearrayID(tlabel);
+        i = GetGamearrayID(tlabel, 0);
         if (i >= 0)
             *g_scriptPtr++ = i;
         else
@@ -2398,9 +2571,10 @@ repeatcase:
         textptr++;
         // fall-through
     case CON_SETARRAY:
-        C_GetNextLabelName();
+        if (C_GetNextLabelName(1))
+            return 1;
 
-        i = GetGamearrayID(tlabel);
+        i = GetGamearrayID(tlabel, 0);
         if (i >= 0)
         {
             *g_scriptPtr++ = i;
@@ -2442,12 +2616,14 @@ repeatcase:
 
     case CON_GETARRAYSIZE:
     case CON_RESIZEARRAY:
-        C_GetNextLabelName();
-        i = GetGamearrayID(tlabel);
+        if (C_GetNextLabelName(1))
+            return 1;
+
+        i = GetGamearrayID(tlabel, 0);
         if (i >= 0)
         {
             *g_scriptPtr++ = i;
-            if (tw==CON_RESIZEARRAY && (aGameArrays[i].dwFlags&(GAMEARRAY_TYPEMASK)))
+            if (tw==CON_RESIZEARRAY && (aGameArrays[i].dwFlags & GAMEARRAY_TYPE_MASK))
             {
                 C_CUSTOMERROR("can't resize system array `%s'.", tlabel);
             }
@@ -2464,8 +2640,9 @@ repeatcase:
 #if 0
     case CON_WRITEARRAYTOFILE:
     case CON_READARRAYFROMFILE:
-        C_GetNextLabelName();
-        i = GetGamearrayID(tlabel);
+        if (C_GetNextLabelName(1))
+            return 1;
+        i = GetGamearrayID(tlabel, 0);
         if (i > (-1))
         {
             *g_scriptPtr++ = i;
@@ -2502,7 +2679,7 @@ repeatcase:
         //printf("Found [add|set]var at line= %d\n",g_lineNumber);
 
         // get the ID of the DEF
-        C_GetNextVarType(GAMEVAR_READONLY);
+        C_GetNextVarType(GV_WRITABLE);
 
         C_GetNextValue(LABEL_DEFINE); // the number to check against...
 
@@ -2529,7 +2706,7 @@ repeatcase:
 
                 *g_scriptPtr++ = CON_INV + (g_lineNumber<<12);
                 textptr = tptr;
-                C_GetNextVarType(GAMEVAR_READONLY);
+                C_GetNextVarType(GV_WRITABLE);
                 C_GetNextValue(LABEL_DEFINE);
                 g_scriptPtr--;
 //                    initprintf("%s:%d: adding inversion\n",g_szScriptFileName,g_lineNumber);
@@ -2554,7 +2731,7 @@ repeatcase:
         instype *inst = (g_scriptPtr-1);
         const char *otextptr;
 
-        C_GetNextVarType(GAMEVAR_READONLY);
+        C_GetNextVarType(GV_WRITABLE);
 
         otextptr = textptr;
 
@@ -2573,7 +2750,7 @@ repeatcase:
 
     case CON_SIN:
     case CON_COS:
-        C_GetNextVarType(GAMEVAR_READONLY);
+        C_GetNextVarType(GV_WRITABLE);
         C_GetNextVar();
         return 0;
 
@@ -2582,7 +2759,7 @@ repeatcase:
         // syntax: displayrand <var>
         // gets rand (not game rand) into <var>
 
-        C_GetNextVarType(GAMEVAR_READONLY);
+        C_GetNextVarType(GV_WRITABLE);
         break;
 
 // *** float access: convert float to int and back
@@ -2590,7 +2767,7 @@ repeatcase:
     case CON_FTOI:
         // syntax: itof <<var>> SCALE
         //         ftoi <<var>> SCALE
-        C_GetNextVarType(GAMEVAR_READONLY);
+        C_GetNextVarType(GV_WRITABLE);
         C_GetNextValue(LABEL_DEFINE);
 
         if (*(g_scriptPtr-1)<=0)
@@ -2600,12 +2777,12 @@ repeatcase:
 
 // *** other math
     case CON_CLAMP:
-        C_GetNextVarType(GAMEVAR_READONLY);
+        C_GetNextVarType(GV_WRITABLE);
         C_GetManyVars(2);
         return 0;
 
     case CON_INV:
-        C_GetNextVarType(GAMEVAR_READONLY);
+        C_GetNextVarType(GV_WRITABLE);
         return 0;
 
     case CON_SQRT:
@@ -2615,22 +2792,22 @@ repeatcase:
 
         C_GetNextVar();
         // target var
-        C_GetNextVarType(GAMEVAR_READONLY);
+        C_GetNextVarType(GV_WRITABLE);
         break;
     }
 
     case CON_MULSCALE:
     case CON_DIVSCALE:
-        C_GetManyVars(4);
+        C_GetNextVarType(GV_WRITABLE);
+        C_GetManyVars(3);
         return 0;
 
     case CON_DIST:
     case CON_LDIST:
     case CON_GETANGLE:
     case CON_GETINCANGLE:
-        C_GetNextVarType(GAMEVAR_READONLY);
-        C_GetNextVar();
-        C_GetNextVar();
+        C_GetNextVarType(GV_WRITABLE);
+        C_GetManyVars(2);
         return 0;
 
     case CON_FOR:  // special-purpose iteration
@@ -2639,9 +2816,9 @@ repeatcase:
         instype *tscrptr;
         int32_t how;
 
-        C_GetNextVarType(GAMEVAR_READONLY|GAMEVAR_SPECIAL);  // only simple vars allowed
+        C_GetNextVarType(GV_WRITABLE|GV_SIMPLE);  // only simple vars allowed
 
-        C_GetNextLabelName();
+        C_GetNextLabelName(0);
         how = hash_find(&h_iter, tlabel);
         if (how < 0)
         {
@@ -2650,8 +2827,8 @@ repeatcase:
         }
         *g_scriptPtr++ = how;
 
-        if (how <= ITER_DRAWNSPRITES) {}
-        else C_GetNextVarType(0);
+        if (how >= ITER_SPRITESOFSECTOR)
+            C_GetNextVar();
 
         offset = g_scriptPtr-script;
         g_scriptPtr++; //Leave a spot for the location to jump to after completion
@@ -2801,7 +2978,7 @@ repeatcase:
 
     case CON_LASTWALL:
         C_GetNextVar();
-        C_GetNextVarType(GAMEVAR_READONLY);
+        C_GetNextVarType(GV_WRITABLE);
         break;
 
     case CON_UPDATECURSECTNUM:
@@ -2812,12 +2989,12 @@ repeatcase:
         C_GetManyVars(2);
         if (tw==CON_UPDATESECTORZ)
             C_GetNextVar();
-        C_GetNextVarType(GAMEVAR_READONLY);
+        C_GetNextVarType(GV_WRITABLE);
         break;
 
     case CON_GETZRANGE:
         C_GetManyVars(4);
-        C_GetManyVarsType(GAMEVAR_READONLY,4);
+        C_GetManyVarsType(GV_WRITABLE, 4);
         C_GetManyVars(2);
         break;
 
@@ -2825,21 +3002,21 @@ repeatcase:
     case CON_CANSEE:
         // get the ID of the DEF
         C_GetManyVars(tw==CON_CANSEE?8:7);
-        C_GetManyVarsType(GAMEVAR_READONLY,tw==CON_CANSEE?1:6);
+        C_GetManyVarsType(GV_WRITABLE, tw==CON_CANSEE?1:6);
         if (tw==CON_HITSCAN) C_GetNextVar();
         break;
     case CON_CANSEESPR:
         C_GetManyVars(2);
-        C_GetNextVarType(GAMEVAR_READONLY);
+        C_GetNextVarType(GV_WRITABLE);
         break;
 
     case CON_NEARTAG:
     case CON_ROTATEPOINT:
         C_GetManyVars(5);
-        C_GetManyVarsType(GAMEVAR_READONLY,2);
+        C_GetManyVarsType(GV_WRITABLE, 2);
         if (tw == CON_NEARTAG)
         {
-            C_GetManyVarsType(GAMEVAR_READONLY,2);
+            C_GetManyVarsType(GV_WRITABLE, 2);
             C_GetManyVars(2);
         }
         break;
@@ -2850,7 +3027,7 @@ repeatcase:
     case CON_GETFLORZOFSLOPE:
     case CON_GETCEILZOFSLOPE:
         C_GetManyVars(3);
-        C_GetNextVarType(GAMEVAR_READONLY);
+        C_GetNextVarType(GV_WRITABLE);
         return 0;
 
     case CON_ALIGNCEILSLOPE:
@@ -2872,7 +3049,7 @@ repeatcase:
         return 0;
 
     case CON_SECTOROFWALL:
-        C_GetNextVarType(GAMEVAR_READONLY);
+        C_GetNextVarType(GV_WRITABLE);
         C_GetNextVar();
         return 0;
 
@@ -2881,7 +3058,8 @@ repeatcase:
         return 0;
 
     case CON_GETCLOSESTCOL:
-        C_GetManyVars(4);
+        C_GetManyVars(3);
+        C_GetNextVarType(GV_WRITABLE);
         return 0;
 
 // *** stuff
@@ -2901,6 +3079,11 @@ repeatcase:
 
 // *** strings
     case CON_DEFINEQUOTE:
+        if (cs.currentStateIdx >=0 || cs.currentEvent >= 0)
+        {
+            C_CUSTOMERROR("Can define quotes only at top level.");
+            return 1;
+        }
     case CON_REDEFINEQUOTE:
         if (tw == CON_DEFINEQUOTE)
             g_scriptPtr--;
@@ -2916,11 +3099,11 @@ repeatcase:
         }
 
         if (ScriptQuotes[k] == NULL)
-            ScriptQuotes[k] = Bcalloc(MAXQUOTELEN,sizeof(uint8_t));
+            ScriptQuotes[k] = Bcalloc(MAXQUOTELEN, sizeof(uint8_t));
 
         if (!ScriptQuotes[k])
         {
-            Bsprintf(tempbuf,"Failed allocating %" PRIdPTR " byte quote text buffer.",sizeof(uint8_t) * MAXQUOTELEN);
+            Bsprintf(tempbuf,"Failed allocating %" PRIdPTR " byte quote text buffer.", MAXQUOTELEN);
             g_numCompilerErrors++;
             return 1;
         }
@@ -2934,10 +3117,10 @@ repeatcase:
         if (tw == CON_REDEFINEQUOTE)
         {
             if (ScriptQuoteRedefinitions[g_numQuoteRedefinitions] == NULL)
-                ScriptQuoteRedefinitions[g_numQuoteRedefinitions] = Bcalloc(MAXQUOTELEN,sizeof(uint8_t));
+                ScriptQuoteRedefinitions[g_numQuoteRedefinitions] = Bcalloc(MAXQUOTELEN, sizeof(uint8_t));
             if (!ScriptQuoteRedefinitions[g_numQuoteRedefinitions])
             {
-                Bsprintf(tempbuf,"Failed allocating %" PRIdPTR " byte quote text buffer.",sizeof(uint8_t) * MAXQUOTELEN);
+                Bsprintf(tempbuf,"Failed allocating %" PRIdPTR " byte quote text buffer.", MAXQUOTELEN);
                 g_numCompilerErrors++;
                 return 1;
             }
@@ -2984,46 +3167,52 @@ repeatcase:
     case CON_QUOTE:
     case CON_ERRORINS:
     case CON_PRINTMESSAGE16:
-        C_GetNextVar();
-        return 0;
-    case CON_PRINTMESSAGE256:
-        C_GetManyVars(3);
-        return 0;
     case CON_PRINTEXT256:
     case CON_PRINTEXT16:
-        C_GetManyVars(6);
+        if (C_GetNextVarOrString()==-1)
+            return 1;
+        if (tw==CON_PRINTMESSAGE256)
+            C_GetManyVars(2);
+        else if (tw==CON_PRINTEXT256 || tw==CON_PRINTEXT16)
+            C_GetManyVars(5);
         return 0;
 
     case CON_GETNUMBER16:
     case CON_GETNUMBER256:
-        C_GetNextVarType(GAMEVAR_READONLY);
-        C_GetManyVars(2);
+        C_GetNextVarType(GV_WRITABLE);
+        if (C_GetNextVarOrString()==-1)
+            return 1;
+        C_GetNextVar();
         return 0;
 
     case CON_QSPRINTF:
-        C_GetManyVars(2);
-
+        C_GetNextVar();
+        if (C_GetNextVarOrString()==-1)
+            return 1;
         j = 0;
         while (C_GetKeyword() == -1 && j < 32)
             C_GetNextVar(), j++;
-
         *g_scriptPtr++ = -1; //CON_NULLOP + (g_lineNumber<<12);
         return 0;
 
     case CON_QSTRCAT:
     case CON_QSTRCPY:
     case CON_QSTRLEN:
+    case CON_QSTRNCAT:
+    case CON_QSUBSTR:
+        C_GetNextVar();
+        if (C_GetNextVarOrString()==-1)
+            return 1;
+        if (tw==CON_QSTRNCAT)
+            C_GetNextVar();
+        else if (tw==CON_QSUBSTR)
+            C_GetManyVars(2);
+        return 0;
 #if 0
     case CON_QGETSYSSTR:
         C_GetManyVars(2);
         return 0;
 #endif
-    case CON_QSTRNCAT:
-        C_GetManyVars(3);
-        return 0;
-    case CON_QSUBSTR:
-        C_GetManyVars(4);
-        return 0;
 
 // *** findnear*
     case CON_FINDNEARSPRITE:
@@ -3043,7 +3232,7 @@ repeatcase:
 
         // target var
         // get the ID of the DEF
-        C_GetNextVarType(GAMEVAR_READONLY);
+        C_GetNextVarType(GV_WRITABLE);
         break;
     }
 
@@ -3061,17 +3250,17 @@ repeatcase:
 
         // target var
         // get the ID of the DEF
-        C_GetNextVarType(GAMEVAR_READONLY);
+        C_GetNextVarType(GV_WRITABLE);
         break;
     }
 
 
     case CON_GETTICKS:
-        C_GetNextVarType(GAMEVAR_READONLY);
+        C_GetNextVarType(GV_WRITABLE);
         return 0;
 
     case CON_GETTIMEDATE:
-        C_GetManyVarsType(GAMEVAR_READONLY,8);
+        C_GetManyVarsType(GV_WRITABLE, 8);
         break;
 
     case CON_SETASPECT:
@@ -3103,7 +3292,7 @@ repeatcase:
 
     case CON_GETSOUNDFLAGS:
         C_GetNextVar();
-        C_GetNextVarType(GAMEVAR_READONLY);
+        C_GetNextVarType(GV_WRITABLE);
         break;
 
     case CON_SOUNDVAR:
@@ -3119,12 +3308,7 @@ repeatcase:
 
     case CON_CSTAT:
         C_GetNextValue(LABEL_DEFINE);
-        if (*(g_scriptPtr-1) == 32767)
-        {
-            *(g_scriptPtr-1) = 32768;
-            C_CUSTOMWARNING("tried to set cstat 32767, using 32768 instead.");
-        }
-        else if ((*(g_scriptPtr-1) & 32) && (*(g_scriptPtr-1) & 16))
+        if ((*(g_scriptPtr-1) & 32) && (*(g_scriptPtr-1) & 16))
         {
             i = *(g_scriptPtr-1);
             *(g_scriptPtr-1) ^= 48;
@@ -3313,6 +3497,7 @@ static void C_AddDefaultDefinitions(void)
 void C_CompilationInfo(void)
 {
     int32_t j, k=0;
+    initprintf(" \n");
     initprintf("Compiled code info: (size=%ld*%d bytes)\n",
                (unsigned)(g_scriptPtr-script), sizeof(instype));
     initprintf("  %d/%d user labels, %d/65536 indirect constants,\n",
@@ -3359,6 +3544,7 @@ void C_Compile(const char *filenameortext, int32_t isfilename)
         {
             aEventOffsets[i] = -1;
             aEventEnabled[i] = 0;
+            aEventNumLocals[i] = 0;
         }
 
         C_InitHashes();
@@ -3409,6 +3595,7 @@ void C_Compile(const char *filenameortext, int32_t isfilename)
         }
 
         fs = kfilelength(fp);
+        initprintf(" \n");
         initprintf("--- Compiling: %s (%d bytes)\n",mptr,fs);
         Bstrcpy(g_szScriptFileName, mptr);   // JBF 20031130: Store currently compiling file name
         Bfree(mptr);
@@ -3437,10 +3624,12 @@ void C_Compile(const char *filenameortext, int32_t isfilename)
 
         kread(fp, mptr, fs);
         kclose(fp);
-        textptr = (char *)mptr;
+        start_textptr = textptr = (char *)mptr;
     }
     else
-        textptr = filenameortext;
+        start_textptr = textptr = filenameortext;
+
+    g_curkwptr = textptr;
 
 //////
     g_numCompilerWarnings = g_numCompilerErrors = 0;
@@ -3458,8 +3647,8 @@ void C_Compile(const char *filenameortext, int32_t isfilename)
 
 //    flushlogwindow = 1;
 
-    if (g_numCompilerErrors >= ABORTERRCNT)
-        initprintf("fatal error: too many errors: Aborted\n");
+//    if (g_numCompilerErrors >= ABORTERRCNT)
+//        initprintf("Too many errors: Aborted\n");
 
     //*script = g_scriptPtr-script;
 
@@ -3509,6 +3698,7 @@ void C_Compile(const char *filenameortext, int32_t isfilename)
 
     if (g_numCompilerErrors)
     {
+        initprintf(" \n");
         initprintf("--- Found %d errors", g_numCompilerErrors);
         if (g_numCompilerWarnings)
             initprintf(", %d warnings.\n", g_numCompilerWarnings);
@@ -3516,7 +3706,10 @@ void C_Compile(const char *filenameortext, int32_t isfilename)
             initprintf(".\n");
     }
     else if (g_numCompilerWarnings)
+    {
+        initprintf(" \n");
         initprintf("--- Found %d warnings.\n", g_numCompilerWarnings);
+    }
 }
 
 void C_ReportError(int32_t iError)
@@ -3524,7 +3717,8 @@ void C_ReportError(int32_t iError)
     if (Bstrcmp(g_szCurrentBlockName, g_szLastBlockName))
     {
         if (cs.parsingEventOfs >= 0 || cs.currentStateIdx >= 0)
-            initprintf("%s: In %s `%s':\n",g_szScriptFileName, cs.parsingEventOfs >= 0 ? "event":"state", g_szCurrentBlockName);
+            initprintf("%s: In %s `%s':\n", g_szScriptFileName,
+                       cs.parsingEventOfs >= 0 ? "event":"state", g_szCurrentBlockName);
         else
             initprintf("%s: At top level:\n", g_szScriptFileName);
 
@@ -3541,10 +3735,6 @@ void C_ReportError(int32_t iError)
         initprintf("%s:%d: error: `%s' only valid during events.\n",
                    g_szScriptFileName, g_lineNumber, tempbuf);
         break;
-//    case ERROR_EXCEEDSMAXTILES:
-//        initprintf("%s:%d: error: `%s' value exceeds MAXTILES.  Maximum is %d.\n",
-//                   g_szScriptFileName, g_lineNumber, tempbuf, MAXTILES-1);
-//        break;
     case ERROR_EXPECTEDKEYWORD:
         initprintf("%s:%d: error: expected a keyword but found `%s'.\n",
                    g_szScriptFileName, g_lineNumber, tempbuf);
@@ -3621,10 +3811,6 @@ void C_ReportError(int32_t iError)
         initprintf("%s:%d: error: label `%s' is already in use by a %s.\n",
                    g_szScriptFileName, g_lineNumber, tlabel, g_tw==CON_DEFSTATE?"define":"state");
         break;
-//    case WARNING_BADGAMEVAR:
-//        initprintf("%s:%ld: warning: variable `%s' should be either per-player OR per-actor, not both.\n",
-//                   g_szScriptFileName, g_lineNumber, tlabel);
-//        break;
     case WARNING_DUPLICATECASE:
         initprintf("%s:%ld: warning: duplicate case ignored.\n",
                    g_szScriptFileName, g_lineNumber);
@@ -3640,13 +3826,64 @@ void C_ReportError(int32_t iError)
     case WARNING_NAMEMATCHESVAR:
         initprintf("%s:%d: warning: symbol `%s' already used for game variable.\n",
                    g_szScriptFileName, g_lineNumber, tlabel);
-//    case WARNING_CONSTANTBITSIZE:
-//        initprintf("%s:%d: warning: constants where gamevars are expected save only 16 bits.\n",
-//                   g_szScriptFileName,g_lineNumber);
-//        break;
     case WARNING_OUTSIDEDRAWSPRITE:
         initprintf("%s:%d: warning: found `%s' outside of EVENT_ANALYZESPRITES\n",
                    g_szScriptFileName,g_lineNumber,tempbuf);
         break;
     }
+
+    if (iError!=-1)
+        PrintErrorPosition();
+}
+
+static void PrintErrorPosition()
+{
+    const char *b = g_curkwptr, *e=textptr;
+    int32_t i, nchars;
+    int32_t osdcols = OSD_GetCols();
+
+    if (!(b<e+1))
+        return;
+
+    while (*e && !(*e==0x0a || *e==0x0d))
+        e++;
+
+    while (b>start_textptr && *b!=0x0a)
+        b--;
+    if (*b==0x0a)
+        b++;
+
+    nchars = e-b;
+    if (nchars==0 || nchars > osdcols)
+        return;
+
+    {
+        char *buf = Bmalloc(nchars+1);
+
+        Bmemcpy(buf, b, nchars);
+        buf[nchars]=0;
+
+        for (i=0; i<nchars; i++)
+            if (buf[i]==0x0a || buf[i]==0x0d)
+                buf[i]=' ';
+
+        initprintf("%s\n", buf);
+
+        for (i=0; i<nchars; i++)
+            buf[i]=' ';
+
+        buf[g_curkwptr-b] = '|';
+        buf[textptr-b] = '*';
+        buf[textptr-1-b] = '>';
+
+        i = g_curkwptr-b+1;
+
+        while (i<textptr-1-b)
+            buf[i++] = '-';
+        buf[nchars]=0;
+
+        initprintf("%s\n", buf);
+
+        Bfree(buf);
+    }
 }
diff --git a/polymer/eduke32/source/m32def.h b/polymer/eduke32/source/m32def.h
index 520cc276f..090083785 100644
--- a/polymer/eduke32/source/m32def.h
+++ b/polymer/eduke32/source/m32def.h
@@ -25,23 +25,26 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef _m32def_h_
 #define _m32def_h_
 
-#define ABORTERRCNT 8
+// the parsing routines aren't good at error recovery yet...
+#define ABORTERRCNT 1
 
+// these two are for m32def.c
 #define C_CUSTOMERROR(Text, ...) do { \
     C_ReportError(-1);                                                  \
     initprintf("%s:%d: error: " Text "\n", g_szScriptFileName, g_lineNumber, ## __VA_ARGS__); \
+    PrintErrorPosition();  \
     g_numCompilerErrors++; \
     } while (0)
-
 #define C_CUSTOMWARNING(Text, ...) do { \
     C_ReportError(-1);                                                  \
     initprintf("%s:%d: warning: " Text "\n", g_szScriptFileName, g_lineNumber, ## __VA_ARGS__); \
+    PrintErrorPosition();    \
     g_numCompilerWarnings++; \
     } while (0)
 
 extern char g_szScriptFileName[BMAX_PATH];
-extern int32_t g_totalLines,g_lineNumber;
-extern int32_t g_numCompilerErrors,g_numCompilerWarnings;
+extern int32_t g_totalLines, g_lineNumber;
+extern int32_t g_numCompilerErrors, g_numCompilerWarnings;
 
 extern int32_t g_didDefineSomething;
 
@@ -52,8 +55,9 @@ void C_CompilationInfo(void);
 
 typedef struct
 {
-    int32_t ofs;
+    int32_t ofs;  // offset into script[]
     int32_t codesize;
+    uint16_t numlocals;  // number of local int32_t vars to allocate
     char name[MAXLABELLEN];
 } statesinfo_t;
 
@@ -99,7 +103,6 @@ extern vmstate_t vm_default;
 
 
 extern int32_t g_errorLineNum;
-extern int32_t g_tw;
 extern const char *keyw[];
 
 enum SystemString_t {
@@ -228,6 +231,7 @@ enum IterationTypes_t
     ITER_SELSECTORS,
     ITER_SELWALLS,
     ITER_DRAWNSPRITES,
+// ---
     ITER_SPRITESOFSECTOR,
     ITER_WALLSOFSECTOR,
     ITER_LOOPOFWALL,
diff --git a/polymer/eduke32/source/m32exec.c b/polymer/eduke32/source/m32exec.c
index db1cfeba2..6238c6a5f 100644
--- a/polymer/eduke32/source/m32exec.c
+++ b/polymer/eduke32/source/m32exec.c
@@ -151,6 +151,12 @@ void VM_OnEvent(register int32_t iEventID, register int32_t iActor)
     {
         instype *oinsptr=insptr;
         vmstate_t vm_backup;
+        void *olocalvars = aGameArrays[M32_LOCAL_ARRAY_ID].vals;
+        void *localvars = alloca(aEventNumLocals[iEventID] * sizeof(int32_t));
+
+        // needed since any read access before initialization would cause undefined behaviour
+        if (aEventNumLocals[iEventID] > 0)
+            Bmemset(localvars, aEventNumLocals[iEventID]*sizeof(int32_t), 0);
 
         Bmemcpy(&vm_backup, &vm, sizeof(vmstate_t));
 
@@ -163,7 +169,10 @@ void VM_OnEvent(register int32_t iEventID, register int32_t iActor)
         vm.flags = 0;
 
         insptr = script + aEventOffsets[iEventID];
+
+        aGameArrays[M32_LOCAL_ARRAY_ID].vals = localvars;
         VM_Execute(0);
+        aGameArrays[M32_LOCAL_ARRAY_ID].vals = olocalvars;
 
         if (vm.flags&VMFLAG_ERROR)
         {
@@ -278,6 +287,26 @@ static int32_t X_DoSort(const int32_t *lv, const int32_t *rv)
         vm.flags |= VMFLAG_ERROR;                                       \
         continue;                                                       \
     }                                                                   \
+
+static char *GetMaybeInlineQuote(int32_t quotei)
+{
+    char *quotetext;
+    if (quotei==-1)
+    {
+        quotetext = (char *)insptr;
+        while (*insptr++) /* skip the string */;
+    }
+    else
+    {
+        quotei = Gv_GetVarX(quotei);
+        do { X_ERROR_INVALIDQUOTE(quotei, ScriptQuotes) } while (0);
+        if (vm.flags&VMFLAG_ERROR)
+            return NULL;
+        quotetext = ScriptQuotes[quotei];
+    }
+
+    return quotetext;
+}
  
 int32_t VM_Execute(int32_t once)
 {
@@ -311,10 +340,18 @@ skip_check:
         {
             instype *tempscrptr = insptr+2;
             int32_t stateidx = *(insptr+1), o_g_st = vm.g_st, oret=vm.flags&VMFLAG_RETURN;
+            void *olocalvars = aGameArrays[M32_LOCAL_ARRAY_ID].vals;
+            void *localvars = alloca(statesinfo[stateidx].numlocals * sizeof(int32_t));
+
+            // needed since any read access before initialization would cause undefined behaviour
+            if (statesinfo[stateidx].numlocals > 0)
+                Bmemset(localvars, statesinfo[stateidx].numlocals*sizeof(int32_t), 0);
 
             insptr = script + statesinfo[stateidx].ofs;
             vm.g_st = 1+MAXEVENTS+stateidx;
+            aGameArrays[M32_LOCAL_ARRAY_ID].vals = localvars;
             VM_Execute(0);
+            aGameArrays[M32_LOCAL_ARRAY_ID].vals = olocalvars;
             vm.g_st = o_g_st;
             vm.flags &= ~VMFLAG_RETURN;
             vm.flags |= oret;
@@ -544,7 +581,7 @@ skip_check:
 
                 if (asize<=0 || asize>65536)
                 {
-                    M32_PRINTERROR("Invalid array size %d (max: 65536)");
+                    M32_PRINTERROR("Invalid array size %d (must be between 1 and 65536)", asize);
                     vm.flags |= VMFLAG_ERROR;
                     continue;
                 }
@@ -598,7 +635,7 @@ skip_check:
                 if ((sidx+numelts) > ssiz) numelts = ssiz-sidx;
                 if ((didx+numelts) > dsiz) numelts = dsiz-didx;
 
-                switch (aGameArrays[si].dwFlags & GAMEARRAY_TYPEMASK)
+                switch (aGameArrays[si].dwFlags & GAMEARRAY_TYPE_MASK)
                 {
                 case 0:
                 case GAMEARRAY_OFINT:
@@ -1150,13 +1187,13 @@ skip_check:
 
                 if (state < 0)
                 {
-                    qsort(aGameArrays[aridx].vals, count, sizeof(int32_t), (int32_t( *)(const void *,const void *))X_DoSortDefault);
+                    qsort(aGameArrays[aridx].vals, count, sizeof(int32_t), (int32_t(*)(const void *,const void *))X_DoSortDefault);
                 }
                 else
                 {
                     x_sortingstateptr = script + statesinfo[state].ofs;
                     vm.g_st = 1+MAXEVENTS+state;
-                    qsort(aGameArrays[aridx].vals, count, sizeof(int32_t), (int32_t( *)(const void *,const void *))X_DoSort);
+                    qsort(aGameArrays[aridx].vals, count, sizeof(int32_t), (int32_t(*)(const void *,const void *))X_DoSort);
                     vm.g_st = o_g_st;
                     insptr = end;
                 }
@@ -2025,16 +2062,20 @@ badindex:
                     char pp1[4][8] = {"sprite","sector","wall","tsprite"};
                     const memberlabel_t *pp2[4] = {SpriteLabels, SectorLabels, WallLabels, SpriteLabels};
 
-                    if ((code&M32_FLAG_ARRAY) || (code&M32_FLAG_SPECIAL))
+                    if ((code&M32_VARTYPE_MASK)==M32_FLAG_ARRAY || (code&M32_VARTYPE_MASK)==M32_FLAG_STRUCT)
                     {
-                        if (code&MAXGAMEVARS)
+                        if (code&M32_FLAG_CONSTANT)
                             Bsprintf(buf2, "%d", (code>>16)&0xffff);
                         else
-                            Bsprintf(buf2, "%s", aGameVars[(code>>16)&(MAXGAMEVARS-1)].szLabel?
-                                     aGameVars[(code>>16)&(MAXGAMEVARS-1)].szLabel:"???");
+                        {
+                            char *label = aGameVars[(code>>16)&(MAXGAMEVARS-1)].szLabel;
+                            Bsprintf(buf2, "%s", label?label:"???");
+                        }
                     }
+                    else if ((code&M32_VARTYPE_MASK)==M32_FLAG_LOCAL)
+                        Bsprintf(buf2, "%d", code&(MAXGAMEVARS-1));
 
-                    if ((code&0x0000FFFC) == MAXGAMEVARS) // addlogvar for a constant.. why not? :P
+                    if ((code&0x0000FFFC) == M32_FLAG_CONSTANT) // addlogvar for a constant.. why not? :P
                     {
                         switch (code&3)
                         {
@@ -2044,13 +2085,25 @@ badindex:
                         default: Bsprintf(buf, "(??? constant)"); break;
                         }
                     }
-                    else if (code&M32_FLAG_ARRAY)
-                        Bsprintf(buf, "%s[%s]", aGameArrays[code&(MAXGAMEARRAYS-1)].szLabel?
-                                 aGameArrays[code&(MAXGAMEARRAYS-1)].szLabel:"???", buf2);
-                    else if (code&M32_FLAG_SPECIAL)
-                        Bsprintf(buf, "%s[%s].%s", pp1[code&3], buf2, pp2[code&3][(code>>2)&31].name);
                     else
-                        Bsprintf(buf, "???");
+                    {
+                        switch (code&M32_VARTYPE_MASK)
+                        {
+                        case M32_FLAG_ARRAY:
+                            Bsprintf(buf, "%s[%s]", aGameArrays[code&(MAXGAMEARRAYS-1)].szLabel?
+                                     aGameArrays[code&(MAXGAMEARRAYS-1)].szLabel:"???", buf2);
+                            break;
+                        case M32_FLAG_STRUCT:
+                            Bsprintf(buf, "%s[%s].%s", pp1[code&3], buf2, pp2[code&3][(code>>2)&31].name);
+                            break;
+                        case M32_FLAG_VAR:
+                            Bsprintf(buf, "???");
+                            break;
+                        case M32_FLAG_LOCAL:
+                            Bsprintf(buf, ".local[%s]", buf2);
+                            break;
+                        }
+                    }
                 }
                 else
                 {
@@ -2098,17 +2151,24 @@ badindex:
         case CON_GETNUMBER256:
             insptr++;
             {
-                int32_t var=*insptr++, quote=Gv_GetVarX(*insptr++), max=Gv_GetVarX(*insptr++), sign=ksgn(max)<0?1:0;
-                char buf[60];
+                int32_t var=*insptr++, quote=*insptr++;
+                const char *quotetext = GetMaybeInlineQuote(quote);
+                if (vm.flags&VMFLAG_ERROR)
+                    continue;
 
-                X_ERROR_INVALIDQUOTE(quote, ScriptQuotes);
-                Bmemcpy(buf, ScriptQuotes[quote], sizeof(buf)-1);
-                buf[sizeof(buf)-1]='\0';
+                {
+                    int32_t max=Gv_GetVarX(*insptr++), sign=ksgn(max)<0?1:0;
+                    char buf[64];  // buffers in getnumber* are 80 bytes long
 
-                if (tw==CON_GETNUMBER16)
-                    Gv_SetVarX(var, getnumber16(ScriptQuotes[quote], Gv_GetVarX(var), max, sign));
-                else
-                    Gv_SetVarX(var, getnumber256(ScriptQuotes[quote], Gv_GetVarX(var), max, sign));
+                    // no danger of accessing unallocated memory since we took care in C_SetScriptSize()
+                    Bmemcpy(buf, quotetext, sizeof(buf));
+                    buf[sizeof(buf)-1]='\0';
+
+                    if (tw==CON_GETNUMBER16)
+                        Gv_SetVarX(var, getnumber16(quotetext, Gv_GetVarX(var), max, sign));
+                    else
+                        Gv_SetVarX(var, getnumber256(quotetext, Gv_GetVarX(var), max, sign));
+                }
             }
             continue;
 
@@ -2121,35 +2181,39 @@ badindex:
         case CON_PRINTEXT16:
             insptr++;
             {
-                int32_t i=Gv_GetVarX(*insptr++);
-                int32_t x=(tw>=CON_PRINTMESSAGE256)?Gv_GetVarX(*insptr++):0;
-                int32_t y=(tw>=CON_PRINTMESSAGE256)?Gv_GetVarX(*insptr++):0;
-                int32_t col=(tw>=CON_PRINTEXT256)?Gv_GetVarX(*insptr++):0;
-                int32_t backcol=(tw>=CON_PRINTEXT256)?Gv_GetVarX(*insptr++):0;
-                int32_t fontsize=(tw>=CON_PRINTEXT256)?Gv_GetVarX(*insptr++):0;
+                int32_t i=*insptr++;
+                const char *quotetext = GetMaybeInlineQuote(i);
+                if (vm.flags&VMFLAG_ERROR)
+                    continue;
 
-                if (tw==CON_ERRORINS) vm.flags |= VMFLAG_ERROR;
-
-                X_ERROR_INVALIDQUOTE(i, ScriptQuotes);
-
-                if (tw==CON_PRINT)
-                    OSD_Printf("%s\n", ScriptQuotes[i]);
-                if (tw==CON_QUOTE)
-                    message("%s", ScriptQuotes[i]);
-                else if (tw==CON_PRINTMESSAGE16)
-                    printmessage16("%s", ScriptQuotes[i]);
-                else if (tw==CON_PRINTMESSAGE256)
-                    printmessage256(x, y, ScriptQuotes[i]);
-                else if (tw==CON_PRINTEXT256)
                 {
-                    if (col<0 || col>=256) col=0;
-                    if (backcol<0 || backcol>=256) backcol=-1;
-                    printext256(x, y, col, backcol, ScriptQuotes[i], fontsize);
-                }
-                else if (tw==CON_PRINTEXT16)
-                {
-                    printext16(x, y, editorcolors[col&15], backcol<0 ? -1 : editorcolors[backcol&15],
-                               ScriptQuotes[i], fontsize);
+                    int32_t x=(tw>=CON_PRINTMESSAGE256)?Gv_GetVarX(*insptr++):0;
+                    int32_t y=(tw>=CON_PRINTMESSAGE256)?Gv_GetVarX(*insptr++):0;
+                    int32_t col=(tw>=CON_PRINTEXT256)?Gv_GetVarX(*insptr++):0;
+                    int32_t backcol=(tw>=CON_PRINTEXT256)?Gv_GetVarX(*insptr++):0;
+                    int32_t fontsize=(tw>=CON_PRINTEXT256)?Gv_GetVarX(*insptr++):0;
+
+                    if (tw==CON_ERRORINS) vm.flags |= VMFLAG_ERROR;
+
+                    if (tw==CON_PRINT || tw==CON_ERRORINS)
+                        OSD_Printf("%s\n", quotetext);
+                    else if (tw==CON_QUOTE)
+                        message("%s", quotetext);
+                    else if (tw==CON_PRINTMESSAGE16)
+                        printmessage16("%s", quotetext);
+                    else if (tw==CON_PRINTMESSAGE256)
+                        printmessage256(x, y, quotetext);
+                    else if (tw==CON_PRINTEXT256)
+                    {
+                        if (col<0 || col>=256) col=0;
+                        if (backcol<0 || backcol>=256) backcol=-1;
+                        printext256(x, y, col, backcol, quotetext, fontsize);
+                    }
+                    else if (tw==CON_PRINTEXT16)
+                    {
+                        printext16(x, y, editorcolors[col&15], backcol<0 ? -1 : editorcolors[backcol&15],
+                                   quotetext, fontsize);
+                    }
                 }
             }
             continue;
@@ -2157,11 +2221,12 @@ badindex:
         case CON_QSTRLEN:
             insptr++;
             {
-                int32_t i=*insptr++;
-                int32_t j=Gv_GetVarX(*insptr++);
+                int32_t i=*insptr++, quote=*insptr++;
+                const char *quotetext = GetMaybeInlineQuote(quote);
+                if (vm.flags&VMFLAG_ERROR)
+                    continue;
 
-                X_ERROR_INVALIDQUOTE(j, ScriptQuotes);
-                Gv_SetVarX(i, Bstrlen(ScriptQuotes[j]));
+                Gv_SetVarX(i, Bstrlen(quotetext));
                 continue;
             }
 
@@ -2169,16 +2234,18 @@ badindex:
             insptr++;
             {
                 int32_t q1 = Gv_GetVarX(*insptr++);
-                int32_t q2 = Gv_GetVarX(*insptr++);
-                int32_t st = Gv_GetVarX(*insptr++);
-                int32_t ln = Gv_GetVarX(*insptr++);
+                int32_t q2 = *insptr++;
+                const char *q2text = GetMaybeInlineQuote(q2);
+                if (vm.flags&VMFLAG_ERROR)
+                    continue;
 
                 X_ERROR_INVALIDQUOTE(q1, ScriptQuotes);
-                X_ERROR_INVALIDQUOTE(q2, ScriptQuotes);
 
                 {
+                    int32_t st = Gv_GetVarX(*insptr++);
+                    int32_t ln = Gv_GetVarX(*insptr++);
                     char *s1 = ScriptQuotes[q1];
-                    char *s2 = ScriptQuotes[q2];
+                    const char *s2 = q2text;
 
                     while (*s2 && st--) s2++;
                     while ((*s1 = *s2) && ln--)
@@ -2198,10 +2265,13 @@ badindex:
             insptr++;
             {
                 int32_t i = Gv_GetVarX(*insptr++);
-                int32_t j = Gv_GetVarX(*insptr++);
+                int32_t j = *insptr++;
+
+                const char *quotetext = GetMaybeInlineQuote(j);
+                if (vm.flags&VMFLAG_ERROR)
+                    continue;
 
                 X_ERROR_INVALIDQUOTE(i, ScriptQuotes);
-                X_ERROR_INVALIDQUOTE(j, ScriptQuotes);
 
                 switch (tw)
                 {
@@ -2226,13 +2296,13 @@ badindex:
                     break;
 #endif
                 case CON_QSTRCAT:
-                    Bstrncat(ScriptQuotes[i],ScriptQuotes[j],(MAXQUOTELEN-1)-Bstrlen(ScriptQuotes[i]));
+                    Bstrncat(ScriptQuotes[i], quotetext, (MAXQUOTELEN-1)-Bstrlen(ScriptQuotes[i]));
                     break;
                 case CON_QSTRNCAT:
-                    Bstrncat(ScriptQuotes[i],ScriptQuotes[j],Gv_GetVarX(*insptr++));
+                    Bstrncat(ScriptQuotes[i], quotetext, Gv_GetVarX(*insptr++));
                     break;
                 case CON_QSTRCPY:
-                    Bstrcpy(ScriptQuotes[i],ScriptQuotes[j]);
+                    Bstrcpy(ScriptQuotes[i], quotetext);
                     break;
                 }
                 continue;
@@ -2241,14 +2311,16 @@ badindex:
         case CON_QSPRINTF:
             insptr++;
             {
-                int32_t dq = Gv_GetVarX(*insptr++), sq = Gv_GetVarX(*insptr++);
+                int32_t dq=Gv_GetVarX(*insptr++), sq=*insptr++;
+                const char *sourcetext = GetMaybeInlineQuote(sq);
+                if (vm.flags&VMFLAG_ERROR)
+                    continue;
 
                 X_ERROR_INVALIDQUOTE(dq, ScriptQuotes);
-                X_ERROR_INVALIDQUOTE(sq, ScriptQuotes);
 
                 {
                     int32_t arg[32], numvals=0, i=0, j=0, k=0;
-                    int32_t len = Bstrlen(ScriptQuotes[sq]);
+                    int32_t len = Bstrlen(sourcetext);
                     char tmpbuf[MAXQUOTELEN<<1];
 
                     while (*insptr != -1 && numvals < 32)
@@ -2259,23 +2331,23 @@ badindex:
                     i = 0;
                     do
                     {
-                        while (k < len && j < MAXQUOTELEN && ScriptQuotes[sq][k] != '%')
-                            tmpbuf[j++] = ScriptQuotes[sq][k++];
+                        while (k < len && j < MAXQUOTELEN && sourcetext[k] != '%')
+                            tmpbuf[j++] = sourcetext[k++];
 
-                        if (ScriptQuotes[sq][k] == '%')
+                        if (sourcetext[k] == '%')
                         {
                             k++;
 
                             if (i>=numvals) goto dodefault;
 
-                            switch (ScriptQuotes[sq][k])
+                            switch (sourcetext[k])
                             {
                             case 'l':
-                                if (ScriptQuotes[sq][k+1] != 'd')
+                                if (sourcetext[k+1] != 'd')
                                 {
                                     // write the % and l
-                                    tmpbuf[j++] = ScriptQuotes[sq][k-1];
-                                    tmpbuf[j++] = ScriptQuotes[sq][k++];
+                                    tmpbuf[j++] = sourcetext[k-1];
+                                    tmpbuf[j++] = sourcetext[k++];
                                     break;
                                 }
                                 k++;
@@ -2321,7 +2393,7 @@ badindex:
 
 dodefault:
                             default:
-                                tmpbuf[j++] = ScriptQuotes[sq][k-1];
+                                tmpbuf[j++] = sourcetext[k-1];
                                 break;
                             }
                         }
diff --git a/polymer/eduke32/source/m32structures.c b/polymer/eduke32/source/m32structures.c
index 984141978..811001bc5 100644
--- a/polymer/eduke32/source/m32structures.c
+++ b/polymer/eduke32/source/m32structures.c
@@ -33,25 +33,27 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define ACCESS_USEVARS 2
 #define ACCESS_SPRITEEXT 4
 
+int32_t m32_script_expertmode = 0;
+
 
 static int32_t __fastcall VM_AccessWall(int32_t how, int32_t lVar1, int32_t lLabelID, int32_t lVar2)
 {
     int32_t lValue;
     int32_t i = (how&ACCESS_USEVARS) ? Gv_GetVarX(lVar1) : lVar1;
 
-    if (i<0 || i >= numwalls)
+    if (!m32_script_expertmode && (i<0 || i >= numwalls))
         goto badwall;
 
     if (how&ACCESS_SET)
     {
-        if (WallLabels[lLabelID].flags & 1)
+        if (!m32_script_expertmode && (WallLabels[lLabelID].flags & 1))
             goto readonly;
 
         lValue = (how&ACCESS_USEVARS) ? Gv_GetVarX(lVar2) : lVar2;
 
         asksave = 1;
 
-        if (WallLabels[lLabelID].min != 0 || WallLabels[lLabelID].max != 0)
+        if (!m32_script_expertmode && (WallLabels[lLabelID].min != 0 || WallLabels[lLabelID].max != 0))
         {
             if (lValue < WallLabels[lLabelID].min)
                 lValue = WallLabels[lLabelID].min;
@@ -134,19 +136,19 @@ static int32_t __fastcall VM_AccessSector(int32_t how, int32_t lVar1, int32_t lL
     if ((how&ACCESS_USEVARS) && lVar1 != M32_THISACTOR_VAR_ID)
         i = Gv_GetVarX(lVar1);
 
-    if (i<0 || i >= numsectors)
+    if (!m32_script_expertmode && (i<0 || i >= numsectors))
         goto badsector;
 
     if (how&ACCESS_SET)
     {
-        if (SectorLabels[lLabelID].flags & 1)
+        if (!m32_script_expertmode && (SectorLabels[lLabelID].flags & 1))
             goto readonly;
 
         lValue = (how&ACCESS_USEVARS) ? Gv_GetVarX(lVar2) : lVar2;
 
         asksave = 1;
 
-        if (SectorLabels[lLabelID].min != 0 || SectorLabels[lLabelID].max != 0)
+        if (!m32_script_expertmode && (SectorLabels[lLabelID].min != 0 || SectorLabels[lLabelID].max != 0))
         {
             if (lValue < SectorLabels[lLabelID].min)
                 lValue = SectorLabels[lLabelID].min;
@@ -252,18 +254,18 @@ static int32_t __fastcall VM_AccessSprite(int32_t how, int32_t lVar1, int32_t lL
         i = Gv_GetVarX(lVar1);
 
     if (i < 0 || i >= MAXSPRITES)
-        goto badactor;
+        goto badsprite;
 
     if (how&ACCESS_SET)
     {
-        if (SpriteLabels[lLabelID].flags & 1)
+        if (!m32_script_expertmode && (SpriteLabels[lLabelID].flags & 1))
             goto readonly;
 
         lValue = (how&ACCESS_USEVARS) ? Gv_GetVarX(lVar2) : lVar2;
 
         asksave = 1;
 
-        if (SpriteLabels[lLabelID].min != 0 || SpriteLabels[lLabelID].max != 0)
+        if (!m32_script_expertmode && (SpriteLabels[lLabelID].min != 0 || SpriteLabels[lLabelID].max != 0))
         {
             if (lValue < SpriteLabels[lLabelID].min)
                 lValue = SpriteLabels[lLabelID].min;
@@ -342,14 +344,11 @@ static int32_t __fastcall VM_AccessSprite(int32_t how, int32_t lVar1, int32_t lL
 
         return lValue;
     }
-badactor:
-//    OSD_Printf(CON_ERROR "tried to set %s on invalid target sprite (%d) from spr %d pic %d gv %s\n",g_errorLineNum,keyw[g_tw],
-//               SpriteLabels[lLabelID].name,i,vm.g_i,vm.g_sp->picnum,
-//               (lVar1<MAXGAMEVARS)?aGameVars[lVar1].szLabel:"extended");
+badsprite:
     M32_PRINTERROR("tried to set %s on invalid target sprite (%d)", SpriteLabels[lLabelID].name, i);
     return -1;
 readonly:
-    M32_PRINTERROR("Sprite structure member `%s' is read-only.", SpriteLabels[lLabelID].name);
+    M32_PRINTERROR("sprite structure member `%s' is read-only.", SpriteLabels[lLabelID].name);
     return -1;
 }
 
diff --git a/polymer/eduke32/source/m32vars.c b/polymer/eduke32/source/m32vars.c
index a9c622c62..ac8dc21a5 100644
--- a/polymer/eduke32/source/m32vars.c
+++ b/polymer/eduke32/source/m32vars.c
@@ -42,6 +42,7 @@ static void Gv_Clear(void)
     {
         if (aGameVars[i].szLabel)
             Bfree(aGameVars[i].szLabel);
+
         aGameVars[i].szLabel = NULL;
         aGameVars[i].dwFlags = 0;
 
@@ -50,22 +51,30 @@ static void Gv_Clear(void)
             Bfree(aGameVars[i].val.plValues);
             aGameVars[i].val.plValues = NULL;
         }
-        aGameVars[i].val.lValue=0;
+
+        aGameVars[i].val.lValue = 0;
         aGameVars[i].dwFlags |= GAMEVAR_RESET;
+
         if (i >= MAXGAMEARRAYS)
             continue;
+
         if (aGameArrays[i].szLabel)
             Bfree(aGameArrays[i].szLabel);
+
         aGameArrays[i].szLabel = NULL;
 
         if (aGameArrays[i].vals)
             Bfree(aGameArrays[i].vals);
+
         aGameArrays[i].vals = NULL;
         aGameArrays[i].dwFlags |= GAMEARRAY_RESET;
     }
+
     g_gameVarCount = g_gameArrayCount = 0;
+
     hash_init(&h_gamevars);
     hash_init(&h_arrays);
+
     return;
 }
 
@@ -90,7 +99,7 @@ int32_t Gv_NewArray(const char *pszLabel, void *arrayptr, intptr_t asize, uint32
     {
         // found it it's a duplicate in error
 
-        if (aGameArrays[i].dwFlags&GAMEARRAY_TYPEMASK)
+        if (aGameArrays[i].dwFlags&GAMEARRAY_TYPE_MASK)
         {
             C_CUSTOMWARNING("ignored redefining system array `%s'.", pszLabel);
         }
@@ -98,8 +107,10 @@ int32_t Gv_NewArray(const char *pszLabel, void *arrayptr, intptr_t asize, uint32
         return 0;
     }
 
-    if (!(dwFlags&GAMEARRAY_VARSIZE) && (asize<=0 || asize>=65536))
+    if (!(dwFlags&GAMEARRAY_VARSIZE) && !(dwFlags&GAMEARRAY_TYPE_MASK) && (asize<=0 || asize>65536))
     {
+        // the dummy array with index 0 sets the size to 0 so that accidental accesses as array
+        // will complain.
         C_CUSTOMERROR("invalid array size %d. Must be between 1 and 65536", (int32_t)asize);
         return 0;
     }
@@ -111,7 +122,7 @@ int32_t Gv_NewArray(const char *pszLabel, void *arrayptr, intptr_t asize, uint32
     if (aGameArrays[i].szLabel != pszLabel)
         Bstrcpy(aGameArrays[i].szLabel, pszLabel);
 
-    if (!(dwFlags & GAMEARRAY_TYPEMASK))
+    if (!(dwFlags & GAMEARRAY_TYPE_MASK))
         aGameArrays[i].vals = Bcalloc(asize, sizeof(int32_t));
     else
         aGameArrays[i].vals = arrayptr;
@@ -148,7 +159,7 @@ int32_t Gv_NewVar(const char *pszLabel, intptr_t lValue, uint32_t dwFlags)
     if (i >= 0 && !(aGameVars[i].dwFlags & GAMEVAR_RESET))
     {
         // found it...
-        if (aGameVars[i].dwFlags & (GAMEVAR_INTPTR|GAMEVAR_FLOATPTR|GAMEVAR_SHORTPTR|GAMEVAR_CHARPTR))
+        if (aGameVars[i].dwFlags & GAMEVAR_PTR_MASK)
         {
             C_ReportError(-1);
             initprintf("%s:%d: warning: cannot redefine internal gamevar `%s'.\n",g_szScriptFileName,g_lineNumber,label+(g_numLabels<<6));
@@ -206,36 +217,44 @@ int32_t Gv_NewVar(const char *pszLabel, intptr_t lValue, uint32_t dwFlags)
     return 1;
 }
 
-int32_t __fastcall Gv_GetVarN(register int32_t id)  // 'N' for "no side-effects"... vars only!
+int32_t __fastcall Gv_GetVarN(register int32_t id)  // 'N' for "no side-effects"... vars and locals only!
 {
     if (id == M32_THISACTOR_VAR_ID)
         return vm.g_i;
 
-    if (id & (0xFFFFFFFF-(MAXGAMEVARS-1)))
+    switch (id&M32_VARTYPE_MASK)
     {
-        M32_PRINTERROR("Gv_GetVarN(): invalid var index %d", id);
-        vm.flags |= VMFLAG_ERROR;
-        return -1;
+    case M32_FLAG_VAR:
+        id &= (MAXGAMEVARS-1);
+
+        switch (aGameVars[id].dwFlags & (GAMEVAR_USER_MASK|GAMEVAR_PTR_MASK))
+        {
+        case 0:
+            return aGameVars[id].val.lValue;
+        case GAMEVAR_PERBLOCK:
+            return aGameVars[id].val.plValues[vm.g_st];
+        case GAMEVAR_FLOATPTR:
+        case GAMEVAR_INTPTR:
+            return *((int32_t *)aGameVars[id].val.lValue);
+        case GAMEVAR_SHORTPTR:
+            return *((int16_t *)aGameVars[id].val.lValue);
+        case GAMEVAR_CHARPTR:
+            return *((uint8_t *)aGameVars[id].val.lValue);
+        default:
+            M32_PRINTERROR("Gv_GetVarN(): WTF??");
+            vm.flags |= VMFLAG_ERROR;
+            return -1;
+        }
+
+    case M32_FLAG_LOCAL:
+    {
+        int32_t index = id&(MAXGAMEVARS-1);
+        // no bounds checking since it's done at script compilation time
+        return ((int32_t *)aGameArrays[M32_LOCAL_ARRAY_ID].vals)[index];
     }
 
-    id &= (MAXGAMEVARS-1);
-
-    switch (aGameVars[id].dwFlags &
-            (GAMEVAR_USER_MASK|GAMEVAR_INTPTR|GAMEVAR_FLOATPTR|GAMEVAR_SHORTPTR|GAMEVAR_CHARPTR))
-    {
-    case 0:
-        return aGameVars[id].val.lValue;
-    case GAMEVAR_PERBLOCK:
-        return aGameVars[id].val.plValues[vm.g_st];
-    case GAMEVAR_FLOATPTR:
-    case GAMEVAR_INTPTR:
-        return *((int32_t *)aGameVars[id].val.lValue);
-    case GAMEVAR_SHORTPTR:
-        return *((int16_t *)aGameVars[id].val.lValue);
-    case GAMEVAR_CHARPTR:
-        return *((uint8_t *)aGameVars[id].val.lValue);
     default:
-        M32_PRINTERROR("Gv_GetVarN(): WTF??");
+        M32_PRINTERROR("Gv_GetVarN(): invalid var code %0x08x", id);
         vm.flags |= VMFLAG_ERROR;
         return -1;
     }
@@ -246,7 +265,9 @@ int32_t __fastcall Gv_GetVarX(register int32_t id)
     if (id == M32_THISACTOR_VAR_ID)
         return vm.g_i;
 
-    if ((id & 0x0000FFFC) == MAXGAMEVARS)
+    register int32_t negateResult = !!(id&M32_FLAG_NEGATE);
+
+    if ((id & M32_BITS_MASK) == M32_FLAG_CONSTANT)
     {
         switch (id&3)
         {
@@ -255,7 +276,7 @@ int32_t __fastcall Gv_GetVarX(register int32_t id)
         case 1:
             return constants[(id>>16)&0xffff];
         case 2:
-            return labelval[(id>>16)&0xffff];
+            return (labelval[(id>>16)&0xffff] ^ -negateResult) + negateResult;
         default:
             M32_PRINTERROR("Gv_GetVarX() (constant): WTF??");
             vm.flags |= VMFLAG_ERROR;
@@ -263,229 +284,225 @@ int32_t __fastcall Gv_GetVarX(register int32_t id)
         }
     }
 
+
+    switch (id&M32_VARTYPE_MASK)
     {
-        register int32_t negateResult = (id&M32_FLAG_NEGATE)>>(LOG2MAXGV+1);
+    case M32_FLAG_ARRAY:
+    {
+        register int32_t index;
+        int32_t siz;
 
-        if (id & (0xFFFFFFFF-(MAXGAMEVARS-1)))
+        index = (int32_t)((id>>16)&0xffff);
+        if (!(id&M32_FLAG_CONSTANTINDEX))
+            index = Gv_GetVarN(index);
+
+        id &= (MAXGAMEARRAYS-1);
+
+        if (aGameArrays[id].dwFlags & GAMEARRAY_VARSIZE)
+            siz = Gv_GetVarN(aGameArrays[id].size);
+        else
+            siz = aGameArrays[id].size;
+
+        if (index < 0 || index >= siz)
         {
-            if (id&M32_FLAG_ARRAY) // array
-            {
-                register int32_t index;
-                int32_t siz;
-
-                index = (int32_t)((id>>16)&0xffff);
-                if (!(id&MAXGAMEVARS))
-                    index = Gv_GetVarN(index);
-
-                id &= (MAXGAMEARRAYS-1);
-
-                if (aGameArrays[id].dwFlags & GAMEARRAY_VARSIZE)
-                    siz = Gv_GetVarN(aGameArrays[id].size);
-                else
-                    siz = aGameArrays[id].size;
-
-                if (index < 0 || index >= siz)
-                {
-                    M32_PRINTERROR("Gv_GetVarX(): invalid array index (%s[%d])", aGameArrays[id].szLabel, index);
-                    return -1;
-                }
-
-                switch (aGameArrays[id].dwFlags & GAMEARRAY_TYPEMASK)
-                {
-                case 0:
-                case GAMEARRAY_OFINT:
-                    return ((((int32_t *)aGameArrays[id].vals)[index] ^ -negateResult) + negateResult);
-                case GAMEARRAY_OFSHORT:
-                    return ((((int16_t *)aGameArrays[id].vals)[index] ^ -negateResult) + negateResult);
-                case GAMEARRAY_OFCHAR:
-                    return ((((uint8_t *)aGameArrays[id].vals)[index] ^ -negateResult) + negateResult);
-                default:
-                    M32_PRINTERROR("Gv_GetVarX() (array): WTF??");
-                    vm.flags |= VMFLAG_ERROR;
-                    return -1;
-                }
-            }
-
-            if (id&M32_FLAG_SPECIAL) // struct shortcut vars
-            {
-                register int32_t index, memberid;
-
-                index = (id>>16)&0x7fff;
-                if (!(id&MAXGAMEVARS))
-                    index = Gv_GetVarN(index);
-
-                memberid = (id>>2)&31;
-
-                switch (id&3)
-                {
-                case M32_SPRITE_VAR_ID:
-                    return ((VM_AccessSprite(0, index, memberid, 0) ^ -negateResult) + negateResult);
-                case M32_SECTOR_VAR_ID:
-//                    if (index == vm.g_i) index = sprite[vm.g_i].sectnum;
-                    return ((VM_AccessSector(0, index, memberid, 0) ^ -negateResult) + negateResult);
-                case M32_WALL_VAR_ID:
-                    return ((VM_AccessWall(0, index, memberid, 0) ^ -negateResult) + negateResult);
-                case M32_TSPRITE_VAR_ID:
-                    return ((VM_AccessTsprite(0, index, memberid, 0) ^ -negateResult) + negateResult);
-//                default:
-//                    M32_PRINTERROR("Gv_GetVarX() (special): WTF??");
-//                    return -1;
-                }
-            }
-
-            id &= (MAXGAMEVARS-1);
-
-            if (!negateResult)
-            {
-                M32_PRINTERROR("Gv_GetVarX(): invalid gamevar ID (%d)", id);
-                vm.flags |= VMFLAG_ERROR;
-                return -1;
-            }
+            M32_PRINTERROR("Gv_GetVarX(): invalid array index (%s[%d])", aGameArrays[id].szLabel, index);
+            return -1;
         }
 
-        switch (aGameVars[id].dwFlags &
-                (GAMEVAR_USER_MASK|GAMEVAR_INTPTR|GAMEVAR_FLOATPTR|GAMEVAR_SHORTPTR|GAMEVAR_CHARPTR))
+        switch (aGameArrays[id].dwFlags & GAMEARRAY_TYPE_MASK)
         {
         case 0:
-            return ((aGameVars[id].val.lValue ^ -negateResult) + negateResult);
+        case GAMEARRAY_OFINT:
+            return (((int32_t *)aGameArrays[id].vals)[index] ^ -negateResult) + negateResult;
+        case GAMEARRAY_OFSHORT:
+            return (((int16_t *)aGameArrays[id].vals)[index] ^ -negateResult) + negateResult;
+        case GAMEARRAY_OFCHAR:
+            return (((uint8_t *)aGameArrays[id].vals)[index] ^ -negateResult) + negateResult;
+        default:
+            M32_PRINTERROR("Gv_GetVarX() (array): WTF??");
+            vm.flags |= VMFLAG_ERROR;
+            return -1;
+        }
+    }
+    case M32_FLAG_STRUCT:
+    {
+        register int32_t index, memberid;
+
+        index = (id>>16)&0x7fff;
+        if (!(id&M32_FLAG_CONSTANTINDEX))
+            index = Gv_GetVarN(index);
+
+        memberid = (id>>2)&31;
+
+        switch (id&3)
+        {
+        case M32_SPRITE_VAR_ID:
+            return (VM_AccessSprite(0, index, memberid, 0) ^ -negateResult) + negateResult;
+        case M32_SECTOR_VAR_ID:
+            return (VM_AccessSector(0, index, memberid, 0) ^ -negateResult) + negateResult;
+        case M32_WALL_VAR_ID:
+            return (VM_AccessWall(0, index, memberid, 0) ^ -negateResult) + negateResult;
+        case M32_TSPRITE_VAR_ID:
+            return (VM_AccessTsprite(0, index, memberid, 0) ^ -negateResult) + negateResult;
+        }
+    }
+    case M32_FLAG_VAR:
+    {
+        id &= (MAXGAMEVARS-1);
+
+        switch (aGameVars[id].dwFlags & (GAMEVAR_USER_MASK|GAMEVAR_PTR_MASK))
+        {
+        case 0:
+            return (aGameVars[id].val.lValue ^ -negateResult) + negateResult;
         case GAMEVAR_PERBLOCK:
-            return ((aGameVars[id].val.plValues[vm.g_st] ^ -negateResult) + negateResult);
+            return (aGameVars[id].val.plValues[vm.g_st] ^ -negateResult) + negateResult;
         case GAMEVAR_FLOATPTR:
+        {
+            float fval = *(float *)aGameVars[id].val.lValue;
             if (negateResult)
-            {
-                float fval = -(*(float *)aGameVars[id].val.lValue);
-                return *(int32_t *)&fval;
-            }
+                fval *= -1;
+            return *(int32_t *)&fval;
+        }
         case GAMEVAR_INTPTR:
-            return ((*((int32_t *)aGameVars[id].val.lValue) ^ -negateResult) + negateResult);
+            return (*((int32_t *)aGameVars[id].val.lValue) ^ -negateResult) + negateResult;
         case GAMEVAR_SHORTPTR:
-            return ((*((int16_t *)aGameVars[id].val.lValue) ^ -negateResult) + negateResult);
+            return (*((int16_t *)aGameVars[id].val.lValue) ^ -negateResult) + negateResult;
         case GAMEVAR_CHARPTR:
-            return ((*((uint8_t *)aGameVars[id].val.lValue) ^ -negateResult) + negateResult);
+            return (*((uint8_t *)aGameVars[id].val.lValue) ^ -negateResult) + negateResult;
         default:
             M32_PRINTERROR("Gv_GetVarX(): WTF??");
             vm.flags |= VMFLAG_ERROR;
             return -1;
         }
     }
+    case M32_FLAG_LOCAL:
+    {
+        int32_t index = id&(MAXGAMEVARS-1);
+        // no bounds checking since it's done at script compilation time
+        return (((int32_t *)aGameArrays[M32_LOCAL_ARRAY_ID].vals)[index] ^ -negateResult) + negateResult;
+    }
+    }  // switch (id&M32_VARTYPE_MASK)
+
+    return 0;  // never reached
 }
 
+
 void __fastcall Gv_SetVarX(register int32_t id, register int32_t lValue)
 {
-    if (id & (0xFFFFFFFF-(MAXGAMEVARS-1)))
+    switch (id&M32_VARTYPE_MASK)
     {
-        if (id&M32_FLAG_ARRAY) // array
+    case M32_FLAG_ARRAY:
+    {
+        register int32_t index;
+        int32_t siz;
+
+        index = (id>>16)&0xffff;
+        if (!(id&M32_FLAG_CONSTANTINDEX))
+            index = Gv_GetVarN(index);
+
+        id &= (MAXGAMEARRAYS-1);
+
+        if (aGameArrays[id].dwFlags & GAMEARRAY_VARSIZE)
+            siz = Gv_GetVarN(aGameArrays[id].size);
+        else siz = aGameArrays[id].size;
+
+        if (index < 0 || index >= siz)
         {
-            register int32_t index;
-            int32_t siz;
-
-            index = (id>>16)&0xffff;
-            if (!(id&MAXGAMEVARS))
-                index = Gv_GetVarN(index);
-
-            id &= (MAXGAMEARRAYS-1);
-
-            if (aGameArrays[id].dwFlags & GAMEARRAY_VARSIZE)
-                siz = Gv_GetVarN(aGameArrays[id].size);
-            else siz = aGameArrays[id].size;
-
-            if (index < 0 || index >= siz)
-            {
-                M32_PRINTERROR("Gv_SetVarX(): invalid array index (%s[%d])", aGameArrays[id].szLabel, index);
-                vm.flags |= VMFLAG_ERROR;
-                return;
-            }
-
-            switch (aGameArrays[id].dwFlags & GAMEARRAY_TYPEMASK)
-            {
-            case 0:
-            case GAMEARRAY_OFINT:
-                ((int32_t *)aGameArrays[id].vals)[index] = lValue;
-                return;
-            case GAMEARRAY_OFSHORT:
-                ((int16_t *)aGameArrays[id].vals)[index] = (int16_t)lValue;
-                return;
-            case GAMEARRAY_OFCHAR:
-                ((uint8_t *)aGameArrays[id].vals)[index] = (uint8_t)lValue;
-                return;
-            default:
-                M32_PRINTERROR("Gv_SetVarX() (array): WTF??");
-                vm.flags |= VMFLAG_ERROR;
-                return;
-            }
+            M32_PRINTERROR("Gv_SetVarX(): invalid array index %s[%d], size=%d", aGameArrays[id].szLabel, index, siz);
+            vm.flags |= VMFLAG_ERROR;
             return;
         }
 
-        if (id&M32_FLAG_SPECIAL) // struct shortcut vars
+        switch (aGameArrays[id].dwFlags & GAMEARRAY_TYPE_MASK)
         {
-            register int32_t index, memberid;
-
-            index = (id>>16)&0x7fff;
-            if (!(id&MAXGAMEVARS))
-                index = Gv_GetVarN(index);
-
-            memberid = (id>>2)&31;
-
-            switch (id&3)
-            {
-            case M32_SPRITE_VAR_ID:
-                VM_AccessSprite(1, index, memberid, lValue);
-                return;
-            case M32_SECTOR_VAR_ID:
-//                    if (index == vm.g_i) index = sprite[vm.g_i].sectnum;
-                VM_AccessSector(1, index, memberid, lValue);
-                return;
-            case M32_WALL_VAR_ID:
-                VM_AccessWall(1, index, memberid, lValue);
-                return;
-            case M32_TSPRITE_VAR_ID:
-                VM_AccessTsprite(1, index, memberid, lValue);
-                return;
-//                default:
-//                    M32_PRINTERROR("Gv_SetVarX(): WTF??");
-//                    return;
-            }
+        case 0:
+        case GAMEARRAY_OFINT:
+            ((int32_t *)aGameArrays[id].vals)[index] = lValue;
+            return;
+        case GAMEARRAY_OFSHORT:
+            ((int16_t *)aGameArrays[id].vals)[index] = (int16_t)lValue;
+            return;
+        case GAMEARRAY_OFCHAR:
+            ((uint8_t *)aGameArrays[id].vals)[index] = (uint8_t)lValue;
+            return;
+        default:
+            M32_PRINTERROR("Gv_SetVarX() (array): WTF??");
+            vm.flags |= VMFLAG_ERROR;
+            return;
         }
-
-        M32_PRINTERROR("Gv_SetVarX(): invalid gamevar ID (%d)", id);
-        vm.flags |= VMFLAG_ERROR;
         return;
     }
+    case M32_FLAG_STRUCT:
+    {
+        register int32_t index, memberid;
 
-    switch (aGameVars[id].dwFlags &
-            (GAMEVAR_USER_MASK|GAMEVAR_INTPTR|GAMEVAR_FLOATPTR|GAMEVAR_SHORTPTR|GAMEVAR_CHARPTR))
-    {
-    case 0:
-        aGameVars[id].val.lValue=lValue;
-        return;
-    case GAMEVAR_PERBLOCK:
-        aGameVars[id].val.plValues[vm.g_st] = lValue;
-        return;
-    case GAMEVAR_FLOATPTR:
-    {
-        int32_t ival = lValue;
-        float fval = *(float *)&ival;
-        if (fval!=fval || fval<-3.4e38 || fval > 3.4e38)
+        index = (id>>16)&0x7fff;
+        if (!(id&M32_FLAG_CONSTANTINDEX))
+            index = Gv_GetVarN(index);
+
+        memberid = (id>>2)&31;
+
+        switch (id&3)
         {
-            M32_PRINTERROR("Gv_SetVarX(): tried to set float var to NaN or infinity");
+        case M32_SPRITE_VAR_ID:
+            VM_AccessSprite(1, index, memberid, lValue);
+            return;
+        case M32_SECTOR_VAR_ID:
+            VM_AccessSector(1, index, memberid, lValue);
+            return;
+        case M32_WALL_VAR_ID:
+            VM_AccessWall(1, index, memberid, lValue);
+            return;
+        case M32_TSPRITE_VAR_ID:
+            VM_AccessTsprite(1, index, memberid, lValue);
+            return;
+        }
+    }
+    case M32_FLAG_VAR:
+    {
+        id &= (MAXGAMEVARS-1);
+
+        switch (aGameVars[id].dwFlags & (GAMEVAR_USER_MASK|GAMEVAR_PTR_MASK))
+        {
+        case 0:
+            aGameVars[id].val.lValue=lValue;
+            return;
+        case GAMEVAR_PERBLOCK:
+            aGameVars[id].val.plValues[vm.g_st] = lValue;
+            return;
+        case GAMEVAR_FLOATPTR:
+        {
+            int32_t ival = lValue;
+            float fval = *(float *)&ival;
+            if (fval!=fval || fval<-3.4e38 || fval > 3.4e38)
+            {
+                M32_PRINTERROR("Gv_SetVarX(): tried to set float var to NaN or infinity");
+                vm.flags |= VMFLAG_ERROR;
+                return;
+            }
+        }
+        case GAMEVAR_INTPTR:
+            *((int32_t *)aGameVars[id].val.lValue)=(int32_t)lValue;
+            return;
+        case GAMEVAR_SHORTPTR:
+            *((int16_t *)aGameVars[id].val.lValue)=(int16_t)lValue;
+            return;
+        case GAMEVAR_CHARPTR:
+            *((uint8_t *)aGameVars[id].val.lValue)=(uint8_t)lValue;
+            return;
+        default:
+            M32_PRINTERROR("Gv_SetVarX(): WTF??");
             vm.flags |= VMFLAG_ERROR;
             return;
         }
     }
-    case GAMEVAR_INTPTR:
-        *((int32_t *)aGameVars[id].val.lValue)=(int32_t)lValue;
-        return;
-    case GAMEVAR_SHORTPTR:
-        *((int16_t *)aGameVars[id].val.lValue)=(int16_t)lValue;
-        return;
-    case GAMEVAR_CHARPTR:
-        *((uint8_t *)aGameVars[id].val.lValue)=(uint8_t)lValue;
-        return;
-    default:
-        M32_PRINTERROR("Gv_SetVarX(): WTF??");
-        vm.flags |= VMFLAG_ERROR;
+    case M32_FLAG_LOCAL:
+    {
+        int32_t index = id&(MAXGAMEVARS-1);
+        ((int32_t *)aGameArrays[M32_LOCAL_ARRAY_ID].vals)[index] = lValue;
         return;
     }
+    }
 }
 
 static uint8_t alphakeys[] =
@@ -616,6 +633,8 @@ static void Gv_AddSystemVars(void)
 
     g_systemVarCount = g_gameVarCount;
 
+    // must be first!
+    Gv_NewArray(".LOCALS_BASE", NULL, 0, GAMEARRAY_OFINT);
 
     Gv_NewArray("highlight", (void *)highlight, hlcnt_id,
                 GAMEARRAY_READONLY|GAMEARRAY_OFSHORT|GAMEARRAY_VARSIZE);