Minor tweaks

src/c_cmds.c

@@ -5214,7 +5214,7 @@ static void mapstats_func2(char *cmd, char *parms)
         if (gamemission == pack_nerve)
             C_TabbedOutput(tabs, "Map\t%i of 9", gamemap);
         else
-            C_TabbedOutput(tabs, "Map\t%i of %i", gamemap, (bfgedition ? 33 : 32));
+            C_TabbedOutput(tabs, "Map\t%i of %i", gamemap, (legacyofrust ? 16 : (bfgedition ? 33 : 32)));
     }
     else
         C_TabbedOutput(tabs, "Map\t%i of 9", gamemap);

src/p_saveg.c

@@ -1455,9 +1455,6 @@ void P_RestoreTargets(void)
 //
 void P_ArchiveSpecials(void)
 {
-    int         i = maxbuttons;
-    button_t    *button = buttonlist;
-
     // save off the current thinkers
     for (thinker_t *th = thinkers[th_misc].cnext; th != &thinkers[th_misc]; th = th->cnext)
     {
@@ -1539,16 +1536,16 @@ void P_ArchiveSpecials(void)
         }
     }
 
-    do
+    for (int i = 0; i < maxbuttons; i++)
     {
+        button_t    *button = &buttonlist[i];
+
         if (button->btimer)
         {
             saveg_write8(tc_button);
             saveg_write_button_t(button);
         }
-
-        button++;
-    } while (--i);
+    };
 
     // add a terminating marker
     saveg_write8(tc_endspecials);

src/r_things.c

@@ -1384,7 +1384,7 @@ static void R_DrawSprite(const vissprite_t *spr)
             {
                 // masked midtexture?
                 if (ds->maskedtexturecol)
-                    R_RenderMaskedSegRange(ds, MAX(ds->x1, x1), MIN(ds->x2, x2));
+                    R_RenderMaskedSegRange(ds, MAX(x1, ds->x1), MIN(ds->x2, x2));
 
                 // seg is behind sprite
                 continue;