Minor fixes

git-svn-id: https://svn.eduke32.com/eduke32@480 1a8010ca-5511-0410-912e-c29ae57300e0

polymer/build/include/build.h

@@ -29,8 +29,8 @@ extern "C" {
 #define MAXVOXELS 4096
 #define MAXSTATUS 1024
 #define MAXPLAYERS 16
-#define MAXXDIM 1600
-#define MAXYDIM 1200
+#define MAXXDIM 2048
+#define MAXYDIM 1536
 #define MAXPALOOKUPS 256
 #define MAXPSKYTILES 256
 #define MAXSPRITESONSCREEN 4096

polymer/build/src/build.c

@@ -478,7 +478,7 @@ CANCEL:
             
             if (keystatus[0x15] != 0) {
                 keystatus[0x15] = 0;
-
+                fixspritesectors();
                 updatesector(startposx,startposy,&startsectnum);
                 ExtPreSaveMap();
                 saveboard(boardfilename,&startposx,&startposy,&startposz,&startang,&startsectnum);

polymer/eduke32/source/astub.c

@@ -46,10 +46,11 @@ Modifications for JonoF's port by Jonathon Fowler (jonof@edgenetwk.com)
 short floor_over_floor;
 
 static char *startwin_labeltext = "Starting Mapster32...";
-static char setupfilename[BMAX_PATH]= "build.cfg";
+static char setupfilename[BMAX_PATH]= "mapster32.cfg";
 static char defaultduke3dgrp[BMAX_PATH] = "duke3d.grp";
 static char *duke3dgrp = defaultduke3dgrp;
 static int usecwd = 0;
+static int fixmapbeforesaving = 1;
 
 static struct strllist
 {
@@ -4278,6 +4279,8 @@ static void InitCustomColors(void)
 }
 
 void ExtPreSaveMap(void)
+{
+    if (fixmapbeforesaving)
     {
         short i, startwall, j, endwall;
 
@@ -4304,7 +4307,7 @@ void ExtPreSaveMap(void)
             for (j=startwall;j<endwall;j++)
                 checksectorpointer((short)j,(short)i);
         }
-    fixspritesectors(); // yes, I realize this gets called a few more times than it needs to be
+    }
 }
 
 void ExtPreLoadMap(void)
@@ -4316,6 +4319,7 @@ static void comlinehelp(void)
               "-gFILE, -grp FILE\tUse extra group file FILE\n"
               "-hFILE\t\tUse definitions file FILE\n"
               "-jDIR, -game_dir DIR\n\t\tAdds DIR to the file path stack\n"
+              "-nocheck\t\tDisables map pointer checking when saving\n"
 #if defined RENDERTYPEWIN || (defined RENDERTYPESDL && !defined __APPLE__ && defined HAVE_GTK2)
               "-setup\t\tDisplays the configuration dialog\n"
 #endif              
@@ -4395,6 +4399,13 @@ static void checkcommandline(int argc,char **argv)
                     i++;
                     continue;
                 }
+                if (!Bstrcasecmp(c+1,"nocheck"))
+                {
+                    initprintf("Map pointer checking disabled\n");
+                    fixmapbeforesaving = 0;
+                    i++;
+                    continue;
+                }
 #if !defined(_WIN32)
                 if (!Bstrcasecmp(c+1,"usecwd"))
                 {

polymer/eduke32/source/game.c

@@ -8350,6 +8350,7 @@ static int loadgroupfiles(char *fn)
                     initprintf("Using group file %s.\n",fn);
             }
         }
+        break;
         case T_CACHESIZE:
         {
             int j;