Minor tweaks

Author: bradharding

releasenotes.md

@@ -51,6 +51,7 @@
 * Changing the `con_warninglevel` CVAR will now cause all previously generated warnings in the console to appear or disappear accordingly.
 * Wildcard expressions now work correctly with the `reset` CCMD to reset multiple CVARs at once.
 * The `BIGDOOR1` texture is now vertically aligned correctly.
+* A bug is fixed whereby the player’s weapon could bleed from the right side of the screen to the left in some rare instances.
 
 ![](https://github.com/bradharding/www.doomretro.com/raw/master/wiki/bigdivider.png)
 

src/p_setup.c

@@ -383,7 +383,7 @@ int             nograduallighting_global = -1;
 bool            canmodify;
 bool            transferredsky;
 
-static int      MAPINFO;
+static int      MAPINFO = -1;
 char            *mapinfolump = "";
 
 bool            samelevel;

src/r_things.c

@@ -1291,10 +1291,6 @@ static void R_DrawPlayerSprite(const pspdef_t *psp, bool invisibility, bool alte
 
     // store information in a vissprite
     vis->texturemid = (BASEYCENTER << FRACBITS) + FRACUNIT / 4 - (psp->sy + ABS(viewplayer->bounce) - spritetopoffset[lump]);
-
-    vis->x1 = MAX(0, x1);
-    vis->x2 = MIN(x2, viewwidth - 1);
-    vis->startfrac = (vis->x1 > x1 ? pspriteiscale * (vis->x1 - x1) : 0);
     vis->patch = lump;
 
     // interpolation for weapon bobbing
@@ -1324,10 +1320,9 @@ static void R_DrawPlayerSprite(const pspdef_t *psp, bool invisibility, bool alte
         {
             const int   basex1 = psp_inter.x1;
             int         interpx1 = basex1 + FixedMul(x1 - basex1, fractionaltic);
-            int         interpx2 = interpx1 + x2 - basex1;
 
             vis->x1 = MAX(0, interpx1);
-            vis->x2 = MIN(interpx2, viewwidth - 1);
+            vis->x2 = MIN(interpx1 + x2 - basex1, viewwidth - 1);
             vis->startfrac = (vis->x1 > interpx1 ? pspriteiscale * (vis->x1 - interpx1) : 0);
             vis->texturemid = psp_inter.texturemid + FixedMul(vis->texturemid - psp_inter.texturemid,
                 fractionaltic);
@@ -1339,8 +1334,18 @@ static void R_DrawPlayerSprite(const pspdef_t *psp, bool invisibility, bool alte
             psp_inter.lump = lump;
 
             skippsprinterp = false;
+
+            vis->x1 = MAX(0, x1);
+            vis->x2 = MIN(x2, viewwidth - 1);
+            vis->startfrac = (vis->x1 > x1 ? pspriteiscale * (vis->x1 - x1) : 0);
         }
     }
+    else
+    {
+        vis->x1 = MAX(0, x1);
+        vis->x2 = MIN(x2, viewwidth - 1);
+        vis->startfrac = (vis->x1 > x1 ? pspriteiscale * (vis->x1 - x1) : 0);
+    }
 
     vis->texturemid += FixedMul(((centery - viewheight / 2) << FRACBITS), pspriteiscale);