From 4139e67ddb67337002cf1faafa8122a1941e27fc Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Sun, 28 Feb 2021 23:31:56 -0500
Subject: [PATCH] Renderer compile errors

---
 src/r_defs.h   |  5 +++--
 src/r_main.c   |  4 ++--
 src/r_plane.c  |  1 -
 src/r_segs.c   |  2 +-
 src/r_splats.c |  4 ++--
 src/r_things.c | 10 ----------
 src/r_things.h |  2 ++
 7 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/r_defs.h b/src/r_defs.h
index 0fe713dc5..cc8b51c70 100644
--- a/src/r_defs.h
+++ b/src/r_defs.h
@@ -744,8 +744,9 @@ typedef enum
 
 	RF_BLENDMASK        = 0x00000F00,   // --Blending modes
 	RF_FULLBRIGHT       = 0x00000100,   // Sprite is drawn at full brightness
-	RF_FULLDARK         = 0x00000200,   // Sprite is drawn completely dark
-	RF_NOCOLORMAPS      = 0x00000400,   // Sprite is not drawn with colormaps
+	RF_SEMIBRIGHT       = 0x00000200,   // Sprite is drawn between sector brightness & full brightness
+	RF_FULLDARK         = 0x00000400,   // Sprite is drawn completely dark
+	RF_NOCOLORMAPS      = 0x00000800,   // Sprite is not drawn with colormaps
 
 	RF_SPRITETYPEMASK   = 0x00007000,   // ---Different sprite types
 	RF_PAPERSPRITE      = 0x00001000,   // Paper sprite
diff --git a/src/r_main.c b/src/r_main.c
index 518e14dac..dfee8cc93 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -1032,8 +1032,8 @@ void R_ExecuteSetViewSize(void)
 		for (i = 0; i < j; i++)
 		{
 			dy = ((i - viewheight*8)<<FRACBITS) + FRACUNIT/2;
-			dy = FixedMul(abs(dy), fovtan);
-			yslopetab[i] = FixedDiv(centerx*FRACUNIT, dy);
+			dy = FixedMul(abs(dy), fovtan[s]);
+			yslopetab[s][i] = FixedDiv(centerx*FRACUNIT, dy);
 		}
 
 		if (ds_su)
diff --git a/src/r_plane.c b/src/r_plane.c
index 6af961c31..64e888ed9 100644
--- a/src/r_plane.c
+++ b/src/r_plane.c
@@ -908,7 +908,6 @@ void R_DrawSinglePlane(visplane_t *pl)
 		{
 			INT32 top, bottom;
 
-			itswater = true;
 			if (spanfunctype == SPANDRAWFUNC_TRANS)
 			{
 				UINT8 i;
diff --git a/src/r_segs.c b/src/r_segs.c
index e8ecd04be..b1e801a72 100644
--- a/src/r_segs.c
+++ b/src/r_segs.c
@@ -1661,7 +1661,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 
 			gxt = FixedMul(tr_x, viewcos);
 			gyt = -FixedMul(tr_y, viewsin);
-			ds_p->scale1 = FixedDiv(projection, gxt - gyt);
+			ds_p->scale1 = FixedDiv(projection[viewssnum], gxt - gyt);
 		}
 #endif
 		ds_p->scale2 = ds_p->scale1;
diff --git a/src/r_splats.c b/src/r_splats.c
index a3fad82d8..d2ee8f105 100644
--- a/src/r_splats.c
+++ b/src/r_splats.c
@@ -322,8 +322,8 @@ void R_DrawFloorSprite(vissprite_t *spr)
 			return;
 
 		// note: y from view above of map, is distance far away
-		xscale = FixedDiv(projection, rot_y);
-		yscale = -FixedDiv(projectiony, rot_y);
+		xscale = FixedDiv(projection[viewssnum], rot_y);
+		yscale = -FixedDiv(projectiony[viewssnum], rot_y);
 
 		// projection
 		v2d[i].x = (centerxfrac + FixedMul(rot_x, xscale))>>FRACBITS;
diff --git a/src/r_things.c b/src/r_things.c
index 4b9520ce1..0fe58b099 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -772,16 +772,6 @@ UINT8 *R_GetSpriteTranslation(vissprite_t *vis)
 		// New colormap stuff for skins Tails 06-07-2002
 		if (!(vis->cut & SC_PRECIP) && vis->mobj->colorized)
 			return R_GetTranslationColormap(TC_RAINBOW, vis->mobj->color, GTC_CACHE);
-		else if (!(vis->cut & SC_PRECIP)
-			&& vis->mobj->player && vis->mobj->player->dashmode >= DASHMODE_THRESHOLD
-			&& (vis->mobj->player->charflags & SF_DASHMODE)
-			&& ((leveltime/2) & 1))
-		{
-			if (vis->mobj->player->charflags & SF_MACHINE)
-				return R_GetTranslationColormap(TC_DASHMODE, 0, GTC_CACHE);
-			else
-				return R_GetTranslationColormap(TC_RAINBOW, vis->mobj->color, GTC_CACHE);
-		}
 		else if (!(vis->cut & SC_PRECIP) && vis->mobj->skin && vis->mobj->sprite == SPR_PLAY) // This thing is a player!
 		{
 			size_t skinnum = (skin_t*)vis->mobj->skin-skins;
diff --git a/src/r_things.h b/src/r_things.h
index ba7d03880..ca8e76193 100644
--- a/src/r_things.h
+++ b/src/r_things.h
@@ -154,6 +154,7 @@ typedef struct vissprite_s
 
 	fixed_t gx, gy; // for line side calculation
 	fixed_t gz, gzt; // global bottom/top for silhouette clipping and sorting with 3D floors
+	fixed_t pz, pzt; // physical bottom/top
 
 	fixed_t startfrac; // horizontal position of x1
 	fixed_t scale;
@@ -187,6 +188,7 @@ typedef struct vissprite_s
 	fixed_t xscale;
 
 	// Precalculated top and bottom screen coords for the sprite.
+	fixed_t thingheight; // The actual height of the thing
 	sector_t *sector; // The sector containing the thing.
 	INT16 sz, szt;