diff --git a/polymer/build/src/build.c b/polymer/build/src/build.c
index 69b536a11..5f9dfdb35 100644
--- a/polymer/build/src/build.c
+++ b/polymer/build/src/build.c
@@ -6060,7 +6060,7 @@ CANCEL:
                                 i--;
                                 boardfilename[i] = 0;
                             }
-                            else if (i < 32 && ch > 32 && ch < 128)
+                            else if (i < 40 && ch > 32 && ch < 128)
                             {
                                 boardfilename[i++] = ch;
                                 boardfilename[i] = 0;
diff --git a/polymer/build/src/engine.c b/polymer/build/src/engine.c
index a1158eb81..7473ce8a5 100644
--- a/polymer/build/src/engine.c
+++ b/polymer/build/src/engine.c
@@ -655,7 +655,7 @@ static permfifotype permfifo[MAXPERMS];
 static int permhead = 0, permtail = 0;
 
 short numscans, numhits, numbunches;
-static short capturecount = 0;
+short capturecount = 0;
 
 char vgapal16[4*256] =
 {
@@ -11102,7 +11102,11 @@ void draw2dscreen(int posxe, int posye, short ange, int zoome, short gride)
             if ((i == linehighlight) || ((linehighlight >= 0) && (i == wall[linehighlight].nextwall)))
                 if (totalclock & 16) col += (2<<2);
         }
-        if (showfirstwall && (sector[searchsector].wallptr==i||sector[searchsector].wallptr==wall[i].nextwall))col = 14;
+        if (showfirstwall && (sector[searchsector].wallptr==i||sector[searchsector].wallptr==wall[i].nextwall))
+        {
+            col = 14;
+            if (i == linehighlight) if (totalclock & 16) col -= (2<<2);
+        }
 
         xp1 = mulscale14(wal->x-posxe,zoome);
         yp1 = mulscale14(wal->y-posye,zoome);
@@ -11112,7 +11116,12 @@ void draw2dscreen(int posxe, int posye, short ange, int zoome, short gride)
         dx=wal->x-wall[wal->point2].x;
         dy=wal->y-wall[wal->point2].y;
         dist=dx*dx+dy*dy;
-        if (dist>0xffffffff)col=9;
+        if (dist>0xffffffff)
+        {
+            col=9;
+            if (i == linehighlight || ((linehighlight >= 0) && (i == wall[linehighlight].nextwall)))
+                if (totalclock & 16) col -= (2<<2);
+        }
 
         if ((wal->cstat&64) > 0)
         {
diff --git a/polymer/build/src/glbuild.c b/polymer/build/src/glbuild.c
index 91f41eae8..773e22f39 100644
--- a/polymer/build/src/glbuild.c
+++ b/polymer/build/src/glbuild.c
@@ -75,8 +75,8 @@ void (APIENTRY * bglShadeModel)(GLenum mode);
 
 // Raster funcs
 void (APIENTRY * bglReadPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels);
-void (APIENTRY * bglRasterPos4i)( GLint x, GLint y, GLint z, GLint w );
-void (APIENTRY * bglDrawPixels)( GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels );
+void (APIENTRY * bglRasterPos4i)(GLint x, GLint y, GLint z, GLint w);
+void (APIENTRY * bglDrawPixels)(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
 
 // Texture mapping
 void (APIENTRY * bglTexEnvf)(GLenum target, GLenum pname, GLfloat param);
diff --git a/polymer/eduke32/source/actors.c b/polymer/eduke32/source/actors.c
index d961b7b97..17ba9d9b1 100644
--- a/polymer/eduke32/source/actors.c
+++ b/polymer/eduke32/source/actors.c
@@ -5579,7 +5579,7 @@ static void moveeffectors(void)   //STATNUM 3
 
             if (s->owner == -1)
             {
-                Bsprintf(tempbuf,"Could not find any locators for SE# 6 and 14 with a hitag of %td.\n",t[3]);
+                Bsprintf(tempbuf,"Could not find any locators for SE# 6 and 14 with a hitag of %d.\n",t[3]);
                 gameexit(tempbuf);
             }
 
diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c
index d329f0d29..df3865f8a 100644
--- a/polymer/eduke32/source/astub.c
+++ b/polymer/eduke32/source/astub.c
@@ -157,7 +157,7 @@ static char *Help3d[]=
     " HOME = PGUP/PGDN MODIFIER (256 UNITS)",
     " END = PGUP/PGDN MODIFIER (512 UNITS)",
 };
-char *type2str[]={"Wall","Sector","Sector","Sprite","Wall"};
+static char *type2str[]={"Wall","Sector","Sector","Sprite","Wall"};
 
 static CACHE1D_FIND_REC *finddirs=NULL, *findfiles=NULL, *finddirshigh=NULL, *findfileshigh=NULL;
 static int numdirs=0, numfiles=0;
@@ -167,7 +167,7 @@ static int repeatcountx, repeatcounty;
 static int infobox=3; // bit0: current window, bit1: mouse pointer, the variable should be renamed
 
 extern char mskip;
-
+extern short capturecount;
 
 static void clearfilenames(void)
 {
@@ -1917,22 +1917,24 @@ static void ReadGamePalette()
     ReadPaletteTable();
 }
 
-static inline void _message(char message[162])
+void message(const char *fmt, ...)
 {
-    Bstrcpy(getmessage,message);
+    char tmpstr[256];
+    va_list va;
+
+    va_start(va, fmt);
+    Bvsnprintf(tmpstr, 256, fmt, va);
+    va_end(va);
+
+    Bstrcpy(getmessage,tmpstr);
     getmessageleng = strlen(getmessage);
     getmessagetimeoff = totalclock+120*3;
-}
-
-static void message(char message[162])
-{
-    char tmpbuf[2048];
-
-    _message(message);
     lastmessagetime = totalclock;
-    Bstrcpy(tmpbuf,message);
-    Bstrcat(tmpbuf,"\n");
-    if (!mouseaction)OSD_Printf(tmpbuf);
+    if (!mouseaction)
+    {
+        Bstrcat(tmpstr,"\n");
+        OSD_Printf(tmpstr);
+    }
 }
 
 static char lockbyte4094;
@@ -3160,16 +3162,14 @@ static void Keys3d(void)
     {
         floor_over_floor = !floor_over_floor;
         //        if (!floor_over_floor) ResetFOFSize();
-        Bsprintf(tempbuf,"Floor-over-floor %s",floor_over_floor?"ON":"OFF");
-        message(tempbuf);
+        message("Floor-over-floor display %s",floor_over_floor?"enabled":"disabled");
         keystatus[KEYSC_3] = 0;
     }
 
     if (keystatus[KEYSC_F3])
     {
         mlook = 1-mlook;
-        Bsprintf(tempbuf,"Mouselook %s",mlook?"ON":"OFF");
-        message(tempbuf);
+        message("Mouselook: %s",mlook?"enabled":"disabled");
         keystatus[KEYSC_F3] = 0;
     }
 
@@ -3177,8 +3177,7 @@ static void Keys3d(void)
     if (keystatus[KEYSC_F5])
     {
         unrealedlook = 1-unrealedlook;
-        Bsprintf(tempbuf,"UnrealEd mouse navigation: %d",unrealedlook);
-        message(tempbuf);
+        message("UnrealEd mouse navigation: %s",unrealedlook?"enabled":"disabled");
         keystatus[KEYSC_F5] = 0;
     }
 
@@ -3190,14 +3189,12 @@ static void Keys3d(void)
         case 0:
         case 4:
             wall[searchwall].cstat = 0;
-            Bsprintf(tempbuf,"Wall %d cstat = 0",searchwall);
-            message(tempbuf);
+            message("Wall %d cstat = 0",searchwall);
             break;
             //            case 1: case 2: sector[searchsector].cstat = 0; break;
         case 3:
             sprite[searchwall].cstat = 0;
-            Bsprintf(tempbuf,"Sprite %d cstat = 0",searchwall);
-            message(tempbuf);
+            message("Sprite %d cstat = 0",searchwall);
             break;
         }
     }
@@ -3302,8 +3299,7 @@ static void Keys3d(void)
         {
             deletesprite(searchwall);
             updatenumsprites();
-            Bsprintf(tempbuf,"Sprite %d deleted",searchwall);
-            message(tempbuf);
+            message("Sprite %d deleted",searchwall);
             asksave = 1;
         }
         keystatus[KEYSC_DELETE] = 0;
@@ -3313,16 +3309,13 @@ static void Keys3d(void)
     {
         keystatus[KEYSC_F6] = 0;
         autospritehelp=!autospritehelp;
-        Bsprintf(tempbuf,"Automatic SECTOREFFECTOR help %s",autospritehelp?"ON":"OFF");
-        message(tempbuf);
+        message("Automatic SECTOREFFECTOR help %s",autospritehelp?"enabled":"disabled");
     }
     if (keystatus[KEYSC_F7])  //F7
     {
         keystatus[KEYSC_F7] = 0;
         autosecthelp=!autosecthelp;
-        Bsprintf(tempbuf,"Automatic sector tag help %s",autosecthelp?"ON":"OFF");
-        message(tempbuf);
-
+        message("Automatic sector tag help %s",autosecthelp?"enabled":"disabled");
     }
 
     if ((searchstat == 3) && (sprite[searchwall].picnum==SECTOREFFECTOR))
@@ -3345,8 +3338,7 @@ static void Keys3d(void)
                 sprite[i].ang = ((sprite[i].ang+2048-128)&2047);
                 keystatus[KEYSC_COMMA] = 0;
             }
-            Bsprintf(tempbuf,"Sprite %d angle: %d",i,sprite[i].ang);
-            message(tempbuf);
+            message("Sprite %d angle: %d",i,sprite[i].ang);
         }
     }
     if (keystatus[KEYSC_PERIOD]) // . Search & fix panning to the right (3D)
@@ -3354,8 +3346,7 @@ static void Keys3d(void)
         if ((searchstat == 0) || (searchstat == 4))
         {
             AutoAlignWalls((int)searchwall,0L);
-            Bsprintf(tempbuf,"Wall %d autoalign",searchwall);
-            message(tempbuf);
+            message("Wall %d autoalign",searchwall);
             keystatus[KEYSC_PERIOD] = 0;
         }
         if (searchstat == 3)
@@ -3368,8 +3359,7 @@ static void Keys3d(void)
                 sprite[i].ang = ((sprite[i].ang+2048+128)&2047);
                 keystatus[KEYSC_PERIOD] = 0;
             }
-            Bsprintf(tempbuf,"Sprite %d angle: %d",i,sprite[i].ang);
-            message(tempbuf);
+            message("Sprite %d angle: %d",i,sprite[i].ang);
         }
     }
 
@@ -3465,7 +3455,7 @@ static void Keys3d(void)
         if (searchstat != 3)
         {
             wall[searchwall].cstat ^= 32;
-            sprintf(getmessage,"Wall %d one side masking %s",searchwall,wall[searchwall].cstat&32?"ON":"OFF");
+            sprintf(getmessage,"Wall %d one side masking bit %s",searchwall,wall[searchwall].cstat&32?"ON":"OFF");
             message(getmessage);
             asksave = 1;
         }
@@ -3481,7 +3471,7 @@ static void Keys3d(void)
                         sprite[searchwall].cstat |= 8;
             }
             asksave = 1;
-            sprintf(getmessage,"Sprite %d one sided %s",searchwall,sprite[searchwall].cstat&64?"ON":"OFF");
+            sprintf(getmessage,"Sprite %d one sided bit %s",searchwall,sprite[searchwall].cstat&64?"ON":"OFF");
             message(getmessage);
 
         }
@@ -3492,7 +3482,7 @@ static void Keys3d(void)
         if (searchstat != 3)
         {
             wall[searchwall].cstat ^= 2;
-            sprintf(getmessage,"Wall %d bottom texture swap %s",searchwall,wall[searchwall].cstat&2?"ON":"OFF");
+            sprintf(getmessage,"Wall %d bottom texture swap bit %s",searchwall,wall[searchwall].cstat&2?"ON":"OFF");
             message(getmessage);
             asksave = 1;
         }
@@ -3546,7 +3536,7 @@ static void Keys3d(void)
             if (i >= 0)
             {
                 wall[searchwall].cstat ^= 16;
-                sprintf(getmessage,"Wall %d masking %s",searchwall,wall[searchwall].cstat&16?"ON":"OFF");
+                sprintf(getmessage,"Wall %d masking bit %s",searchwall,wall[searchwall].cstat&16?"ON":"OFF");
                 message(getmessage);
                 if ((wall[searchwall].cstat&16) > 0)
                 {
@@ -3607,7 +3597,7 @@ static void Keys3d(void)
             if (searchstat == 3)
             {
                 sprite[searchwall].cstat ^= 256;
-                sprintf(getmessage,"Sprite %d hitscan sensitivity %s",searchwall,sprite[searchwall].cstat&256?"ON":"OFF");
+                sprintf(getmessage,"Sprite %d hitscan sensitivity bit %s",searchwall,sprite[searchwall].cstat&256?"ON":"OFF");
                 message(getmessage);
                 asksave = 1;
             }
@@ -3620,7 +3610,7 @@ static void Keys3d(void)
                     wall[wall[searchwall].nextwall].cstat &= ~64;
                     wall[wall[searchwall].nextwall].cstat |= (wall[searchwall].cstat&64);
                 }
-                sprintf(getmessage,"Wall %d hitscan sensitivity %s",searchwall,wall[searchwall].cstat&64?"ON":"OFF");
+                sprintf(getmessage,"Wall %d hitscan sensitivity bit %s",searchwall,wall[searchwall].cstat&64?"ON":"OFF");
                 message(getmessage);
 
                 asksave = 1;
@@ -3903,14 +3893,14 @@ static void Keys3d(void)
         if (searchstat == 1)
         {
             sector[searchsector].ceilingstat ^= 8;
-            sprintf(getmessage,"Sector %d ceiling texture expansion %s",searchsector,sector[searchsector].ceilingstat&8?"ON":"OFF");
+            sprintf(getmessage,"Sector %d ceiling texture expansion bit %s",searchsector,sector[searchsector].ceilingstat&8?"ON":"OFF");
             message(getmessage);
             asksave = 1;
         }
         if (searchstat == 2)
         {
             sector[searchsector].floorstat ^= 8;
-            sprintf(getmessage,"Sector %d floor texture expansion %s",searchsector,sector[searchsector].floorstat&8?"ON":"OFF");
+            sprintf(getmessage,"Sector %d floor texture expansion bit %s",searchsector,sector[searchsector].floorstat&8?"ON":"OFF");
             message(getmessage);
             asksave = 1;
         }
@@ -3934,14 +3924,14 @@ static void Keys3d(void)
             if (searchstat == 1)
             {
                 sector[searchsector].ceilingstat ^= 64;
-                sprintf(getmessage,"Sector %d ceiling texture relativity %s",searchsector,sector[searchsector].ceilingstat&64?"ON":"OFF");
+                sprintf(getmessage,"Sector %d ceiling texture relativity bit %s",searchsector,sector[searchsector].ceilingstat&64?"ON":"OFF");
                 message(getmessage);
                 asksave = 1;
             }
             if (searchstat == 2)
             {
                 sector[searchsector].floorstat ^= 64;
-                sprintf(getmessage,"Sector %d floor texture relativity %s",searchsector,sector[searchsector].floorstat&64?"ON":"OFF"); //PK (was ceiling in string)
+                sprintf(getmessage,"Sector %d floor texture relativity bit %s",searchsector,sector[searchsector].floorstat&64?"ON":"OFF"); //PK (was ceiling in string)
                 message(getmessage);
                 asksave = 1;
             }
@@ -4089,7 +4079,7 @@ static void Keys3d(void)
                 {
                     sprite[searchwall].cstat &= ~0xc;
                     sprite[searchwall].cstat |= ((i&4)^4);
-                    Bsprintf(getmessage,"Sprite %d flip %s",searchwall,sprite[searchwall].cstat&4?"ON":"OFF");
+                    Bsprintf(getmessage,"Sprite %d flip bit %s",searchwall,sprite[searchwall].cstat&4?"ON":"OFF");
                     message(getmessage);
                 }
                 else
@@ -4575,9 +4565,8 @@ static void Keys3d(void)
         keystatus[KEYSC_D] = 0;
         skill++;
         if (skill>MAXSKILL-1) skill=0;
-        sprintf(tempbuf,"%s",SKILLMODE[skill]);
+        message("%s",SKILLMODE[skill]);
         //        printext256(1*4,1*8,11,-1,tempbuf,0);
-        message(tempbuf);
     }
 
     /*    if (keystatus[KEYSC_QUOTE] && keystatus[KEYSC_G]) // ' g <Unused>
@@ -4611,9 +4600,8 @@ static void Keys3d(void)
         keystatus[KEYSC_W] = 0;
         nosprites++;
         if (nosprites>3) nosprites=0;
-        Bsprintf(tempbuf,"%s",SPRDSPMODE[nosprites]);
+        message("%s",SPRDSPMODE[nosprites]);
         //        printext256(1*4,1*8,whitecol,-1,tempbuf,0);
-        message(tempbuf);
     }
 
     if (keystatus[KEYSC_QUOTE] && keystatus[KEYSC_Y]) // ' y
@@ -4637,8 +4625,7 @@ static void Keys3d(void)
                 if (wall[i].picnum==temppicnum)
                     wall[i].shade=tempshade;
             }
-            Bsprintf(tempbuf,"Walls with picnum %d have shade of %d",temppicnum,tempshade);
-            message(tempbuf);
+            message("Walls with picnum %d have shade of %d",temppicnum,tempshade);
             asksave=1;
             break;
         case 1:
@@ -4656,8 +4643,7 @@ static void Keys3d(void)
                         sector[i].floorshade=tempshade;
                     }
             }
-            Bsprintf(tempbuf,"Sectors with picnum %d have shade of %d",temppicnum,tempshade);
-            message(tempbuf);
+            message("Sectors with picnum %d have shade of %d",temppicnum,tempshade);
             asksave=1;
             break;
         case 3:
@@ -4668,8 +4654,7 @@ static void Keys3d(void)
                     sprite[i].shade=tempshade;
                 }
             }
-            Bsprintf(tempbuf,"Sprites with picnum %d have shade of %d",temppicnum,tempshade);
-            message(tempbuf);
+            message("Sprites with picnum %d have shade of %d",temppicnum,tempshade);
             asksave=1;
             break;
         }
@@ -4848,7 +4833,7 @@ static void Keys3d(void)
             sprite[searchwall].cstat ^= 1;
             //                                sprite[searchwall].cstat &= ~256;
             //                                sprite[searchwall].cstat |= ((sprite[searchwall].cstat&1)<<8);
-            sprintf(getmessage,"Sprite %d blocking %s",searchwall,sprite[searchwall].cstat&1?"ON":"OFF");
+            sprintf(getmessage,"Sprite %d blocking bit %s",searchwall,sprite[searchwall].cstat&1?"ON":"OFF");
             message(getmessage);
             asksave = 1;
         }
@@ -4861,7 +4846,7 @@ static void Keys3d(void)
                 wall[wall[searchwall].nextwall].cstat &= ~(1+64);
                 wall[wall[searchwall].nextwall].cstat |= (wall[searchwall].cstat&1);
             }
-            sprintf(getmessage,"Wall %d blocking %s",searchwall,wall[searchwall].cstat&1?"ON":"OFF");
+            sprintf(getmessage,"Wall %d blocking bit %s",searchwall,wall[searchwall].cstat&1?"ON":"OFF");
             message(getmessage);
             asksave = 1;
         }
@@ -5019,13 +5004,11 @@ static void Keys3d(void)
                 case 1:
                 case 4:
                     alignceilslope(searchsector,wall[searchwall].x,wall[searchwall].y,getceilzofslope(i,wall[searchwall].x,wall[searchwall].y));
-                    Bsprintf(tempbuf,"Sector %d align ceiling to wall %d",searchsector,searchwall);
-                    message(tempbuf);
+                    message("Sector %d align ceiling to wall %d",searchsector,searchwall);
                     break;
                 case 2:
                     alignflorslope(searchsector,wall[searchwall].x,wall[searchwall].y,getflorzofslope(i,wall[searchwall].x,wall[searchwall].y));
-                    Bsprintf(tempbuf,"Sector %d align floor to wall %d",searchsector,searchwall);
-                    message(tempbuf);
+                    message("Sector %d align floor to wall %d",searchsector,searchwall);
                     break;
                 }
         }
@@ -5036,16 +5019,14 @@ static void Keys3d(void)
                 if (!(sector[searchsector].ceilingstat&2))
                     sector[searchsector].ceilingheinum = 0;
                 sector[searchsector].ceilingheinum = max(sector[searchsector].ceilingheinum-i,-32768);
-                Bsprintf(tempbuf,"Sector %d ceiling slope = %d",searchsector,sector[searchsector].ceilingheinum);
-                message(tempbuf);
+                message("Sector %d ceiling slope = %d",searchsector,sector[searchsector].ceilingheinum);
             }
             if (searchstat == 2)
             {
                 if (!(sector[searchsector].floorstat&2))
                     sector[searchsector].floorheinum = 0;
                 sector[searchsector].floorheinum = max(sector[searchsector].floorheinum-i,-32768);
-                Bsprintf(tempbuf,"Sector %d floor slope = %d",searchsector,sector[searchsector].floorheinum);
-                message(tempbuf);
+                message("Sector %d floor slope = %d",searchsector,sector[searchsector].floorheinum);
             }
         }
 
@@ -5085,15 +5066,13 @@ static void Keys3d(void)
                 {
                 case 1:
                     alignceilslope(searchsector,wall[searchwall].x,wall[searchwall].y,getceilzofslope(i,wall[searchwall].x,wall[searchwall].y));
-                    Bsprintf(tempbuf,"Sector %d align ceiling to wall %d",searchsector,searchwall);
-                    message(tempbuf);
+                    message("Sector %d align ceiling to wall %d",searchsector,searchwall);
                     break;
                 case 0:
                 case 2:
                 case 4:
                     alignflorslope(searchsector,wall[searchwall].x,wall[searchwall].y,getflorzofslope(i,wall[searchwall].x,wall[searchwall].y));
-                    Bsprintf(tempbuf,"Sector %d align floor to wall %d",searchsector,searchwall);
-                    message(tempbuf);
+                    message("Sector %d align floor to wall %d",searchsector,searchwall);
                     break;
                 }
         }
@@ -5104,16 +5083,14 @@ static void Keys3d(void)
                 if (!(sector[searchsector].ceilingstat&2))
                     sector[searchsector].ceilingheinum = 0;
                 sector[searchsector].ceilingheinum = min(sector[searchsector].ceilingheinum+i,32767);
-                Bsprintf(tempbuf,"Sector %d ceiling slope = %d",searchsector,sector[searchsector].ceilingheinum);
-                message(tempbuf);
+                message("Sector %d ceiling slope = %d",searchsector,sector[searchsector].ceilingheinum);
             }
             if (searchstat == 2)
             {
                 if (!(sector[searchsector].floorstat&2))
                     sector[searchsector].floorheinum = 0;
                 sector[searchsector].floorheinum = min(sector[searchsector].floorheinum+i,32767);
-                Bsprintf(tempbuf,"Sector %d floor slope = %d",searchsector,sector[searchsector].floorheinum);
-                message(tempbuf);
+                message("Sector %d floor slope = %d",searchsector,sector[searchsector].floorheinum);
             }
         }
 
@@ -5189,7 +5166,7 @@ static void Keys3d(void)
                     while (x1--)sector[searchsector].ceilingxpanning = changechar(sector[searchsector].ceilingxpanning,changedir,0,0);
                     changedir=1;if (y1<0) {changedir=-1;y1*=-1;}
                     while (y1--)sector[searchsector].ceilingypanning = changechar(sector[searchsector].ceilingypanning,changedir,0,0);
-                    Bsprintf(tempbuf,"Sector %d ceiling panning: %d, %d",searchsector,sector[searchsector].ceilingxpanning,sector[searchsector].ceilingypanning);
+                    message("Sector %d ceiling panning: %d, %d",searchsector,sector[searchsector].ceilingxpanning,sector[searchsector].ceilingypanning);
                 }
                 else
                 {
@@ -5197,9 +5174,8 @@ static void Keys3d(void)
                     while (x1--)sector[searchsector].floorxpanning = changechar(sector[searchsector].floorxpanning,changedir,0,0);
                     changedir=1;if (y1<0) {changedir=-1;y1*=-1;}
                     while (y1--)sector[searchsector].floorypanning = changechar(sector[searchsector].floorypanning,changedir,0,0);
-                    Bsprintf(tempbuf,"Sector %d floor panning: %d, %d",searchsector,sector[searchsector].floorxpanning,sector[searchsector].floorypanning);
+                    message("Sector %d floor panning: %d, %d",searchsector,sector[searchsector].floorxpanning,sector[searchsector].floorypanning);
                 }
-                message(tempbuf);
                 asksave=1;
             }
         }
@@ -5261,7 +5237,7 @@ static void Keys3d(void)
                 if (repeatpanalign == 0)
                 {
                     while (updownunits--)wall[searchwall].xrepeat = changechar(wall[searchwall].xrepeat,changedir,smooshyalign,1);
-                    Bsprintf(tempbuf,"Wall %d repeat: %d, %d",searchwall,wall[searchwall].xrepeat,wall[searchwall].yrepeat);
+                    message("Wall %d repeat: %d, %d",searchwall,wall[searchwall].xrepeat,wall[searchwall].yrepeat);
                 }
                 else
                 {
@@ -5272,23 +5248,21 @@ static void Keys3d(void)
                         if (i==1||i==3)changedir*=-1;
                     }
                     while (updownunits--)wall[searchwall].xpanning = changechar(wall[searchwall].xpanning,changedir,smooshyalign,0);
-                    Bsprintf(tempbuf,"Wall %d panning: %d, %d",searchwall,wall[searchwall].xpanning,wall[searchwall].ypanning);
+                    message("Wall %d panning: %d, %d",searchwall,wall[searchwall].xpanning,wall[searchwall].ypanning);
                 }
-                message(tempbuf);
             }
             if ((searchstat == 1) || (searchstat == 2))
             {
                 if (searchstat == 1)
                 {
                     while (updownunits--)sector[searchsector].ceilingxpanning = changechar(sector[searchsector].ceilingxpanning,changedir,smooshyalign,0);
-                    Bsprintf(tempbuf,"Sector %d ceiling panning: %d, %d",searchsector,sector[searchsector].ceilingxpanning,sector[searchsector].ceilingypanning);
+                    message("Sector %d ceiling panning: %d, %d",searchsector,sector[searchsector].ceilingxpanning,sector[searchsector].ceilingypanning);
                 }
                 else
                 {
                     while (updownunits--)sector[searchsector].floorxpanning = changechar(sector[searchsector].floorxpanning,changedir,smooshyalign,0);
-                    Bsprintf(tempbuf,"Sector %d floor panning: %d, %d",searchsector,sector[searchsector].floorxpanning,sector[searchsector].floorypanning);
+                    message("Sector %d floor panning: %d, %d",searchsector,sector[searchsector].floorxpanning,sector[searchsector].floorypanning);
                 }
-                message(tempbuf);
             }
             if (searchstat == 3)
             {
@@ -5308,8 +5282,7 @@ static void Keys3d(void)
                     while (updownunits--)sprite[searchwall].xrepeat = changechar(sprite[searchwall].xrepeat,changedir,smooshyalign,1);
                     if (sprite[searchwall].xrepeat < 4)
                         sprite[searchwall].xrepeat = 4;
-                    Bsprintf(tempbuf,"Sprite %d repeat: %d, %d",searchwall,sprite[searchwall].xrepeat,sprite[searchwall].yrepeat);
-                    message(tempbuf);
+                    message("Sprite %d repeat: %d, %d",searchwall,sprite[searchwall].xrepeat,sprite[searchwall].yrepeat);
                 }
             }
             asksave = 1;
@@ -5372,28 +5345,26 @@ static void Keys3d(void)
                 if (repeatpanalign == 0)
                 {
                     while (updownunits--)wall[searchwall].yrepeat = changechar(wall[searchwall].yrepeat,changedir,smooshyalign,1);
-                    Bsprintf(tempbuf,"Wall %d repeat: %d, %d",searchwall,wall[searchwall].xrepeat,wall[searchwall].yrepeat);
+                    message("Wall %d repeat: %d, %d",searchwall,wall[searchwall].xrepeat,wall[searchwall].yrepeat);
                 }
                 else
                 {
                     while (updownunits--)wall[searchwall].ypanning = changechar(wall[searchwall].ypanning,changedir,smooshyalign,0);
-                    Bsprintf(tempbuf,"Wall %d panning: %d, %d",searchwall,wall[searchwall].xpanning,wall[searchwall].ypanning);
+                    message("Wall %d panning: %d, %d",searchwall,wall[searchwall].xpanning,wall[searchwall].ypanning);
                 }
-                message(tempbuf);
             }
             if ((searchstat == 1) || (searchstat == 2))
             {
                 if (searchstat == 1)
                 {
                     while (updownunits--)sector[searchsector].ceilingypanning = changechar(sector[searchsector].ceilingypanning,changedir,smooshyalign,0);
-                    Bsprintf(tempbuf,"Sector %d ceiling panning: %d, %d",searchsector,sector[searchsector].ceilingxpanning,sector[searchsector].ceilingypanning);
+                    message("Sector %d ceiling panning: %d, %d",searchsector,sector[searchsector].ceilingxpanning,sector[searchsector].ceilingypanning);
                 }
                 else
                 {
                     while (updownunits--)sector[searchsector].floorypanning = changechar(sector[searchsector].floorypanning,changedir,smooshyalign,0);
-                    Bsprintf(tempbuf,"Sector %d floor panning: %d, %d",searchsector,sector[searchsector].floorxpanning,sector[searchsector].floorypanning);
+                    message("Sector %d floor panning: %d, %d",searchsector,sector[searchsector].floorxpanning,sector[searchsector].floorypanning);
                 }
-                message(tempbuf);
             }
             if (searchstat == 3)
             {
@@ -5412,8 +5383,7 @@ static void Keys3d(void)
                     while (updownunits--)sprite[searchwall].yrepeat = changechar(sprite[searchwall].yrepeat,changedir,smooshyalign,1);
                     if (sprite[searchwall].yrepeat < 4)
                         sprite[searchwall].yrepeat = 4;
-                    Bsprintf(tempbuf,"Sprite %d repeat: %d, %d",searchwall,sprite[searchwall].xrepeat,sprite[searchwall].yrepeat);
-                    message(tempbuf);
+                    message("Sprite %d repeat: %d, %d",searchwall,sprite[searchwall].xrepeat,sprite[searchwall].yrepeat);
                 }
             }
             asksave = 1;
@@ -5432,14 +5402,7 @@ static void Keys3d(void)
         brightness++;
         if (brightness >= 16) brightness = 0;
         setbrightness(brightness,palette,0);
-        Bsprintf(tempbuf,"Brightness %d out of 16",brightness);
-        message(tempbuf);
-    }
-    if (keystatus[KEYSC_F12])   //F12
-    {
-        screencapture("captxxxx.tga",keystatus[KEYSC_LSHIFT]|keystatus[KEYSC_RSHIFT]);
-        message("Screenshot taken");
-        keystatus[KEYSC_F12] = 0;
+        message("Brightness: %d/16",brightness);
     }
 
     if (keystatus[KEYSC_TAB])  //TAB
@@ -5543,8 +5506,7 @@ static void Keys3d(void)
                     i = wall[i].point2;
                 }
                 while (i != searchwall);
-                Bsprintf(tempbuf,"Wall %d auto-shaded",searchwall);
-                message(tempbuf);
+                message("Wall %d auto-shaded",searchwall);
             }
             else if (somethingintab < 255)
             {
@@ -5808,8 +5770,7 @@ static void Keys3d(void)
             if (searchstat == 3)
             {
                 sprite[searchwall].cstat ^= 128;
-                Bsprintf(tempbuf,"Sprite %d centered %s",searchwall,(sprite[searchwall].cstat&128)?"ON":"OFF");
-                message(tempbuf);
+                message("Sprite %d center bit %s",searchwall,(sprite[searchwall].cstat&128)?"ON":"OFF");
                 asksave = 1;
             }
         }
@@ -5852,8 +5813,7 @@ static void Keys3d(void)
                 sprite[searchwall].yrepeat = 64;
             }
         }
-        Bsprintf(tempbuf,"%s's size and panning reset",type2str[searchstat]);
-        message(tempbuf);
+        message("%s's size and panning reset",type2str[searchstat]);
         keystatus[KEYSC_SLASH] = 0;
         asksave = 1;
     }
@@ -5866,8 +5826,7 @@ static void Keys3d(void)
             if (parallaxtype == 3)
                 parallaxtype = 0;
             sector[searchsector].ceilingstat ^= 1;
-            Bsprintf(tempbuf,"Parallax type %d",parallaxtype);
-            message(tempbuf);
+            message("Parallax type %d",parallaxtype);
         }
         else if (eitherALT)
         {
@@ -5897,15 +5856,13 @@ static void Keys3d(void)
             if ((searchstat == 0) || (searchstat == 1) || (searchstat == 4))
             {
                 sector[searchsector].ceilingstat ^= 1;
-                Bsprintf(tempbuf,"Sector %d ceiling parallax %s",searchsector,sector[searchsector].ceilingstat&1?"ON":"OFF");
-                message(tempbuf);
+                message("Sector %d ceiling parallax bit %s",searchsector,sector[searchsector].ceilingstat&1?"ON":"OFF");
                 asksave = 1;
             }
             else if (searchstat == 2)
             {
                 sector[searchsector].floorstat ^= 1;
-                Bsprintf(tempbuf,"Sector %d floor parallax %s",searchsector,sector[searchsector].floorstat&1?"ON":"OFF");
-                message(tempbuf);
+                message("Sector %d floor parallax bit %s",searchsector,sector[searchsector].floorstat&1?"ON":"OFF");
                 asksave = 1;
             }
         }
@@ -6068,8 +6025,7 @@ static void Keys2d(void)
     if (keystatus[KEYSC_F4])
     {
         showfirstwall = !showfirstwall;
-        Bsprintf(tempbuf,"Show first wall %s",showfirstwall?"ON":"OFF");
-        message(tempbuf);
+        message("Sector firstwall highlight ",showfirstwall?"enabled":"disabled");
         keystatus[KEYSC_F4] = 0;
     }
 
@@ -7057,7 +7013,7 @@ static int osdcmd_vars_pk(const osdfuncparm_t *parm)
     else if (!Bstrcasecmp(parm->name, "pk_quickmapcycling"))
     {
         OSD_Printf("Quick map cycling ((LShift-)Ctrl-X): %s\n",
-                   (quickmapcycling = !quickmapcycling) ? "on":"off");
+                   (quickmapcycling = !quickmapcycling) ? "enabled":"disabled");
     }
     else if (!Bstrcasecmp(parm->name, "pk_uedaccel"))
     {
@@ -7783,17 +7739,17 @@ void ExtPreCheckKeys(void) // just before drawrooms
                             wall[w].pal = sprite[i].pal;
                             wallflag[w] = 1;
                         }
-/*                        if (wall[w].nextwall >= 0)
-                        {
-                            if (!wallflag[wall[w].nextwall])
-                            {
-                                wallshades[wall[w].nextwall] = wall[wall[w].nextwall].shade;
-                                wall[wall[w].nextwall].shade = sprite[i].shade;
-                                wallpals[wall[w].nextwall] = wall[wall[w].nextwall].pal;
-                                wall[wall[w].nextwall].pal = sprite[i].pal;
-                                wallflag[wall[w].nextwall] = 1;
-                            }
-                        } */
+                        /*                        if (wall[w].nextwall >= 0)
+                                                {
+                                                    if (!wallflag[wall[w].nextwall])
+                                                    {
+                                                        wallshades[wall[w].nextwall] = wall[wall[w].nextwall].shade;
+                                                        wall[wall[w].nextwall].shade = sprite[i].shade;
+                                                        wallpals[wall[w].nextwall] = wall[wall[w].nextwall].pal;
+                                                        wall[wall[w].nextwall].pal = sprite[i].pal;
+                                                        wallflag[wall[w].nextwall] = 1;
+                                                    }
+                                                } */
                     }
                     sectorshades[sprite[i].sectnum][0] = sector[sprite[i].sectnum].floorshade;
                     sectorshades[sprite[i].sectnum][1] = sector[sprite[i].sectnum].ceilingshade;
@@ -7972,12 +7928,20 @@ void ExtAnalyzeSprites(void)
 static void Keys2d3d(void)
 {
     int i;
+
+    if (keystatus[KEYSC_F12])   //F12
+    {
+        screencapture("captxxxx.tga",keystatus[KEYSC_LSHIFT]|keystatus[KEYSC_RSHIFT]);
+        message("Saved screenshot %d",capturecount-1);
+        keystatus[KEYSC_F12] = 0;
+    }
+
     if (keystatus[KEYSC_QUOTE] && keystatus[KEYSC_A]) // ' a
     {
         keystatus[KEYSC_A] = 0;
         autosave=autosave?0:180; // 3 minutes
-        if (autosave) message("Autosave ON");
-        else message("Autosave OFF");
+        if (autosave) message("Autosave enabled, interval: %d seconds",autosave);
+        else message("Autosave disabled");
     }
 
     if (keystatus[KEYSC_QUOTE] && keystatus[KEYSC_N]) // ' n
@@ -8175,15 +8139,15 @@ void ExtCheckKeys(void)
                             wall[w].pal = wallpals[w];
                             wallflag[w] = 0;
                         }
-/*                        if (wall[w].nextwall >= 0)
-                        {
-                            if (wallflag[wall[w].nextwall])
-                            {
-                                wall[wall[w].nextwall].shade = wallshades[wall[w].nextwall];
-                                wall[wall[w].nextwall].pal = wallpals[wall[w].nextwall];
-                                wallflag[wall[w].nextwall] = 0;
-                            }
-                        } */
+                        /*                        if (wall[w].nextwall >= 0)
+                                                {
+                                                    if (wallflag[wall[w].nextwall])
+                                                    {
+                                                        wall[wall[w].nextwall].shade = wallshades[wall[w].nextwall];
+                                                        wall[wall[w].nextwall].pal = wallpals[wall[w].nextwall];
+                                                        wallflag[wall[w].nextwall] = 0;
+                                                    }
+                                                } */
                     }
                     sector[sprite[i].sectnum].floorshade = sectorshades[sprite[i].sectnum][0];
                     sector[sprite[i].sectnum].ceilingshade = sectorshades[sprite[i].sectnum][1];
diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c
index 8dec9a0e3..aba863adc 100644
--- a/polymer/eduke32/source/gamedef.c
+++ b/polymer/eduke32/source/gamedef.c
@@ -451,7 +451,7 @@ static const char *keyw[] =
     "writearraytofile",         // 319
     "readarrayfromfile",        // 320
     "starttrackvar",			// 321
-	"qgetsysstr",   			// 322
+    "qgetsysstr",   			// 322
     "<null>"
 };
 
@@ -4062,7 +4062,7 @@ repeatcase:
     case CON_QSTRCAT:
     case CON_QSTRCPY:
     case CON_QSTRLEN:
-	case CON_QGETSYSSTR:
+    case CON_QGETSYSSTR:
     case CON_HEADSPRITESTAT:
     case CON_PREVSPRITESTAT:
     case CON_NEXTSPRITESTAT:
@@ -4965,10 +4965,10 @@ static void AddDefaultDefinitions(void)
     AddDefinition("EVENT_KILLIT",EVENT_KILLIT,LABEL_DEFINE);
     AddDefinition("EVENT_LOADACTOR",EVENT_LOADACTOR,LABEL_DEFINE);
 
-	AddDefinition("STR_MAPNAME",STR_MAPNAME,LABEL_DEFINE);
-	AddDefinition("STR_MAPFILENAME",STR_MAPFILENAME,LABEL_DEFINE);
-	AddDefinition("STR_PLAYERNAME",STR_PLAYERNAME,LABEL_DEFINE);
-	AddDefinition("STR_VERSION",STR_VERSION,LABEL_DEFINE);
+    AddDefinition("STR_MAPNAME",STR_MAPNAME,LABEL_DEFINE);
+    AddDefinition("STR_MAPFILENAME",STR_MAPFILENAME,LABEL_DEFINE);
+    AddDefinition("STR_PLAYERNAME",STR_PLAYERNAME,LABEL_DEFINE);
+    AddDefinition("STR_VERSION",STR_VERSION,LABEL_DEFINE);
 
     AddDefinition("NO",0,LABEL_DEFINE|LABEL_ACTION|LABEL_AI|LABEL_MOVE);
 
diff --git a/polymer/eduke32/source/gameexec.c b/polymer/eduke32/source/gameexec.c
index b92283a04..c75e3d698 100644
--- a/polymer/eduke32/source/gameexec.c
+++ b/polymer/eduke32/source/gameexec.c
@@ -5106,7 +5106,7 @@ static int parse(void)
     case CON_GETPNAME:
     case CON_QSTRCAT:
     case CON_QSTRCPY:
-	case CON_QGETSYSSTR:
+    case CON_QGETSYSSTR:
     case CON_CHANGESPRITESTAT:
     case CON_CHANGESPRITESECT:
         insptr++;
@@ -5130,27 +5130,27 @@ static int parse(void)
                 }
                 else OSD_Printf("%s %d null quote %d\n",__FILE__,__LINE__,i);
                 break;
-			case CON_QGETSYSSTR:
-				if (fta_quotes[i] != NULL)
-				switch(j)
-				{
-					case STR_MAPNAME:
-						Bstrcpy(fta_quotes[i],map[ud.volume_number*MAXLEVELS + ud.level_number].name);
-						break;
-					case STR_MAPFILENAME:
-						Bstrcpy(fta_quotes[i],map[ud.volume_number*MAXLEVELS + ud.level_number].filename);
-						break;
-					case STR_PLAYERNAME:
-						Bstrcpy(fta_quotes[i],g_player[g_p].user_name);
-						break;
-					case STR_VERSION:
-						Bstrcpy(fta_quotes[i],HEAD2);
-						break;
-					default:
-						OSD_Printf("%s %d unknown str ID %d %d\n",__FILE__,__LINE__,i,j);
-				}
-				else OSD_Printf("%s %d null quote %d %d\n",__FILE__,__LINE__,i,j);
-				break;
+            case CON_QGETSYSSTR:
+                if (fta_quotes[i] != NULL)
+                    switch (j)
+                    {
+                    case STR_MAPNAME:
+                        Bstrcpy(fta_quotes[i],map[ud.volume_number*MAXLEVELS + ud.level_number].name);
+                        break;
+                    case STR_MAPFILENAME:
+                        Bstrcpy(fta_quotes[i],map[ud.volume_number*MAXLEVELS + ud.level_number].filename);
+                        break;
+                    case STR_PLAYERNAME:
+                        Bstrcpy(fta_quotes[i],g_player[g_p].user_name);
+                        break;
+                    case STR_VERSION:
+                        Bstrcpy(fta_quotes[i],HEAD2);
+                        break;
+                    default:
+                        OSD_Printf("%s %d unknown str ID %d %d\n",__FILE__,__LINE__,i,j);
+                    }
+                else OSD_Printf("%s %d null quote %d %d\n",__FILE__,__LINE__,i,j);
+                break;
             case CON_QSTRCAT:
                 if (fta_quotes[i] != NULL && fta_quotes[j] != NULL)
                     Bstrncat(fta_quotes[i],fta_quotes[j],(MAXQUOTELEN-1)-Bstrlen(fta_quotes[i]));
diff --git a/polymer/eduke32/source/gamevars.c b/polymer/eduke32/source/gamevars.c
index 0da09c221..0dfbaa5c9 100755
--- a/polymer/eduke32/source/gamevars.c
+++ b/polymer/eduke32/source/gamevars.c
@@ -32,1441 +32,1441 @@ static void ResetPointerVars(void);
 
 static void FreeGameVars(void) /* called from ReadGameVars() and ResetGameVars() */
 {
-	// call this function as many times as needed.
-	int i;
-	//  AddLog("FreeGameVars");
-	for (i=0;i<MAXGAMEVARS;i++)
-	{
+    // call this function as many times as needed.
+    int i;
+    //  AddLog("FreeGameVars");
+    for (i=0;i<MAXGAMEVARS;i++)
+    {
 //  	  aGameVars[i].lValue=0;
 //  	  if (aGameVars[i].szLabel)
-		//Bfree(aGameVars[i].szLabel);
+        //Bfree(aGameVars[i].szLabel);
 //  	  aGameVars[i].szLabel=NULL;
 //  	  aGameVars[i].dwFlags=0;
 
-		if (aGameVars[i].plValues)
-			Bfree(aGameVars[i].plValues);
-		aGameVars[i].plValues=NULL;
-		aGameVars[i].bReset=1;
-	}
-	iGameVarCount=0;
-	for (i=0;i<MAXGAMEARRAYS;i++)
-	{
-		if (aGameArrays[i].plValues)
-			Bfree(aGameArrays[i].plValues);
-		aGameArrays[i].plValues=NULL;
-		aGameArrays[i].bReset=1;
-	}
-	iGameArrayCount=0;
-	return;
+        if (aGameVars[i].plValues)
+            Bfree(aGameVars[i].plValues);
+        aGameVars[i].plValues=NULL;
+        aGameVars[i].bReset=1;
+    }
+    iGameVarCount=0;
+    for (i=0;i<MAXGAMEARRAYS;i++)
+    {
+        if (aGameArrays[i].plValues)
+            Bfree(aGameArrays[i].plValues);
+        aGameArrays[i].plValues=NULL;
+        aGameArrays[i].bReset=1;
+    }
+    iGameArrayCount=0;
+    return;
 }
 
 static void ClearGameVars(void)
 {
-	// only call this function ONCE...
-	int i;
+    // only call this function ONCE...
+    int i;
 
-	//AddLog("ClearGameVars");
+    //AddLog("ClearGameVars");
 
-	for (i=0;i<MAXGAMEVARS;i++)
-	{
-		aGameVars[i].lValue=0;
-		if (aGameVars[i].szLabel)
-			Bfree(aGameVars[i].szLabel);
-		aGameVars[i].szLabel=NULL;
-		aGameVars[i].dwFlags=0;
+    for (i=0;i<MAXGAMEVARS;i++)
+    {
+        aGameVars[i].lValue=0;
+        if (aGameVars[i].szLabel)
+            Bfree(aGameVars[i].szLabel);
+        aGameVars[i].szLabel=NULL;
+        aGameVars[i].dwFlags=0;
 
-		if (aGameVars[i].plValues)
-			Bfree(aGameVars[i].plValues);
-		aGameVars[i].plValues=NULL;
-		aGameVars[i].bReset=1;
-	}
-	iGameVarCount=0;
-	for (i=0;i<MAXGAMEARRAYS;i++)
-	{
-		if (aGameArrays[i].szLabel)
-			Bfree(aGameArrays[i].szLabel);
-		aGameArrays[i].szLabel=NULL;
+        if (aGameVars[i].plValues)
+            Bfree(aGameVars[i].plValues);
+        aGameVars[i].plValues=NULL;
+        aGameVars[i].bReset=1;
+    }
+    iGameVarCount=0;
+    for (i=0;i<MAXGAMEARRAYS;i++)
+    {
+        if (aGameArrays[i].szLabel)
+            Bfree(aGameArrays[i].szLabel);
+        aGameArrays[i].szLabel=NULL;
 
-		if (aGameArrays[i].plValues)
-			Bfree(aGameArrays[i].plValues);
-		aGameArrays[i].plValues=NULL;
-		aGameArrays[i].bReset=1;
-	}
-	iGameArrayCount=0;
-	return;
+        if (aGameArrays[i].plValues)
+            Bfree(aGameArrays[i].plValues);
+        aGameArrays[i].plValues=NULL;
+        aGameArrays[i].bReset=1;
+    }
+    iGameArrayCount=0;
+    return;
 }
 
 int ReadGameVars(int fil)
 {
-	int i;
-	int l;
+    int i;
+    int l;
 
-	//     AddLog("Reading gamevars from savegame");
+    //     AddLog("Reading gamevars from savegame");
 
-	FreeGameVars(); // nuke 'em from orbit, it's the only way to be sure...
-	//  Bsprintf(g_szBuf,"CP:%s %d",__FILE__,__LINE__);
-	//  AddLog(g_szBuf);
+    FreeGameVars(); // nuke 'em from orbit, it's the only way to be sure...
+    //  Bsprintf(g_szBuf,"CP:%s %d",__FILE__,__LINE__);
+    //  AddLog(g_szBuf);
 
-	if (kdfread(&iGameVarCount,sizeof(iGameVarCount),1,fil) != 1) goto corrupt;
-	for (i=0;i<iGameVarCount;i++)
-	{
-		if (kdfread(&(aGameVars[i]),sizeof(gamevar_t),1,fil) != 1) goto corrupt;
-		aGameVars[i].szLabel=Bcalloc(MAXVARLABEL,sizeof(char));
-		if (kdfread(aGameVars[i].szLabel,sizeof(char) * MAXVARLABEL, 1, fil) != 1) goto corrupt;
-	}
-	//  Bsprintf(g_szBuf,"CP:%s %d",__FILE__,__LINE__);
-	//  AddLog(g_szBuf);
-	for (i=0;i<iGameVarCount;i++)
-	{
-		if (aGameVars[i].dwFlags & GAMEVAR_FLAG_PERPLAYER)
-			aGameVars[i].plValues=Bcalloc(MAXPLAYERS,sizeof(int));
-		else if (aGameVars[i].dwFlags & GAMEVAR_FLAG_PERACTOR)
-			aGameVars[i].plValues=Bcalloc(MAXSPRITES,sizeof(int));
-		else
-			// else nothing 'extra...'
-			aGameVars[i].plValues=NULL;
-	}
+    if (kdfread(&iGameVarCount,sizeof(iGameVarCount),1,fil) != 1) goto corrupt;
+    for (i=0;i<iGameVarCount;i++)
+    {
+        if (kdfread(&(aGameVars[i]),sizeof(gamevar_t),1,fil) != 1) goto corrupt;
+        aGameVars[i].szLabel=Bcalloc(MAXVARLABEL,sizeof(char));
+        if (kdfread(aGameVars[i].szLabel,sizeof(char) * MAXVARLABEL, 1, fil) != 1) goto corrupt;
+    }
+    //  Bsprintf(g_szBuf,"CP:%s %d",__FILE__,__LINE__);
+    //  AddLog(g_szBuf);
+    for (i=0;i<iGameVarCount;i++)
+    {
+        if (aGameVars[i].dwFlags & GAMEVAR_FLAG_PERPLAYER)
+            aGameVars[i].plValues=Bcalloc(MAXPLAYERS,sizeof(int));
+        else if (aGameVars[i].dwFlags & GAMEVAR_FLAG_PERACTOR)
+            aGameVars[i].plValues=Bcalloc(MAXSPRITES,sizeof(int));
+        else
+            // else nothing 'extra...'
+            aGameVars[i].plValues=NULL;
+    }
 
-	//  Bsprintf(g_szBuf,"CP:%s %d",__FILE__,__LINE__);
-	//  AddLog(g_szBuf);
-	InitGameVarPointers();
+    //  Bsprintf(g_szBuf,"CP:%s %d",__FILE__,__LINE__);
+    //  AddLog(g_szBuf);
+    InitGameVarPointers();
 
-	//  Bsprintf(g_szBuf,"CP:%s %d",__FILE__,__LINE__);
-	//  AddLog(g_szBuf);
-	for (i=0;i<iGameVarCount;i++)
-	{
-		if (aGameVars[i].dwFlags & GAMEVAR_FLAG_PERPLAYER)
-		{
-			//Bsprintf(g_szBuf,"Reading value array for %s (%d)",aGameVars[i].szLabel,sizeof(int) * MAXPLAYERS);
-			//AddLog(g_szBuf);
-			if (kdfread(aGameVars[i].plValues,sizeof(int) * MAXPLAYERS, 1, fil) != 1) goto corrupt;
-		}
-		else if (aGameVars[i].dwFlags & GAMEVAR_FLAG_PERACTOR)
-		{
-			//Bsprintf(g_szBuf,"Reading value array for %s (%d)",aGameVars[i].szLabel,sizeof(int) * MAXSPRITES);
-			//AddLog(g_szBuf);
-			if (kdfread(&aGameVars[i].plValues[0],sizeof(int), MAXSPRITES, fil) != MAXSPRITES) goto corrupt;
-		}
-		// else nothing 'extra...'
-	}
+    //  Bsprintf(g_szBuf,"CP:%s %d",__FILE__,__LINE__);
+    //  AddLog(g_szBuf);
+    for (i=0;i<iGameVarCount;i++)
+    {
+        if (aGameVars[i].dwFlags & GAMEVAR_FLAG_PERPLAYER)
+        {
+            //Bsprintf(g_szBuf,"Reading value array for %s (%d)",aGameVars[i].szLabel,sizeof(int) * MAXPLAYERS);
+            //AddLog(g_szBuf);
+            if (kdfread(aGameVars[i].plValues,sizeof(int) * MAXPLAYERS, 1, fil) != 1) goto corrupt;
+        }
+        else if (aGameVars[i].dwFlags & GAMEVAR_FLAG_PERACTOR)
+        {
+            //Bsprintf(g_szBuf,"Reading value array for %s (%d)",aGameVars[i].szLabel,sizeof(int) * MAXSPRITES);
+            //AddLog(g_szBuf);
+            if (kdfread(&aGameVars[i].plValues[0],sizeof(int), MAXSPRITES, fil) != MAXSPRITES) goto corrupt;
+        }
+        // else nothing 'extra...'
+    }
 
-	ResetPointerVars();
+    ResetPointerVars();
 
-	if (kdfread(&iGameArrayCount,sizeof(iGameArrayCount),1,fil) != 1) goto corrupt;
-	for (i=0;i<iGameArrayCount;i++)
-	{
-		if (kdfread(&(aGameArrays[i]),sizeof(gamearray_t),1,fil) != 1) goto corrupt;
-		aGameArrays[i].szLabel=Bcalloc(MAXARRAYLABEL,sizeof(char));
-		if (kdfread(aGameArrays[i].szLabel,sizeof(char) * MAXARRAYLABEL, 1, fil) != 1) goto corrupt;
-	}
-	//  Bsprintf(g_szBuf,"CP:%s %d",__FILE__,__LINE__);
-	//  AddLog(g_szBuf);
-	for (i=0;i<iGameArrayCount;i++)
-	{
-		aGameArrays[i].plValues=Bcalloc(aGameArrays[i].size,sizeof(int));
-	}
+    if (kdfread(&iGameArrayCount,sizeof(iGameArrayCount),1,fil) != 1) goto corrupt;
+    for (i=0;i<iGameArrayCount;i++)
+    {
+        if (kdfread(&(aGameArrays[i]),sizeof(gamearray_t),1,fil) != 1) goto corrupt;
+        aGameArrays[i].szLabel=Bcalloc(MAXARRAYLABEL,sizeof(char));
+        if (kdfread(aGameArrays[i].szLabel,sizeof(char) * MAXARRAYLABEL, 1, fil) != 1) goto corrupt;
+    }
+    //  Bsprintf(g_szBuf,"CP:%s %d",__FILE__,__LINE__);
+    //  AddLog(g_szBuf);
+    for (i=0;i<iGameArrayCount;i++)
+    {
+        aGameArrays[i].plValues=Bcalloc(aGameArrays[i].size,sizeof(int));
+    }
 
-	//  Bsprintf(g_szBuf,"CP:%s %d",__FILE__,__LINE__);
-	//  AddLog(g_szBuf);
-	for (i=0;i<iGameArrayCount;i++)
-	{
-		//Bsprintf(g_szBuf,"Reading value array for %s (%d)",aGameVars[i].szLabel,sizeof(int) * MAXPLAYERS);
-		//AddLog(g_szBuf);
-		if (kdfread(aGameArrays[i].plValues,sizeof(intptr_t) * aGameArrays[i].size, 1, fil) < 1) goto corrupt;
-	}
+    //  Bsprintf(g_szBuf,"CP:%s %d",__FILE__,__LINE__);
+    //  AddLog(g_szBuf);
+    for (i=0;i<iGameArrayCount;i++)
+    {
+        //Bsprintf(g_szBuf,"Reading value array for %s (%d)",aGameVars[i].szLabel,sizeof(int) * MAXPLAYERS);
+        //AddLog(g_szBuf);
+        if (kdfread(aGameArrays[i].plValues,sizeof(intptr_t) * aGameArrays[i].size, 1, fil) < 1) goto corrupt;
+    }
 
-	//  Bsprintf(g_szBuf,"CP:%s %d",__FILE__,__LINE__);
-	//  AddLog(g_szBuf);
-	if (kdfread(apScriptGameEvent,sizeof(apScriptGameEvent),1,fil) != 1) goto corrupt;
-	for (i=0;i<MAXGAMEEVENTS;i++)
-		if (apScriptGameEvent[i])
-		{
-			l = (int)apScriptGameEvent[i]+(int)&script[0];
-			apScriptGameEvent[i] = (int *)l;
-		}
+    //  Bsprintf(g_szBuf,"CP:%s %d",__FILE__,__LINE__);
+    //  AddLog(g_szBuf);
+    if (kdfread(apScriptGameEvent,sizeof(apScriptGameEvent),1,fil) != 1) goto corrupt;
+    for (i=0;i<MAXGAMEEVENTS;i++)
+        if (apScriptGameEvent[i])
+        {
+            l = (int)apScriptGameEvent[i]+(int)&script[0];
+            apScriptGameEvent[i] = (int *)l;
+        }
 
-	//  Bsprintf(g_szBuf,"CP:%s %d",__FILE__,__LINE__);
-	//  AddLog(g_szBuf);
-	if (kdfread(&l,sizeof(l),1,fil) != 1) goto corrupt;
-	if (kdfread(g_szBuf,l,1,fil) != 1) goto corrupt;
-	g_szBuf[l]=0;
-	OSD_Printf("%s\n",g_szBuf);
+    //  Bsprintf(g_szBuf,"CP:%s %d",__FILE__,__LINE__);
+    //  AddLog(g_szBuf);
+    if (kdfread(&l,sizeof(l),1,fil) != 1) goto corrupt;
+    if (kdfread(g_szBuf,l,1,fil) != 1) goto corrupt;
+    g_szBuf[l]=0;
+    OSD_Printf("%s\n",g_szBuf);
 
 #if 0
-	{
-		FILE *fp;
-		AddLog("Dumping Vars...");
-		fp=fopen("xxx.txt","w");
-		if (fp)
-		{
-			DumpGameVars(fp);
-			fclose(fp);
-		}
-		AddLog("Done Dumping...");
-	}
+    {
+        FILE *fp;
+        AddLog("Dumping Vars...");
+        fp=fopen("xxx.txt","w");
+        if (fp)
+        {
+            DumpGameVars(fp);
+            fclose(fp);
+        }
+        AddLog("Done Dumping...");
+    }
 #endif
-	return(0);
+    return(0);
 corrupt:
-	return(1);
+    return(1);
 }
 
 void SaveGameVars(FILE *fil)
 {
-	int i;
-	int l;
+    int i;
+    int l;
 
-	//   AddLog("Saving Game Vars to File");
-	dfwrite(&iGameVarCount,sizeof(iGameVarCount),1,fil);
+    //   AddLog("Saving Game Vars to File");
+    dfwrite(&iGameVarCount,sizeof(iGameVarCount),1,fil);
 
-	for (i=0;i<iGameVarCount;i++)
-	{
-		dfwrite(&(aGameVars[i]),sizeof(gamevar_t),1,fil);
-		dfwrite(aGameVars[i].szLabel,sizeof(char) * MAXVARLABEL, 1, fil);
-	}
+    for (i=0;i<iGameVarCount;i++)
+    {
+        dfwrite(&(aGameVars[i]),sizeof(gamevar_t),1,fil);
+        dfwrite(aGameVars[i].szLabel,sizeof(char) * MAXVARLABEL, 1, fil);
+    }
 
-	//     dfwrite(&aGameVars,sizeof(aGameVars),1,fil);
+    //     dfwrite(&aGameVars,sizeof(aGameVars),1,fil);
 
-	for (i=0;i<iGameVarCount;i++)
-	{
-		if (aGameVars[i].dwFlags & GAMEVAR_FLAG_PERPLAYER)
-		{
-			//Bsprintf(g_szBuf,"Writing value array for %s (%d)",aGameVars[i].szLabel,sizeof(int) * MAXPLAYERS);
-			//AddLog(g_szBuf);
-			dfwrite(aGameVars[i].plValues,sizeof(int) * MAXPLAYERS, 1, fil);
-		}
-		else if (aGameVars[i].dwFlags & GAMEVAR_FLAG_PERACTOR)
-		{
-			//Bsprintf(g_szBuf,"Writing value array for %s (%d)",aGameVars[i].szLabel,sizeof(int) * MAXSPRITES);
-			//AddLog(g_szBuf);
-			dfwrite(&aGameVars[i].plValues[0],sizeof(int), MAXSPRITES, fil);
-		}
-		// else nothing 'extra...'
-	}
+    for (i=0;i<iGameVarCount;i++)
+    {
+        if (aGameVars[i].dwFlags & GAMEVAR_FLAG_PERPLAYER)
+        {
+            //Bsprintf(g_szBuf,"Writing value array for %s (%d)",aGameVars[i].szLabel,sizeof(int) * MAXPLAYERS);
+            //AddLog(g_szBuf);
+            dfwrite(aGameVars[i].plValues,sizeof(int) * MAXPLAYERS, 1, fil);
+        }
+        else if (aGameVars[i].dwFlags & GAMEVAR_FLAG_PERACTOR)
+        {
+            //Bsprintf(g_szBuf,"Writing value array for %s (%d)",aGameVars[i].szLabel,sizeof(int) * MAXSPRITES);
+            //AddLog(g_szBuf);
+            dfwrite(&aGameVars[i].plValues[0],sizeof(int), MAXSPRITES, fil);
+        }
+        // else nothing 'extra...'
+    }
 
-	dfwrite(&iGameArrayCount,sizeof(iGameArrayCount),1,fil);
+    dfwrite(&iGameArrayCount,sizeof(iGameArrayCount),1,fil);
 
-	for (i=0;i<iGameArrayCount;i++)
-	{
-		dfwrite(&(aGameArrays[i]),sizeof(gamearray_t),1,fil);
-		dfwrite(aGameArrays[i].szLabel,sizeof(char) * MAXARRAYLABEL, 1, fil);
-	}
+    for (i=0;i<iGameArrayCount;i++)
+    {
+        dfwrite(&(aGameArrays[i]),sizeof(gamearray_t),1,fil);
+        dfwrite(aGameArrays[i].szLabel,sizeof(char) * MAXARRAYLABEL, 1, fil);
+    }
 
-	//     dfwrite(&aGameVars,sizeof(aGameVars),1,fil);
+    //     dfwrite(&aGameVars,sizeof(aGameVars),1,fil);
 
-	for (i=0;i<iGameArrayCount;i++)
-	{
-		dfwrite(aGameArrays[i].plValues,sizeof(intptr_t) * aGameArrays[i].size, 1, fil);
-	}
+    for (i=0;i<iGameArrayCount;i++)
+    {
+        dfwrite(aGameArrays[i].plValues,sizeof(intptr_t) * aGameArrays[i].size, 1, fil);
+    }
 
-	for (i=0;i<MAXGAMEEVENTS;i++)
-		if (apScriptGameEvent[i])
-		{
-			l = (int)apScriptGameEvent[i]-(int)&script[0];
-			apScriptGameEvent[i] = (int *)l;
-		}
-	dfwrite(apScriptGameEvent,sizeof(apScriptGameEvent),1,fil);
-	for (i=0;i<MAXGAMEEVENTS;i++)
-		if (apScriptGameEvent[i])
-		{
-			l = (int)apScriptGameEvent[i]+(int)&script[0];
-			apScriptGameEvent[i] = (int *)l;
-		}
+    for (i=0;i<MAXGAMEEVENTS;i++)
+        if (apScriptGameEvent[i])
+        {
+            l = (int)apScriptGameEvent[i]-(int)&script[0];
+            apScriptGameEvent[i] = (int *)l;
+        }
+    dfwrite(apScriptGameEvent,sizeof(apScriptGameEvent),1,fil);
+    for (i=0;i<MAXGAMEEVENTS;i++)
+        if (apScriptGameEvent[i])
+        {
+            l = (int)apScriptGameEvent[i]+(int)&script[0];
+            apScriptGameEvent[i] = (int *)l;
+        }
 
-	Bsprintf(g_szBuf,"EOF: EDuke32");
-	l=strlen(g_szBuf);
-	dfwrite(&l,sizeof(l),1,fil);
-	dfwrite(g_szBuf,l,1,fil);
+    Bsprintf(g_szBuf,"EOF: EDuke32");
+    l=strlen(g_szBuf);
+    dfwrite(&l,sizeof(l),1,fil);
+    dfwrite(g_szBuf,l,1,fil);
 }
 
 void DumpGameVars(FILE *fp)
 {
-	int i;
-	if (!fp)
-	{
-		return;
-	}
-	fprintf(fp,"// Current Game Definitions\n\n");
-	for (i=0;i<iGameVarCount;i++)
-	{
-		if (aGameVars[i].dwFlags & (GAMEVAR_FLAG_SECRET))
-		{
-			continue; // do nothing...
-		}
-		else
-		{
-			fprintf(fp,"gamevar %s ",aGameVars[i].szLabel);
+    int i;
+    if (!fp)
+    {
+        return;
+    }
+    fprintf(fp,"// Current Game Definitions\n\n");
+    for (i=0;i<iGameVarCount;i++)
+    {
+        if (aGameVars[i].dwFlags & (GAMEVAR_FLAG_SECRET))
+        {
+            continue; // do nothing...
+        }
+        else
+        {
+            fprintf(fp,"gamevar %s ",aGameVars[i].szLabel);
 
-			if (aGameVars[i].dwFlags & (GAMEVAR_FLAG_INTPTR))
-				fprintf(fp,"%d",*((int*)aGameVars[i].lValue));
-			else if (aGameVars[i].dwFlags & (GAMEVAR_FLAG_SHORTPTR))
-				fprintf(fp,"%d",*((short*)aGameVars[i].lValue));
-			else if (aGameVars[i].dwFlags & (GAMEVAR_FLAG_CHARPTR))
-				fprintf(fp,"%d",*((char*)aGameVars[i].lValue));
-			else
-				fprintf(fp,"%d",aGameVars[i].lValue);
-			if (aGameVars[i].dwFlags & (GAMEVAR_FLAG_PERPLAYER))
-				fprintf(fp," GAMEVAR_FLAG_PERPLAYER");
-			else if (aGameVars[i].dwFlags & (GAMEVAR_FLAG_PERACTOR))
-				fprintf(fp," GAMEVAR_FLAG_PERACTOR");
-			else
-				fprintf(fp," %d",aGameVars[i].dwFlags & (GAMEVAR_FLAG_USER_MASK));
-			fprintf(fp," // ");
-			if (aGameVars[i].dwFlags & (GAMEVAR_FLAG_SYSTEM))
-				fprintf(fp," (system)");
-			if (aGameVars[i].dwFlags & (GAMEVAR_FLAG_INTPTR|GAMEVAR_FLAG_SHORTPTR|GAMEVAR_FLAG_CHARPTR))
-				fprintf(fp," (pointer)");
-			if (aGameVars[i].dwFlags & (GAMEVAR_FLAG_READONLY))
-				fprintf(fp," (read only)");
-			fprintf(fp,"\n");
-		}
-	}
-	fprintf(fp,"\n// end of game definitions\n");
+            if (aGameVars[i].dwFlags & (GAMEVAR_FLAG_INTPTR))
+                fprintf(fp,"%d",*((int*)aGameVars[i].lValue));
+            else if (aGameVars[i].dwFlags & (GAMEVAR_FLAG_SHORTPTR))
+                fprintf(fp,"%d",*((short*)aGameVars[i].lValue));
+            else if (aGameVars[i].dwFlags & (GAMEVAR_FLAG_CHARPTR))
+                fprintf(fp,"%d",*((char*)aGameVars[i].lValue));
+            else
+                fprintf(fp,"%d",aGameVars[i].lValue);
+            if (aGameVars[i].dwFlags & (GAMEVAR_FLAG_PERPLAYER))
+                fprintf(fp," GAMEVAR_FLAG_PERPLAYER");
+            else if (aGameVars[i].dwFlags & (GAMEVAR_FLAG_PERACTOR))
+                fprintf(fp," GAMEVAR_FLAG_PERACTOR");
+            else
+                fprintf(fp," %d",aGameVars[i].dwFlags & (GAMEVAR_FLAG_USER_MASK));
+            fprintf(fp," // ");
+            if (aGameVars[i].dwFlags & (GAMEVAR_FLAG_SYSTEM))
+                fprintf(fp," (system)");
+            if (aGameVars[i].dwFlags & (GAMEVAR_FLAG_INTPTR|GAMEVAR_FLAG_SHORTPTR|GAMEVAR_FLAG_CHARPTR))
+                fprintf(fp," (pointer)");
+            if (aGameVars[i].dwFlags & (GAMEVAR_FLAG_READONLY))
+                fprintf(fp," (read only)");
+            fprintf(fp,"\n");
+        }
+    }
+    fprintf(fp,"\n// end of game definitions\n");
 }
 
 void ResetGameVars(void) /* this is called during a new game and nowhere else */
 {
-	int i;
+    int i;
 
-	//AddLog("Reset Game Vars");
-	FreeGameVars();
+    //AddLog("Reset Game Vars");
+    FreeGameVars();
 
-	for (i=0;i<MAXGAMEVARS;i++)
-	{
-		//Bsprintf(g_szBuf,"Resetting %d: '%s' to %d",i,aDefaultGameVars[i].szLabel,
-		//  	aDefaultGameVars[i].lValue
-		//     );
-		//AddLog(g_szBuf);
-		if (aGameVars[i].szLabel != NULL && aGameVars[i].bReset)
-			AddGameVar(aGameVars[i].szLabel,aGameVars[i].lDefault,aGameVars[i].dwFlags);
-	}
+    for (i=0;i<MAXGAMEVARS;i++)
+    {
+        //Bsprintf(g_szBuf,"Resetting %d: '%s' to %d",i,aDefaultGameVars[i].szLabel,
+        //  	aDefaultGameVars[i].lValue
+        //     );
+        //AddLog(g_szBuf);
+        if (aGameVars[i].szLabel != NULL && aGameVars[i].bReset)
+            AddGameVar(aGameVars[i].szLabel,aGameVars[i].lDefault,aGameVars[i].dwFlags);
+    }
 
-	for (i=0;i<MAXGAMEARRAYS;i++)
-	{
-		//Bsprintf(g_szBuf,"Resetting %d: '%s' to %d",i,aDefaultGameVars[i].szLabel,
-		//  	aDefaultGameVars[i].lValue
-		//     );
-		//AddLog(g_szBuf);
-		if (aGameArrays[i].szLabel != NULL && aGameArrays[i].bReset)
-			AddGameArray(aGameArrays[i].szLabel,aGameArrays[i].size);
-	}
+    for (i=0;i<MAXGAMEARRAYS;i++)
+    {
+        //Bsprintf(g_szBuf,"Resetting %d: '%s' to %d",i,aDefaultGameVars[i].szLabel,
+        //  	aDefaultGameVars[i].lValue
+        //     );
+        //AddLog(g_szBuf);
+        if (aGameArrays[i].szLabel != NULL && aGameArrays[i].bReset)
+            AddGameArray(aGameArrays[i].szLabel,aGameArrays[i].size);
+    }
 }
 
 int AddGameArray(const char *pszLabel, int asize)
 {
-	int i;
+    int i;
 
-	if (Bstrlen(pszLabel) > (MAXARRAYLABEL-1))
-	{
-		error++;
-		ReportError(-1);
-		initprintf("%s:%d: error: array name `%s' exceeds limit of %d characters.\n",compilefile,line_number,pszLabel, MAXARRAYLABEL);
-		return 0;
-	}
-	for (i=0;i<iGameArrayCount;i++)
-	{
-		if (aGameVars[i].szLabel != NULL && !aGameArrays[i].bReset)
-		{
-			if (Bstrcmp(pszLabel,aGameArrays[i].szLabel) == 0)
-			{
-				// found it it's a duplicate in error
-				warning++;
-				ReportError(WARNING_DUPLICATEDEFINITION);
-				return 0;
+    if (Bstrlen(pszLabel) > (MAXARRAYLABEL-1))
+    {
+        error++;
+        ReportError(-1);
+        initprintf("%s:%d: error: array name `%s' exceeds limit of %d characters.\n",compilefile,line_number,pszLabel, MAXARRAYLABEL);
+        return 0;
+    }
+    for (i=0;i<iGameArrayCount;i++)
+    {
+        if (aGameVars[i].szLabel != NULL && !aGameArrays[i].bReset)
+        {
+            if (Bstrcmp(pszLabel,aGameArrays[i].szLabel) == 0)
+            {
+                // found it it's a duplicate in error
+                warning++;
+                ReportError(WARNING_DUPLICATEDEFINITION);
+                return 0;
 
-			}
-		}
-	}
-	if (i < MAXGAMEARRAYS)
-	{
-		if (aGameArrays[i].szLabel == NULL)
-			aGameArrays[i].szLabel=Bcalloc(MAXVARLABEL,sizeof(char));
-		if (aGameArrays[i].szLabel != pszLabel)
-			Bstrcpy(aGameArrays[i].szLabel,pszLabel);
-		aGameArrays[i].plValues=Bcalloc(asize,sizeof(int));
-		aGameArrays[i].size=asize;
-		aGameVars[i].bReset=0;
-		iGameArrayCount++;
-		return 1;
-	}
-	return 0;
+            }
+        }
+    }
+    if (i < MAXGAMEARRAYS)
+    {
+        if (aGameArrays[i].szLabel == NULL)
+            aGameArrays[i].szLabel=Bcalloc(MAXVARLABEL,sizeof(char));
+        if (aGameArrays[i].szLabel != pszLabel)
+            Bstrcpy(aGameArrays[i].szLabel,pszLabel);
+        aGameArrays[i].plValues=Bcalloc(asize,sizeof(int));
+        aGameArrays[i].size=asize;
+        aGameVars[i].bReset=0;
+        iGameArrayCount++;
+        return 1;
+    }
+    return 0;
 }
 
 int AddGameVar(const char *pszLabel, int lValue, unsigned int dwFlags)
 {
-	int i, j;
+    int i, j;
 
-	//Bsprintf(g_szBuf,"AddGameVar(%s, %d, %X)",pszLabel, lValue, dwFlags);
-	//AddLog(g_szBuf);
+    //Bsprintf(g_szBuf,"AddGameVar(%s, %d, %X)",pszLabel, lValue, dwFlags);
+    //AddLog(g_szBuf);
 
-	if (Bstrlen(pszLabel) > (MAXVARLABEL-1))
-	{
-		error++;
-		ReportError(-1);
-		initprintf("%s:%d: error: variable name `%s' exceeds limit of %d characters.\n",compilefile,line_number,pszLabel, MAXVARLABEL);
-		return 0;
-	}
-	for (i=0;i<iGameVarCount;i++)
-	{
-		if (aGameVars[i].szLabel != NULL && !aGameVars[i].bReset)
-		{
-			if (Bstrcmp(pszLabel,aGameVars[i].szLabel) == 0)
-			{
-				// found it...
-				if (aGameVars[i].dwFlags & (GAMEVAR_FLAG_INTPTR|GAMEVAR_FLAG_SHORTPTR|GAMEVAR_FLAG_CHARPTR))
-				{
-					//  			   warning++;
-					//  			   initprintf("%s:%d: warning: Internal gamevar '%s' cannot be redefined.\n",compilefile,line_number,label+(labelcnt<<6));
-					ReportError(-1);
-					initprintf("%s:%d: warning: cannot redefine internal gamevar `%s'.\n",compilefile,line_number,label+(labelcnt<<6));
-					return 0;
-				}
-				else if ((aGameVars[i].dwFlags & GAMEVAR_FLAG_DEFAULT) || (aGameVars[i].dwFlags & GAMEVAR_FLAG_SYSTEM))
-				{
-					//Bsprintf(g_szBuf,"Replacing %s at %d",pszLabel,i);
-					//AddLog(g_szBuf);
-					//b=1;
-					// it's OK to replace
-					break;
-				}
-				else
-				{
-					// it's a duplicate in error
-					warning++;
-					ReportError(WARNING_DUPLICATEDEFINITION);
-					return 0;
-				}
-			}
-		}
-	}
-	if (i < MAXGAMEVARS)
-	{
-		// Set values
-		if (aGameVars[i].dwFlags & GAMEVAR_FLAG_SYSTEM)
-		{
-			//if(b)
-			//{
-			//Bsprintf(g_szBuf,"CP:%s %d",__FILE__,__LINE__);
-			//AddLog(g_szBuf);
-			//}
-			// if existing is system, they only get to change default value....
-			aGameVars[i].lValue=lValue;
-			aGameVars[i].lDefault=lValue;
-			aGameVars[i].bReset=0;
-		}
-		else
-		{
-			if (aGameVars[i].szLabel == NULL)
-				aGameVars[i].szLabel=Bcalloc(MAXVARLABEL,sizeof(char));
-			if (aGameVars[i].szLabel != pszLabel)
-				Bstrcpy(aGameVars[i].szLabel,pszLabel);
-			aGameVars[i].dwFlags=dwFlags;
-			aGameVars[i].lValue=lValue;
-			aGameVars[i].lDefault=lValue;
-			aGameVars[i].bReset=0;
-		}
+    if (Bstrlen(pszLabel) > (MAXVARLABEL-1))
+    {
+        error++;
+        ReportError(-1);
+        initprintf("%s:%d: error: variable name `%s' exceeds limit of %d characters.\n",compilefile,line_number,pszLabel, MAXVARLABEL);
+        return 0;
+    }
+    for (i=0;i<iGameVarCount;i++)
+    {
+        if (aGameVars[i].szLabel != NULL && !aGameVars[i].bReset)
+        {
+            if (Bstrcmp(pszLabel,aGameVars[i].szLabel) == 0)
+            {
+                // found it...
+                if (aGameVars[i].dwFlags & (GAMEVAR_FLAG_INTPTR|GAMEVAR_FLAG_SHORTPTR|GAMEVAR_FLAG_CHARPTR))
+                {
+                    //  			   warning++;
+                    //  			   initprintf("%s:%d: warning: Internal gamevar '%s' cannot be redefined.\n",compilefile,line_number,label+(labelcnt<<6));
+                    ReportError(-1);
+                    initprintf("%s:%d: warning: cannot redefine internal gamevar `%s'.\n",compilefile,line_number,label+(labelcnt<<6));
+                    return 0;
+                }
+                else if ((aGameVars[i].dwFlags & GAMEVAR_FLAG_DEFAULT) || (aGameVars[i].dwFlags & GAMEVAR_FLAG_SYSTEM))
+                {
+                    //Bsprintf(g_szBuf,"Replacing %s at %d",pszLabel,i);
+                    //AddLog(g_szBuf);
+                    //b=1;
+                    // it's OK to replace
+                    break;
+                }
+                else
+                {
+                    // it's a duplicate in error
+                    warning++;
+                    ReportError(WARNING_DUPLICATEDEFINITION);
+                    return 0;
+                }
+            }
+        }
+    }
+    if (i < MAXGAMEVARS)
+    {
+        // Set values
+        if (aGameVars[i].dwFlags & GAMEVAR_FLAG_SYSTEM)
+        {
+            //if(b)
+            //{
+            //Bsprintf(g_szBuf,"CP:%s %d",__FILE__,__LINE__);
+            //AddLog(g_szBuf);
+            //}
+            // if existing is system, they only get to change default value....
+            aGameVars[i].lValue=lValue;
+            aGameVars[i].lDefault=lValue;
+            aGameVars[i].bReset=0;
+        }
+        else
+        {
+            if (aGameVars[i].szLabel == NULL)
+                aGameVars[i].szLabel=Bcalloc(MAXVARLABEL,sizeof(char));
+            if (aGameVars[i].szLabel != pszLabel)
+                Bstrcpy(aGameVars[i].szLabel,pszLabel);
+            aGameVars[i].dwFlags=dwFlags;
+            aGameVars[i].lValue=lValue;
+            aGameVars[i].lDefault=lValue;
+            aGameVars[i].bReset=0;
+        }
 
-		if (i==iGameVarCount)
-		{
-			// we're adding a new one.
-			iGameVarCount++;
-		}
-		if (aGameVars[i].plValues && !(aGameVars[i].dwFlags & GAMEVAR_FLAG_SYSTEM))
-		{
-			// only free if not system
-			Bfree(aGameVars[i].plValues);
-			aGameVars[i].plValues=NULL;
-		}
-		if (aGameVars[i].dwFlags & GAMEVAR_FLAG_PERPLAYER)
-		{
-			if (!aGameVars[i].plValues)
-				aGameVars[i].plValues=Bcalloc(MAXPLAYERS,sizeof(intptr_t));
-			for (j=0;j<MAXPLAYERS;j++)
-				aGameVars[i].plValues[j]=lValue;
-		}
-		else if (aGameVars[i].dwFlags & GAMEVAR_FLAG_PERACTOR)
-		{
-			if (!aGameVars[i].plValues)
-				aGameVars[i].plValues=Bcalloc(MAXSPRITES,sizeof(intptr_t));
-			for (j=0;j<MAXSPRITES;j++)
-				aGameVars[i].plValues[j]=lValue;
-		}
-		return 1;
-	}
-	else
-	{
-		// no room to add...
-		return 0;
-	}
+        if (i==iGameVarCount)
+        {
+            // we're adding a new one.
+            iGameVarCount++;
+        }
+        if (aGameVars[i].plValues && !(aGameVars[i].dwFlags & GAMEVAR_FLAG_SYSTEM))
+        {
+            // only free if not system
+            Bfree(aGameVars[i].plValues);
+            aGameVars[i].plValues=NULL;
+        }
+        if (aGameVars[i].dwFlags & GAMEVAR_FLAG_PERPLAYER)
+        {
+            if (!aGameVars[i].plValues)
+                aGameVars[i].plValues=Bcalloc(MAXPLAYERS,sizeof(intptr_t));
+            for (j=0;j<MAXPLAYERS;j++)
+                aGameVars[i].plValues[j]=lValue;
+        }
+        else if (aGameVars[i].dwFlags & GAMEVAR_FLAG_PERACTOR)
+        {
+            if (!aGameVars[i].plValues)
+                aGameVars[i].plValues=Bcalloc(MAXSPRITES,sizeof(intptr_t));
+            for (j=0;j<MAXSPRITES;j++)
+                aGameVars[i].plValues[j]=lValue;
+        }
+        return 1;
+    }
+    else
+    {
+        // no room to add...
+        return 0;
+    }
 }
 
 void ResetActorGameVars(int iActor)
 {
-	int i;
-	//    OSD_Printf("resetting vars for actor %d\n",iActor);
-	for (i=0;i<MAXGAMEVARS;i++)
-		if ((aGameVars[i].dwFlags & GAMEVAR_FLAG_PERACTOR) && !(aGameVars[i].dwFlags & GAMEVAR_FLAG_NODEFAULT))
-		{
-			//  		  OSD_Printf("reset %s (%d) to %s (%d)\n",aGameVars[i].szLabel,aGameVars[i].plValues[iActor],aDefaultGameVars[i].szLabel,aDefaultGameVars[i].lValue);
-			aGameVars[i].plValues[iActor]=aGameVars[i].lDefault;
-		}
+    int i;
+    //    OSD_Printf("resetting vars for actor %d\n",iActor);
+    for (i=0;i<MAXGAMEVARS;i++)
+        if ((aGameVars[i].dwFlags & GAMEVAR_FLAG_PERACTOR) && !(aGameVars[i].dwFlags & GAMEVAR_FLAG_NODEFAULT))
+        {
+            //  		  OSD_Printf("reset %s (%d) to %s (%d)\n",aGameVars[i].szLabel,aGameVars[i].plValues[iActor],aDefaultGameVars[i].szLabel,aDefaultGameVars[i].lValue);
+            aGameVars[i].plValues[iActor]=aGameVars[i].lDefault;
+        }
 }
 
 static int GetGameID(const char *szGameLabel)
 {
-	int i;
+    int i;
 
-	for (i=0;i<iGameVarCount;i++)
-	{
-		if (aGameVars[i].szLabel != NULL)
-		{
-			if (Bstrcmp(szGameLabel, aGameVars[i].szLabel) == 0)
-			{
-				return i;
-			}
-		}
-	}
-	return -1;
+    for (i=0;i<iGameVarCount;i++)
+    {
+        if (aGameVars[i].szLabel != NULL)
+        {
+            if (Bstrcmp(szGameLabel, aGameVars[i].szLabel) == 0)
+            {
+                return i;
+            }
+        }
+    }
+    return -1;
 }
 
 int GetGameVarID(int id, int iActor, int iPlayer)
 {
-	int m = 1;
+    int m = 1;
 
-	if (id == MAXGAMEVARS)
-	{
+    if (id == MAXGAMEVARS)
+    {
 //  		  OSD_Printf("GetGameVarID(): reading gamevar constant\n");
-		return(*insptr++);
-	}
+        return(*insptr++);
+    }
 
-	if (id == g_iThisActorID)
-		return iActor;
+    if (id == g_iThisActorID)
+        return iActor;
 
-	if (id<0 || id >= iGameVarCount)
-	{
+    if (id<0 || id >= iGameVarCount)
+    {
 //  	  if (id < (MAXGAMEVARS<<1)+MAXGAMEVARS+1+MAXGAMEARRAYS)
-		if (id&(MAXGAMEVARS<<2))
-		{
-			int index=GetGameVarID(*insptr++,iActor,iPlayer);
+        if (id&(MAXGAMEVARS<<2))
+        {
+            int index=GetGameVarID(*insptr++,iActor,iPlayer);
 
-			id ^= (MAXGAMEVARS<<2);
+            id ^= (MAXGAMEVARS<<2);
 
-			if (id&(MAXGAMEVARS<<1)) // negative array access
-			{
-				m = -1;
-				id ^= (MAXGAMEVARS<<1);
-			}
+            if (id&(MAXGAMEVARS<<1)) // negative array access
+            {
+                m = -1;
+                id ^= (MAXGAMEVARS<<1);
+            }
 
 //  		  OSD_Printf("GetGameVarID(): reading from array\n");
-			if ((index < aGameArrays[id].size)&&(index>=0))
-				return(m * aGameArrays[id].plValues[index]);
-			OSD_Printf("GetGameVarID(): invalid array index (%s[%d])\n",aGameArrays[id].szLabel,index);
-			return -1;
-		}
+            if ((index < aGameArrays[id].size)&&(index>=0))
+                return(m * aGameArrays[id].plValues[index]);
+            OSD_Printf("GetGameVarID(): invalid array index (%s[%d])\n",aGameArrays[id].szLabel,index);
+            return -1;
+        }
 
-		if (!(id&(MAXGAMEVARS<<1)))
-		{
-			OSD_Printf("GetGameVarID(): invalid gamevar ID (%d)\n",id);
-			return -1;
-		}
+        if (!(id&(MAXGAMEVARS<<1)))
+        {
+            OSD_Printf("GetGameVarID(): invalid gamevar ID (%d)\n",id);
+            return -1;
+        }
 
-		m = -1;
-		id ^= (MAXGAMEVARS<<1);
-	}
+        m = -1;
+        id ^= (MAXGAMEVARS<<1);
+    }
 
-	if (aGameVars[id].dwFlags & GAMEVAR_FLAG_PERPLAYER)
-	{
-		// for the current player
-		if (iPlayer >= 0 && iPlayer < MAXPLAYERS)
-		{
-			//Bsprintf(g_szBuf,"GetGameVarID(%d, %d, %d) returns %d\n",id,iActor,iPlayer, aGameVars[id].plValues[iPlayer]);
-			//AddLog(g_szBuf);
-			return(m * aGameVars[id].plValues[iPlayer]);
-		}
+    if (aGameVars[id].dwFlags & GAMEVAR_FLAG_PERPLAYER)
+    {
+        // for the current player
+        if (iPlayer >= 0 && iPlayer < MAXPLAYERS)
+        {
+            //Bsprintf(g_szBuf,"GetGameVarID(%d, %d, %d) returns %d\n",id,iActor,iPlayer, aGameVars[id].plValues[iPlayer]);
+            //AddLog(g_szBuf);
+            return(m * aGameVars[id].plValues[iPlayer]);
+        }
 
-		return(m * aGameVars[id].lValue);
-	}
+        return(m * aGameVars[id].lValue);
+    }
 
-	if (aGameVars[id].dwFlags & GAMEVAR_FLAG_PERACTOR)
-	{
-		// for the current actor
-		if (iActor >= 0 && iActor <= MAXSPRITES)
-		{
-			return(m * aGameVars[id].plValues[iActor]);
-		}
+    if (aGameVars[id].dwFlags & GAMEVAR_FLAG_PERACTOR)
+    {
+        // for the current actor
+        if (iActor >= 0 && iActor <= MAXSPRITES)
+        {
+            return(m * aGameVars[id].plValues[iActor]);
+        }
 
-		return(m * aGameVars[id].lValue);
-	}
+        return(m * aGameVars[id].lValue);
+    }
 
-	if (aGameVars[id].dwFlags & GAMEVAR_FLAG_INTPTR)
-	{
-		return(m * (*((int*)aGameVars[id].lValue)));
-	}
+    if (aGameVars[id].dwFlags & GAMEVAR_FLAG_INTPTR)
+    {
+        return(m * (*((int*)aGameVars[id].lValue)));
+    }
 
-	if (aGameVars[id].dwFlags & GAMEVAR_FLAG_SHORTPTR)
-	{
-		return(m * (*((short*)aGameVars[id].lValue)));
-	}
+    if (aGameVars[id].dwFlags & GAMEVAR_FLAG_SHORTPTR)
+    {
+        return(m * (*((short*)aGameVars[id].lValue)));
+    }
 
-	if (aGameVars[id].dwFlags & GAMEVAR_FLAG_CHARPTR)
-	{
-		return(m * (*((char*)aGameVars[id].lValue)));
-	}
+    if (aGameVars[id].dwFlags & GAMEVAR_FLAG_CHARPTR)
+    {
+        return(m * (*((char*)aGameVars[id].lValue)));
+    }
 
-	return(m * aGameVars[id].lValue);
+    return(m * aGameVars[id].lValue);
 }
 
 void SetGameArrayID(int id,int index, int lValue)
 {
-	if (id<0 || id >= iGameArrayCount || !((index < aGameArrays[id].size)&&(index>=0)))
-	{
-		OSD_Printf("SetGameVarID(): tried to set invalid array ID (%d) or index out of bounds from sprite %d (%d), player %d\n",id,g_i,sprite[g_i].picnum,g_p);
-		return;
-	}
-	aGameArrays[id].plValues[index]=lValue;
+    if (id<0 || id >= iGameArrayCount || !((index < aGameArrays[id].size)&&(index>=0)))
+    {
+        OSD_Printf("SetGameVarID(): tried to set invalid array ID (%d) or index out of bounds from sprite %d (%d), player %d\n",id,g_i,sprite[g_i].picnum,g_p);
+        return;
+    }
+    aGameArrays[id].plValues[index]=lValue;
 }
 
 void SetGameVarID(int id, int lValue, int iActor, int iPlayer)
 {
-	if (id<0 || id >= iGameVarCount)
-	{
-		OSD_Printf("SetGameVarID(): tried to set invalid gamevar ID (%d) from sprite %d (%d), player %d\n",id,g_i,sprite[g_i].picnum,g_p);
-		return;
-	}
-	//Bsprintf(g_szBuf,"SGVI: %d ('%s') to %d for %d %d",id,aGameVars[id].szLabel,lValue,iActor,iPlayer);
-	//AddLog(g_szBuf);
-	if (aGameVars[id].dwFlags & GAMEVAR_FLAG_PERPLAYER)
-	{
-		if (iPlayer < 0 || iPlayer > MAXPLAYERS-1)
-		{
-			OSD_Printf("SetGameVarID(): invalid player (%d) for per-player gamevar %s from sprite %d (%d), player %d\n",iPlayer,aGameVars[id].szLabel,g_i,sprite[g_i].picnum,g_p);
-			return;
-		}
-		// for the current player
-		aGameVars[id].plValues[iPlayer]=lValue;
-		return;
-	}
+    if (id<0 || id >= iGameVarCount)
+    {
+        OSD_Printf("SetGameVarID(): tried to set invalid gamevar ID (%d) from sprite %d (%d), player %d\n",id,g_i,sprite[g_i].picnum,g_p);
+        return;
+    }
+    //Bsprintf(g_szBuf,"SGVI: %d ('%s') to %d for %d %d",id,aGameVars[id].szLabel,lValue,iActor,iPlayer);
+    //AddLog(g_szBuf);
+    if (aGameVars[id].dwFlags & GAMEVAR_FLAG_PERPLAYER)
+    {
+        if (iPlayer < 0 || iPlayer > MAXPLAYERS-1)
+        {
+            OSD_Printf("SetGameVarID(): invalid player (%d) for per-player gamevar %s from sprite %d (%d), player %d\n",iPlayer,aGameVars[id].szLabel,g_i,sprite[g_i].picnum,g_p);
+            return;
+        }
+        // for the current player
+        aGameVars[id].plValues[iPlayer]=lValue;
+        return;
+    }
 
-	if (aGameVars[id].dwFlags & GAMEVAR_FLAG_PERACTOR)
-	{
-		if (iActor < 0 || iActor > MAXSPRITES-1)
-		{
-			OSD_Printf("SetGameVarID(): invalid sprite (%d) for per-actor gamevar %s from sprite %d (%d), player %d\n",iActor,aGameVars[id].szLabel,g_i,sprite[g_i].picnum,g_p);
-			return;
-		}
-		// for the current actor
-		aGameVars[id].plValues[iActor]=lValue;
-		return;
-	}
+    if (aGameVars[id].dwFlags & GAMEVAR_FLAG_PERACTOR)
+    {
+        if (iActor < 0 || iActor > MAXSPRITES-1)
+        {
+            OSD_Printf("SetGameVarID(): invalid sprite (%d) for per-actor gamevar %s from sprite %d (%d), player %d\n",iActor,aGameVars[id].szLabel,g_i,sprite[g_i].picnum,g_p);
+            return;
+        }
+        // for the current actor
+        aGameVars[id].plValues[iActor]=lValue;
+        return;
+    }
 
-	if (aGameVars[id].dwFlags & GAMEVAR_FLAG_INTPTR)
-	{
-		// set the value at pointer
-		*((int*)aGameVars[id].lValue)=(int)lValue;
-		return;
-	}
+    if (aGameVars[id].dwFlags & GAMEVAR_FLAG_INTPTR)
+    {
+        // set the value at pointer
+        *((int*)aGameVars[id].lValue)=(int)lValue;
+        return;
+    }
 
-	if (aGameVars[id].dwFlags & GAMEVAR_FLAG_SHORTPTR)
-	{
-		// set the value at pointer
-		*((short*)aGameVars[id].lValue)=(short)lValue;
-		return;
-	}
+    if (aGameVars[id].dwFlags & GAMEVAR_FLAG_SHORTPTR)
+    {
+        // set the value at pointer
+        *((short*)aGameVars[id].lValue)=(short)lValue;
+        return;
+    }
 
-	if (aGameVars[id].dwFlags & GAMEVAR_FLAG_CHARPTR)
-	{
-		// set the value at pointer
-		*((char*)aGameVars[id].lValue)=(char)lValue;
-		return;
-	}
+    if (aGameVars[id].dwFlags & GAMEVAR_FLAG_CHARPTR)
+    {
+        // set the value at pointer
+        *((char*)aGameVars[id].lValue)=(char)lValue;
+        return;
+    }
 
-	aGameVars[id].lValue=lValue;
+    aGameVars[id].lValue=lValue;
 }
 
 int GetGameVar(const char *szGameLabel, int lDefault, int iActor, int iPlayer)
 {
-	int i=0;
-	for (;i<iGameVarCount;i++)
-	{
-		if (aGameVars[i].szLabel != NULL)
-		{
-			if (Bstrcmp(szGameLabel, aGameVars[i].szLabel) == 0)
-			{
-				return GetGameVarID(i, iActor, iPlayer);
-			}
-		}
-	}
-	return lDefault;
+    int i=0;
+    for (;i<iGameVarCount;i++)
+    {
+        if (aGameVars[i].szLabel != NULL)
+        {
+            if (Bstrcmp(szGameLabel, aGameVars[i].szLabel) == 0)
+            {
+                return GetGameVarID(i, iActor, iPlayer);
+            }
+        }
+    }
+    return lDefault;
 }
 
 static intptr_t *GetGameValuePtr(const char *szGameLabel)
 {
-	int i=0;
+    int i=0;
 
-	for (;i<iGameVarCount;i++)
-	{
-		if (aGameVars[i].szLabel != NULL)
-		{
-			if (Bstrcmp(szGameLabel, aGameVars[i].szLabel) == 0)
-			{
-				if (aGameVars[i].dwFlags & (GAMEVAR_FLAG_PERACTOR | GAMEVAR_FLAG_PERPLAYER))
-				{
-					if (!aGameVars[i].plValues)
-					{
-						OSD_Printf("GetGameValuePtr(): INTERNAL ERROR: NULL array !!!\n");
-					}
-					return aGameVars[i].plValues;
-				}
-				return &(aGameVars[i].lValue);
-			}
-		}
-	}
-	//Bsprintf(g_szBuf,"Could not find value '%s'\n",szGameLabel);
-	//AddLog(g_szBuf);
-	return NULL;
+    for (;i<iGameVarCount;i++)
+    {
+        if (aGameVars[i].szLabel != NULL)
+        {
+            if (Bstrcmp(szGameLabel, aGameVars[i].szLabel) == 0)
+            {
+                if (aGameVars[i].dwFlags & (GAMEVAR_FLAG_PERACTOR | GAMEVAR_FLAG_PERPLAYER))
+                {
+                    if (!aGameVars[i].plValues)
+                    {
+                        OSD_Printf("GetGameValuePtr(): INTERNAL ERROR: NULL array !!!\n");
+                    }
+                    return aGameVars[i].plValues;
+                }
+                return &(aGameVars[i].lValue);
+            }
+        }
+    }
+    //Bsprintf(g_szBuf,"Could not find value '%s'\n",szGameLabel);
+    //AddLog(g_szBuf);
+    return NULL;
 }
 
 void ResetSystemDefaults(void)
 {
-	// call many times...
+    // call many times...
 
-	int i,j;
-	char aszBuf[64];
+    int i,j;
+    char aszBuf[64];
 
-	//AddLog("ResetWeaponDefaults");
+    //AddLog("ResetWeaponDefaults");
 
-	for (j=0;j<MAXPLAYERS;j++)
-	{
-		for (i=0;i<MAX_WEAPONS;i++)
-		{
-			Bsprintf(aszBuf,"WEAPON%d_CLIP",i);
-			aplWeaponClip[i][j]=GetGameVar(aszBuf,0, -1, j);
-			Bsprintf(aszBuf,"WEAPON%d_RELOAD",i);
-			aplWeaponReload[i][j]=GetGameVar(aszBuf,0, -1, j);
-			Bsprintf(aszBuf,"WEAPON%d_FIREDELAY",i);
-			aplWeaponFireDelay[i][j]=GetGameVar(aszBuf,0, -1, j);
-			Bsprintf(aszBuf,"WEAPON%d_TOTALTIME",i);
-			aplWeaponTotalTime[i][j]=GetGameVar(aszBuf,0, -1, j);
-			Bsprintf(aszBuf,"WEAPON%d_HOLDDELAY",i);
-			aplWeaponHoldDelay[i][j]=GetGameVar(aszBuf,0, -1, j);
-			Bsprintf(aszBuf,"WEAPON%d_FLAGS",i);
-			aplWeaponFlags[i][j]=GetGameVar(aszBuf,0, -1, j);
-			Bsprintf(aszBuf,"WEAPON%d_SHOOTS",i);
-			aplWeaponShoots[i][j]=GetGameVar(aszBuf,0, -1, j);
-			Bsprintf(aszBuf,"WEAPON%d_SPAWNTIME",i);
-			aplWeaponSpawnTime[i][j]=GetGameVar(aszBuf,0, -1, j);
-			Bsprintf(aszBuf,"WEAPON%d_SPAWN",i);
-			aplWeaponSpawn[i][j]=GetGameVar(aszBuf,0, -1, j);
-			Bsprintf(aszBuf,"WEAPON%d_SHOTSPERBURST",i);
-			aplWeaponShotsPerBurst[i][j]=GetGameVar(aszBuf,0, -1, j);
-			Bsprintf(aszBuf,"WEAPON%d_WORKSLIKE",i);
-			aplWeaponWorksLike[i][j]=GetGameVar(aszBuf,0, -1, j);
-			Bsprintf(aszBuf,"WEAPON%d_INITIALSOUND",i);
-			aplWeaponInitialSound[i][j]=GetGameVar(aszBuf,0, -1, j);
-			Bsprintf(aszBuf,"WEAPON%d_FIRESOUND",i);
-			aplWeaponFireSound[i][j]=GetGameVar(aszBuf,0, -1, j);
-			Bsprintf(aszBuf,"WEAPON%d_SOUND2TIME",i);
-			aplWeaponSound2Time[i][j]=GetGameVar(aszBuf,0, -1, j);
-			Bsprintf(aszBuf,"WEAPON%d_SOUND2SOUND",i);
-			aplWeaponSound2Sound[i][j]=GetGameVar(aszBuf,0, -1, j);
-			Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND1",i);
-			aplWeaponReloadSound1[i][j]=GetGameVar(aszBuf,0, -1, j);
-			Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND2",i);
-			aplWeaponReloadSound2[i][j]=GetGameVar(aszBuf,0, -1, j);
-		}
-	}
+    for (j=0;j<MAXPLAYERS;j++)
+    {
+        for (i=0;i<MAX_WEAPONS;i++)
+        {
+            Bsprintf(aszBuf,"WEAPON%d_CLIP",i);
+            aplWeaponClip[i][j]=GetGameVar(aszBuf,0, -1, j);
+            Bsprintf(aszBuf,"WEAPON%d_RELOAD",i);
+            aplWeaponReload[i][j]=GetGameVar(aszBuf,0, -1, j);
+            Bsprintf(aszBuf,"WEAPON%d_FIREDELAY",i);
+            aplWeaponFireDelay[i][j]=GetGameVar(aszBuf,0, -1, j);
+            Bsprintf(aszBuf,"WEAPON%d_TOTALTIME",i);
+            aplWeaponTotalTime[i][j]=GetGameVar(aszBuf,0, -1, j);
+            Bsprintf(aszBuf,"WEAPON%d_HOLDDELAY",i);
+            aplWeaponHoldDelay[i][j]=GetGameVar(aszBuf,0, -1, j);
+            Bsprintf(aszBuf,"WEAPON%d_FLAGS",i);
+            aplWeaponFlags[i][j]=GetGameVar(aszBuf,0, -1, j);
+            Bsprintf(aszBuf,"WEAPON%d_SHOOTS",i);
+            aplWeaponShoots[i][j]=GetGameVar(aszBuf,0, -1, j);
+            Bsprintf(aszBuf,"WEAPON%d_SPAWNTIME",i);
+            aplWeaponSpawnTime[i][j]=GetGameVar(aszBuf,0, -1, j);
+            Bsprintf(aszBuf,"WEAPON%d_SPAWN",i);
+            aplWeaponSpawn[i][j]=GetGameVar(aszBuf,0, -1, j);
+            Bsprintf(aszBuf,"WEAPON%d_SHOTSPERBURST",i);
+            aplWeaponShotsPerBurst[i][j]=GetGameVar(aszBuf,0, -1, j);
+            Bsprintf(aszBuf,"WEAPON%d_WORKSLIKE",i);
+            aplWeaponWorksLike[i][j]=GetGameVar(aszBuf,0, -1, j);
+            Bsprintf(aszBuf,"WEAPON%d_INITIALSOUND",i);
+            aplWeaponInitialSound[i][j]=GetGameVar(aszBuf,0, -1, j);
+            Bsprintf(aszBuf,"WEAPON%d_FIRESOUND",i);
+            aplWeaponFireSound[i][j]=GetGameVar(aszBuf,0, -1, j);
+            Bsprintf(aszBuf,"WEAPON%d_SOUND2TIME",i);
+            aplWeaponSound2Time[i][j]=GetGameVar(aszBuf,0, -1, j);
+            Bsprintf(aszBuf,"WEAPON%d_SOUND2SOUND",i);
+            aplWeaponSound2Sound[i][j]=GetGameVar(aszBuf,0, -1, j);
+            Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND1",i);
+            aplWeaponReloadSound1[i][j]=GetGameVar(aszBuf,0, -1, j);
+            Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND2",i);
+            aplWeaponReloadSound2[i][j]=GetGameVar(aszBuf,0, -1, j);
+        }
+    }
 
-	g_iReturnVarID=GetGameID("RETURN");
-	g_iWeaponVarID=GetGameID("WEAPON");
-	g_iWorksLikeVarID=GetGameID("WORKSLIKE");
-	g_iZRangeVarID=GetGameID("ZRANGE");
-	g_iAngRangeVarID=GetGameID("ANGRANGE");
-	g_iAimAngleVarID=GetGameID("AUTOAIMANGLE");
-	g_iLoTagID=GetGameID("LOTAG");
-	g_iHiTagID=GetGameID("HITAG");
-	g_iTextureID=GetGameID("TEXTURE");
-	g_iThisActorID=GetGameID("THISACTOR");
+    g_iReturnVarID=GetGameID("RETURN");
+    g_iWeaponVarID=GetGameID("WEAPON");
+    g_iWorksLikeVarID=GetGameID("WORKSLIKE");
+    g_iZRangeVarID=GetGameID("ZRANGE");
+    g_iAngRangeVarID=GetGameID("ANGRANGE");
+    g_iAimAngleVarID=GetGameID("AUTOAIMANGLE");
+    g_iLoTagID=GetGameID("LOTAG");
+    g_iHiTagID=GetGameID("HITAG");
+    g_iTextureID=GetGameID("TEXTURE");
+    g_iThisActorID=GetGameID("THISACTOR");
 
-	Bmemcpy(&projectile,&defaultprojectile,sizeof(projectile));
+    Bmemcpy(&projectile,&defaultprojectile,sizeof(projectile));
 
-	//AddLog("EOF:ResetWeaponDefaults");
+    //AddLog("EOF:ResetWeaponDefaults");
 }
 
 static void AddSystemVars()
 {
-	// only call ONCE
-	char aszBuf[64];
+    // only call ONCE
+    char aszBuf[64];
 
-	//AddLog("AddSystemVars");
+    //AddLog("AddSystemVars");
 
-	Bsprintf(aszBuf,"WEAPON%d_WORKSLIKE",KNEE_WEAPON);
-	AddGameVar(aszBuf, KNEE_WEAPON, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_CLIP",KNEE_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOAD",KNEE_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FIREDELAY",KNEE_WEAPON);
-	AddGameVar(aszBuf, 7, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_TOTALTIME",KNEE_WEAPON);
-	AddGameVar(aszBuf, 14, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_HOLDDELAY",KNEE_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FLAGS",KNEE_WEAPON);
-	AddGameVar(aszBuf, WEAPON_FLAG_NOVISIBLE | WEAPON_FLAG_RANDOMRESTART | WEAPON_FLAG_AUTOMATIC, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SHOOTS",KNEE_WEAPON);
-	AddGameVar(aszBuf, KNEE, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SPAWNTIME",KNEE_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SPAWN",KNEE_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SHOTSPERBURST",KNEE_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_INITIALSOUND",KNEE_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FIRESOUND",KNEE_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SOUND2TIME",KNEE_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SOUND2SOUND",KNEE_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND1",KNEE_WEAPON);
-	AddGameVar(aszBuf, EJECT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND2",KNEE_WEAPON);
-	AddGameVar(aszBuf, INSERT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_WORKSLIKE",KNEE_WEAPON);
+    AddGameVar(aszBuf, KNEE_WEAPON, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_CLIP",KNEE_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOAD",KNEE_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FIREDELAY",KNEE_WEAPON);
+    AddGameVar(aszBuf, 7, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_TOTALTIME",KNEE_WEAPON);
+    AddGameVar(aszBuf, 14, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_HOLDDELAY",KNEE_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FLAGS",KNEE_WEAPON);
+    AddGameVar(aszBuf, WEAPON_FLAG_NOVISIBLE | WEAPON_FLAG_RANDOMRESTART | WEAPON_FLAG_AUTOMATIC, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SHOOTS",KNEE_WEAPON);
+    AddGameVar(aszBuf, KNEE, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SPAWNTIME",KNEE_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SPAWN",KNEE_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SHOTSPERBURST",KNEE_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_INITIALSOUND",KNEE_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FIRESOUND",KNEE_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SOUND2TIME",KNEE_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SOUND2SOUND",KNEE_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND1",KNEE_WEAPON);
+    AddGameVar(aszBuf, EJECT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND2",KNEE_WEAPON);
+    AddGameVar(aszBuf, INSERT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
 
-	/////////////////////////////
-	Bsprintf(aszBuf,"WEAPON%d_WORKSLIKE",PISTOL_WEAPON);
-	AddGameVar(aszBuf, PISTOL_WEAPON, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_CLIP",PISTOL_WEAPON);
-	AddGameVar(aszBuf, NAM?20:12, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOAD",PISTOL_WEAPON);
-	AddGameVar(aszBuf, NAM?50:27, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FIREDELAY",PISTOL_WEAPON);
-	AddGameVar(aszBuf, 2, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_TOTALTIME",PISTOL_WEAPON);
-	AddGameVar(aszBuf, 5, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_HOLDDELAY",PISTOL_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FLAGS",PISTOL_WEAPON);
-	AddGameVar(aszBuf, NAM?WEAPON_FLAG_HOLSTER_CLEARS_CLIP:0 | WEAPON_FLAG_RELOAD_TIMING, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SHOOTS",PISTOL_WEAPON);
-	AddGameVar(aszBuf, SHOTSPARK1, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SPAWNTIME",PISTOL_WEAPON);
-	AddGameVar(aszBuf, 2, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SPAWN",PISTOL_WEAPON);
-	AddGameVar(aszBuf, SHELL, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SHOTSPERBURST",PISTOL_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_INITIALSOUND",PISTOL_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FIRESOUND",PISTOL_WEAPON);
-	AddGameVar(aszBuf, PISTOL_FIRE, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SOUND2TIME",PISTOL_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SOUND2SOUND",PISTOL_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND1",PISTOL_WEAPON);
-	AddGameVar(aszBuf, EJECT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND2",PISTOL_WEAPON);
-	AddGameVar(aszBuf, INSERT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    /////////////////////////////
+    Bsprintf(aszBuf,"WEAPON%d_WORKSLIKE",PISTOL_WEAPON);
+    AddGameVar(aszBuf, PISTOL_WEAPON, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_CLIP",PISTOL_WEAPON);
+    AddGameVar(aszBuf, NAM?20:12, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOAD",PISTOL_WEAPON);
+    AddGameVar(aszBuf, NAM?50:27, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FIREDELAY",PISTOL_WEAPON);
+    AddGameVar(aszBuf, 2, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_TOTALTIME",PISTOL_WEAPON);
+    AddGameVar(aszBuf, 5, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_HOLDDELAY",PISTOL_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FLAGS",PISTOL_WEAPON);
+    AddGameVar(aszBuf, NAM?WEAPON_FLAG_HOLSTER_CLEARS_CLIP:0 | WEAPON_FLAG_RELOAD_TIMING, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SHOOTS",PISTOL_WEAPON);
+    AddGameVar(aszBuf, SHOTSPARK1, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SPAWNTIME",PISTOL_WEAPON);
+    AddGameVar(aszBuf, 2, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SPAWN",PISTOL_WEAPON);
+    AddGameVar(aszBuf, SHELL, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SHOTSPERBURST",PISTOL_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_INITIALSOUND",PISTOL_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FIRESOUND",PISTOL_WEAPON);
+    AddGameVar(aszBuf, PISTOL_FIRE, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SOUND2TIME",PISTOL_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SOUND2SOUND",PISTOL_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND1",PISTOL_WEAPON);
+    AddGameVar(aszBuf, EJECT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND2",PISTOL_WEAPON);
+    AddGameVar(aszBuf, INSERT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
 
-	/////////////////////////////
-	Bsprintf(aszBuf,"WEAPON%d_WORKSLIKE",SHOTGUN_WEAPON);
-	AddGameVar(aszBuf, SHOTGUN_WEAPON, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_CLIP",SHOTGUN_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOAD",SHOTGUN_WEAPON);
-	AddGameVar(aszBuf, 13, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FIREDELAY",SHOTGUN_WEAPON);
-	AddGameVar(aszBuf, 4, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_TOTALTIME",SHOTGUN_WEAPON);
-	AddGameVar(aszBuf, 30, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_HOLDDELAY",SHOTGUN_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FLAGS",SHOTGUN_WEAPON);
-	AddGameVar(aszBuf, WEAPON_FLAG_CHECKATRELOAD, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SHOOTS",SHOTGUN_WEAPON);
-	AddGameVar(aszBuf, SHOTGUN, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SPAWNTIME",SHOTGUN_WEAPON);
-	AddGameVar(aszBuf, 24, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SPAWN",SHOTGUN_WEAPON);
-	AddGameVar(aszBuf, SHOTGUNSHELL, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SHOTSPERBURST",SHOTGUN_WEAPON);
-	AddGameVar(aszBuf, 7, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_INITIALSOUND",SHOTGUN_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FIRESOUND",SHOTGUN_WEAPON);
-	AddGameVar(aszBuf, SHOTGUN_FIRE, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SOUND2TIME",SHOTGUN_WEAPON);
-	AddGameVar(aszBuf, 15, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SOUND2SOUND",SHOTGUN_WEAPON);
-	AddGameVar(aszBuf, SHOTGUN_COCK, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND1",SHOTGUN_WEAPON);
-	AddGameVar(aszBuf, EJECT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND2",SHOTGUN_WEAPON);
-	AddGameVar(aszBuf, INSERT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    /////////////////////////////
+    Bsprintf(aszBuf,"WEAPON%d_WORKSLIKE",SHOTGUN_WEAPON);
+    AddGameVar(aszBuf, SHOTGUN_WEAPON, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_CLIP",SHOTGUN_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOAD",SHOTGUN_WEAPON);
+    AddGameVar(aszBuf, 13, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FIREDELAY",SHOTGUN_WEAPON);
+    AddGameVar(aszBuf, 4, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_TOTALTIME",SHOTGUN_WEAPON);
+    AddGameVar(aszBuf, 30, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_HOLDDELAY",SHOTGUN_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FLAGS",SHOTGUN_WEAPON);
+    AddGameVar(aszBuf, WEAPON_FLAG_CHECKATRELOAD, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SHOOTS",SHOTGUN_WEAPON);
+    AddGameVar(aszBuf, SHOTGUN, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SPAWNTIME",SHOTGUN_WEAPON);
+    AddGameVar(aszBuf, 24, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SPAWN",SHOTGUN_WEAPON);
+    AddGameVar(aszBuf, SHOTGUNSHELL, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SHOTSPERBURST",SHOTGUN_WEAPON);
+    AddGameVar(aszBuf, 7, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_INITIALSOUND",SHOTGUN_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FIRESOUND",SHOTGUN_WEAPON);
+    AddGameVar(aszBuf, SHOTGUN_FIRE, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SOUND2TIME",SHOTGUN_WEAPON);
+    AddGameVar(aszBuf, 15, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SOUND2SOUND",SHOTGUN_WEAPON);
+    AddGameVar(aszBuf, SHOTGUN_COCK, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND1",SHOTGUN_WEAPON);
+    AddGameVar(aszBuf, EJECT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND2",SHOTGUN_WEAPON);
+    AddGameVar(aszBuf, INSERT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
 
-	/////////////////////////////
-	Bsprintf(aszBuf,"WEAPON%d_WORKSLIKE",CHAINGUN_WEAPON);
-	AddGameVar(aszBuf, CHAINGUN_WEAPON, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_CLIP",CHAINGUN_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOAD",CHAINGUN_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FIREDELAY",CHAINGUN_WEAPON);
-	AddGameVar(aszBuf, 3, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_TOTALTIME",CHAINGUN_WEAPON);
-	AddGameVar(aszBuf, 12, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_HOLDDELAY",CHAINGUN_WEAPON);
-	AddGameVar(aszBuf, 3, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FLAGS",CHAINGUN_WEAPON);
-	AddGameVar(aszBuf, WEAPON_FLAG_AUTOMATIC | WEAPON_FLAG_FIREEVERYTHIRD | WEAPON_FLAG_AMMOPERSHOT | WEAPON_FLAG_SPAWNTYPE3 | WEAPON_FLAG_RESET, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SHOOTS",CHAINGUN_WEAPON);
-	AddGameVar(aszBuf, CHAINGUN, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SPAWNTIME",CHAINGUN_WEAPON);
-	AddGameVar(aszBuf, 1, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SPAWN",CHAINGUN_WEAPON);
-	AddGameVar(aszBuf, SHELL, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SHOTSPERBURST",CHAINGUN_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_INITIALSOUND",CHAINGUN_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FIRESOUND",CHAINGUN_WEAPON);
-	AddGameVar(aszBuf, CHAINGUN_FIRE, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SOUND2TIME",CHAINGUN_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SOUND2SOUND",CHAINGUN_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND1",CHAINGUN_WEAPON);
-	AddGameVar(aszBuf, EJECT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND2",CHAINGUN_WEAPON);
-	AddGameVar(aszBuf, INSERT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    /////////////////////////////
+    Bsprintf(aszBuf,"WEAPON%d_WORKSLIKE",CHAINGUN_WEAPON);
+    AddGameVar(aszBuf, CHAINGUN_WEAPON, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_CLIP",CHAINGUN_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOAD",CHAINGUN_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FIREDELAY",CHAINGUN_WEAPON);
+    AddGameVar(aszBuf, 3, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_TOTALTIME",CHAINGUN_WEAPON);
+    AddGameVar(aszBuf, 12, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_HOLDDELAY",CHAINGUN_WEAPON);
+    AddGameVar(aszBuf, 3, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FLAGS",CHAINGUN_WEAPON);
+    AddGameVar(aszBuf, WEAPON_FLAG_AUTOMATIC | WEAPON_FLAG_FIREEVERYTHIRD | WEAPON_FLAG_AMMOPERSHOT | WEAPON_FLAG_SPAWNTYPE3 | WEAPON_FLAG_RESET, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SHOOTS",CHAINGUN_WEAPON);
+    AddGameVar(aszBuf, CHAINGUN, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SPAWNTIME",CHAINGUN_WEAPON);
+    AddGameVar(aszBuf, 1, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SPAWN",CHAINGUN_WEAPON);
+    AddGameVar(aszBuf, SHELL, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SHOTSPERBURST",CHAINGUN_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_INITIALSOUND",CHAINGUN_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FIRESOUND",CHAINGUN_WEAPON);
+    AddGameVar(aszBuf, CHAINGUN_FIRE, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SOUND2TIME",CHAINGUN_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SOUND2SOUND",CHAINGUN_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND1",CHAINGUN_WEAPON);
+    AddGameVar(aszBuf, EJECT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND2",CHAINGUN_WEAPON);
+    AddGameVar(aszBuf, INSERT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
 
-	/////////////////////////////
-	Bsprintf(aszBuf,"WEAPON%d_WORKSLIKE",RPG_WEAPON);
-	AddGameVar(aszBuf, RPG_WEAPON, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_CLIP",RPG_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOAD",RPG_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FIREDELAY",RPG_WEAPON);
-	AddGameVar(aszBuf, 4, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_TOTALTIME",RPG_WEAPON);
-	AddGameVar(aszBuf, 20, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_HOLDDELAY",RPG_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FLAGS",RPG_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SHOOTS",RPG_WEAPON);
-	AddGameVar(aszBuf, RPG, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SPAWNTIME",RPG_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SPAWN",RPG_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SHOTSPERBURST",RPG_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_INITIALSOUND",RPG_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FIRESOUND",RPG_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SOUND2TIME",RPG_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SOUND2SOUND",RPG_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND1",RPG_WEAPON);
-	AddGameVar(aszBuf, EJECT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND2",RPG_WEAPON);
-	AddGameVar(aszBuf, INSERT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    /////////////////////////////
+    Bsprintf(aszBuf,"WEAPON%d_WORKSLIKE",RPG_WEAPON);
+    AddGameVar(aszBuf, RPG_WEAPON, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_CLIP",RPG_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOAD",RPG_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FIREDELAY",RPG_WEAPON);
+    AddGameVar(aszBuf, 4, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_TOTALTIME",RPG_WEAPON);
+    AddGameVar(aszBuf, 20, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_HOLDDELAY",RPG_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FLAGS",RPG_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SHOOTS",RPG_WEAPON);
+    AddGameVar(aszBuf, RPG, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SPAWNTIME",RPG_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SPAWN",RPG_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SHOTSPERBURST",RPG_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_INITIALSOUND",RPG_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FIRESOUND",RPG_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SOUND2TIME",RPG_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SOUND2SOUND",RPG_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND1",RPG_WEAPON);
+    AddGameVar(aszBuf, EJECT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND2",RPG_WEAPON);
+    AddGameVar(aszBuf, INSERT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
 
-	/////////////////////////////
-	Bsprintf(aszBuf,"WEAPON%d_WORKSLIKE",HANDBOMB_WEAPON);
-	AddGameVar(aszBuf, HANDBOMB_WEAPON, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_CLIP",HANDBOMB_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOAD",HANDBOMB_WEAPON);
-	AddGameVar(aszBuf, 30, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FIREDELAY",HANDBOMB_WEAPON);
-	AddGameVar(aszBuf, 6, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_TOTALTIME",HANDBOMB_WEAPON);
-	AddGameVar(aszBuf, 19, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_HOLDDELAY",HANDBOMB_WEAPON);
-	AddGameVar(aszBuf, 12, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FLAGS",HANDBOMB_WEAPON);
-	AddGameVar(aszBuf, WEAPON_FLAG_THROWIT, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SHOOTS",HANDBOMB_WEAPON);
-	AddGameVar(aszBuf, HEAVYHBOMB, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SPAWNTIME",HANDBOMB_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SPAWN",HANDBOMB_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SHOTSPERBURST",HANDBOMB_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_INITIALSOUND",HANDBOMB_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FIRESOUND",HANDBOMB_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SOUND2TIME",HANDBOMB_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SOUND2SOUND",HANDBOMB_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND1",HANDBOMB_WEAPON);
-	AddGameVar(aszBuf, EJECT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND2",HANDBOMB_WEAPON);
-	AddGameVar(aszBuf, INSERT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    /////////////////////////////
+    Bsprintf(aszBuf,"WEAPON%d_WORKSLIKE",HANDBOMB_WEAPON);
+    AddGameVar(aszBuf, HANDBOMB_WEAPON, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_CLIP",HANDBOMB_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOAD",HANDBOMB_WEAPON);
+    AddGameVar(aszBuf, 30, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FIREDELAY",HANDBOMB_WEAPON);
+    AddGameVar(aszBuf, 6, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_TOTALTIME",HANDBOMB_WEAPON);
+    AddGameVar(aszBuf, 19, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_HOLDDELAY",HANDBOMB_WEAPON);
+    AddGameVar(aszBuf, 12, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FLAGS",HANDBOMB_WEAPON);
+    AddGameVar(aszBuf, WEAPON_FLAG_THROWIT, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SHOOTS",HANDBOMB_WEAPON);
+    AddGameVar(aszBuf, HEAVYHBOMB, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SPAWNTIME",HANDBOMB_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SPAWN",HANDBOMB_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SHOTSPERBURST",HANDBOMB_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_INITIALSOUND",HANDBOMB_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FIRESOUND",HANDBOMB_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SOUND2TIME",HANDBOMB_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SOUND2SOUND",HANDBOMB_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND1",HANDBOMB_WEAPON);
+    AddGameVar(aszBuf, EJECT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND2",HANDBOMB_WEAPON);
+    AddGameVar(aszBuf, INSERT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
 
-	/////////////////////////////
-	Bsprintf(aszBuf,"WEAPON%d_WORKSLIKE",SHRINKER_WEAPON);
-	AddGameVar(aszBuf, SHRINKER_WEAPON, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_CLIP",SHRINKER_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOAD",SHRINKER_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FIREDELAY",SHRINKER_WEAPON);
-	AddGameVar(aszBuf, 10, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_TOTALTIME",SHRINKER_WEAPON);
-	AddGameVar(aszBuf, NAM?30:12, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_HOLDDELAY",SHRINKER_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FLAGS",SHRINKER_WEAPON);
-	AddGameVar(aszBuf, WEAPON_FLAG_GLOWS, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SHOOTS",SHRINKER_WEAPON);
-	AddGameVar(aszBuf, SHRINKER, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SPAWNTIME",SHRINKER_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SPAWN",SHRINKER_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SHOTSPERBURST",SHRINKER_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_INITIALSOUND",SHRINKER_WEAPON);
-	AddGameVar(aszBuf, SHRINKER_FIRE, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FIRESOUND",SHRINKER_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SOUND2TIME",SHRINKER_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SOUND2SOUND",SHRINKER_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND1",SHRINKER_WEAPON);
-	AddGameVar(aszBuf, EJECT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND2",SHRINKER_WEAPON);
-	AddGameVar(aszBuf, INSERT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    /////////////////////////////
+    Bsprintf(aszBuf,"WEAPON%d_WORKSLIKE",SHRINKER_WEAPON);
+    AddGameVar(aszBuf, SHRINKER_WEAPON, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_CLIP",SHRINKER_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOAD",SHRINKER_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FIREDELAY",SHRINKER_WEAPON);
+    AddGameVar(aszBuf, 10, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_TOTALTIME",SHRINKER_WEAPON);
+    AddGameVar(aszBuf, NAM?30:12, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_HOLDDELAY",SHRINKER_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FLAGS",SHRINKER_WEAPON);
+    AddGameVar(aszBuf, WEAPON_FLAG_GLOWS, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SHOOTS",SHRINKER_WEAPON);
+    AddGameVar(aszBuf, SHRINKER, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SPAWNTIME",SHRINKER_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SPAWN",SHRINKER_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SHOTSPERBURST",SHRINKER_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_INITIALSOUND",SHRINKER_WEAPON);
+    AddGameVar(aszBuf, SHRINKER_FIRE, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FIRESOUND",SHRINKER_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SOUND2TIME",SHRINKER_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SOUND2SOUND",SHRINKER_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND1",SHRINKER_WEAPON);
+    AddGameVar(aszBuf, EJECT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND2",SHRINKER_WEAPON);
+    AddGameVar(aszBuf, INSERT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
 
-	/////////////////////////////
-	Bsprintf(aszBuf,"WEAPON%d_WORKSLIKE",DEVISTATOR_WEAPON);
-	AddGameVar(aszBuf, DEVISTATOR_WEAPON, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_CLIP",DEVISTATOR_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOAD",DEVISTATOR_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FIREDELAY",DEVISTATOR_WEAPON);
-	AddGameVar(aszBuf, 3, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_TOTALTIME",DEVISTATOR_WEAPON);
-	AddGameVar(aszBuf, 6, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_HOLDDELAY",DEVISTATOR_WEAPON);
-	AddGameVar(aszBuf, 5, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FLAGS",DEVISTATOR_WEAPON);
-	AddGameVar(aszBuf, WEAPON_FLAG_FIREEVERYOTHER | WEAPON_FLAG_AMMOPERSHOT, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SHOOTS",DEVISTATOR_WEAPON);
-	AddGameVar(aszBuf, RPG, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SPAWNTIME",DEVISTATOR_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SPAWN",DEVISTATOR_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SHOTSPERBURST",DEVISTATOR_WEAPON);
-	AddGameVar(aszBuf, 2, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_INITIALSOUND",DEVISTATOR_WEAPON);
-	AddGameVar(aszBuf, CAT_FIRE, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FIRESOUND",DEVISTATOR_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SOUND2TIME",DEVISTATOR_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SOUND2SOUND",DEVISTATOR_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND1",DEVISTATOR_WEAPON);
-	AddGameVar(aszBuf, EJECT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND2",DEVISTATOR_WEAPON);
-	AddGameVar(aszBuf, INSERT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    /////////////////////////////
+    Bsprintf(aszBuf,"WEAPON%d_WORKSLIKE",DEVISTATOR_WEAPON);
+    AddGameVar(aszBuf, DEVISTATOR_WEAPON, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_CLIP",DEVISTATOR_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOAD",DEVISTATOR_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FIREDELAY",DEVISTATOR_WEAPON);
+    AddGameVar(aszBuf, 3, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_TOTALTIME",DEVISTATOR_WEAPON);
+    AddGameVar(aszBuf, 6, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_HOLDDELAY",DEVISTATOR_WEAPON);
+    AddGameVar(aszBuf, 5, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FLAGS",DEVISTATOR_WEAPON);
+    AddGameVar(aszBuf, WEAPON_FLAG_FIREEVERYOTHER | WEAPON_FLAG_AMMOPERSHOT, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SHOOTS",DEVISTATOR_WEAPON);
+    AddGameVar(aszBuf, RPG, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SPAWNTIME",DEVISTATOR_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SPAWN",DEVISTATOR_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SHOTSPERBURST",DEVISTATOR_WEAPON);
+    AddGameVar(aszBuf, 2, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_INITIALSOUND",DEVISTATOR_WEAPON);
+    AddGameVar(aszBuf, CAT_FIRE, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FIRESOUND",DEVISTATOR_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SOUND2TIME",DEVISTATOR_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SOUND2SOUND",DEVISTATOR_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND1",DEVISTATOR_WEAPON);
+    AddGameVar(aszBuf, EJECT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND2",DEVISTATOR_WEAPON);
+    AddGameVar(aszBuf, INSERT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
 
-	/////////////////////////////
-	Bsprintf(aszBuf,"WEAPON%d_WORKSLIKE",TRIPBOMB_WEAPON);
-	AddGameVar(aszBuf, TRIPBOMB_WEAPON, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_CLIP",TRIPBOMB_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOAD",TRIPBOMB_WEAPON);
-	AddGameVar(aszBuf, 16, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FIREDELAY",TRIPBOMB_WEAPON);
-	AddGameVar(aszBuf, 3, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_TOTALTIME",TRIPBOMB_WEAPON);
-	AddGameVar(aszBuf, 16, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_HOLDDELAY",TRIPBOMB_WEAPON);
-	AddGameVar(aszBuf, 7, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FLAGS",TRIPBOMB_WEAPON);
-	AddGameVar(aszBuf, WEAPON_FLAG_STANDSTILL | WEAPON_FLAG_CHECKATRELOAD, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SHOOTS",TRIPBOMB_WEAPON);
-	AddGameVar(aszBuf, HANDHOLDINGLASER, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SPAWNTIME",TRIPBOMB_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SPAWN",TRIPBOMB_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SHOTSPERBURST",TRIPBOMB_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_INITIALSOUND",TRIPBOMB_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FIRESOUND",TRIPBOMB_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SOUND2TIME",TRIPBOMB_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SOUND2SOUND",TRIPBOMB_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND1",TRIPBOMB_WEAPON);
-	AddGameVar(aszBuf, EJECT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND2",TRIPBOMB_WEAPON);
-	AddGameVar(aszBuf, INSERT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    /////////////////////////////
+    Bsprintf(aszBuf,"WEAPON%d_WORKSLIKE",TRIPBOMB_WEAPON);
+    AddGameVar(aszBuf, TRIPBOMB_WEAPON, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_CLIP",TRIPBOMB_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOAD",TRIPBOMB_WEAPON);
+    AddGameVar(aszBuf, 16, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FIREDELAY",TRIPBOMB_WEAPON);
+    AddGameVar(aszBuf, 3, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_TOTALTIME",TRIPBOMB_WEAPON);
+    AddGameVar(aszBuf, 16, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_HOLDDELAY",TRIPBOMB_WEAPON);
+    AddGameVar(aszBuf, 7, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FLAGS",TRIPBOMB_WEAPON);
+    AddGameVar(aszBuf, WEAPON_FLAG_STANDSTILL | WEAPON_FLAG_CHECKATRELOAD, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SHOOTS",TRIPBOMB_WEAPON);
+    AddGameVar(aszBuf, HANDHOLDINGLASER, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SPAWNTIME",TRIPBOMB_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SPAWN",TRIPBOMB_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SHOTSPERBURST",TRIPBOMB_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_INITIALSOUND",TRIPBOMB_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FIRESOUND",TRIPBOMB_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SOUND2TIME",TRIPBOMB_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SOUND2SOUND",TRIPBOMB_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND1",TRIPBOMB_WEAPON);
+    AddGameVar(aszBuf, EJECT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND2",TRIPBOMB_WEAPON);
+    AddGameVar(aszBuf, INSERT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
 
-	/////////////////////////////
-	Bsprintf(aszBuf,"WEAPON%d_WORKSLIKE",FREEZE_WEAPON);
-	AddGameVar(aszBuf, FREEZE_WEAPON, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_CLIP",FREEZE_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOAD",FREEZE_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FIREDELAY",FREEZE_WEAPON);
-	AddGameVar(aszBuf, 3, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_TOTALTIME",FREEZE_WEAPON);
-	AddGameVar(aszBuf, 5, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_HOLDDELAY",FREEZE_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FLAGS",FREEZE_WEAPON);
-	AddGameVar(aszBuf, WEAPON_FLAG_RESET, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SHOOTS",FREEZE_WEAPON);
-	AddGameVar(aszBuf, FREEZEBLAST, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SPAWNTIME",FREEZE_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SPAWN",FREEZE_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SHOTSPERBURST",FREEZE_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_INITIALSOUND",FREEZE_WEAPON);
-	AddGameVar(aszBuf, CAT_FIRE, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FIRESOUND",FREEZE_WEAPON);
-	AddGameVar(aszBuf, CAT_FIRE, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SOUND2TIME",FREEZE_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SOUND2SOUND",FREEZE_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND1",FREEZE_WEAPON);
-	AddGameVar(aszBuf, EJECT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND2",FREEZE_WEAPON);
-	AddGameVar(aszBuf, INSERT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    /////////////////////////////
+    Bsprintf(aszBuf,"WEAPON%d_WORKSLIKE",FREEZE_WEAPON);
+    AddGameVar(aszBuf, FREEZE_WEAPON, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_CLIP",FREEZE_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOAD",FREEZE_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FIREDELAY",FREEZE_WEAPON);
+    AddGameVar(aszBuf, 3, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_TOTALTIME",FREEZE_WEAPON);
+    AddGameVar(aszBuf, 5, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_HOLDDELAY",FREEZE_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FLAGS",FREEZE_WEAPON);
+    AddGameVar(aszBuf, WEAPON_FLAG_RESET, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SHOOTS",FREEZE_WEAPON);
+    AddGameVar(aszBuf, FREEZEBLAST, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SPAWNTIME",FREEZE_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SPAWN",FREEZE_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SHOTSPERBURST",FREEZE_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_INITIALSOUND",FREEZE_WEAPON);
+    AddGameVar(aszBuf, CAT_FIRE, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FIRESOUND",FREEZE_WEAPON);
+    AddGameVar(aszBuf, CAT_FIRE, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SOUND2TIME",FREEZE_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SOUND2SOUND",FREEZE_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND1",FREEZE_WEAPON);
+    AddGameVar(aszBuf, EJECT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND2",FREEZE_WEAPON);
+    AddGameVar(aszBuf, INSERT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
 
-	/////////////////////////////
-	Bsprintf(aszBuf,"WEAPON%d_WORKSLIKE",HANDREMOTE_WEAPON);
-	AddGameVar(aszBuf, HANDREMOTE_WEAPON, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_CLIP",HANDREMOTE_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOAD",HANDREMOTE_WEAPON);
-	AddGameVar(aszBuf, 10, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FIREDELAY",HANDREMOTE_WEAPON);
-	AddGameVar(aszBuf, 2, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_TOTALTIME",HANDREMOTE_WEAPON);
-	AddGameVar(aszBuf, 10, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_HOLDDELAY",HANDREMOTE_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FLAGS",HANDREMOTE_WEAPON);
-	AddGameVar(aszBuf, WEAPON_FLAG_BOMB_TRIGGER | WEAPON_FLAG_NOVISIBLE, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SHOOTS",HANDREMOTE_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SPAWNTIME",HANDREMOTE_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SPAWN",HANDREMOTE_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SHOTSPERBURST",HANDREMOTE_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_INITIALSOUND",HANDREMOTE_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FIRESOUND",HANDREMOTE_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SOUND2TIME",HANDREMOTE_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SOUND2SOUND",HANDREMOTE_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND1",HANDREMOTE_WEAPON);
-	AddGameVar(aszBuf, EJECT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND2",HANDREMOTE_WEAPON);
-	AddGameVar(aszBuf, INSERT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    /////////////////////////////
+    Bsprintf(aszBuf,"WEAPON%d_WORKSLIKE",HANDREMOTE_WEAPON);
+    AddGameVar(aszBuf, HANDREMOTE_WEAPON, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_CLIP",HANDREMOTE_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOAD",HANDREMOTE_WEAPON);
+    AddGameVar(aszBuf, 10, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FIREDELAY",HANDREMOTE_WEAPON);
+    AddGameVar(aszBuf, 2, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_TOTALTIME",HANDREMOTE_WEAPON);
+    AddGameVar(aszBuf, 10, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_HOLDDELAY",HANDREMOTE_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FLAGS",HANDREMOTE_WEAPON);
+    AddGameVar(aszBuf, WEAPON_FLAG_BOMB_TRIGGER | WEAPON_FLAG_NOVISIBLE, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SHOOTS",HANDREMOTE_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SPAWNTIME",HANDREMOTE_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SPAWN",HANDREMOTE_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SHOTSPERBURST",HANDREMOTE_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_INITIALSOUND",HANDREMOTE_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FIRESOUND",HANDREMOTE_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SOUND2TIME",HANDREMOTE_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SOUND2SOUND",HANDREMOTE_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND1",HANDREMOTE_WEAPON);
+    AddGameVar(aszBuf, EJECT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND2",HANDREMOTE_WEAPON);
+    AddGameVar(aszBuf, INSERT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
 
-	///////////////////////////////////////////////////////
-	Bsprintf(aszBuf,"WEAPON%d_WORKSLIKE",GROW_WEAPON);
-	AddGameVar(aszBuf, GROW_WEAPON, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_CLIP",GROW_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOAD",GROW_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FIREDELAY",GROW_WEAPON);
-	AddGameVar(aszBuf, 3, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_TOTALTIME",GROW_WEAPON);
-	AddGameVar(aszBuf, NAM?30:5, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_HOLDDELAY",GROW_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FLAGS",GROW_WEAPON);
-	AddGameVar(aszBuf, WEAPON_FLAG_GLOWS, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SHOOTS",GROW_WEAPON);
-	AddGameVar(aszBuf, GROWSPARK, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SPAWNTIME",GROW_WEAPON);
-	AddGameVar(aszBuf, NAM?2:0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SPAWN",GROW_WEAPON);
-	AddGameVar(aszBuf, NAM?SHELL:0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SHOTSPERBURST",GROW_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_INITIALSOUND",GROW_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_FIRESOUND",GROW_WEAPON);
-	AddGameVar(aszBuf, NAM?0:EXPANDERSHOOT, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SOUND2TIME",GROW_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_SOUND2SOUND",GROW_WEAPON);
-	AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND1",GROW_WEAPON);
-	AddGameVar(aszBuf, EJECT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND2",GROW_WEAPON);
-	AddGameVar(aszBuf, INSERT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    ///////////////////////////////////////////////////////
+    Bsprintf(aszBuf,"WEAPON%d_WORKSLIKE",GROW_WEAPON);
+    AddGameVar(aszBuf, GROW_WEAPON, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_CLIP",GROW_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOAD",GROW_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FIREDELAY",GROW_WEAPON);
+    AddGameVar(aszBuf, 3, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_TOTALTIME",GROW_WEAPON);
+    AddGameVar(aszBuf, NAM?30:5, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_HOLDDELAY",GROW_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FLAGS",GROW_WEAPON);
+    AddGameVar(aszBuf, WEAPON_FLAG_GLOWS, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SHOOTS",GROW_WEAPON);
+    AddGameVar(aszBuf, GROWSPARK, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SPAWNTIME",GROW_WEAPON);
+    AddGameVar(aszBuf, NAM?2:0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SPAWN",GROW_WEAPON);
+    AddGameVar(aszBuf, NAM?SHELL:0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SHOTSPERBURST",GROW_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_INITIALSOUND",GROW_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_FIRESOUND",GROW_WEAPON);
+    AddGameVar(aszBuf, NAM?0:EXPANDERSHOOT, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SOUND2TIME",GROW_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_SOUND2SOUND",GROW_WEAPON);
+    AddGameVar(aszBuf, 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND1",GROW_WEAPON);
+    AddGameVar(aszBuf, EJECT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND2",GROW_WEAPON);
+    AddGameVar(aszBuf, INSERT_CLIP, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
 
-	AddGameVar("GRENADE_LIFETIME", NAM_GRENADE_LIFETIME, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	AddGameVar("GRENADE_LIFETIME_VAR", NAM_GRENADE_LIFETIME_VAR, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    AddGameVar("GRENADE_LIFETIME", NAM_GRENADE_LIFETIME, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    AddGameVar("GRENADE_LIFETIME_VAR", NAM_GRENADE_LIFETIME_VAR, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
 
-	AddGameVar("STICKYBOMB_LIFETIME", NAM_GRENADE_LIFETIME, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	AddGameVar("STICKYBOMB_LIFETIME_VAR", NAM_GRENADE_LIFETIME_VAR, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    AddGameVar("STICKYBOMB_LIFETIME", NAM_GRENADE_LIFETIME, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    AddGameVar("STICKYBOMB_LIFETIME_VAR", NAM_GRENADE_LIFETIME_VAR, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
 
-	AddGameVar("TRIPBOMB_CONTROL", TRIPBOMB_TRIPWIRE, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	AddGameVar("PIPEBOMB_CONTROL", NAM?PIPEBOMB_TIMER:PIPEBOMB_REMOTE, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    AddGameVar("TRIPBOMB_CONTROL", TRIPBOMB_TRIPWIRE, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    AddGameVar("PIPEBOMB_CONTROL", NAM?PIPEBOMB_TIMER:PIPEBOMB_REMOTE, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
 
-	AddGameVar("RESPAWN_MONSTERS", (int)&ud.respawn_monsters,GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR);
-	AddGameVar("RESPAWN_ITEMS",(int)&ud.respawn_items, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR);
-	AddGameVar("RESPAWN_INVENTORY",(int)&ud.respawn_inventory, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR);
-	AddGameVar("MONSTERS_OFF",(int)&ud.monsters_off, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR);
-	AddGameVar("MARKER",(int)&ud.marker, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR);
-	AddGameVar("FFIRE",(int)&ud.ffire, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR);
-	AddGameVar("LEVEL",(int)&ud.level_number, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_READONLY);
-	AddGameVar("VOLUME",(int)&ud.volume_number, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_READONLY);
+    AddGameVar("RESPAWN_MONSTERS", (int)&ud.respawn_monsters,GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR);
+    AddGameVar("RESPAWN_ITEMS",(int)&ud.respawn_items, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR);
+    AddGameVar("RESPAWN_INVENTORY",(int)&ud.respawn_inventory, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR);
+    AddGameVar("MONSTERS_OFF",(int)&ud.monsters_off, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR);
+    AddGameVar("MARKER",(int)&ud.marker, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR);
+    AddGameVar("FFIRE",(int)&ud.ffire, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR);
+    AddGameVar("LEVEL",(int)&ud.level_number, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_READONLY);
+    AddGameVar("VOLUME",(int)&ud.volume_number, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_READONLY);
 
-	AddGameVar("COOP",(int)&ud.coop, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR);
-	AddGameVar("MULTIMODE",(int)&ud.multimode, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR);
+    AddGameVar("COOP",(int)&ud.coop, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR);
+    AddGameVar("MULTIMODE",(int)&ud.multimode, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR);
 
-	AddGameVar("WEAPON", 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_READONLY | GAMEVAR_FLAG_SYSTEM);
-	AddGameVar("WORKSLIKE", 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_READONLY | GAMEVAR_FLAG_SYSTEM);
-	AddGameVar("RETURN", 0, GAMEVAR_FLAG_SYSTEM);
-	AddGameVar("ZRANGE", 4, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	AddGameVar("ANGRANGE", 18, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	AddGameVar("AUTOAIMANGLE", 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
-	AddGameVar("LOTAG", 0, GAMEVAR_FLAG_SYSTEM);
-	AddGameVar("HITAG", 0, GAMEVAR_FLAG_SYSTEM);
-	AddGameVar("TEXTURE", 0, GAMEVAR_FLAG_SYSTEM);
-	AddGameVar("THISACTOR", 0, GAMEVAR_FLAG_READONLY | GAMEVAR_FLAG_SYSTEM);
-	AddGameVar("myconnectindex", (int)&myconnectindex, GAMEVAR_FLAG_READONLY | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("screenpeek", (int)&screenpeek, GAMEVAR_FLAG_READONLY | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("currentweapon",(int)&g_currentweapon, GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("gs",(int)&g_gs, GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("looking_arc",(int)&g_looking_arc, GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("gun_pos",(int)&g_gun_pos, GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("weapon_xoffset",(int)&g_weapon_xoffset, GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("weaponcount",(int)&g_kb, GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("looking_angSR1",(int)&g_looking_angSR1, GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("xdim",(int)&xdim, GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_READONLY | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("ydim",(int)&ydim, GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_READONLY | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("windowx1",(int)&windowx1, GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_READONLY | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("windowx2",(int)&windowx2, GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_READONLY | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("windowy1",(int)&windowy1, GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_READONLY | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("windowy2",(int)&windowy2, GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_READONLY | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("totalclock",(int)&totalclock, GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_READONLY | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("lastvisinc",(int)&lastvisinc, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("numsectors",(int)&numsectors, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_READONLY);
-	AddGameVar("numplayers",(int)&numplayers, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_READONLY);
-	AddGameVar("viewingrange",(int)&viewingrange, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_READONLY | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("yxaspect",(int)&yxaspect, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_READONLY | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("gravitationalconstant",(int)&gc, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR);
-	AddGameVar("gametype_flags",(int)&gametype_flags[ud.coop], GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR);
-	AddGameVar("framerate",(int)&framerate, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_READONLY | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("CLIPMASK0", CLIPMASK0, GAMEVAR_FLAG_SYSTEM|GAMEVAR_FLAG_READONLY);
-	AddGameVar("CLIPMASK1", CLIPMASK1, GAMEVAR_FLAG_SYSTEM|GAMEVAR_FLAG_READONLY);
+    AddGameVar("WEAPON", 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_READONLY | GAMEVAR_FLAG_SYSTEM);
+    AddGameVar("WORKSLIKE", 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_READONLY | GAMEVAR_FLAG_SYSTEM);
+    AddGameVar("RETURN", 0, GAMEVAR_FLAG_SYSTEM);
+    AddGameVar("ZRANGE", 4, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    AddGameVar("ANGRANGE", 18, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    AddGameVar("AUTOAIMANGLE", 0, GAMEVAR_FLAG_PERPLAYER | GAMEVAR_FLAG_SYSTEM);
+    AddGameVar("LOTAG", 0, GAMEVAR_FLAG_SYSTEM);
+    AddGameVar("HITAG", 0, GAMEVAR_FLAG_SYSTEM);
+    AddGameVar("TEXTURE", 0, GAMEVAR_FLAG_SYSTEM);
+    AddGameVar("THISACTOR", 0, GAMEVAR_FLAG_READONLY | GAMEVAR_FLAG_SYSTEM);
+    AddGameVar("myconnectindex", (int)&myconnectindex, GAMEVAR_FLAG_READONLY | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("screenpeek", (int)&screenpeek, GAMEVAR_FLAG_READONLY | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("currentweapon",(int)&g_currentweapon, GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("gs",(int)&g_gs, GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("looking_arc",(int)&g_looking_arc, GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("gun_pos",(int)&g_gun_pos, GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("weapon_xoffset",(int)&g_weapon_xoffset, GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("weaponcount",(int)&g_kb, GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("looking_angSR1",(int)&g_looking_angSR1, GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("xdim",(int)&xdim, GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_READONLY | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("ydim",(int)&ydim, GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_READONLY | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("windowx1",(int)&windowx1, GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_READONLY | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("windowx2",(int)&windowx2, GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_READONLY | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("windowy1",(int)&windowy1, GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_READONLY | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("windowy2",(int)&windowy2, GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_READONLY | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("totalclock",(int)&totalclock, GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_READONLY | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("lastvisinc",(int)&lastvisinc, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("numsectors",(int)&numsectors, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_READONLY);
+    AddGameVar("numplayers",(int)&numplayers, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_READONLY);
+    AddGameVar("viewingrange",(int)&viewingrange, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_READONLY | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("yxaspect",(int)&yxaspect, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_READONLY | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("gravitationalconstant",(int)&gc, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR);
+    AddGameVar("gametype_flags",(int)&gametype_flags[ud.coop], GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR);
+    AddGameVar("framerate",(int)&framerate, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_READONLY | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("CLIPMASK0", CLIPMASK0, GAMEVAR_FLAG_SYSTEM|GAMEVAR_FLAG_READONLY);
+    AddGameVar("CLIPMASK1", CLIPMASK1, GAMEVAR_FLAG_SYSTEM|GAMEVAR_FLAG_READONLY);
 
-	AddGameVar("camerax",(int)&ud.camerax, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("cameray",(int)&ud.cameray, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("cameraz",(int)&ud.cameraz, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("cameraang",(int)&ud.cameraang, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SHORTPTR | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("camerahoriz",(int)&ud.camerahoriz, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SHORTPTR | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("camerasect",(int)&ud.camerasect, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SHORTPTR | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("cameradist",(int)&cameradist, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("cameraclock",(int)&cameraclock, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("camerax",(int)&ud.camerax, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("cameray",(int)&ud.cameray, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("cameraz",(int)&ud.cameraz, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("cameraang",(int)&ud.cameraang, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SHORTPTR | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("camerahoriz",(int)&ud.camerahoriz, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SHORTPTR | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("camerasect",(int)&ud.camerasect, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SHORTPTR | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("cameradist",(int)&cameradist, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("cameraclock",(int)&cameraclock, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYNCCHECK);
 
-	AddGameVar("myx",(int)&myx, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("myy",(int)&myy, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("myz",(int)&myz, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("omyx",(int)&omyx, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("omyy",(int)&omyy, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("omyz",(int)&omyz, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("myxvel",(int)&myxvel, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("myyvel",(int)&myyvel, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("myzvel",(int)&myzvel, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("myx",(int)&myx, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("myy",(int)&myy, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("myz",(int)&myz, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("omyx",(int)&omyx, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("omyy",(int)&omyy, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("omyz",(int)&omyz, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("myxvel",(int)&myxvel, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("myyvel",(int)&myyvel, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("myzvel",(int)&myzvel, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_SYNCCHECK);
 
-	AddGameVar("myhoriz",(int)&myhoriz, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SHORTPTR | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("myhorizoff",(int)&myhorizoff, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SHORTPTR | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("omyhoriz",(int)&omyhoriz, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SHORTPTR | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("omyhorizoff",(int)&omyhorizoff, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SHORTPTR | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("myang",(int)&myang, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SHORTPTR | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("omyang",(int)&omyang, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SHORTPTR | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("mycursectnum",(int)&mycursectnum, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SHORTPTR | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("myjumpingcounter",(int)&myjumpingcounter, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SHORTPTR | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("myhoriz",(int)&myhoriz, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SHORTPTR | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("myhorizoff",(int)&myhorizoff, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SHORTPTR | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("omyhoriz",(int)&omyhoriz, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SHORTPTR | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("omyhorizoff",(int)&omyhorizoff, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SHORTPTR | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("myang",(int)&myang, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SHORTPTR | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("omyang",(int)&omyang, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SHORTPTR | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("mycursectnum",(int)&mycursectnum, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SHORTPTR | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("myjumpingcounter",(int)&myjumpingcounter, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_SHORTPTR | GAMEVAR_FLAG_SYNCCHECK);
 
-	AddGameVar("myjumpingtoggle",(int)&myjumpingtoggle, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_CHARPTR | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("myonground",(int)&myonground, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_CHARPTR | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("myhardlanding",(int)&myhardlanding, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_CHARPTR | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("myreturntocenter",(int)&myreturntocenter, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_CHARPTR | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("myjumpingtoggle",(int)&myjumpingtoggle, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_CHARPTR | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("myonground",(int)&myonground, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_CHARPTR | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("myhardlanding",(int)&myhardlanding, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_CHARPTR | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("myreturntocenter",(int)&myreturntocenter, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_CHARPTR | GAMEVAR_FLAG_SYNCCHECK);
 
-	AddGameVar("display_mirror",(int)&display_mirror, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_CHARPTR | GAMEVAR_FLAG_SYNCCHECK);
-	AddGameVar("randomseed",(int)&randomseed, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR);
+    AddGameVar("display_mirror",(int)&display_mirror, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_CHARPTR | GAMEVAR_FLAG_SYNCCHECK);
+    AddGameVar("randomseed",(int)&randomseed, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR);
 
-	AddGameVar("NUMWALLS",(int)&numwalls, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_READONLY);
-	AddGameVar("NUMSECTORS",(int)&numsectors, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_READONLY);
+    AddGameVar("NUMWALLS",(int)&numwalls, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_READONLY);
+    AddGameVar("NUMSECTORS",(int)&numsectors, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_INTPTR | GAMEVAR_FLAG_READONLY);
 }
 
 void InitGameVars(void)
 {
-	// only call ONCE
+    // only call ONCE
 
-	//  initprintf("Initializing game variables\n");
-	//AddLog("InitGameVars");
+    //  initprintf("Initializing game variables\n");
+    //AddLog("InitGameVars");
 
-	ClearGameVars();
-	AddSystemVars();
-	InitGameVarPointers();
-	ResetSystemDefaults();
+    ClearGameVars();
+    AddSystemVars();
+    InitGameVarPointers();
+    ResetSystemDefaults();
 }
 
 void InitGameVarPointers(void)
 {
-	int i;
-	char aszBuf[64];
-	// called from game Init AND when level is loaded...
+    int i;
+    char aszBuf[64];
+    // called from game Init AND when level is loaded...
 
-	//AddLog("InitGameVarPointers");
+    //AddLog("InitGameVarPointers");
 
-	for (i=0;i<MAX_WEAPONS;i++)
-	{
-		Bsprintf(aszBuf,"WEAPON%d_CLIP",i);
-		aplWeaponClip[i]=GetGameValuePtr(aszBuf);
-		if (!aplWeaponClip[i])
-		{
-			initprintf("ERROR: NULL Weapon\n");
-			exit(0);
-		}
-		Bsprintf(aszBuf,"WEAPON%d_RELOAD",i);
-		aplWeaponReload[i]=GetGameValuePtr(aszBuf);
-		Bsprintf(aszBuf,"WEAPON%d_FIREDELAY",i);
-		aplWeaponFireDelay[i]=GetGameValuePtr(aszBuf);
-		Bsprintf(aszBuf,"WEAPON%d_TOTALTIME",i);
-		aplWeaponTotalTime[i]=GetGameValuePtr(aszBuf);
-		Bsprintf(aszBuf,"WEAPON%d_HOLDDELAY",i);
-		aplWeaponHoldDelay[i]=GetGameValuePtr(aszBuf);
-		Bsprintf(aszBuf,"WEAPON%d_FLAGS",i);
-		aplWeaponFlags[i]=GetGameValuePtr(aszBuf);
-		Bsprintf(aszBuf,"WEAPON%d_SHOOTS",i);
-		aplWeaponShoots[i]=GetGameValuePtr(aszBuf);
-		Bsprintf(aszBuf,"WEAPON%d_SPAWNTIME",i);
-		aplWeaponSpawnTime[i]=GetGameValuePtr(aszBuf);
-		Bsprintf(aszBuf,"WEAPON%d_SPAWN",i);
-		aplWeaponSpawn[i]=GetGameValuePtr(aszBuf);
-		Bsprintf(aszBuf,"WEAPON%d_SHOTSPERBURST",i);
-		aplWeaponShotsPerBurst[i]=GetGameValuePtr(aszBuf);
-		Bsprintf(aszBuf,"WEAPON%d_WORKSLIKE",i);
-		aplWeaponWorksLike[i]=GetGameValuePtr(aszBuf);
-		Bsprintf(aszBuf,"WEAPON%d_INITIALSOUND",i);
-		aplWeaponInitialSound[i]=GetGameValuePtr(aszBuf);
-		Bsprintf(aszBuf,"WEAPON%d_FIRESOUND",i);
-		aplWeaponFireSound[i]=GetGameValuePtr(aszBuf);
-		Bsprintf(aszBuf,"WEAPON%d_SOUND2TIME",i);
-		aplWeaponSound2Time[i]=GetGameValuePtr(aszBuf);
-		Bsprintf(aszBuf,"WEAPON%d_SOUND2SOUND",i);
-		aplWeaponSound2Sound[i]=GetGameValuePtr(aszBuf);
-		Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND1",i);
-		aplWeaponReloadSound1[i]=GetGameValuePtr(aszBuf);
-		Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND2",i);
-		aplWeaponReloadSound2[i]=GetGameValuePtr(aszBuf);
-	}
+    for (i=0;i<MAX_WEAPONS;i++)
+    {
+        Bsprintf(aszBuf,"WEAPON%d_CLIP",i);
+        aplWeaponClip[i]=GetGameValuePtr(aszBuf);
+        if (!aplWeaponClip[i])
+        {
+            initprintf("ERROR: NULL Weapon\n");
+            exit(0);
+        }
+        Bsprintf(aszBuf,"WEAPON%d_RELOAD",i);
+        aplWeaponReload[i]=GetGameValuePtr(aszBuf);
+        Bsprintf(aszBuf,"WEAPON%d_FIREDELAY",i);
+        aplWeaponFireDelay[i]=GetGameValuePtr(aszBuf);
+        Bsprintf(aszBuf,"WEAPON%d_TOTALTIME",i);
+        aplWeaponTotalTime[i]=GetGameValuePtr(aszBuf);
+        Bsprintf(aszBuf,"WEAPON%d_HOLDDELAY",i);
+        aplWeaponHoldDelay[i]=GetGameValuePtr(aszBuf);
+        Bsprintf(aszBuf,"WEAPON%d_FLAGS",i);
+        aplWeaponFlags[i]=GetGameValuePtr(aszBuf);
+        Bsprintf(aszBuf,"WEAPON%d_SHOOTS",i);
+        aplWeaponShoots[i]=GetGameValuePtr(aszBuf);
+        Bsprintf(aszBuf,"WEAPON%d_SPAWNTIME",i);
+        aplWeaponSpawnTime[i]=GetGameValuePtr(aszBuf);
+        Bsprintf(aszBuf,"WEAPON%d_SPAWN",i);
+        aplWeaponSpawn[i]=GetGameValuePtr(aszBuf);
+        Bsprintf(aszBuf,"WEAPON%d_SHOTSPERBURST",i);
+        aplWeaponShotsPerBurst[i]=GetGameValuePtr(aszBuf);
+        Bsprintf(aszBuf,"WEAPON%d_WORKSLIKE",i);
+        aplWeaponWorksLike[i]=GetGameValuePtr(aszBuf);
+        Bsprintf(aszBuf,"WEAPON%d_INITIALSOUND",i);
+        aplWeaponInitialSound[i]=GetGameValuePtr(aszBuf);
+        Bsprintf(aszBuf,"WEAPON%d_FIRESOUND",i);
+        aplWeaponFireSound[i]=GetGameValuePtr(aszBuf);
+        Bsprintf(aszBuf,"WEAPON%d_SOUND2TIME",i);
+        aplWeaponSound2Time[i]=GetGameValuePtr(aszBuf);
+        Bsprintf(aszBuf,"WEAPON%d_SOUND2SOUND",i);
+        aplWeaponSound2Sound[i]=GetGameValuePtr(aszBuf);
+        Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND1",i);
+        aplWeaponReloadSound1[i]=GetGameValuePtr(aszBuf);
+        Bsprintf(aszBuf,"WEAPON%d_RELOADSOUND2",i);
+        aplWeaponReloadSound2[i]=GetGameValuePtr(aszBuf);
+    }
 }
 
 static void ResetPointerVars(void)
 {
-	aGameVars[GetGameID("RESPAWN_MONSTERS")].lValue = (intptr_t)&ud.respawn_monsters;
-	aGameVars[GetGameID("RESPAWN_ITEMS")].lValue = (intptr_t)&ud.respawn_items;
-	aGameVars[GetGameID("RESPAWN_INVENTORY")].lValue = (intptr_t)&ud.respawn_inventory;
-	aGameVars[GetGameID("MONSTERS_OFF")].lValue = (intptr_t)&ud.monsters_off;
-	aGameVars[GetGameID("MARKER")].lValue = (intptr_t)&ud.marker;
-	aGameVars[GetGameID("FFIRE")].lValue = (intptr_t)&ud.ffire;
-	aGameVars[GetGameID("LEVEL")].lValue = (intptr_t)&ud.level_number;
-	aGameVars[GetGameID("VOLUME")].lValue = (intptr_t)&ud.volume_number;
+    aGameVars[GetGameID("RESPAWN_MONSTERS")].lValue = (intptr_t)&ud.respawn_monsters;
+    aGameVars[GetGameID("RESPAWN_ITEMS")].lValue = (intptr_t)&ud.respawn_items;
+    aGameVars[GetGameID("RESPAWN_INVENTORY")].lValue = (intptr_t)&ud.respawn_inventory;
+    aGameVars[GetGameID("MONSTERS_OFF")].lValue = (intptr_t)&ud.monsters_off;
+    aGameVars[GetGameID("MARKER")].lValue = (intptr_t)&ud.marker;
+    aGameVars[GetGameID("FFIRE")].lValue = (intptr_t)&ud.ffire;
+    aGameVars[GetGameID("LEVEL")].lValue = (intptr_t)&ud.level_number;
+    aGameVars[GetGameID("VOLUME")].lValue = (intptr_t)&ud.volume_number;
 
-	aGameVars[GetGameID("COOP")].lValue = (intptr_t)&ud.coop;
-	aGameVars[GetGameID("MULTIMODE")].lValue = (intptr_t)&ud.multimode;
+    aGameVars[GetGameID("COOP")].lValue = (intptr_t)&ud.coop;
+    aGameVars[GetGameID("MULTIMODE")].lValue = (intptr_t)&ud.multimode;
 
-	aGameVars[GetGameID("myconnectindex")].lValue = (intptr_t)&myconnectindex;
-	aGameVars[GetGameID("screenpeek")].lValue = (intptr_t)&screenpeek;
-	aGameVars[GetGameID("currentweapon")].lValue = (intptr_t)&g_currentweapon;
-	aGameVars[GetGameID("gs")].lValue = (intptr_t)&g_gs;
-	aGameVars[GetGameID("looking_arc")].lValue = (intptr_t)&g_looking_arc;
-	aGameVars[GetGameID("gun_pos")].lValue = (intptr_t)&g_gun_pos;
-	aGameVars[GetGameID("weapon_xoffset")].lValue = (intptr_t)&g_weapon_xoffset;
-	aGameVars[GetGameID("weaponcount")].lValue = (intptr_t)&g_kb;
-	aGameVars[GetGameID("looking_angSR1")].lValue = (intptr_t)&g_looking_angSR1;
-	aGameVars[GetGameID("xdim")].lValue = (intptr_t)&xdim;
-	aGameVars[GetGameID("ydim")].lValue = (intptr_t)&ydim;
-	aGameVars[GetGameID("windowx1")].lValue = (intptr_t)&windowx1;
-	aGameVars[GetGameID("windowx2")].lValue = (intptr_t)&windowx2;
-	aGameVars[GetGameID("windowy1")].lValue = (intptr_t)&windowy1;
-	aGameVars[GetGameID("windowy2")].lValue = (intptr_t)&windowy2;
-	aGameVars[GetGameID("totalclock")].lValue = (intptr_t)&totalclock;
-	aGameVars[GetGameID("lastvisinc")].lValue = (intptr_t)&lastvisinc;
-	aGameVars[GetGameID("numsectors")].lValue = (intptr_t)&numsectors;
-	aGameVars[GetGameID("numplayers")].lValue = (intptr_t)&numplayers;
-	aGameVars[GetGameID("viewingrange")].lValue = (intptr_t)&viewingrange;
-	aGameVars[GetGameID("yxaspect")].lValue = (intptr_t)&yxaspect;
-	aGameVars[GetGameID("gravitationalconstant")].lValue = (intptr_t)&gc;
-	aGameVars[GetGameID("gametype_flags")].lValue = (intptr_t)&gametype_flags[ud.coop];
-	aGameVars[GetGameID("framerate")].lValue = (intptr_t)&framerate;
+    aGameVars[GetGameID("myconnectindex")].lValue = (intptr_t)&myconnectindex;
+    aGameVars[GetGameID("screenpeek")].lValue = (intptr_t)&screenpeek;
+    aGameVars[GetGameID("currentweapon")].lValue = (intptr_t)&g_currentweapon;
+    aGameVars[GetGameID("gs")].lValue = (intptr_t)&g_gs;
+    aGameVars[GetGameID("looking_arc")].lValue = (intptr_t)&g_looking_arc;
+    aGameVars[GetGameID("gun_pos")].lValue = (intptr_t)&g_gun_pos;
+    aGameVars[GetGameID("weapon_xoffset")].lValue = (intptr_t)&g_weapon_xoffset;
+    aGameVars[GetGameID("weaponcount")].lValue = (intptr_t)&g_kb;
+    aGameVars[GetGameID("looking_angSR1")].lValue = (intptr_t)&g_looking_angSR1;
+    aGameVars[GetGameID("xdim")].lValue = (intptr_t)&xdim;
+    aGameVars[GetGameID("ydim")].lValue = (intptr_t)&ydim;
+    aGameVars[GetGameID("windowx1")].lValue = (intptr_t)&windowx1;
+    aGameVars[GetGameID("windowx2")].lValue = (intptr_t)&windowx2;
+    aGameVars[GetGameID("windowy1")].lValue = (intptr_t)&windowy1;
+    aGameVars[GetGameID("windowy2")].lValue = (intptr_t)&windowy2;
+    aGameVars[GetGameID("totalclock")].lValue = (intptr_t)&totalclock;
+    aGameVars[GetGameID("lastvisinc")].lValue = (intptr_t)&lastvisinc;
+    aGameVars[GetGameID("numsectors")].lValue = (intptr_t)&numsectors;
+    aGameVars[GetGameID("numplayers")].lValue = (intptr_t)&numplayers;
+    aGameVars[GetGameID("viewingrange")].lValue = (intptr_t)&viewingrange;
+    aGameVars[GetGameID("yxaspect")].lValue = (intptr_t)&yxaspect;
+    aGameVars[GetGameID("gravitationalconstant")].lValue = (intptr_t)&gc;
+    aGameVars[GetGameID("gametype_flags")].lValue = (intptr_t)&gametype_flags[ud.coop];
+    aGameVars[GetGameID("framerate")].lValue = (intptr_t)&framerate;
 
-	aGameVars[GetGameID("camerax")].lValue = (intptr_t)&ud.camerax;
-	aGameVars[GetGameID("cameray")].lValue = (intptr_t)&ud.cameray;
-	aGameVars[GetGameID("cameraz")].lValue = (intptr_t)&ud.cameraz;
-	aGameVars[GetGameID("cameraang")].lValue = (intptr_t)&ud.cameraang;
-	aGameVars[GetGameID("camerahoriz")].lValue = (intptr_t)&ud.camerahoriz;
-	aGameVars[GetGameID("camerasect")].lValue = (intptr_t)&ud.camerasect;
-	aGameVars[GetGameID("cameradist")].lValue = (intptr_t)&cameradist;
-	aGameVars[GetGameID("cameraclock")].lValue = (intptr_t)&cameraclock;
+    aGameVars[GetGameID("camerax")].lValue = (intptr_t)&ud.camerax;
+    aGameVars[GetGameID("cameray")].lValue = (intptr_t)&ud.cameray;
+    aGameVars[GetGameID("cameraz")].lValue = (intptr_t)&ud.cameraz;
+    aGameVars[GetGameID("cameraang")].lValue = (intptr_t)&ud.cameraang;
+    aGameVars[GetGameID("camerahoriz")].lValue = (intptr_t)&ud.camerahoriz;
+    aGameVars[GetGameID("camerasect")].lValue = (intptr_t)&ud.camerasect;
+    aGameVars[GetGameID("cameradist")].lValue = (intptr_t)&cameradist;
+    aGameVars[GetGameID("cameraclock")].lValue = (intptr_t)&cameraclock;
 
-	aGameVars[GetGameID("myx")].lValue = (intptr_t)&myx;
-	aGameVars[GetGameID("myy")].lValue = (intptr_t)&myy;
-	aGameVars[GetGameID("myz")].lValue = (intptr_t)&myz;
-	aGameVars[GetGameID("omyx")].lValue = (intptr_t)&omyx;
-	aGameVars[GetGameID("omyy")].lValue = (intptr_t)&omyy;
-	aGameVars[GetGameID("omyz")].lValue = (intptr_t)&omyz;
-	aGameVars[GetGameID("myxvel")].lValue = (intptr_t)&myxvel;
-	aGameVars[GetGameID("myyvel")].lValue = (intptr_t)&myyvel;
-	aGameVars[GetGameID("myzvel")].lValue = (intptr_t)&myzvel;
+    aGameVars[GetGameID("myx")].lValue = (intptr_t)&myx;
+    aGameVars[GetGameID("myy")].lValue = (intptr_t)&myy;
+    aGameVars[GetGameID("myz")].lValue = (intptr_t)&myz;
+    aGameVars[GetGameID("omyx")].lValue = (intptr_t)&omyx;
+    aGameVars[GetGameID("omyy")].lValue = (intptr_t)&omyy;
+    aGameVars[GetGameID("omyz")].lValue = (intptr_t)&omyz;
+    aGameVars[GetGameID("myxvel")].lValue = (intptr_t)&myxvel;
+    aGameVars[GetGameID("myyvel")].lValue = (intptr_t)&myyvel;
+    aGameVars[GetGameID("myzvel")].lValue = (intptr_t)&myzvel;
 
-	aGameVars[GetGameID("myhoriz")].lValue = (intptr_t)&myhoriz;
-	aGameVars[GetGameID("myhorizoff")].lValue = (intptr_t)&myhorizoff;
-	aGameVars[GetGameID("omyhoriz")].lValue = (intptr_t)&omyhoriz;
-	aGameVars[GetGameID("omyhorizoff")].lValue = (intptr_t)&omyhorizoff;
-	aGameVars[GetGameID("myang")].lValue = (intptr_t)&myang;
-	aGameVars[GetGameID("omyang")].lValue = (intptr_t)&omyang;
-	aGameVars[GetGameID("mycursectnum")].lValue = (intptr_t)&mycursectnum;
-	aGameVars[GetGameID("myjumpingcounter")].lValue = (intptr_t)&myjumpingcounter;
+    aGameVars[GetGameID("myhoriz")].lValue = (intptr_t)&myhoriz;
+    aGameVars[GetGameID("myhorizoff")].lValue = (intptr_t)&myhorizoff;
+    aGameVars[GetGameID("omyhoriz")].lValue = (intptr_t)&omyhoriz;
+    aGameVars[GetGameID("omyhorizoff")].lValue = (intptr_t)&omyhorizoff;
+    aGameVars[GetGameID("myang")].lValue = (intptr_t)&myang;
+    aGameVars[GetGameID("omyang")].lValue = (intptr_t)&omyang;
+    aGameVars[GetGameID("mycursectnum")].lValue = (intptr_t)&mycursectnum;
+    aGameVars[GetGameID("myjumpingcounter")].lValue = (intptr_t)&myjumpingcounter;
 
-	aGameVars[GetGameID("myjumpingtoggle")].lValue = (intptr_t)&myjumpingtoggle;
-	aGameVars[GetGameID("myonground")].lValue = (intptr_t)&myonground;
-	aGameVars[GetGameID("myhardlanding")].lValue = (intptr_t)&myhardlanding;
-	aGameVars[GetGameID("myreturntocenter")].lValue = (intptr_t)&myreturntocenter;
+    aGameVars[GetGameID("myjumpingtoggle")].lValue = (intptr_t)&myjumpingtoggle;
+    aGameVars[GetGameID("myonground")].lValue = (intptr_t)&myonground;
+    aGameVars[GetGameID("myhardlanding")].lValue = (intptr_t)&myhardlanding;
+    aGameVars[GetGameID("myreturntocenter")].lValue = (intptr_t)&myreturntocenter;
 
-	aGameVars[GetGameID("display_mirror")].lValue = (intptr_t)&display_mirror;
-	aGameVars[GetGameID("randomseed")].lValue = (intptr_t)&randomseed;
+    aGameVars[GetGameID("display_mirror")].lValue = (intptr_t)&display_mirror;
+    aGameVars[GetGameID("randomseed")].lValue = (intptr_t)&randomseed;
 
-	aGameVars[GetGameID("NUMWALLS")].lValue = (intptr_t)&numwalls;
-	aGameVars[GetGameID("NUMSECTORS")].lValue = (intptr_t)&numsectors;
+    aGameVars[GetGameID("NUMWALLS")].lValue = (intptr_t)&numwalls;
+    aGameVars[GetGameID("NUMSECTORS")].lValue = (intptr_t)&numsectors;
 }
diff --git a/polymer/eduke32/source/jaudiolib/dsl.c b/polymer/eduke32/source/jaudiolib/dsl.c
index f4042f447..0402bdec7 100755
--- a/polymer/eduke32/source/jaudiolib/dsl.c
+++ b/polymer/eduke32/source/jaudiolib/dsl.c
@@ -263,9 +263,9 @@ unsigned DSL_GetPlaybackRate(void)
 
 int DisableInterrupts(void)
 {
-    if (interrupts_disabled)
+    if (interrupts_disabled++)
         return 0;
-    interrupts_disabled = 1;
+//    interrupts_disabled = 1;
     SDL_LockAudio();
     return(0);
 }
@@ -273,9 +273,9 @@ int DisableInterrupts(void)
 int RestoreInterrupts(int flags)
 {
     UNREFERENCED_PARAMETER(flags);
-    if (!interrupts_disabled)
+    if (--interrupts_disabled)
         return 0;
-    interrupts_disabled = 0;
+ //   interrupts_disabled = 0;
     SDL_UnlockAudio();
     return(0);
 }
diff --git a/polymer/eduke32/source/menus.c b/polymer/eduke32/source/menus.c
index 4d2ac9952..9e3c9788f 100644
--- a/polymer/eduke32/source/menus.c
+++ b/polymer/eduke32/source/menus.c
@@ -4037,11 +4037,11 @@ cheat_for_port_credits:
             break;
         }
 
-        Bsprintf(tempbuf,(char *)getjoyname(0,thispage*2));
+        Bstrcpy(tempbuf,(char *)getjoyname(0,thispage*2));
         menutext(42,32,0,0,tempbuf);
         if (twothispage)
         {
-            Bsprintf(tempbuf,(char *)getjoyname(0,thispage*2+1));
+            Bstrcpy(tempbuf,(char *)getjoyname(0,thispage*2+1));
             menutext(42,32+64,0,0,tempbuf);
         }
         gametext(76,38,"SCALE",0,2+8+16);
@@ -4166,7 +4166,7 @@ cheat_for_port_credits:
         for (m=first;m<last;m++)
         {
             unsigned short odx,dx,ody,dy;
-            Bsprintf(tempbuf,(char *)getjoyname(0,m));
+            Bstrcpy(tempbuf,(char *)getjoyname(0,m));
             menutext(32,48+30*(m-first),0,0,tempbuf);
 
             gametext(128,48+30*(m-first)-8,"DEAD",0,2+8+16);