From 897feac6516d4702cb057bce86cd63d02af4f0c4 Mon Sep 17 00:00:00 2001
From: Latapostrophe <hyperclassic3@gmail.com>
Date: Fri, 20 Mar 2020 14:59:38 +0100
Subject: [PATCH 01/49] Make SPB spawn damaging dust and sliptides while it
 moves around

---
 src/dehacked.c |  1 +
 src/info.c     | 27 +++++++++++++++
 src/info.h     |  1 +
 src/p_enemy.c  | 91 +++++++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 119 insertions(+), 1 deletion(-)

diff --git a/src/dehacked.c b/src/dehacked.c
index 31986e942..2e4b89d41 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -7999,6 +7999,7 @@ static const char *const MOBJTYPE_LIST[] = {  // array length left dynamic for s
 	"MT_KARMAFIREWORK",
 	"MT_RINGSPARKS",
 	"MT_DRAFTDUST",
+	"MT_SPBDUST",
 	"MT_TIREGREASE",
 
 	"MT_OVERTIMEFOG",
diff --git a/src/info.c b/src/info.c
index b1d95859b..fb56abcfa 100644
--- a/src/info.c
+++ b/src/info.c
@@ -20293,6 +20293,33 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 	    S_NULL          // raisestate
 	},
 
+	{           // MT_SPBDUST
+	    -1,             // doomednum
+	    S_DRAFTDUST1,   // spawnstate
+	    1000,           // spawnhealth
+	    S_NULL,         // seestate
+	    sfx_None,       // seesound
+	    8,              // reactiontime
+	    sfx_None,       // attacksound
+	    S_NULL,         // painstate
+	    0,              // painchance
+	    sfx_None,       // painsound
+	    S_NULL,         // meleestate
+	    S_NULL,         // missilestate
+	    S_NULL,         // deathstate
+	    S_NULL,         // xdeathstate
+	    sfx_None,       // deathsound
+	    0,              // speed
+	    16<<FRACBITS,    // radius
+	    32<<FRACBITS,   // height
+	    1,              // display offset
+	    100,            // mass
+	    0,              // damage
+	    sfx_None,       // activesound
+	    MF_DONTENCOREMAP|MF_NOGRAVITY|MF_PAIN, // flags
+	    S_NULL          // raisestate
+	},
+
 	{           // MT_TIREGREASE
 	    -1,             // doomednum
 	    S_TIREGREASE,   // spawnstate
diff --git a/src/info.h b/src/info.h
index c1eacfd31..5a0622261 100644
--- a/src/info.h
+++ b/src/info.h
@@ -4920,6 +4920,7 @@ typedef enum mobj_type
 	MT_KARMAFIREWORK,
 	MT_RINGSPARKS,
 	MT_DRAFTDUST,
+	MT_SPBDUST,
 	MT_TIREGREASE,
 
 	MT_OVERTIMEFOG,
diff --git a/src/p_enemy.c b/src/p_enemy.c
index 521d44b1b..0aa6a49ac 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -8459,6 +8459,78 @@ static void SpawnSPBTrailRings(mobj_t *actor)
 	}
 }
 
+// Spawns the V shaped dust. To be used when the SPB is going mostly forward.
+static void SpawnSPBDust(mobj_t *mo)
+{
+	// The easiest way to spawn a V shaped cone of dust from the SPB is simply to spawn 2 particles, and to both move them to the sides in opposite direction.
+	mobj_t *dust;
+	fixed_t sx;
+	fixed_t sy;
+	fixed_t sz = mo->floorz;
+	angle_t sa = mo->angle - ANG1*60;
+	INT32 i;
+
+	if (mo->eflags & MFE_VERTICALFLIP)
+		sz = mo->ceilingz;
+
+	if (leveltime & 1 && abs(mo->z - sz) < FRACUNIT*32)	// Only ever other frame. Also don't spawn it if we're way above the ground.
+	{
+		// Determine spawning position next to the SPB:
+		for (i=0; i < 2; i++)
+		{
+			sx = mo->x + FixedMul((mo->scale*96), FINECOSINE((sa)>>ANGLETOFINESHIFT));
+			sy = mo->y + FixedMul((mo->scale*96), FINESINE((sa)>>ANGLETOFINESHIFT));
+
+			dust = P_SpawnMobj(sx, sy, sz, MT_SPBDUST);
+			dust->momx = mo->momx/2;
+			dust->momy = mo->momy/2;
+			dust->momz = mo->momz/2;	// Give some of the momentum to the dust
+			P_SetScale(dust, mo->scale*2);
+			dust->colorized = true;
+			dust->color = SKINCOLOR_RED;
+			dust->angle = mo->angle - FixedAngle(FRACUNIT*90 - FRACUNIT*180*i);	// The first one will spawn to the right of the spb, the second one to the left.
+			P_Thrust(dust, dust->angle, 6*dust->scale);
+
+			K_MatchGenericExtraFlags(dust, mo);
+
+			sa += ANG1*120;	// Add 120 degrees to get to mo->angle + ANG1*60
+		}
+	}
+}
+
+// Spawns SPB slip tide. To be used when the SPB is turning.
+// Modified version of K_SpawnAIZDust. Maybe we could merge those to be cleaner?
+
+// dir should be either 1 or -1 to determine where to spawn the dust.
+
+static void SpawnSPBAIZDust(mobj_t *mo, INT32 dir)
+{
+	fixed_t newx;
+	fixed_t newy;
+	mobj_t *spark;
+	angle_t travelangle;
+
+	travelangle = R_PointToAngle2(0, 0, mo->momx, mo->momy);
+	if (leveltime & 1)
+	{
+		newx = mo->x + P_ReturnThrustX(mo, travelangle - (dir*ANGLE_45), FixedMul(24*FRACUNIT, mo->scale));
+		newy = mo->y + P_ReturnThrustY(mo, travelangle - (dir*ANGLE_45), FixedMul(24*FRACUNIT, mo->scale));
+		spark = P_SpawnMobj(newx, newy, mo->z, MT_AIZDRIFTSTRAT);
+		spark->colorized = true;
+		spark->color = SKINCOLOR_RED;
+		spark->flags = MF_NOGRAVITY|MF_PAIN;
+		P_SetTarget(&spark->target, mo);
+
+		spark->angle = travelangle+(dir*ANGLE_90);
+		P_SetScale(spark, (spark->destscale = mo->scale*3/2));
+
+		spark->momx = (6*mo->momx)/5;
+		spark->momy = (6*mo->momy)/5;
+
+		K_MatchGenericExtraFlags(spark, mo);
+	}
+}
+
 void A_SPBChase(mobj_t *actor)
 {
 	player_t *player = NULL;
@@ -8703,6 +8775,12 @@ void A_SPBChase(mobj_t *actor)
 		spbplace = bestrank;
 		dist = P_AproxDistance(P_AproxDistance(actor->x-actor->tracer->x, actor->y-actor->tracer->y), actor->z-actor->tracer->z);
 
+		/*
+			K_GetBestWaypointForMobj returns the waypoint closest to the object that isn't its current waypoint. While this is usually good enough,
+			in cases where the track overlaps, this means that the SPB will sometimes target a waypoint on an earlier/later portion of the track instead of following along.
+			For this reason, we're going to try and make sure to avoid these situations.
+		*/
+
 		// Move along the waypoints until you get close enough
 		if (actor->cusval > -1 && actor->extravalue2 > 0)
 		{
@@ -8770,6 +8848,8 @@ void A_SPBChase(mobj_t *actor)
 			// Smoothly rotate horz angle
 			angle_t input = hang - actor->angle;
 			boolean invert = (input > ANGLE_180);
+			INT32 turnangle;
+
 			if (invert)
 				input = InvAngle(input);
 
@@ -8782,6 +8862,15 @@ void A_SPBChase(mobj_t *actor)
 				input = InvAngle(input);
 			actor->angle += input;
 
+			// If input is small enough, spawn dust. Otherwise, spawn a slip tide!
+			turnangle = AngleFixed(input)/FRACUNIT;
+
+			// The SPB is really turning if that value is >= 3 and <= 357. This looks pretty bad check-wise so feel free to change it for something that isn't as terrible.
+			if (turnangle >= 3 && turnangle <= 357)
+				SpawnSPBAIZDust(actor, turnangle < 180 ? 1 : -1);	// 1 if turning left, -1 if turning right. Angles work counterclockwise, remember!
+			else
+				SpawnSPBDust(actor);	// if we're mostly going straight, then spawn the V dust cone!
+
 			// Smoothly rotate vert angle
 			input = vang - actor->movedir;
 			invert = (input > ANGLE_180);
@@ -8830,7 +8919,7 @@ void A_SPBChase(mobj_t *actor)
 		// Spawn a trail of rings behind the SPB!
 		SpawnSPBTrailRings(actor);
 
-		if (dist <= (1024*actor->tracer->scale)) // Close enough to target?
+		if (dist <= (1024*actor->tracer->scale) && !actor->reactiontime) // Close enough to target? Reactiontime is used for debug purposes.
 		{
 			S_StartSound(actor, actor->info->attacksound);
 			actor->extravalue1 = 1; // TARGET ACQUIRED

From 366fff9942baeb9530d474fd4784a066af467294 Mon Sep 17 00:00:00 2001
From: Latapostrophe <hyperclassic3@gmail.com>
Date: Fri, 20 Mar 2020 21:58:14 +0100
Subject: [PATCH 02/49] Red rings, fuse, and spb game speed support

---
 src/k_kart.c  | 19 ++++++++++++++-----
 src/k_kart.h  |  1 +
 src/p_enemy.c | 51 +++++++++++++++++++++++++++++++--------------------
 src/p_mobj.c  | 35 +++++++++++++++++++++++++++++++++++
 4 files changed, 81 insertions(+), 25 deletions(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index 27a4b1e1f..fd280f86e 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -2499,20 +2499,29 @@ static void K_GetKartBoostPower(player_t *player)
 	player->kartstuff[k_numboosts] = numboosts;
 }
 
-fixed_t K_GetKartSpeed(player_t *player, boolean doboostpower)
+// Returns kart speed from a stat. Boost power and scale are NOT taken into account, no player or object is necessary.
+fixed_t K_GetKartSpeedFromStat(UINT8 kartspeed)
 {
 	const fixed_t xspd = (3*FRACUNIT)/64;
 	fixed_t g_cc = K_GetKartGameSpeedScalar(gamespeed) + xspd;
 	fixed_t k_speed = 150;
-	UINT8 kartspeed = player->kartspeed;
 	fixed_t finalspeed;
 
-	if (G_BattleGametype() && player->kartstuff[k_bumper] <= 0)
-		kartspeed = 1;
-
 	k_speed += kartspeed*3; // 153 - 177
 
 	finalspeed = FixedMul(k_speed<<14, g_cc);
+	return finalspeed;
+}
+
+fixed_t K_GetKartSpeed(player_t *player, boolean doboostpower)
+{
+	fixed_t finalspeed;
+	UINT8 kartspeed = player->kartspeed;
+
+	if (G_BattleGametype() && player->kartstuff[k_bumper] <= 0)
+		kartspeed = 1;
+
+	finalspeed = K_GetKartSpeedFromStat(kartspeed);
 
 	if (player->mo && !P_MobjWasRemoved(player->mo))
 		finalspeed = FixedMul(finalspeed, player->mo->scale);
diff --git a/src/k_kart.h b/src/k_kart.h
index ff6f6fafc..988b1b8ad 100644
--- a/src/k_kart.h
+++ b/src/k_kart.h
@@ -62,6 +62,7 @@ void K_DropItems(player_t *player);
 void K_StripItems(player_t *player);
 void K_StripOther(player_t *player);
 void K_MomentumToFacing(player_t *player);
+fixed_t K_GetKartSpeedFromStat(UINT8 kartspeed);
 fixed_t K_GetKartSpeed(player_t *player, boolean doboostpower);
 fixed_t K_GetKartAccel(player_t *player);
 UINT16 K_GetKartFlashing(player_t *player);
diff --git a/src/p_enemy.c b/src/p_enemy.c
index 0aa6a49ac..8c33aba3e 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -8449,12 +8449,14 @@ static void SpawnSPBTrailRings(mobj_t *actor)
 {
 	if (actor != NULL)
 	{
-		if (leveltime % 6 == 0)
+		if (leveltime % (actor->extravalue1 == 2 ? 6 : 3) == 0)	// Extravalue1 == 2 is seeking mode. Because the SPB is about twice as fast as normal in that mode, also spawn the rings twice as often to make up for it!
 		{
 			mobj_t *ring = P_SpawnMobj(actor->x - actor->momx, actor->y - actor->momy,
 				actor->z - actor->momz + (24*mapobjectscale), MT_RING);
 			ring->threshold = 10;
-			ring->fuse = 120*TICRATE;
+			ring->fuse = 35*TICRATE;
+			ring->colorized = true;
+			ring->color = SKINCOLOR_RED;
 		}
 	}
 }
@@ -8473,7 +8475,7 @@ static void SpawnSPBDust(mobj_t *mo)
 	if (mo->eflags & MFE_VERTICALFLIP)
 		sz = mo->ceilingz;
 
-	if (leveltime & 1 && abs(mo->z - sz) < FRACUNIT*32)	// Only ever other frame. Also don't spawn it if we're way above the ground.
+	if (leveltime & 1 && abs(mo->z - sz) < FRACUNIT*64)	// Only ever other frame. Also don't spawn it if we're way above the ground.
 	{
 		// Determine spawning position next to the SPB:
 		for (i=0; i < 2; i++)
@@ -8509,13 +8511,17 @@ static void SpawnSPBAIZDust(mobj_t *mo, INT32 dir)
 	fixed_t newy;
 	mobj_t *spark;
 	angle_t travelangle;
+	fixed_t sz = mo->floorz;
+
+	if (mo->eflags & MFE_VERTICALFLIP)
+		sz = mo->ceilingz;
 
 	travelangle = R_PointToAngle2(0, 0, mo->momx, mo->momy);
-	if (leveltime & 1)
+	if (leveltime & 1 && abs(mo->z - sz) < FRACUNIT*64)
 	{
 		newx = mo->x + P_ReturnThrustX(mo, travelangle - (dir*ANGLE_45), FixedMul(24*FRACUNIT, mo->scale));
 		newy = mo->y + P_ReturnThrustY(mo, travelangle - (dir*ANGLE_45), FixedMul(24*FRACUNIT, mo->scale));
-		spark = P_SpawnMobj(newx, newy, mo->z, MT_AIZDRIFTSTRAT);
+		spark = P_SpawnMobj(newx, newy, sz, MT_AIZDRIFTSTRAT);
 		spark->colorized = true;
 		spark->color = SKINCOLOR_RED;
 		spark->flags = MF_NOGRAVITY|MF_PAIN;
@@ -8531,6 +8537,21 @@ static void SpawnSPBAIZDust(mobj_t *mo, INT32 dir)
 	}
 }
 
+// Used for seeking and when SPB is trailing its target from way too close!
+static void SpawnSPBSpeedLines(mobj_t *actor)
+{
+	mobj_t *fast = P_SpawnMobj(actor->x + (P_RandomRange(-24,24) * actor->scale),
+		actor->y + (P_RandomRange(-24,24) * actor->scale),
+		actor->z + (actor->height/2) + (P_RandomRange(-24,24) * actor->scale),
+		MT_FASTLINE);
+
+	fast->angle = R_PointToAngle2(0, 0, actor->momx, actor->momy);
+	fast->color = SKINCOLOR_RED;
+	fast->colorized = true;
+	K_MatchGenericExtraFlags(fast, actor);
+}
+
+
 void A_SPBChase(mobj_t *actor)
 {
 	player_t *player = NULL;
@@ -8549,7 +8570,7 @@ void A_SPBChase(mobj_t *actor)
 #endif
 
 	// Default speed
-	wspeed = actor->movefactor;
+	wspeed = FixedMul(mapobjectscale, K_GetKartSpeedFromStat(5)*2);	// Go at twice the average speed a player would be going at!
 
 	if (actor->threshold) // Just fired, go straight.
 	{
@@ -8701,19 +8722,7 @@ void A_SPBChase(mobj_t *actor)
 			if (R_PointToDist2(0, 0, actor->momx, actor->momy) > (actor->tracer->player ? (16*actor->tracer->player->speed)/15
 				: (16*R_PointToDist2(0, 0, actor->tracer->momx, actor->tracer->momy))/15) // Going faster than the target
 				&& xyspeed > K_GetKartSpeed(actor->tracer->player, false)/4) // Don't display speedup lines at pitifully low speeds
-			{
-				mobj_t *fast = P_SpawnMobj(actor->x + (P_RandomRange(-24,24) * actor->scale),
-					actor->y + (P_RandomRange(-24,24) * actor->scale),
-					actor->z + (actor->height/2) + (P_RandomRange(-24,24) * actor->scale),
-					MT_FASTLINE);
-				fast->angle = R_PointToAngle2(0, 0, actor->momx, actor->momy);
-				//fast->momx = (3*actor->momx)/4;
-				//fast->momy = (3*actor->momy)/4;
-				//fast->momz = (3*actor->momz)/4;
-				fast->color = SKINCOLOR_RED;
-				fast->colorized = true;
-				K_MatchGenericExtraFlags(fast, actor);
-			}
+					SpawnSPBSpeedLines(actor);
 
 			return;
 		}
@@ -8871,6 +8880,8 @@ void A_SPBChase(mobj_t *actor)
 			else
 				SpawnSPBDust(actor);	// if we're mostly going straight, then spawn the V dust cone!
 
+			SpawnSPBSpeedLines(actor);	// Always spawn speed lines while seeking
+
 			// Smoothly rotate vert angle
 			input = vang - actor->movedir;
 			invert = (input > ANGLE_180);
@@ -8919,7 +8930,7 @@ void A_SPBChase(mobj_t *actor)
 		// Spawn a trail of rings behind the SPB!
 		SpawnSPBTrailRings(actor);
 
-		if (dist <= (1024*actor->tracer->scale) && !actor->reactiontime) // Close enough to target? Reactiontime is used for debug purposes.
+		if (dist <= (1024*actor->tracer->scale) && !(actor->flags2 & MF2_AMBUSH)) // Close enough to target? Use Ambush flag to disable targetting so I can have an easier time testing stuff...
 		{
 			S_StartSound(actor, actor->info->attacksound);
 			actor->extravalue1 = 1; // TARGET ACQUIRED
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 4ef291c82..2fcc99a08 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -3982,6 +3982,9 @@ void P_PrecipThinker(precipmobj_t *mobj)
 
 static void P_RingThinker(mobj_t *mobj)
 {
+
+	mobj_t *spark;	// Ring Fuse
+
 	if (mobj->momx || mobj->momy)
 	{
 		P_RingXYMovement(mobj);
@@ -4001,6 +4004,38 @@ static void P_RingThinker(mobj_t *mobj)
 			return;
 	}
 
+	// This thinker splits apart before the regular fuse handling so we need to handle it here instead.
+	if (mobj->fuse)
+	{
+		mobj->fuse--;
+
+		if (mobj->fuse < TICRATE*3)
+		{
+			if (leveltime & 1)
+				mobj->flags2 |= MF2_DONTDRAW;
+			else
+				mobj->flags2 &= ~MF2_DONTDRAW;
+		}
+
+		if (!mobj->fuse)
+		{
+#ifdef HAVE_BLUA
+			if (!LUAh_MobjFuse(mobj))
+#endif
+			{
+				mobj->flags2 &= ~MF2_DONTDRAW;
+				spark = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_SIGNSPARKLE);	// Spawn a fancy sparkle
+				K_MatchGenericExtraFlags(spark, mobj);
+				spark->colorized = true;
+				spark->color = mobj->color ? : SKINCOLOR_YELLOW;	// Use yellow if the ring doesn't use a skin color. (It should be red for SPB rings, but let normal rings look fancy too!)
+				P_RemoveMobj(mobj);	// Adieu, monde cruel!
+				return;
+			}
+
+		}
+
+	}
+
 	P_CycleMobjState(mobj);
 }
 

From ae3c4a0227436eb78092ce437774cafe4b97a619 Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Fri, 14 Apr 2017 20:43:30 +0100
Subject: [PATCH 03/49] Removal of cv_allcaps for console stuff.

(cherry picked from commit 95d89078f5bb7a9d8ce52cff129e54a7ec2e4744)
---
 src/console.c  | 20 ++++++++++----------
 src/hu_stuff.c | 20 ++++++++++----------
 src/m_menu.c   |  3 ---
 src/v_video.c  |  2 --
 src/v_video.h  |  2 +-
 5 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/console.c b/src/console.c
index 1defa7e82..ec1e892ed 100644
--- a/src/console.c
+++ b/src/console.c
@@ -1474,32 +1474,32 @@ static void CON_DrawInput(void)
 		if (input_sel < c)
 			V_DrawFill(x, y, charwidth*3, (10 * con_scalefactor), 77 | V_NOSCALESTART);
 		for (i = 0; i < 3; ++i, x += charwidth)
-			V_DrawCharacter(x, y, '.' | cv_constextsize.value | V_GRAYMAP | V_NOSCALESTART, !cv_allcaps.value);
+			V_DrawCharacter(x, y, '.' | cv_constextsize.value | V_GRAYMAP | V_NOSCALESTART, true);
 	}
 	else
-		V_DrawCharacter(x-charwidth, y, CON_PROMPTCHAR | cv_constextsize.value | V_GRAYMAP | V_NOSCALESTART, !cv_allcaps.value);
+		V_DrawCharacter(x-charwidth, y, CON_PROMPTCHAR | cv_constextsize.value | V_GRAYMAP | V_NOSCALESTART, true);
 
 	for (cend = c + clen; c < cend; ++c, x += charwidth)
 	{
 		if ((input_sel > c && input_cur <= c) || (input_sel <= c && input_cur > c))
 		{
 			V_DrawFill(x, y, charwidth, (10 * con_scalefactor), 77 | V_NOSCALESTART);
-			V_DrawCharacter(x, y, p[c] | cv_constextsize.value | V_YELLOWMAP | V_NOSCALESTART, !cv_allcaps.value);
+			V_DrawCharacter(x, y, p[c] | cv_constextsize.value | V_YELLOWMAP | V_NOSCALESTART, true);
 		}
 		else
-			V_DrawCharacter(x, y, p[c] | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
+			V_DrawCharacter(x, y, p[c] | cv_constextsize.value | V_NOSCALESTART, true);
 
 		if (c == input_cur && con_tick >= 4)
-			V_DrawCharacter(x, y + (con_scalefactor*2), '_' | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
+			V_DrawCharacter(x, y + (con_scalefactor*2), '_' | cv_constextsize.value | V_NOSCALESTART, true);
 	}
 	if (cend == input_cur && con_tick >= 4)
-		V_DrawCharacter(x, y + (con_scalefactor*2), '_' | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
+		V_DrawCharacter(x, y + (con_scalefactor*2), '_' | cv_constextsize.value | V_NOSCALESTART, true);
 	if (rellip)
 	{
 		if (input_sel > cend)
 			V_DrawFill(x, y, charwidth*3, (10 * con_scalefactor), 77 | V_NOSCALESTART);
 		for (i = 0; i < 3; ++i, x += charwidth)
-			V_DrawCharacter(x, y, '.' | cv_constextsize.value | V_GRAYMAP | V_NOSCALESTART, !cv_allcaps.value);
+			V_DrawCharacter(x, y, '.' | cv_constextsize.value | V_GRAYMAP | V_NOSCALESTART, true);
 	}
 }
 
@@ -1545,11 +1545,11 @@ static void CON_DrawHudlines(void)
 			else
 			{
 				//charwidth = SHORT(hu_font['A'-HU_FONTSTART]->width) * con_scalefactor;
-				V_DrawCharacter(x, y, (INT32)(*p) | charflags | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
+				V_DrawCharacter(x, y, (INT32)(*p) | charflags | cv_constextsize.value | V_NOSCALESTART, true);
 			}
 		}
 
-		//V_DrawCharacter(x, y, (p[c]&0xff) | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
+		//V_DrawCharacter(x, y, (p[c]&0xff) | cv_constextsize.value | V_NOSCALESTART, true);
 		y += charheight;
 	}
 
@@ -1620,7 +1620,7 @@ static void CON_DrawConsole(void)
 				charflags = (*p & 0x7f) << V_CHARCOLORSHIFT;
 				p++;
 			}
-			V_DrawCharacter(x, y, (INT32)(*p) | charflags | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
+			V_DrawCharacter(x, y, (INT32)(*p) | charflags | cv_constextsize.value | V_NOSCALESTART, true);
 		}
 	}
 
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index 76b85dd01..a454aaecc 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -1583,7 +1583,7 @@ static void HU_drawMiniChat(void)
 				if (cv_chatbacktint.value) // on request of wolfy
 					V_DrawFillConsoleMap(x + dx + 2, y+dy, charwidth, charheight, 159|V_SNAPTOBOTTOM|V_SNAPTOLEFT);
 
-				V_DrawChatCharacter(x + dx + 2, y+dy, msg[j++] |V_SNAPTOBOTTOM|V_SNAPTOLEFT|transflag, !cv_allcaps.value, colormap);
+				V_DrawChatCharacter(x + dx + 2, y+dy, msg[j++] |V_SNAPTOBOTTOM|V_SNAPTOLEFT|transflag, true, colormap);
 			}
 
 			dx += charwidth;
@@ -1677,7 +1677,7 @@ static void HU_drawChatLog(INT32 offset)
 			else
 			{
 				if ((y+dy+2 >= chat_topy) && (y+dy < (chat_bottomy)))
-					V_DrawChatCharacter(x + dx + 2, y+dy+2, msg[j++] |V_SNAPTOBOTTOM|V_SNAPTOLEFT, !cv_allcaps.value, colormap);
+					V_DrawChatCharacter(x + dx + 2, y+dy+2, msg[j++] |V_SNAPTOBOTTOM|V_SNAPTOLEFT, true, colormap);
 				else
 					j++; // don't forget to increment this or we'll get stuck in the limbo.
 			}
@@ -1778,7 +1778,7 @@ static void HU_DrawChat(void)
 			++i;
 		else
 		{
-			V_DrawChatCharacter(chatx + c + 2, y, talk[i] |V_SNAPTOBOTTOM|V_SNAPTOLEFT|cflag, !cv_allcaps.value, V_GetStringColormap(talk[i]|cflag));
+			V_DrawChatCharacter(chatx + c + 2, y, talk[i] |V_SNAPTOBOTTOM|V_SNAPTOLEFT|cflag, true, V_GetStringColormap(talk[i]|cflag));
 			i++;
 		}
 
@@ -1796,7 +1796,7 @@ static void HU_DrawChat(void)
 	typelines = 1;
 
 	if ((strlen(w_chat) == 0 || c_input == 0) && hu_tick < 4)
-		V_DrawChatCharacter(chatx + 2 + c, y+1, '_' |V_SNAPTOBOTTOM|V_SNAPTOLEFT|t, !cv_allcaps.value, NULL);
+		V_DrawChatCharacter(chatx + 2 + c, y+1, '_' |V_SNAPTOBOTTOM|V_SNAPTOLEFT|t, true, NULL);
 
 	while (w_chat[i])
 	{
@@ -1806,7 +1806,7 @@ static void HU_DrawChat(void)
 			INT32 cursorx = (c+charwidth < boxw-charwidth) ? (chatx + 2 + c+charwidth) : (chatx+1); // we may have to go down.
 			INT32 cursory = (cursorx != chatx+1) ? (y) : (y+charheight);
 			if (hu_tick < 4)
-				V_DrawChatCharacter(cursorx, cursory+1, '_' |V_SNAPTOBOTTOM|V_SNAPTOLEFT|t, !cv_allcaps.value, NULL);
+				V_DrawChatCharacter(cursorx, cursory+1, '_' |V_SNAPTOBOTTOM|V_SNAPTOLEFT|t, true, NULL);
 
 			if (cursorx == chatx+1 && saylen == i) // a weirdo hack
 			{
@@ -1819,7 +1819,7 @@ static void HU_DrawChat(void)
 		if (w_chat[i] < HU_FONTSTART)
 			++i;
 		else
-			V_DrawChatCharacter(chatx + c + 2, y, w_chat[i++] | V_SNAPTOBOTTOM|V_SNAPTOLEFT | t, !cv_allcaps.value, NULL);
+			V_DrawChatCharacter(chatx + c + 2, y, w_chat[i++] | V_SNAPTOBOTTOM|V_SNAPTOLEFT | t, true, NULL);
 
 		c += charwidth;
 		if (c > boxw-(charwidth*2) && !skippedline)
@@ -1945,13 +1945,13 @@ static void HU_DrawChat_Old(void)
 		else
 		{
 			//charwidth = SHORT(hu_font[talk[i]-HU_FONTSTART]->width) * con_scalefactor;
-			V_DrawCharacter(HU_INPUTX + c, y, talk[i++] | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
+			V_DrawCharacter(HU_INPUTX + c, y, talk[i++] | cv_constextsize.value | V_NOSCALESTART, true);
 		}
 		c += charwidth;
 	}
 
 	if ((strlen(w_chat) == 0 || c_input == 0) && hu_tick < 4)
-		V_DrawCharacter(HU_INPUTX+c, y+2*con_scalefactor, '_' |cv_constextsize.value | V_NOSCALESTART|t, !cv_allcaps.value);
+		V_DrawCharacter(HU_INPUTX+c, y+2*con_scalefactor, '_' |cv_constextsize.value | V_NOSCALESTART|t, true);
 
 	i = 0;
 	while (w_chat[i])
@@ -1961,7 +1961,7 @@ static void HU_DrawChat_Old(void)
 		{
 			INT32 cursorx = (HU_INPUTX+c+charwidth < vid.width) ? (HU_INPUTX + c + charwidth) : (HU_INPUTX); // we may have to go down.
 			INT32 cursory = (cursorx != HU_INPUTX) ? (y) : (y+charheight);
-			V_DrawCharacter(cursorx, cursory+2*con_scalefactor, '_' |cv_constextsize.value | V_NOSCALESTART|t, !cv_allcaps.value);
+			V_DrawCharacter(cursorx, cursory+2*con_scalefactor, '_' |cv_constextsize.value | V_NOSCALESTART|t, true);
 		}
 
 		//Hurdler: isn't it better like that?
@@ -1973,7 +1973,7 @@ static void HU_DrawChat_Old(void)
 		else
 		{
 			//charwidth = SHORT(hu_font[w_chat[i]-HU_FONTSTART]->width) * con_scalefactor;
-			V_DrawCharacter(HU_INPUTX + c, y, w_chat[i++] | cv_constextsize.value | V_NOSCALESTART | t, !cv_allcaps.value);
+			V_DrawCharacter(HU_INPUTX + c, y, w_chat[i++] | cv_constextsize.value | V_NOSCALESTART | t, true);
 		}
 
 		c += charwidth;
diff --git a/src/m_menu.c b/src/m_menu.c
index 68aae68eb..6ac2ef5ab 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -3321,9 +3321,6 @@ void M_Init(void)
 #ifndef NONET
 	CV_RegisterVar(&cv_serversort);
 #endif
-
-	//todo put this somewhere better...
-	CV_RegisterVar(&cv_allcaps);
 }
 
 void M_InitCharacterTables(void)
diff --git a/src/v_video.c b/src/v_video.c
index 297eae9c4..274c14b38 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -44,8 +44,6 @@ static void CV_usegamma_OnChange(void);
 consvar_t cv_ticrate = {"showfps", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_usegamma = {"gamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_usegamma_OnChange, 0, NULL, NULL, 0, 0, NULL};
 
-consvar_t cv_allcaps = {"allcaps", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-
 static CV_PossibleValue_t constextsize_cons_t[] = {
 	{V_NOSCALEPATCH, "Small"}, {V_SMALLSCALEPATCH, "Medium"}, {V_MEDSCALEPATCH, "Large"}, {0, "Huge"},
 	{0, NULL}};
diff --git a/src/v_video.h b/src/v_video.h
index eb60690bd..d229c370f 100644
--- a/src/v_video.h
+++ b/src/v_video.h
@@ -28,7 +28,7 @@
 extern UINT8 *screens[5];
 
 extern const UINT8 gammatable[5][256];
-extern consvar_t cv_ticrate, cv_usegamma, cv_allcaps, cv_constextsize;
+extern consvar_t cv_ticrate, cv_usegamma, cv_constextsize;
 
 // Allocates buffer screens, call before R_Init.
 void V_Init(void);

From f5ecb1b9c90b5eac35b5c7e5f72d21b09d7d884a Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Mon, 23 Mar 2020 16:27:14 -0700
Subject: [PATCH 04/49] Introducing the Colour Cube!
 https://cdn.discordapp.com/attachments/293238104096112641/304015171385294850/aa.png

Basically in preperation of supporting colourblindness modes I implemented the following link when loading palettes.
http://http.developer.nvidia.com/GPUGems2/gpugems2_chapter24.html

This basically means I can do whatever the hell I want to the colour profile of incoming paletties, and nobody can stop me. Muahahahaha etc.

Also, I added a saturation feature to show off its full potential, converted gamma from a table to a factor of the calculation, tweaked some menus and made the default value of cvars show up on sliders. Because that's how I roll.

(cherry picked from commit 83e16da83bb1a2e3be7ee8a5fd4a779797294fc8)

# Conflicts:
#	src/m_menu.c
---
 src/d_netcmd.c |   1 +
 src/v_video.c  | 251 +++++++++++++++++++++++++++++++------------------
 src/v_video.h  |   3 +-
 3 files changed, 164 insertions(+), 91 deletions(-)

diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 88621ee66..489590978 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -857,6 +857,7 @@ void D_RegisterClientCommands(void)
 
 	// FIXME: not to be here.. but needs be done for config loading
 	CV_RegisterVar(&cv_usegamma);
+	CV_RegisterVar(&cv_usesaturation);
 
 	// m_menu.c
 	//CV_RegisterVar(&cv_compactscoreboard);
diff --git a/src/v_video.c b/src/v_video.c
index 274c14b38..f380f0d99 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -38,12 +38,15 @@ UINT8 *screens[5];
 // screens[3] = fade screen start
 // screens[4] = fade screen end, postimage tempoarary buffer
 
-static CV_PossibleValue_t gamma_cons_t[] = {{0, "MIN"}, {4, "MAX"}, {0, NULL}};
+static CV_PossibleValue_t gamma_cons_t[] = {{-5, "MIN"}, {5, "MAX"}, {0, NULL}};
 static void CV_usegamma_OnChange(void);
 
 consvar_t cv_ticrate = {"showfps", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_usegamma = {"gamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_usegamma_OnChange, 0, NULL, NULL, 0, 0, NULL};
 
+static CV_PossibleValue_t saturation_cons_t[] = {{0, "MIN"}, {10, "MAX"}, {0, NULL}};
+consvar_t cv_usesaturation = {"saturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_usegamma_OnChange, 0, NULL, NULL, 0, 0, NULL};
+
 static CV_PossibleValue_t constextsize_cons_t[] = {
 	{V_NOSCALEPATCH, "Small"}, {V_SMALLSCALEPATCH, "Medium"}, {V_MEDSCALEPATCH, "Large"}, {0, "Huge"},
 	{0, NULL}};
@@ -82,97 +85,123 @@ consvar_t cv_grfallbackplayermodel = {"gr_fallbackplayermodel", "Off", CV_SAVE,
 consvar_t cv_grspritebillboarding = {"gr_spritebillboarding", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 #endif
 
-const UINT8 gammatable[5][256] =
-{
-	{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,
-	17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,
-	33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,
-	49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,
-	65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,
-	81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,
-	97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,
-	113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,
-	128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
-	144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
-	160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
-	176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
-	192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
-	208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
-	224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
-	240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255},
-
-	{2,4,5,7,8,10,11,12,14,15,16,18,19,20,21,23,24,25,26,27,29,30,31,
-	32,33,34,36,37,38,39,40,41,42,44,45,46,47,48,49,50,51,52,54,55,
-	56,57,58,59,60,61,62,63,64,65,66,67,69,70,71,72,73,74,75,76,77,
-	78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,
-	99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,
-	115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,129,
-	130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,
-	146,147,148,148,149,150,151,152,153,154,155,156,157,158,159,160,
-	161,162,163,163,164,165,166,167,168,169,170,171,172,173,174,175,
-	175,176,177,178,179,180,181,182,183,184,185,186,186,187,188,189,
-	190,191,192,193,194,195,196,196,197,198,199,200,201,202,203,204,
-	205,205,206,207,208,209,210,211,212,213,214,214,215,216,217,218,
-	219,220,221,222,222,223,224,225,226,227,228,229,230,230,231,232,
-	233,234,235,236,237,237,238,239,240,241,242,243,244,245,245,246,
-	247,248,249,250,251,252,252,253,254,255},
-
-	{4,7,9,11,13,15,17,19,21,22,24,26,27,29,30,32,33,35,36,38,39,40,42,
-	43,45,46,47,48,50,51,52,54,55,56,57,59,60,61,62,63,65,66,67,68,69,
-	70,72,73,74,75,76,77,78,79,80,82,83,84,85,86,87,88,89,90,91,92,93,
-	94,95,96,97,98,100,101,102,103,104,105,106,107,108,109,110,111,112,
-	113,114,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,
-	129,130,131,132,133,133,134,135,136,137,138,139,140,141,142,143,144,
-	144,145,146,147,148,149,150,151,152,153,153,154,155,156,157,158,159,
-	160,160,161,162,163,164,165,166,166,167,168,169,170,171,172,172,173,
-	174,175,176,177,178,178,179,180,181,182,183,183,184,185,186,187,188,
-	188,189,190,191,192,193,193,194,195,196,197,197,198,199,200,201,201,
-	202,203,204,205,206,206,207,208,209,210,210,211,212,213,213,214,215,
-	216,217,217,218,219,220,221,221,222,223,224,224,225,226,227,228,228,
-	229,230,231,231,232,233,234,235,235,236,237,238,238,239,240,241,241,
-	242,243,244,244,245,246,247,247,248,249,250,251,251,252,253,254,254,
-	255},
-
-	{8,12,16,19,22,24,27,29,31,34,36,38,40,41,43,45,47,49,50,52,53,55,
-	57,58,60,61,63,64,65,67,68,70,71,72,74,75,76,77,79,80,81,82,84,85,
-	86,87,88,90,91,92,93,94,95,96,98,99,100,101,102,103,104,105,106,107,
-	108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,
-	125,126,127,128,129,130,131,132,133,134,135,135,136,137,138,139,140,
-	141,142,143,143,144,145,146,147,148,149,150,150,151,152,153,154,155,
-	155,156,157,158,159,160,160,161,162,163,164,165,165,166,167,168,169,
-	169,170,171,172,173,173,174,175,176,176,177,178,179,180,180,181,182,
-	183,183,184,185,186,186,187,188,189,189,190,191,192,192,193,194,195,
-	195,196,197,197,198,199,200,200,201,202,202,203,204,205,205,206,207,
-	207,208,209,210,210,211,212,212,213,214,214,215,216,216,217,218,219,
-	219,220,221,221,222,223,223,224,225,225,226,227,227,228,229,229,230,
-	231,231,232,233,233,234,235,235,236,237,237,238,238,239,240,240,241,
-	242,242,243,244,244,245,246,246,247,247,248,249,249,250,251,251,252,
-	253,253,254,254,255},
-
-	{16,23,28,32,36,39,42,45,48,50,53,55,57,60,62,64,66,68,69,71,73,75,76,
-	78,80,81,83,84,86,87,89,90,92,93,94,96,97,98,100,101,102,103,105,106,
-	107,108,109,110,112,113,114,115,116,117,118,119,120,121,122,123,124,
-	125,126,128,128,129,130,131,132,133,134,135,136,137,138,139,140,141,
-	142,143,143,144,145,146,147,148,149,150,150,151,152,153,154,155,155,
-	156,157,158,159,159,160,161,162,163,163,164,165,166,166,167,168,169,
-	169,170,171,172,172,173,174,175,175,176,177,177,178,179,180,180,181,
-	182,182,183,184,184,185,186,187,187,188,189,189,190,191,191,192,193,
-	193,194,195,195,196,196,197,198,198,199,200,200,201,202,202,203,203,
-	204,205,205,206,207,207,208,208,209,210,210,211,211,212,213,213,214,
-	214,215,216,216,217,217,218,219,219,220,220,221,221,222,223,223,224,
-	224,225,225,226,227,227,228,228,229,229,230,230,231,232,232,233,233,
-	234,234,235,235,236,236,237,237,238,239,239,240,240,241,241,242,242,
-	243,243,244,244,245,245,246,246,247,247,248,248,249,249,250,250,251,
-	251,252,252,253,254,254,255,255}
-};
-
 // local copy of the palette for V_GetColor()
 RGBA_t *pLocalPalette = NULL;
 
+/*
+The following was an extremely helpful resource when developing my Colour Cube LUT.
+http://http.developer.nvidia.com/GPUGems2/gpugems2_chapter24.html
+Please check it out if you're trying to maintain this.
+toast 18/04/17
+*/
+
+float Cubepal[2][2][2][3];
+
+// returns whether to apply cube, selectively avoiding expensive operations
+static boolean InitCube(void)
+{
+	boolean apply = false;
+	UINT8 q;
+	float working[2][2][2][3] = // the initial positions of the corners of the colour cube!
+	{
+		{
+			{
+				{0.0, 0.0, 0.0}, // black corner
+				{1.0, 0.0, 0.0}  // red corner
+			},
+			{
+				{0.0, 1.0, 0.0}, // green corner
+				{1.0, 1.0, 0.0}  // yellow corner
+			}
+		},
+		{
+			{
+				{0.0, 0.0, 1.0}, // blue corner
+				{1.0, 0.0, 1.0}  // magenta corner
+			},
+			{
+				{0.0, 1.0, 1.0}, // cyan corner
+				{1.0, 1.0, 1.0}  // white corner
+			}
+		}
+	};
+
+	if (cv_usegamma.value)
+	{
+#define gammascale 8
+		float gammamul = (255 - (gammascale*abs(cv_usegamma.value)))/255.0;
+		float gammaoffs = ((cv_usegamma.value > 0) ? ((gammascale*cv_usegamma.value)/255.0) : 0.0);
+#undef gammascale
+
+		apply = true;
+
+		#define dogamma(i, j, k, l) \
+			working[i][j][k][l]*= gammamul;\
+			working[i][j][k][l] += gammaoffs
+		for (q = 0; q < 3; q++)
+		{
+			dogamma(0, 0, 0, q);
+			dogamma(1, 0, 0, q);
+			dogamma(0, 1, 0, q);
+			dogamma(1, 1, 0, q);
+			dogamma(0, 0, 1, q);
+			dogamma(1, 0, 1, q);
+			dogamma(0, 1, 1, q);
+			dogamma(1, 1, 1, q);
+		}
+#undef dogamma
+	}
+
+	if (cv_usesaturation.value != 10)
+	{
+		float desatur[3] = {0.33, 0.33, 0.33}; // grey
+		float work = (cv_usesaturation.value/10.0);
+
+		apply = true;
+
+#define dosaturation(a, e) a = ((1 - work)*e + work*a)
+		for (q = 0; q < 3; q++)
+		{
+			dosaturation(working[0][0][1][q], desatur[q]);
+			dosaturation(working[0][1][0][q], desatur[q]);
+			dosaturation(working[1][0][0][q], desatur[q]);
+
+			dosaturation(working[1][1][0][q], 2*desatur[q]);
+			dosaturation(working[1][0][1][q], 2*desatur[q]);
+			dosaturation(working[0][1][1][q], 2*desatur[q]);
+		}
+#undef dosaturation
+	}
+
+	if (!apply)
+		return false;
+
+#define dowork(i, j, k, l) \
+	if (working[i][j][k][l] > 1.0)\
+		working[i][j][k][l] = 1.0;\
+	else if (working[i][j][k][l] < 0.0)\
+		working[i][j][k][l] = 0.0;\
+	Cubepal[i][j][k][l] = working[i][j][k][l]
+	for (q = 0; q < 3; q++)
+	{
+		dowork(0, 0, 0, q);
+		dowork(1, 0, 0, q);
+		dowork(0, 1, 0, q);
+		dowork(1, 1, 0, q);
+		dowork(0, 0, 1, q);
+		dowork(1, 0, 1, q);
+		dowork(0, 1, 1, q);
+		dowork(1, 1, 1, q);
+	}
+#undef dowork
+
+	return true;
+}
+
 // keep a copy of the palette so that we can get the RGB value for a color index at any time.
 static void LoadPalette(const char *lumpname)
 {
-	const UINT8 *usegamma = gammatable[cv_usegamma.value];
+	boolean cube = InitCube();
 	lumpnum_t lumpnum = W_GetNumForName(lumpname);
 	size_t i, palsize = W_LumpLength(lumpnum)/3;
 	UINT8 *pal;
@@ -184,10 +213,54 @@ static void LoadPalette(const char *lumpname)
 	pal = W_CacheLumpNum(lumpnum, PU_CACHE);
 	for (i = 0; i < palsize; i++)
 	{
-		pLocalPalette[i].s.red = usegamma[*pal++];
-		pLocalPalette[i].s.green = usegamma[*pal++];
-		pLocalPalette[i].s.blue = usegamma[*pal++];
+		pLocalPalette[i].s.red = *pal++;
+		pLocalPalette[i].s.green = *pal++;
+		pLocalPalette[i].s.blue = *pal++;
 		pLocalPalette[i].s.alpha = 0xFF;
+
+		// lerp of colour cubing!
+		if (cube)
+		{
+			float working[4][3];
+			float linear;
+			UINT8 q;
+
+			linear = (pLocalPalette[i].s.red/255.0);
+#define dolerp(e1, e2) ((1 - linear)*e1 + linear*e2)
+			for (q = 0; q < 3; q++)
+			{
+				working[0][q] = dolerp(Cubepal[0][0][0][q], Cubepal[1][0][0][q]);
+				working[1][q] = dolerp(Cubepal[0][1][0][q], Cubepal[1][1][0][q]);
+				working[2][q] = dolerp(Cubepal[0][0][1][q], Cubepal[1][0][1][q]);
+				working[3][q] = dolerp(Cubepal[0][1][1][q], Cubepal[1][1][1][q]);
+			}
+			linear = (pLocalPalette[i].s.green/255.0);
+			for (q = 0; q < 3; q++)
+			{
+				working[0][q] = dolerp(working[0][q], working[1][q]);
+				working[1][q] = dolerp(working[2][q], working[3][q]);
+			}
+			linear = (pLocalPalette[i].s.blue/255.0);
+			for (q = 0; q < 3; q++)
+			{
+				working[0][q] = 255*dolerp(working[0][q], working[1][q]);
+				if (working[0][q] > 255.0)
+					working[0][q] = 255.0;
+				else if (working[0][q]  < 0.0)
+					working[0][q] = 0.0;
+			}
+#undef dowork
+
+			/*
+			I don't know what I messed up such that red takes index 2 and blue takes index 0.
+			It should be the other way around, but I've just got this working after spending
+			hours on it and I'm not going to look a gift ho(rse/t)fix in the mouth.
+			toast 18/04/17
+			*/
+			pLocalPalette[i].s.red = (UINT8)(working[0][2]);
+			pLocalPalette[i].s.green = (UINT8)(working[0][1]);
+			pLocalPalette[i].s.blue = (UINT8)(working[0][0]);
+		}
 	}
 }
 
diff --git a/src/v_video.h b/src/v_video.h
index d229c370f..8b35b920a 100644
--- a/src/v_video.h
+++ b/src/v_video.h
@@ -27,8 +27,7 @@
 
 extern UINT8 *screens[5];
 
-extern const UINT8 gammatable[5][256];
-extern consvar_t cv_ticrate, cv_usegamma, cv_constextsize;
+extern consvar_t cv_ticrate, cv_usegamma, cv_usesaturation, cv_constextsize;
 
 // Allocates buffer screens, call before R_Init.
 void V_Init(void);

From a82e5ee91631057e80c32851bc77880f2980122f Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Tue, 18 Apr 2017 23:38:38 +0100
Subject: [PATCH 05/49] Figured out what was up. I didn't quite understand my
 original array!

(cherry picked from commit c2edd6224da250d251013a10495403d3af1ed074)
---
 src/v_video.c | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/v_video.c b/src/v_video.c
index f380f0d99..ffc5afc37 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -107,20 +107,20 @@ static boolean InitCube(void)
 		{
 			{
 				{0.0, 0.0, 0.0}, // black corner
-				{1.0, 0.0, 0.0}  // red corner
+				{0.0, 0.0, 1.0}  // blue corner
 			},
 			{
-				{0.0, 1.0, 0.0}, // green corner
-				{1.0, 1.0, 0.0}  // yellow corner
+				{0.0, 1.0, 0.0}, // greem corner
+				{0.0, 1.0, 1.0}  // cyan corner
 			}
 		},
 		{
 			{
-				{0.0, 0.0, 1.0}, // blue corner
+				{1.0, 0.0, 0.0}, // red corner
 				{1.0, 0.0, 1.0}  // magenta corner
 			},
 			{
-				{0.0, 1.0, 1.0}, // cyan corner
+				{1.0, 1.0, 0.0}, // yellow corner
 				{1.0, 1.0, 1.0}  // white corner
 			}
 		}
@@ -251,15 +251,9 @@ static void LoadPalette(const char *lumpname)
 			}
 #undef dowork
 
-			/*
-			I don't know what I messed up such that red takes index 2 and blue takes index 0.
-			It should be the other way around, but I've just got this working after spending
-			hours on it and I'm not going to look a gift ho(rse/t)fix in the mouth.
-			toast 18/04/17
-			*/
-			pLocalPalette[i].s.red = (UINT8)(working[0][2]);
+			pLocalPalette[i].s.red = (UINT8)(working[0][0]);
 			pLocalPalette[i].s.green = (UINT8)(working[0][1]);
-			pLocalPalette[i].s.blue = (UINT8)(working[0][0]);
+			pLocalPalette[i].s.blue = (UINT8)(working[0][2]);
 		}
 	}
 }

From b1202b617cb49d63f3d346cb37a7c12d1555e0db Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Tue, 18 Apr 2017 23:40:57 +0100
Subject: [PATCH 06/49] greem

(cherry picked from commit 9b13caccae4e298b7ee99035e679f08fec5519f2)
---
 src/v_video.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/v_video.c b/src/v_video.c
index ffc5afc37..fddfa07a7 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -110,7 +110,7 @@ static boolean InitCube(void)
 				{0.0, 0.0, 1.0}  // blue corner
 			},
 			{
-				{0.0, 1.0, 0.0}, // greem corner
+				{0.0, 1.0, 0.0}, // green corner
 				{0.0, 1.0, 1.0}  // cyan corner
 			}
 		},

From fcc80b12ad2203dd79b93dc463ebcea687688bfd Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Mon, 23 Mar 2020 16:32:11 -0700
Subject: [PATCH 07/49] Colour Cube Calibration Menu! (called "Advanced Color
 Settings" because No Fun Allowed...)

https://cdn.discordapp.com/attachments/237798387070664724/304343382073933824/aa.png

Also, a "Reset all" button for the Monitor toggle menu, a ton of new cvars to match up with the colour cube calibration, and a bunch of variable renames related to colour cube operations.

(cherry picked from commit c3840ba01d866d257434b2abdad40ef3b0cb581f)

# Conflicts:
#	src/m_menu.c
#	src/v_video.c
---
 src/d_netcmd.c |  25 ++++++-
 src/m_menu.c   |   4 +-
 src/v_video.c  | 181 +++++++++++++++++++++++++++++++++++++++----------
 src/v_video.h  |   6 +-
 4 files changed, 174 insertions(+), 42 deletions(-)

diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 489590978..03096197a 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -856,8 +856,29 @@ void D_RegisterClientCommands(void)
 	CV_RegisterVar(&cv_netdemosyncquality);
 
 	// FIXME: not to be here.. but needs be done for config loading
-	CV_RegisterVar(&cv_usegamma);
-	CV_RegisterVar(&cv_usesaturation);
+	CV_RegisterVar(&cv_globalgamma);
+	CV_RegisterVar(&cv_globalsaturation);
+
+	CV_RegisterVar(&cv_rhue);
+	CV_RegisterVar(&cv_yhue);
+	CV_RegisterVar(&cv_ghue);
+	CV_RegisterVar(&cv_chue);
+	CV_RegisterVar(&cv_bhue);
+	CV_RegisterVar(&cv_mhue);
+
+	CV_RegisterVar(&cv_rgamma);
+	CV_RegisterVar(&cv_ygamma);
+	CV_RegisterVar(&cv_ggamma);
+	CV_RegisterVar(&cv_cgamma);
+	CV_RegisterVar(&cv_bgamma);
+	CV_RegisterVar(&cv_mgamma);
+
+	CV_RegisterVar(&cv_rsaturation);
+	CV_RegisterVar(&cv_ysaturation);
+	CV_RegisterVar(&cv_gsaturation);
+	CV_RegisterVar(&cv_csaturation);
+	CV_RegisterVar(&cv_bsaturation);
+	CV_RegisterVar(&cv_msaturation);
 
 	// m_menu.c
 	//CV_RegisterVar(&cv_compactscoreboard);
diff --git a/src/m_menu.c b/src/m_menu.c
index 6ac2ef5ab..4bbaa1205 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -1252,7 +1252,7 @@ static menuitem_t OP_VideoOptionsMenu[] =
 	{IT_STRING|IT_CVAR,		NULL,	"Fullscreen",			&cv_fullscreen,			 20},
 #endif
 	{IT_STRING | IT_CVAR | IT_CV_SLIDER,
-							NULL,	"Gamma",				&cv_usegamma,			 30},
+							NULL,	"Gamma",				&cv_globalgamma,			 30},
 
 	{IT_STRING | IT_CVAR,	NULL,	"Draw Distance",		&cv_drawdist,			 45},
 	//{IT_STRING | IT_CVAR,	NULL,	"NiGHTS Draw Dist",		&cv_drawdist_nights,	 55},
@@ -2675,7 +2675,7 @@ boolean M_Responder(event_t *ev)
 				return true;
 
 			case KEY_F11: // Gamma Level
-				CV_AddValue(&cv_usegamma, 1);
+				CV_AddValue(&cv_globalgamma, 1);
 				return true;
 
 			// Spymode on F12 handled in game logic
diff --git a/src/v_video.c b/src/v_video.c
index fddfa07a7..1a7aabc82 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -38,14 +38,39 @@ UINT8 *screens[5];
 // screens[3] = fade screen start
 // screens[4] = fade screen end, postimage tempoarary buffer
 
-static CV_PossibleValue_t gamma_cons_t[] = {{-5, "MIN"}, {5, "MAX"}, {0, NULL}};
-static void CV_usegamma_OnChange(void);
+consvar_t cv_ticrate = {"showfps", "No", 0, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-consvar_t cv_ticrate = {"showfps", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_usegamma = {"gamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_usegamma_OnChange, 0, NULL, NULL, 0, 0, NULL};
+static void CV_palette_OnChange(void);
+
+static CV_PossibleValue_t gamma_cons_t[] = {{-15, "MIN"}, {5, "MAX"}, {0, NULL}};
+consvar_t cv_globalgamma = {"gamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
 
 static CV_PossibleValue_t saturation_cons_t[] = {{0, "MIN"}, {10, "MAX"}, {0, NULL}};
-consvar_t cv_usesaturation = {"saturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_usegamma_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_globalsaturation = {"saturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
+
+#define huecoloursteps 4
+
+static CV_PossibleValue_t hue_cons_t[] = {{0, "MIN"}, {(huecoloursteps*6)-1, "MAX"}, {0, NULL}};
+consvar_t cv_rhue = {"rhue",  "0", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_yhue = {"yhue",  "4", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_ghue = {"ghue",  "8", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_chue = {"chue", "12", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_bhue = {"bhue", "16", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_mhue = {"mhue", "20", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
+
+consvar_t cv_rgamma = {"rgamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_ygamma = {"ygamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_ggamma = {"ggamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_cgamma = {"cgamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_bgamma = {"bgamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_mgamma = {"mgamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
+
+consvar_t cv_rsaturation = {"rsaturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_ysaturation = {"ysaturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_gsaturation = {"gsaturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_csaturation = {"csaturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_bsaturation = {"bsaturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_msaturation = {"msaturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
 
 static CV_PossibleValue_t constextsize_cons_t[] = {
 	{V_NOSCALEPATCH, "Small"}, {V_SMALLSCALEPATCH, "Medium"}, {V_MEDSCALEPATCH, "Large"}, {0, "Huge"},
@@ -125,54 +150,136 @@ static boolean InitCube(void)
 			}
 		}
 	};
+	float desatur[3]; // grey
+	float globalgammamul, globalgammaoffs;
+	boolean doinggamma;
+
+#define diffcons(cv) (cv.value != atoi(cv.defaultvalue))
+
+	doinggamma = diffcons(cv_globalgamma);
 
-	if (cv_usegamma.value)
-	{
 #define gammascale 8
-		float gammamul = (255 - (gammascale*abs(cv_usegamma.value)))/255.0;
-		float gammaoffs = ((cv_usegamma.value > 0) ? ((gammascale*cv_usegamma.value)/255.0) : 0.0);
-#undef gammascale
+	globalgammamul = (cv_globalgamma.value ? ((255 - (gammascale*abs(cv_globalgamma.value)))/255.0) : 1.0);
+	globalgammaoffs = ((cv_globalgamma.value > 0) ? ((gammascale*cv_globalgamma.value)/255.0) : 0.0);
+	desatur[0] = desatur[1] = desatur[2] = globalgammaoffs + (0.33*globalgammamul);
 
-		apply = true;
-
-		#define dogamma(i, j, k, l) \
-			working[i][j][k][l]*= gammamul;\
-			working[i][j][k][l] += gammaoffs
-		for (q = 0; q < 3; q++)
-		{
-			dogamma(0, 0, 0, q);
-			dogamma(1, 0, 0, q);
-			dogamma(0, 1, 0, q);
-			dogamma(1, 1, 0, q);
-			dogamma(0, 0, 1, q);
-			dogamma(1, 0, 1, q);
-			dogamma(0, 1, 1, q);
-			dogamma(1, 1, 1, q);
-		}
-#undef dogamma
-	}
-
-	if (cv_usesaturation.value != 10)
+	if (doinggamma
+		|| diffcons(cv_rhue)
+		|| diffcons(cv_yhue)
+		|| diffcons(cv_ghue)
+		|| diffcons(cv_chue)
+		|| diffcons(cv_bhue)
+		|| diffcons(cv_mhue)
+		|| diffcons(cv_rgamma)
+		|| diffcons(cv_ygamma)
+		|| diffcons(cv_ggamma)
+		|| diffcons(cv_cgamma)
+		|| diffcons(cv_bgamma)
+		|| diffcons(cv_mgamma))
 	{
-		float desatur[3] = {0.33, 0.33, 0.33}; // grey
-		float work = (cv_usesaturation.value/10.0);
+		float mod, tempgammamul, tempgammaoffs;
 
 		apply = true;
 
+		working[0][0][0][0] = working[0][0][0][1] = working[0][0][0][2] = globalgammaoffs;
+		working[1][1][1][0] = working[1][1][1][1] = working[1][1][1][2] = globalgammaoffs+globalgammamul;
+
+#define dohue(hue, gamma, loc) \
+		tempgammamul = (gamma ? ((255 - (gammascale*abs(gamma)))/255.0)*globalgammamul : globalgammamul);\
+		tempgammaoffs = ((gamma > 0) ? ((gammascale*gamma)/255.0) + globalgammaoffs : globalgammaoffs);\
+		mod = ((hue % huecoloursteps)*(tempgammamul)/huecoloursteps);\
+		switch (hue/huecoloursteps)\
+		{\
+			case 0:\
+			default:\
+				loc[0] = tempgammaoffs+tempgammamul;\
+				loc[1] = tempgammaoffs+mod;\
+				loc[2] = tempgammaoffs;\
+				break;\
+			case 1:\
+				loc[0] = tempgammaoffs+tempgammamul-mod;\
+				loc[1] = tempgammaoffs+tempgammamul;\
+				loc[2] = tempgammaoffs;\
+				break;\
+			case 2:\
+				loc[0] = tempgammaoffs;\
+				loc[1] = tempgammaoffs+tempgammamul;\
+				loc[2] = tempgammaoffs+mod;\
+				break;\
+			case 3:\
+				loc[0] = tempgammaoffs;\
+				loc[1] = tempgammaoffs+tempgammamul-mod;\
+				loc[2] = tempgammaoffs+tempgammamul;\
+				break;\
+			case 4:\
+				loc[0] = tempgammaoffs+mod;\
+				loc[1] = tempgammaoffs;\
+				loc[2] = tempgammaoffs+tempgammamul;\
+				break;\
+			case 5:\
+				loc[0] = tempgammaoffs+tempgammamul;\
+				loc[1] = tempgammaoffs;\
+				loc[2] = tempgammaoffs+tempgammamul-mod;\
+				break;\
+		}
+		dohue(cv_rhue.value, cv_rgamma.value, working[1][0][0]);
+		dohue(cv_yhue.value, cv_ygamma.value, working[1][1][0]);
+		dohue(cv_ghue.value, cv_ggamma.value, working[0][1][0]);
+		dohue(cv_chue.value, cv_cgamma.value, working[0][1][1]);
+		dohue(cv_bhue.value, cv_bgamma.value, working[0][0][1]);
+		dohue(cv_mhue.value, cv_mgamma.value, working[1][0][1]);
+#undef dohue
+	}
+
 #define dosaturation(a, e) a = ((1 - work)*e + work*a)
+#define docvsat(cv_sat, hue, gamma, r, g, b) \
+	if diffcons(cv_sat)\
+	{\
+		float work, mod, tempgammamul, tempgammaoffs;\
+		apply = true;\
+		work = (cv_sat.value/10.0);\
+		mod = ((hue % huecoloursteps)*(1.0)/huecoloursteps);\
+		if (hue & huecoloursteps)\
+			mod = 2-mod;\
+		else\
+			mod += 1;\
+		tempgammamul = (gamma ? ((255 - (gammascale*abs(gamma)))/255.0)*globalgammamul : globalgammamul);\
+		tempgammaoffs = ((gamma > 0) ? ((gammascale*gamma)/255.0) + globalgammaoffs : globalgammaoffs);\
+		for (q = 0; q < 3; q++)\
+			dosaturation(working[r][g][b][q], (tempgammaoffs+(desatur[q]*mod*tempgammamul)));\
+	}
+
+	docvsat(cv_rsaturation, cv_rhue.value, cv_rgamma.value, 1, 0, 0);
+	docvsat(cv_ysaturation, cv_yhue.value, cv_ygamma.value, 1, 1, 0);
+	docvsat(cv_gsaturation, cv_ghue.value, cv_ggamma.value, 0, 1, 0);
+	docvsat(cv_csaturation, cv_chue.value, cv_cgamma.value, 0, 1, 1);
+	docvsat(cv_bsaturation, cv_bhue.value, cv_bgamma.value, 0, 0, 1);
+	docvsat(cv_msaturation, cv_mhue.value, cv_mgamma.value, 1, 0, 1);
+
+#undef gammascale
+
+	if diffcons(cv_globalsaturation)
+	{
+		float work = (cv_globalsaturation.value/10.0);
+
+		apply = true;
+
 		for (q = 0; q < 3; q++)
 		{
-			dosaturation(working[0][0][1][q], desatur[q]);
-			dosaturation(working[0][1][0][q], desatur[q]);
 			dosaturation(working[1][0][0][q], desatur[q]);
+			dosaturation(working[0][1][0][q], desatur[q]);
+			dosaturation(working[0][0][1][q], desatur[q]);
 
 			dosaturation(working[1][1][0][q], 2*desatur[q]);
-			dosaturation(working[1][0][1][q], 2*desatur[q]);
 			dosaturation(working[0][1][1][q], 2*desatur[q]);
+			dosaturation(working[1][0][1][q], 2*desatur[q]);
 		}
-#undef dosaturation
 	}
 
+#undef dosaturation
+
+#undef diffcons
+
 	if (!apply)
 		return false;
 
@@ -319,7 +426,7 @@ void V_SetPaletteLump(const char *pal)
 #endif
 }
 
-static void CV_usegamma_OnChange(void)
+static void CV_palette_OnChange(void)
 {
 	// reload palette
 	LoadMapPalette();
diff --git a/src/v_video.h b/src/v_video.h
index 8b35b920a..0a360bc42 100644
--- a/src/v_video.h
+++ b/src/v_video.h
@@ -27,7 +27,11 @@
 
 extern UINT8 *screens[5];
 
-extern consvar_t cv_ticrate, cv_usegamma, cv_usesaturation, cv_constextsize;
+extern consvar_t cv_ticrate, cv_constextsize,\
+cv_globalgamma, cv_globalsaturation, \
+cv_rhue, cv_yhue, cv_ghue, cv_chue, cv_bhue, cv_mhue,\
+cv_rgamma, cv_ygamma, cv_ggamma, cv_cgamma, cv_bgamma, cv_mgamma, \
+cv_rsaturation, cv_ysaturation, cv_gsaturation, cv_csaturation, cv_bsaturation, cv_msaturation;
 
 // Allocates buffer screens, call before R_Init.
 void V_Init(void);

From cdf8c54f2d1feae314daebbaee61f0e03e1fb929 Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Thu, 20 Apr 2017 13:15:32 +0100
Subject: [PATCH 08/49] Correcting gamma to match base SRB2.

(cherry picked from commit 29d5af61c1f7cff83e5e59117ff6ceef00d698c1)
---
 src/v_video.c | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/v_video.c b/src/v_video.c
index 1a7aabc82..2171f94c5 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -119,7 +119,6 @@ http://http.developer.nvidia.com/GPUGems2/gpugems2_chapter24.html
 Please check it out if you're trying to maintain this.
 toast 18/04/17
 */
-
 float Cubepal[2][2][2][3];
 
 // returns whether to apply cube, selectively avoiding expensive operations
@@ -175,7 +174,7 @@ static boolean InitCube(void)
 		|| diffcons(cv_ggamma)
 		|| diffcons(cv_cgamma)
 		|| diffcons(cv_bgamma)
-		|| diffcons(cv_mgamma))
+		|| diffcons(cv_mgamma)) // set the gamma'd/hued positions (saturation is done later)
 	{
 		float mod, tempgammamul, tempgammaoffs;
 
@@ -305,6 +304,31 @@ static boolean InitCube(void)
 	return true;
 }
 
+/*
+So it turns out that the way gamma was implemented previously, the default
+colour profile of the game was messed up. Since this bad decision has been
+around for a long time, and the intent is to keep the base game looking the
+same, I'm not gonna be the one to remove this base modification.
+toast 20/04/17
+*/
+const UINT8 correctiontable[256] =
+	{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,
+	17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,
+	33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,
+	49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,
+	65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,
+	81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,
+	97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,
+	113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,
+	128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+	144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
+	160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
+	176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
+	192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
+	208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
+	224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
+	240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255};
+
 // keep a copy of the palette so that we can get the RGB value for a color index at any time.
 static void LoadPalette(const char *lumpname)
 {
@@ -320,9 +344,9 @@ static void LoadPalette(const char *lumpname)
 	pal = W_CacheLumpNum(lumpnum, PU_CACHE);
 	for (i = 0; i < palsize; i++)
 	{
-		pLocalPalette[i].s.red = *pal++;
-		pLocalPalette[i].s.green = *pal++;
-		pLocalPalette[i].s.blue = *pal++;
+		pLocalPalette[i].s.red = correctiontable[*pal++];
+		pLocalPalette[i].s.green = correctiontable[*pal++];
+		pLocalPalette[i].s.blue = correctiontable[*pal++];
 		pLocalPalette[i].s.alpha = 0xFF;
 
 		// lerp of colour cubing!

From 56ac0884436ba5bd728114f7d875334ffa830a8e Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Thu, 20 Apr 2017 13:17:11 +0100
Subject: [PATCH 09/49] Screenshots now contain the palette you're actively
 looking at, as opposed to the palette the game/map has! This makes sense for
 colorblind users being able to store their precious memories, and it matches
 up with how gifs palettise.

(cherry picked from commit 9d46ba281fe9ddebc9613c4e2db6792eaf46dda2)
---
 src/hardware/hw_draw.c |  2 +-
 src/m_misc.c           | 25 +++++++++++--------------
 src/m_misc.h           |  2 +-
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/hardware/hw_draw.c b/src/hardware/hw_draw.c
index b39103ee4..dd21f408b 100644
--- a/src/hardware/hw_draw.c
+++ b/src/hardware/hw_draw.c
@@ -1208,7 +1208,7 @@ boolean HWR_Screenshot(const char *lbmname)
 	HWD.pfnReadRect(0, 0, vid.width, vid.height, vid.width * 3, (void *)buf);
 
 #ifdef USE_PNG
-	ret = M_SavePNG(lbmname, buf, vid.width, vid.height, NULL);
+	ret = M_SavePNG(lbmname, buf, vid.width, vid.height, false);
 #else
 	ret = saveTGA(lbmname, buf, vid.width, vid.height);
 #endif
diff --git a/src/m_misc.c b/src/m_misc.c
index f4a4ec291..3600ad08d 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -654,19 +654,18 @@ static void PNG_warn(png_structp PNG, png_const_charp pngtext)
 	CONS_Debug(DBG_RENDER, "libpng warning at %p: %s", PNG, pngtext);
 }
 
-static void M_PNGhdr(png_structp png_ptr, png_infop png_info_ptr, PNG_CONST png_uint_32 width, PNG_CONST png_uint_32 height, PNG_CONST png_byte *palette)
+static void M_PNGhdr(png_structp png_ptr, png_infop png_info_ptr, PNG_CONST png_uint_32 width, PNG_CONST png_uint_32 height, const boolean palette)
 {
 	const png_byte png_interlace = PNG_INTERLACE_NONE; //PNG_INTERLACE_ADAM7
 	if (palette)
 	{
 		png_colorp png_PLTE = png_malloc(png_ptr, sizeof(png_color)*256); //palette
-		const png_byte *pal = palette;
 		png_uint_16 i;
 		for (i = 0; i < 256; i++)
 		{
-			png_PLTE[i].red   = *pal; pal++;
-			png_PLTE[i].green = *pal; pal++;
-			png_PLTE[i].blue  = *pal; pal++;
+			png_PLTE[i].red   = pLocalPalette[i].s.red;
+			png_PLTE[i].green = pLocalPalette[i].s.green;
+			png_PLTE[i].blue  = pLocalPalette[i].s.blue;
 		}
 		png_set_IHDR(png_ptr, png_info_ptr, width, height, 8, PNG_COLOR_TYPE_PALETTE,
 		 png_interlace, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
@@ -941,7 +940,7 @@ static void M_PNGfix_acTL(png_structp png_ptr, png_infop png_info_ptr,
 #endif
 }
 
-static boolean M_SetupaPNG(png_const_charp filename, png_bytep pal)
+static boolean M_SetupaPNG(png_const_charp filename, boolean palette)
 {
 	apng_FILE = fopen(filename,"wb+"); // + mode for reading
 	if (!apng_FILE)
@@ -993,7 +992,7 @@ static boolean M_SetupaPNG(png_const_charp filename, png_bytep pal)
 	png_set_compression_strategy(apng_ptr, cv_zlib_strategya.value);
 	png_set_compression_window_bits(apng_ptr, cv_zlib_window_bitsa.value);
 
-	M_PNGhdr(apng_ptr, apng_info_ptr, vid.width, vid.height, pal);
+	M_PNGhdr(apng_ptr, apng_info_ptr, vid.width, vid.height, palette);
 
 	M_PNGText(apng_ptr, apng_info_ptr, true);
 
@@ -1033,9 +1032,9 @@ static inline moviemode_t M_StartMovieAPNG(const char *pathname)
 	}
 
 	if (rendermode == render_soft)
-		ret = M_SetupaPNG(va(pandf,pathname,freename), W_CacheLumpName(GetPalette(), PU_CACHE));
+		ret = M_SetupaPNG(va(pandf,pathname,freename), true);
 	else
-		ret = M_SetupaPNG(va(pandf,pathname,freename), NULL);
+		ret = M_SetupaPNG(va(pandf,pathname,freename), false);
 
 	if (!ret)
 	{
@@ -1241,11 +1240,10 @@ void M_StopMovie(void)
   * \param palette  Palette of image data
   *  \note if palette is NULL, BGR888 format
   */
-boolean M_SavePNG(const char *filename, void *data, int width, int height, const UINT8 *palette)
+boolean M_SavePNG(const char *filename, void *data, int width, int height, const boolean palette)
 {
 	png_structp png_ptr;
 	png_infop png_info_ptr;
-	PNG_CONST png_byte *PLTE = (const png_byte *)palette;
 #ifdef PNG_SETJMP_SUPPORTED
 #ifdef USE_FAR_KEYWORD
 	jmp_buf jmpbuf;
@@ -1308,7 +1306,7 @@ boolean M_SavePNG(const char *filename, void *data, int width, int height, const
 	png_set_compression_strategy(png_ptr, cv_zlib_strategy.value);
 	png_set_compression_window_bits(png_ptr, cv_zlib_window_bits.value);
 
-	M_PNGhdr(png_ptr, png_info_ptr, width, height, PLTE);
+	M_PNGhdr(png_ptr, png_info_ptr, width, height, palette);
 
 	M_PNGText(png_ptr, png_info_ptr, false);
 
@@ -1471,8 +1469,7 @@ void M_DoScreenShot(void)
 	if (rendermode != render_none)
 	{
 #ifdef USE_PNG
-		ret = M_SavePNG(va(pandf,pathname,freename), linear, vid.width, vid.height,
-			W_CacheLumpName(GetPalette(), PU_CACHE));
+		ret = M_SavePNG(va(pandf,pathname,freename), linear, vid.width, vid.height, true);
 #else
 		ret = WritePCXfile(va(pandf,pathname,freename), linear, vid.width, vid.height,
 			W_CacheLumpName(GetPalette(), PU_CACHE));
diff --git a/src/m_misc.h b/src/m_misc.h
index 658028b44..1e780632b 100644
--- a/src/m_misc.h
+++ b/src/m_misc.h
@@ -64,7 +64,7 @@ void FIL_ForceExtension(char *path, const char *extension);
 boolean FIL_CheckExtension(const char *in);
 
 #ifdef HAVE_PNG
-boolean M_SavePNG(const char *filename, void *data, int width, int height, const UINT8 *palette);
+boolean M_SavePNG(const char *filename, void *data, int width, int height, const boolean palette);
 #endif
 
 extern boolean takescreenshot;

From 7a14bbba829856668359e36e7bcd6dfc2984ef45 Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Mon, 23 Mar 2020 16:35:38 -0700
Subject: [PATCH 10/49] Disable colour profile influence on screenshots and
 gifs if you want.

(cherry picked from commit 8b46ee76ff06d600a606e23802e024416a58b5b2)

# Conflicts:
#	src/m_menu.c
---
 src/d_netcmd.c |  1 +
 src/m_anigif.c | 24 ++++++++++++++++++------
 src/m_misc.c   | 23 +++++++++++++++++++----
 src/m_misc.h   |  2 +-
 4 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 03096197a..36cb01adf 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -789,6 +789,7 @@ void D_RegisterClientCommands(void)
 
 	CV_RegisterVar(&cv_screenshot_option);
 	CV_RegisterVar(&cv_screenshot_folder);
+	CV_RegisterVar(&cv_screenshot_colorprofile);
 	CV_RegisterVar(&cv_moviemode);
 	// PNG variables
 	CV_RegisterVar(&cv_zlib_level);
diff --git a/src/m_anigif.c b/src/m_anigif.c
index 4dfc77cb3..4746d2c19 100644
--- a/src/m_anigif.c
+++ b/src/m_anigif.c
@@ -18,6 +18,7 @@
 #include "z_zone.h"
 #include "v_video.h"
 #include "i_video.h"
+#include "m_misc.h"
 
 // GIFs are always little-endian
 #include "byteptr.h"
@@ -396,7 +397,6 @@ static void GIF_headwrite(void)
 {
 	UINT8 *gifhead = Z_Malloc(800, PU_STATIC, NULL);
 	UINT8 *p = gifhead;
-	RGBA_t *c;
 	INT32 i;
 	UINT16 rwidth, rheight;
 
@@ -427,12 +427,24 @@ static void GIF_headwrite(void)
 	WRITEUINT8(p, 0x00);
 
 	// write color table
-	for (i = 0; i < 256; ++i)
+	if (cv_screenshot_colorprofile.value)
 	{
-		c = &pLocalPalette[i];
-		WRITEUINT8(p, c->s.red);
-		WRITEUINT8(p, c->s.green);
-		WRITEUINT8(p, c->s.blue);
+		for (i = 0; i < 256; i++)
+		{
+			WRITEUINT8(p, pLocalPalette[i].s.red);
+			WRITEUINT8(p, pLocalPalette[i].s.green);
+			WRITEUINT8(p, pLocalPalette[i].s.blue);
+		}
+	}
+	else
+	{
+		const UINT8 *pal = (UINT8 *)W_CacheLumpName(GetPalette(), PU_CACHE);
+		for (i = 0; i < 256; i++)
+		{
+			WRITEUINT8(p, *pal); pal++;
+			WRITEUINT8(p, *pal); pal++;
+			WRITEUINT8(p, *pal); pal++;
+		}
 	}
 
 	// write extension block
diff --git a/src/m_misc.c b/src/m_misc.c
index 3600ad08d..bcf9d4d0a 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -104,6 +104,8 @@ static CV_PossibleValue_t screenshot_cons_t[] = {{0, "Default"}, {1, "HOME"}, {2
 consvar_t cv_screenshot_option = {"screenshot_option", "Default", CV_SAVE|CV_CALL, screenshot_cons_t, Screenshot_option_Onchange, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_screenshot_folder = {"screenshot_folder", "", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
 
+consvar_t cv_screenshot_colorprofile = {"screenshot_colorprofile", "Yes", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+
 static CV_PossibleValue_t moviemode_cons_t[] = {{MM_GIF, "GIF"}, {MM_APNG, "aPNG"}, {MM_SCREENSHOT, "Screenshots"}, {0, NULL}};
 consvar_t cv_moviemode = {"moviemode_mode", "GIF", CV_SAVE|CV_CALL, moviemode_cons_t, Moviemode_mode_Onchange, 0, NULL, NULL, 0, 0, NULL};
 
@@ -661,11 +663,24 @@ static void M_PNGhdr(png_structp png_ptr, png_infop png_info_ptr, PNG_CONST png_
 	{
 		png_colorp png_PLTE = png_malloc(png_ptr, sizeof(png_color)*256); //palette
 		png_uint_16 i;
-		for (i = 0; i < 256; i++)
+		if (cv_screenshot_colorprofile.value)
 		{
-			png_PLTE[i].red   = pLocalPalette[i].s.red;
-			png_PLTE[i].green = pLocalPalette[i].s.green;
-			png_PLTE[i].blue  = pLocalPalette[i].s.blue;
+			for (i = 0; i < 256; i++)
+			{
+				png_PLTE[i].red   = pLocalPalette[i].s.red;
+				png_PLTE[i].green = pLocalPalette[i].s.green;
+				png_PLTE[i].blue  = pLocalPalette[i].s.blue;
+			}
+		}
+		else
+		{
+			const png_byte *pal = (png_byte *)W_CacheLumpName(GetPalette(), PU_CACHE);
+			for (i = 0; i < 256; i++)
+			{
+				png_PLTE[i].red   = *pal++;
+				png_PLTE[i].green = *pal++;
+				png_PLTE[i].blue  = *pal++;
+			}
 		}
 		png_set_IHDR(png_ptr, png_info_ptr, width, height, 8, PNG_COLOR_TYPE_PALETTE,
 		 png_interlace, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
diff --git a/src/m_misc.h b/src/m_misc.h
index 1e780632b..df9344dd4 100644
--- a/src/m_misc.h
+++ b/src/m_misc.h
@@ -29,7 +29,7 @@ typedef enum {
 } moviemode_t;
 extern moviemode_t moviemode;
 
-extern consvar_t cv_screenshot_option, cv_screenshot_folder;
+extern consvar_t cv_screenshot_option, cv_screenshot_folder, cv_screenshot_colorprofile;
 extern consvar_t cv_moviemode;
 extern consvar_t cv_zlib_memory, cv_zlib_level, cv_zlib_strategy, cv_zlib_window_bits;
 extern consvar_t cv_zlib_memorya, cv_zlib_levela, cv_zlib_strategya, cv_zlib_window_bitsa;

From e8c37067ed0ed0ad41849a277b00429f8f90a1ec Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Fri, 21 Apr 2017 20:29:06 +0100
Subject: [PATCH 11/49] Made PCX use cv_screenshot_colorprofile.

Also, optimised gif headwrite's palette writing.

(cherry picked from commit 3cce4956753ced4e325edc4ec61f6fe7494cc233)
---
 src/m_anigif.c |  4 +---
 src/m_misc.c   | 26 +++++++++++++++++++++-----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/m_anigif.c b/src/m_anigif.c
index 4746d2c19..77d9a5463 100644
--- a/src/m_anigif.c
+++ b/src/m_anigif.c
@@ -439,11 +439,9 @@ static void GIF_headwrite(void)
 	else
 	{
 		const UINT8 *pal = (UINT8 *)W_CacheLumpName(GetPalette(), PU_CACHE);
-		for (i = 0; i < 256; i++)
+		for (i = 0; i < 256*3; i++)
 		{
 			WRITEUINT8(p, *pal); pal++;
-			WRITEUINT8(p, *pal); pal++;
-			WRITEUINT8(p, *pal); pal++;
 		}
 	}
 
diff --git a/src/m_misc.c b/src/m_misc.c
index bcf9d4d0a..7ba949424 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -1368,7 +1368,7 @@ typedef struct
   * \param palette  Palette of image data
   */
 #if NUMSCREENS > 2
-static boolean WritePCXfile(const char *filename, const UINT8 *data, int width, int height, const UINT8 *palette)
+static boolean WritePCXfile(const char *filename, const UINT8 *data, int width, int height)
 {
 	int i;
 	size_t length;
@@ -1409,8 +1409,25 @@ static boolean WritePCXfile(const char *filename, const UINT8 *data, int width,
 
 	// write the palette
 	*pack++ = 0x0c; // palette ID byte
-	for (i = 0; i < 768; i++)
-		*pack++ = *palette++;
+
+	// write color table
+	if (cv_screenshot_colorprofile.value)
+	{
+		for (i = 0; i < 256; i++)
+		{
+			*pack++ = pLocalPalette[i].s.red;
+			*pack++ = pLocalPalette[i].s.green;
+			*pack++ = pLocalPalette[i].s.blue;
+		}
+	}
+	else
+	{
+		const UINT8 *pal = (UINT8 *)W_CacheLumpName(GetPalette(), PU_CACHE);
+		for (i = 0; i < 256*3; i++)
+		{
+			*pack++ = *pal++;
+		}
+	}
 
 	// write output file
 	length = pack - (UINT8 *)pcx;
@@ -1486,8 +1503,7 @@ void M_DoScreenShot(void)
 #ifdef USE_PNG
 		ret = M_SavePNG(va(pandf,pathname,freename), linear, vid.width, vid.height, true);
 #else
-		ret = WritePCXfile(va(pandf,pathname,freename), linear, vid.width, vid.height,
-			W_CacheLumpName(GetPalette(), PU_CACHE));
+		ret = WritePCXfile(va(pandf,pathname,freename), linear, vid.width, vid.height);
 #endif
 	}
 

From 2fb599661e5cd44ddf51b5441d286d61980821f8 Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Sat, 29 Apr 2017 16:40:07 +0100
Subject: [PATCH 12/49] Introducing pMasterPalette.

Used instead of pLocalPalette when attempting to determine objective truths, such as "the colours of this gif without color profile modification" and "what indicies should this colormap remap to".

Also, made f_wipe.c's paldiv only get calculated once.

(cherry picked from commit d669a4e84ac4e4292a8b95ab88f4948090282741)
---
 src/f_wipe.c   |  2 +-
 src/m_anigif.c | 19 +++++++------------
 src/m_misc.c   | 46 +++++++++++++++++-----------------------------
 src/r_data.c   | 43 ++++++++++++++++++++++++++++++++++---------
 src/v_video.c  | 11 +++++++----
 src/v_video.h  |  1 +
 6 files changed, 67 insertions(+), 55 deletions(-)

diff --git a/src/f_wipe.c b/src/f_wipe.c
index e42042516..6ad565441 100644
--- a/src/f_wipe.c
+++ b/src/f_wipe.c
@@ -157,7 +157,7 @@ static fademask_t *F_GetFadeMask(UINT8 masknum, UINT8 scrnnum) {
 	while (lsize--)
 	{
 		// Determine pixel to use from fademask
-		pcolor = &pLocalPalette[*lump++];
+		pcolor = &pMasterPalette[*lump++];
 		*mask++ = FixedDiv((pcolor->s.red+1)<<FRACBITS, paldiv)>>FRACBITS;
 	}
 
diff --git a/src/m_anigif.c b/src/m_anigif.c
index 77d9a5463..64254163d 100644
--- a/src/m_anigif.c
+++ b/src/m_anigif.c
@@ -427,21 +427,16 @@ static void GIF_headwrite(void)
 	WRITEUINT8(p, 0x00);
 
 	// write color table
-	if (cv_screenshot_colorprofile.value)
 	{
+		RGBA_t *pal = ((cv_screenshot_colorprofile.value)
+		? pLocalPalette
+		: pMasterPalette);
+
 		for (i = 0; i < 256; i++)
 		{
-			WRITEUINT8(p, pLocalPalette[i].s.red);
-			WRITEUINT8(p, pLocalPalette[i].s.green);
-			WRITEUINT8(p, pLocalPalette[i].s.blue);
-		}
-	}
-	else
-	{
-		const UINT8 *pal = (UINT8 *)W_CacheLumpName(GetPalette(), PU_CACHE);
-		for (i = 0; i < 256*3; i++)
-		{
-			WRITEUINT8(p, *pal); pal++;
+			WRITEUINT8(p, pal[i].s.red);
+			WRITEUINT8(p, pal[i].s.green);
+			WRITEUINT8(p, pal[i].s.blue);
 		}
 	}
 
diff --git a/src/m_misc.c b/src/m_misc.c
index 7ba949424..43b78c35c 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -663,25 +663,18 @@ static void M_PNGhdr(png_structp png_ptr, png_infop png_info_ptr, PNG_CONST png_
 	{
 		png_colorp png_PLTE = png_malloc(png_ptr, sizeof(png_color)*256); //palette
 		png_uint_16 i;
-		if (cv_screenshot_colorprofile.value)
+
+		RGBA_t *pal = ((cv_screenshot_colorprofile.value)
+		? pLocalPalette
+		: pMasterPalette);
+
+		for (i = 0; i < 256; i++)
 		{
-			for (i = 0; i < 256; i++)
-			{
-				png_PLTE[i].red   = pLocalPalette[i].s.red;
-				png_PLTE[i].green = pLocalPalette[i].s.green;
-				png_PLTE[i].blue  = pLocalPalette[i].s.blue;
-			}
-		}
-		else
-		{
-			const png_byte *pal = (png_byte *)W_CacheLumpName(GetPalette(), PU_CACHE);
-			for (i = 0; i < 256; i++)
-			{
-				png_PLTE[i].red   = *pal++;
-				png_PLTE[i].green = *pal++;
-				png_PLTE[i].blue  = *pal++;
-			}
+			png_PLTE[i].red   = pal[i].s.red;
+			png_PLTE[i].green = pal[i].s.green;
+			png_PLTE[i].blue  = pal[i].s.blue;
 		}
+
 		png_set_IHDR(png_ptr, png_info_ptr, width, height, 8, PNG_COLOR_TYPE_PALETTE,
 		 png_interlace, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
 		png_write_info_before_PLTE(png_ptr, png_info_ptr);
@@ -1411,21 +1404,16 @@ static boolean WritePCXfile(const char *filename, const UINT8 *data, int width,
 	*pack++ = 0x0c; // palette ID byte
 
 	// write color table
-	if (cv_screenshot_colorprofile.value)
 	{
+		RGBA_t *pal = ((cv_screenshot_colorprofile.value)
+		? pLocalPalette
+		: pMasterPalette);
+
 		for (i = 0; i < 256; i++)
 		{
-			*pack++ = pLocalPalette[i].s.red;
-			*pack++ = pLocalPalette[i].s.green;
-			*pack++ = pLocalPalette[i].s.blue;
-		}
-	}
-	else
-	{
-		const UINT8 *pal = (UINT8 *)W_CacheLumpName(GetPalette(), PU_CACHE);
-		for (i = 0; i < 256*3; i++)
-		{
-			*pack++ = *pal++;
+			*pack++ = pal[i].s.red;
+			*pack++ = pal[i].s.green;
+			*pack++ = pal[i].s.blue;
 		}
 	}
 
diff --git a/src/r_data.c b/src/r_data.c
index 922e907e2..843ed2acb 100644
--- a/src/r_data.c
+++ b/src/r_data.c
@@ -22,7 +22,7 @@
 #include "w_wad.h"
 #include "z_zone.h"
 #include "p_setup.h" // levelflats
-#include "v_video.h" // pLocalPalette
+#include "v_video.h" // pMasterPalette
 #include "dehacked.h"
 
 #if defined (_WIN32) || defined (_WIN32_WCE)
@@ -1192,7 +1192,7 @@ void R_MakeInvertmap(void)
 INT32 R_CreateColormap(char *p1, char *p2, char *p3)
 {
 	double cmaskr, cmaskg, cmaskb, cdestr, cdestg, cdestb;
-	double maskamt = 0, othermask = 0;
+	double r, g, b, cbrightness, maskamt = 0, othermask = 0;
 	int mask, fog = 0;
 	size_t mapnum = num_extra_colormaps;
 	size_t i;
@@ -1300,6 +1300,32 @@ INT32 R_CreateColormap(char *p1, char *p2, char *p3)
 
 	num_extra_colormaps++;
 
+	if (rendermode == render_soft)
+	{
+		for (i = 0; i < 256; i++)
+		{
+			r = pMasterPalette[i].s.red;
+			g = pMasterPalette[i].s.green;
+			b = pMasterPalette[i].s.blue;
+			cbrightness = sqrt((r*r) + (g*g) + (b*b));
+
+			map[i][0] = (cbrightness * cmaskr) + (r * othermask);
+			if (map[i][0] > 255.0l)
+				map[i][0] = 255.0l;
+			deltas[i][0] = (map[i][0] - cdestr) / (double)fadedist;
+
+			map[i][1] = (cbrightness * cmaskg) + (g * othermask);
+			if (map[i][1] > 255.0l)
+				map[i][1] = 255.0l;
+			deltas[i][1] = (map[i][1] - cdestg) / (double)fadedist;
+
+			map[i][2] = (cbrightness * cmaskb) + (b * othermask);
+			if (map[i][2] > 255.0l)
+				map[i][2] = 255.0l;
+			deltas[i][2] = (map[i][2] - cdestb) / (double)fadedist;
+		}
+	}
+
 	foundcolormaps[mapnum] = LUMPERROR;
 
 	// aligned on 8 bit for asm code
@@ -1313,7 +1339,6 @@ INT32 R_CreateColormap(char *p1, char *p2, char *p3)
 
 	if (rendermode == render_soft)
 	{
-		double r, g, b, cbrightness;
 		int p;
 		lighttable_t *colormap_p;
 
@@ -1324,9 +1349,9 @@ INT32 R_CreateColormap(char *p1, char *p2, char *p3)
 		//  map[i]'s values are decremented by after each use
 		for (i = 0; i < 256; i++)
 		{
-			r = pLocalPalette[i].s.red;
-			g = pLocalPalette[i].s.green;
-			b = pLocalPalette[i].s.blue;
+			r = pMasterPalette[i].s.red;
+			g = pMasterPalette[i].s.green;
+			b = pMasterPalette[i].s.blue;
 			cbrightness = sqrt((r*r) + (g*g) + (b*b));
 
 			map[i][0] = (cbrightness * cmaskr) + (r * othermask);
@@ -1409,9 +1434,9 @@ UINT8 NearestColor(UINT8 r, UINT8 g, UINT8 b)
 
 	for (i = 0; i < 256; i++)
 	{
-		dr = r - pLocalPalette[i].s.red;
-		dg = g - pLocalPalette[i].s.green;
-		db = b - pLocalPalette[i].s.blue;
+		dr = r - pMasterPalette[i].s.red;
+		dg = g - pMasterPalette[i].s.green;
+		db = b - pMasterPalette[i].s.blue;
 		distortion = dr*dr + dg*dg + db*db;
 		if (distortion < bestdistortion)
 		{
diff --git a/src/v_video.c b/src/v_video.c
index 2171f94c5..0efd2cdda 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -112,6 +112,7 @@ consvar_t cv_grspritebillboarding = {"gr_spritebillboarding", "On", CV_SAVE, CV_
 
 // local copy of the palette for V_GetColor()
 RGBA_t *pLocalPalette = NULL;
+RGBA_t *pMasterPalette = NULL;
 
 /*
 The following was an extremely helpful resource when developing my Colour Cube LUT.
@@ -338,16 +339,18 @@ static void LoadPalette(const char *lumpname)
 	UINT8 *pal;
 
 	Z_Free(pLocalPalette);
+	Z_Free(pMasterPalette);
 
 	pLocalPalette = Z_Malloc(sizeof (*pLocalPalette)*palsize, PU_STATIC, NULL);
+	pMasterPalette = Z_Malloc(sizeof (*pMasterPalette)*palsize, PU_STATIC, NULL);
 
 	pal = W_CacheLumpNum(lumpnum, PU_CACHE);
 	for (i = 0; i < palsize; i++)
 	{
-		pLocalPalette[i].s.red = correctiontable[*pal++];
-		pLocalPalette[i].s.green = correctiontable[*pal++];
-		pLocalPalette[i].s.blue = correctiontable[*pal++];
-		pLocalPalette[i].s.alpha = 0xFF;
+		pMasterPalette[i].s.red = pLocalPalette[i].s.red = correctiontable[*pal++];
+		pMasterPalette[i].s.green = pLocalPalette[i].s.green = correctiontable[*pal++];
+		pMasterPalette[i].s.blue = pLocalPalette[i].s.blue = correctiontable[*pal++];
+		pMasterPalette[i].s.alpha = pLocalPalette[i].s.alpha = 0xFF;
 
 		// lerp of colour cubing!
 		if (cube)
diff --git a/src/v_video.h b/src/v_video.h
index 0a360bc42..7478c6903 100644
--- a/src/v_video.h
+++ b/src/v_video.h
@@ -45,6 +45,7 @@ const char *R_GetPalname(UINT16 num);
 const char *GetPalette(void);
 
 extern RGBA_t *pLocalPalette;
+extern RGBA_t *pMasterPalette;
 
 extern UINT8 hudtrans;
 

From d688ef2c901c8aeccf8448b33b38fdda327410f9 Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Sat, 29 Apr 2017 16:40:07 +0100
Subject: [PATCH 13/49] Fix typo.

(cherry picked from commit 5180bff05bf55132746913305ade19ee0ced5c10)
---
 src/v_video.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/v_video.c b/src/v_video.c
index 0efd2cdda..c482debda 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -383,7 +383,7 @@ static void LoadPalette(const char *lumpname)
 				else if (working[0][q]  < 0.0)
 					working[0][q] = 0.0;
 			}
-#undef dowork
+#undef dolerp
 
 			pLocalPalette[i].s.red = (UINT8)(working[0][0]);
 			pLocalPalette[i].s.green = (UINT8)(working[0][1]);

From 60624edc1ae7e5a5f680667a6063e070621dfee9 Mon Sep 17 00:00:00 2001
From: Jimita the Cat <lazymyuutsu@gmail.com>
Date: Wed, 2 Jan 2019 00:41:52 -0300
Subject: [PATCH 14/49] Add support for flashpals in screenshots

(cherry picked from commit e765b9400cf741eb8aaa72768ef677769ee5c12b)
---
 src/hardware/hw_draw.c |  9 ++++--
 src/hardware/hw_main.h |  5 +--
 src/m_misc.c           | 72 ++++++++++++++++++++++++++----------------
 src/m_misc.h           |  2 +-
 src/st_stuff.c         |  2 +-
 src/st_stuff.h         |  1 +
 6 files changed, 56 insertions(+), 35 deletions(-)

diff --git a/src/hardware/hw_draw.c b/src/hardware/hw_draw.c
index dd21f408b..eb1db7d70 100644
--- a/src/hardware/hw_draw.c
+++ b/src/hardware/hw_draw.c
@@ -1196,21 +1196,24 @@ UINT8 *HWR_GetScreenshot(void)
 	return buf;
 }
 
-boolean HWR_Screenshot(const char *lbmname)
+boolean HWR_Screenshot(const char *pathname, char **error)
 {
 	boolean ret;
 	UINT8 *buf = malloc(vid.width * vid.height * 3 * sizeof (*buf));
 
 	if (!buf)
+	{
+		*error = "Failed to allocate memory for HWR_Screenshot";
 		return false;
+	}
 
 	// returns 24bit 888 RGB
 	HWD.pfnReadRect(0, 0, vid.width, vid.height, vid.width * 3, (void *)buf);
 
 #ifdef USE_PNG
-	ret = M_SavePNG(lbmname, buf, vid.width, vid.height, false);
+	ret = M_SavePNG(pathname, buf, vid.width, vid.height, NULL, &*error);	// c_irl
 #else
-	ret = saveTGA(lbmname, buf, vid.width, vid.height);
+	ret = saveTGA(pathname, buf, vid.width, vid.height);
 #endif
 	free(buf);
 	return ret;
diff --git a/src/hardware/hw_main.h b/src/hardware/hw_main.h
index 7bc361d95..109c5cb20 100644
--- a/src/hardware/hw_main.h
+++ b/src/hardware/hw_main.h
@@ -38,8 +38,6 @@ void HWR_RenderSkyboxView(INT32 viewnumber, player_t *player);
 void HWR_RenderPlayerView(INT32 viewnumber, player_t *player);
 void HWR_DrawViewBorder(INT32 clearlines);
 void HWR_DrawFlatFill(INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatlumpnum);
-UINT8 *HWR_GetScreenshot(void);
-boolean HWR_Screenshot(const char *lbmname);
 void HWR_InitTextureMapping(void);
 void HWR_SetViewSize(void);
 void HWR_DrawPatch(GLPatch_t *gpatch, INT32 x, INT32 y, INT32 option);
@@ -54,6 +52,9 @@ void HWR_DrawConsoleFill(INT32 x, INT32 y, INT32 w, INT32 h, UINT32 color, INT32
 void HWR_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 color);
 void HWR_DrawPic(INT32 x,INT32 y,lumpnum_t lumpnum);
 
+UINT8 *HWR_GetScreenshot(void);
+boolean HWR_Screenshot(const char *pathname, char **error);
+
 void HWR_AddCommands(void);
 void HWR_CorrectSWTricks(void);
 void transform(float *cx, float *cy, float *cz);
diff --git a/src/m_misc.c b/src/m_misc.c
index 43b78c35c..40d8c103f 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -30,6 +30,7 @@
 #include "g_game.h"
 #include "m_misc.h"
 #include "hu_stuff.h"
+#include "st_stuff.h"
 #include "v_video.h"
 #include "z_zone.h"
 #include "g_input.h"
@@ -588,6 +589,21 @@ void M_SaveConfig(const char *filename)
 	fclose(f);
 }
 
+// ==========================================================================
+//                              SCREENSHOTS
+// ==========================================================================
+static UINT8 screenshot_palette[768];
+static void M_CreateScreenShotPalette(void)
+{
+	size_t i, j;
+	for (i = 0, j = 0; i < 768; i += 3, j++)
+	{
+		RGBA_t locpal = pLocalPalette[(max(st_palette,0)*256)+j];
+		screenshot_palette[i] = locpal.s.red;
+		screenshot_palette[i+1] = locpal.s.green;
+		screenshot_palette[i+2] = locpal.s.blue;
+	}
+}
 
 #if NUMSCREENS > 2
 static const char *Newsnapshotfile(const char *pathname, const char *ext)
@@ -1024,6 +1040,7 @@ static boolean M_SetupaPNG(png_const_charp filename, boolean palette)
 static inline moviemode_t M_StartMovieAPNG(const char *pathname)
 {
 #ifdef USE_APNG
+	UINT8 *palette;
 	const char *freename = NULL;
 	boolean ret = false;
 
@@ -1039,10 +1056,8 @@ static inline moviemode_t M_StartMovieAPNG(const char *pathname)
 		return MM_OFF;
 	}
 
-	if (rendermode == render_soft)
-		ret = M_SetupaPNG(va(pandf,pathname,freename), true);
-	else
-		ret = M_SetupaPNG(va(pandf,pathname,freename), false);
+	if (rendermode == render_soft) M_CreateScreenShotPalette();
+	ret = M_SetupaPNG(va(pandf,pathname,freename), (palette = screenshot_palette));
 
 	if (!ret)
 	{
@@ -1245,10 +1260,11 @@ void M_StopMovie(void)
   * \param data     The image data.
   * \param width    Width of the picture.
   * \param height   Height of the picture.
-  * \param palette  Palette of image data
+  * \param palette  Palette of image data.
   *  \note if palette is NULL, BGR888 format
+  * \param error    Error string to return, if screenshot failed.
   */
-boolean M_SavePNG(const char *filename, void *data, int width, int height, const boolean palette)
+boolean M_SavePNG(const char *filename, void *data, int width, int height, const UINT8 *palette, char **error)
 {
 	png_structp png_ptr;
 	png_infop png_info_ptr;
@@ -1262,15 +1278,14 @@ boolean M_SavePNG(const char *filename, void *data, int width, int height, const
 	png_FILE = fopen(filename,"wb");
 	if (!png_FILE)
 	{
-		CONS_Debug(DBG_RENDER, "M_SavePNG: Error on opening %s for write\n", filename);
+		*error = "Failed to open file for write";
 		return false;
 	}
 
-	png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL,
-	 PNG_error, PNG_warn);
+	png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, PNG_error, PNG_warn);
 	if (!png_ptr)
 	{
-		CONS_Debug(DBG_RENDER, "M_SavePNG: Error on initialize libpng\n");
+		*error = "Failed to initialize libpng";
 		fclose(png_FILE);
 		remove(filename);
 		return false;
@@ -1279,7 +1294,7 @@ boolean M_SavePNG(const char *filename, void *data, int width, int height, const
 	png_info_ptr = png_create_info_struct(png_ptr);
 	if (!png_info_ptr)
 	{
-		CONS_Debug(DBG_RENDER, "M_SavePNG: Error on allocate for libpng\n");
+		*error = "Failed to allocate memory for libpng";
 		png_destroy_write_struct(&png_ptr,  NULL);
 		fclose(png_FILE);
 		remove(filename);
@@ -1292,7 +1307,7 @@ boolean M_SavePNG(const char *filename, void *data, int width, int height, const
 	if (setjmp(png_jmpbuf(png_ptr)))
 #endif
 	{
-		//CONS_Debug(DBG_RENDER, "libpng write error on %s\n", filename);
+		*error = "libpng write error";
 		png_destroy_write_struct(&png_ptr, &png_info_ptr);
 		fclose(png_FILE);
 		remove(filename);
@@ -1433,9 +1448,8 @@ void M_ScreenShot(void)
 }
 
 /** Takes a screenshot.
-  * The screenshot is saved as "kartxxxx.pcx" (or "kartxxxx.tga" in hardware
-  * rendermode) where xxxx is the lowest four-digit number for which a file
-  * does not already exist.
+  * The screenshot is saved as "srb2xxxx.png" where xxxx is the lowest
+  * four-digit number for which a file does not already exist.
   *
   * \sa HWR_ScreenShot
   */
@@ -1444,11 +1458,16 @@ void M_DoScreenShot(void)
 #if NUMSCREENS > 2
 	const char *freename = NULL, *pathname = ".";
 	boolean ret = false;
+	char *error = "Unknown error";
 	UINT8 *linear = NULL;
 
 	// Don't take multiple screenshots, obviously
 	takescreenshot = false;
 
+	// how does one take a screenshot without a render system?
+	if (rendermode == render_none)
+		return;
+
 	if (cv_screenshot_option.value == 0)
 		pathname = usehome ? srb2home : srb2path;
 	else if (cv_screenshot_option.value == 1)
@@ -1459,16 +1478,13 @@ void M_DoScreenShot(void)
 		pathname = cv_screenshot_folder.string;
 
 #ifdef USE_PNG
-	if (rendermode != render_none)
-		freename = Newsnapshotfile(pathname,"png");
+	freename = Newsnapshotfile(pathname,"png");
 #else
 	if (rendermode == render_soft)
 		freename = Newsnapshotfile(pathname,"pcx");
-	else if (rendermode != render_none)
+	else if (rendermode == render_opengl)
 		freename = Newsnapshotfile(pathname,"tga");
 #endif
-	else
-		I_Error("Can't take a screenshot without a render system");
 
 	if (rendermode == render_soft)
 	{
@@ -1482,16 +1498,16 @@ void M_DoScreenShot(void)
 
 	// save the pcx file
 #ifdef HWRENDER
-	if (rendermode != render_soft)
-		ret = HWR_Screenshot(va(pandf,pathname,freename));
+	if (rendermode == render_opengl)
+		ret = HWR_Screenshot(va(pandf,pathname,freename), &error);
 	else
 #endif
-	if (rendermode != render_none)
 	{
+		M_CreateScreenShotPalette();
 #ifdef USE_PNG
-		ret = M_SavePNG(va(pandf,pathname,freename), linear, vid.width, vid.height, true);
+		ret = M_SavePNG(va(pandf,pathname,freename), linear, vid.width, vid.height, screenshot_palette, &error);
 #else
-		ret = WritePCXfile(va(pandf,pathname,freename), linear, vid.width, vid.height);
+		ret = WritePCXfile(va(pandf,pathname,freename), linear, vid.width, vid.height, screenshot_palette);
 #endif
 	}
 
@@ -1499,14 +1515,14 @@ failure:
 	if (ret)
 	{
 		if (moviemode != MM_SCREENSHOT)
-			CONS_Printf(M_GetText("screen shot %s saved in %s\n"), freename, pathname);
+			CONS_Printf(M_GetText("Screen shot %s saved in %s\n"), freename, pathname);
 	}
 	else
 	{
 		if (freename)
-			CONS_Printf(M_GetText("Couldn't create screen shot %s in %s\n"), freename, pathname);
+			CONS_Alert(CONS_ERROR, M_GetText("Couldn't create screen shot %s in %s (%s)\n"), freename, pathname, error);
 		else
-			CONS_Printf(M_GetText("Couldn't create screen shot (all 10000 slots used!) in %s\n"), pathname);
+			CONS_Alert(CONS_ERROR, M_GetText("Couldn't create screen shot in %s (all 10000 slots used!)\n"), pathname);
 
 		if (moviemode == MM_SCREENSHOT)
 			M_StopMovie();
diff --git a/src/m_misc.h b/src/m_misc.h
index df9344dd4..990e15b3c 100644
--- a/src/m_misc.h
+++ b/src/m_misc.h
@@ -64,7 +64,7 @@ void FIL_ForceExtension(char *path, const char *extension);
 boolean FIL_CheckExtension(const char *in);
 
 #ifdef HAVE_PNG
-boolean M_SavePNG(const char *filename, void *data, int width, int height, const boolean palette);
+boolean M_SavePNG(const char *filename, void *data, int width, int height, const UINT8 *palette, char **error);
 #endif
 
 extern boolean takescreenshot;
diff --git a/src/st_stuff.c b/src/st_stuff.c
index 2a2ede350..8ac6e89a0 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -203,7 +203,7 @@ void ST_Ticker(void)
 }
 
 // 0 is default, any others are special palettes.
-static INT32 st_palette = 0;
+INT32 st_palette = 0;
 
 void ST_doPaletteStuff(void)
 {
diff --git a/src/st_stuff.h b/src/st_stuff.h
index 16f7b8811..5ed5dd1c6 100644
--- a/src/st_stuff.h
+++ b/src/st_stuff.h
@@ -61,6 +61,7 @@ boolean ST_SameTeam(player_t *a, player_t *b);
 //--------------------
 
 extern boolean st_overlay; // sb overlay on or off when fullscreen
+extern INT32 st_palette; // 0 is default, any others are special palettes.
 
 extern lumpnum_t st_borderpatchnum;
 // patches, also used in intermission

From d6493c9101bb29d1a02a577cce3260a75b434886 Mon Sep 17 00:00:00 2001
From: Jimita the Cat <lazymyuutsu@gmail.com>
Date: Wed, 2 Jan 2019 01:01:57 -0300
Subject: [PATCH 15/49] dumb

(cherry picked from commit 892e65071281e1aa2bd6158748120cf4b7cd81c2)
---
 src/hardware/hw_draw.c |  6 +++---
 src/hardware/hw_main.h |  2 +-
 src/m_misc.c           | 18 ++++++++----------
 src/m_misc.h           |  2 +-
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/hardware/hw_draw.c b/src/hardware/hw_draw.c
index eb1db7d70..eca6edfc1 100644
--- a/src/hardware/hw_draw.c
+++ b/src/hardware/hw_draw.c
@@ -1196,14 +1196,14 @@ UINT8 *HWR_GetScreenshot(void)
 	return buf;
 }
 
-boolean HWR_Screenshot(const char *pathname, char **error)
+boolean HWR_Screenshot(const char *pathname)
 {
 	boolean ret;
 	UINT8 *buf = malloc(vid.width * vid.height * 3 * sizeof (*buf));
 
 	if (!buf)
 	{
-		*error = "Failed to allocate memory for HWR_Screenshot";
+		CONS_Debug(DBG_RENDER, "HWR_Screenshot: Failed to allocate memory\n");
 		return false;
 	}
 
@@ -1211,7 +1211,7 @@ boolean HWR_Screenshot(const char *pathname, char **error)
 	HWD.pfnReadRect(0, 0, vid.width, vid.height, vid.width * 3, (void *)buf);
 
 #ifdef USE_PNG
-	ret = M_SavePNG(pathname, buf, vid.width, vid.height, NULL, &*error);	// c_irl
+	ret = M_SavePNG(pathname, buf, vid.width, vid.height, NULL);
 #else
 	ret = saveTGA(pathname, buf, vid.width, vid.height);
 #endif
diff --git a/src/hardware/hw_main.h b/src/hardware/hw_main.h
index 109c5cb20..67c2f5430 100644
--- a/src/hardware/hw_main.h
+++ b/src/hardware/hw_main.h
@@ -53,7 +53,7 @@ void HWR_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 color);
 void HWR_DrawPic(INT32 x,INT32 y,lumpnum_t lumpnum);
 
 UINT8 *HWR_GetScreenshot(void);
-boolean HWR_Screenshot(const char *pathname, char **error);
+boolean HWR_Screenshot(const char *pathname);
 
 void HWR_AddCommands(void);
 void HWR_CorrectSWTricks(void);
diff --git a/src/m_misc.c b/src/m_misc.c
index 40d8c103f..a63c31ce1 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -1262,9 +1262,8 @@ void M_StopMovie(void)
   * \param height   Height of the picture.
   * \param palette  Palette of image data.
   *  \note if palette is NULL, BGR888 format
-  * \param error    Error string to return, if screenshot failed.
   */
-boolean M_SavePNG(const char *filename, void *data, int width, int height, const UINT8 *palette, char **error)
+boolean M_SavePNG(const char *filename, void *data, int width, int height, const UINT8 *palette)
 {
 	png_structp png_ptr;
 	png_infop png_info_ptr;
@@ -1278,14 +1277,14 @@ boolean M_SavePNG(const char *filename, void *data, int width, int height, const
 	png_FILE = fopen(filename,"wb");
 	if (!png_FILE)
 	{
-		*error = "Failed to open file for write";
+		CONS_Debug(DBG_RENDER, "M_SavePNG: Error on opening %s for write\n", filename);
 		return false;
 	}
 
 	png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, PNG_error, PNG_warn);
 	if (!png_ptr)
 	{
-		*error = "Failed to initialize libpng";
+		CONS_Debug(DBG_RENDER, "M_SavePNG: Error on initialize libpng\n");
 		fclose(png_FILE);
 		remove(filename);
 		return false;
@@ -1294,7 +1293,7 @@ boolean M_SavePNG(const char *filename, void *data, int width, int height, const
 	png_info_ptr = png_create_info_struct(png_ptr);
 	if (!png_info_ptr)
 	{
-		*error = "Failed to allocate memory for libpng";
+		CONS_Debug(DBG_RENDER, "M_SavePNG: Error on allocate for libpng\n");
 		png_destroy_write_struct(&png_ptr,  NULL);
 		fclose(png_FILE);
 		remove(filename);
@@ -1307,7 +1306,7 @@ boolean M_SavePNG(const char *filename, void *data, int width, int height, const
 	if (setjmp(png_jmpbuf(png_ptr)))
 #endif
 	{
-		*error = "libpng write error";
+		//CONS_Debug(DBG_RENDER, "libpng write error on %s\n", filename);
 		png_destroy_write_struct(&png_ptr, &png_info_ptr);
 		fclose(png_FILE);
 		remove(filename);
@@ -1458,7 +1457,6 @@ void M_DoScreenShot(void)
 #if NUMSCREENS > 2
 	const char *freename = NULL, *pathname = ".";
 	boolean ret = false;
-	char *error = "Unknown error";
 	UINT8 *linear = NULL;
 
 	// Don't take multiple screenshots, obviously
@@ -1499,13 +1497,13 @@ void M_DoScreenShot(void)
 	// save the pcx file
 #ifdef HWRENDER
 	if (rendermode == render_opengl)
-		ret = HWR_Screenshot(va(pandf,pathname,freename), &error);
+		ret = HWR_Screenshot(va(pandf,pathname,freename));
 	else
 #endif
 	{
 		M_CreateScreenShotPalette();
 #ifdef USE_PNG
-		ret = M_SavePNG(va(pandf,pathname,freename), linear, vid.width, vid.height, screenshot_palette, &error);
+		ret = M_SavePNG(va(pandf,pathname,freename), linear, vid.width, vid.height, screenshot_palette);
 #else
 		ret = WritePCXfile(va(pandf,pathname,freename), linear, vid.width, vid.height, screenshot_palette);
 #endif
@@ -1520,7 +1518,7 @@ failure:
 	else
 	{
 		if (freename)
-			CONS_Alert(CONS_ERROR, M_GetText("Couldn't create screen shot %s in %s (%s)\n"), freename, pathname, error);
+			CONS_Alert(CONS_ERROR, M_GetText("Couldn't create screen shot %s in %s\n"), freename, pathname);
 		else
 			CONS_Alert(CONS_ERROR, M_GetText("Couldn't create screen shot in %s (all 10000 slots used!)\n"), pathname);
 
diff --git a/src/m_misc.h b/src/m_misc.h
index 990e15b3c..3d42b4244 100644
--- a/src/m_misc.h
+++ b/src/m_misc.h
@@ -64,7 +64,7 @@ void FIL_ForceExtension(char *path, const char *extension);
 boolean FIL_CheckExtension(const char *in);
 
 #ifdef HAVE_PNG
-boolean M_SavePNG(const char *filename, void *data, int width, int height, const UINT8 *palette, char **error);
+boolean M_SavePNG(const char *filename, void *data, int width, int height, const UINT8 *palette);
 #endif
 
 extern boolean takescreenshot;

From a3732678e06c7c4e89276e8f19f3b72f7bb7ca41 Mon Sep 17 00:00:00 2001
From: Jimita the Cat <lazymyuutsu@gmail.com>
Date: Wed, 2 Jan 2019 00:41:52 -0300
Subject: [PATCH 16/49] Add support for flashpals in screenshots

(cherry picked from commit e765b9400cf741eb8aaa72768ef677769ee5c12b)
---
 src/hardware/hw_draw.c |  6 +++---
 src/hardware/hw_main.h |  2 +-
 src/m_misc.c           | 18 ++++++++++--------
 src/m_misc.h           |  2 +-
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/hardware/hw_draw.c b/src/hardware/hw_draw.c
index eca6edfc1..eb1db7d70 100644
--- a/src/hardware/hw_draw.c
+++ b/src/hardware/hw_draw.c
@@ -1196,14 +1196,14 @@ UINT8 *HWR_GetScreenshot(void)
 	return buf;
 }
 
-boolean HWR_Screenshot(const char *pathname)
+boolean HWR_Screenshot(const char *pathname, char **error)
 {
 	boolean ret;
 	UINT8 *buf = malloc(vid.width * vid.height * 3 * sizeof (*buf));
 
 	if (!buf)
 	{
-		CONS_Debug(DBG_RENDER, "HWR_Screenshot: Failed to allocate memory\n");
+		*error = "Failed to allocate memory for HWR_Screenshot";
 		return false;
 	}
 
@@ -1211,7 +1211,7 @@ boolean HWR_Screenshot(const char *pathname)
 	HWD.pfnReadRect(0, 0, vid.width, vid.height, vid.width * 3, (void *)buf);
 
 #ifdef USE_PNG
-	ret = M_SavePNG(pathname, buf, vid.width, vid.height, NULL);
+	ret = M_SavePNG(pathname, buf, vid.width, vid.height, NULL, &*error);	// c_irl
 #else
 	ret = saveTGA(pathname, buf, vid.width, vid.height);
 #endif
diff --git a/src/hardware/hw_main.h b/src/hardware/hw_main.h
index 67c2f5430..109c5cb20 100644
--- a/src/hardware/hw_main.h
+++ b/src/hardware/hw_main.h
@@ -53,7 +53,7 @@ void HWR_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 color);
 void HWR_DrawPic(INT32 x,INT32 y,lumpnum_t lumpnum);
 
 UINT8 *HWR_GetScreenshot(void);
-boolean HWR_Screenshot(const char *pathname);
+boolean HWR_Screenshot(const char *pathname, char **error);
 
 void HWR_AddCommands(void);
 void HWR_CorrectSWTricks(void);
diff --git a/src/m_misc.c b/src/m_misc.c
index a63c31ce1..40d8c103f 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -1262,8 +1262,9 @@ void M_StopMovie(void)
   * \param height   Height of the picture.
   * \param palette  Palette of image data.
   *  \note if palette is NULL, BGR888 format
+  * \param error    Error string to return, if screenshot failed.
   */
-boolean M_SavePNG(const char *filename, void *data, int width, int height, const UINT8 *palette)
+boolean M_SavePNG(const char *filename, void *data, int width, int height, const UINT8 *palette, char **error)
 {
 	png_structp png_ptr;
 	png_infop png_info_ptr;
@@ -1277,14 +1278,14 @@ boolean M_SavePNG(const char *filename, void *data, int width, int height, const
 	png_FILE = fopen(filename,"wb");
 	if (!png_FILE)
 	{
-		CONS_Debug(DBG_RENDER, "M_SavePNG: Error on opening %s for write\n", filename);
+		*error = "Failed to open file for write";
 		return false;
 	}
 
 	png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, PNG_error, PNG_warn);
 	if (!png_ptr)
 	{
-		CONS_Debug(DBG_RENDER, "M_SavePNG: Error on initialize libpng\n");
+		*error = "Failed to initialize libpng";
 		fclose(png_FILE);
 		remove(filename);
 		return false;
@@ -1293,7 +1294,7 @@ boolean M_SavePNG(const char *filename, void *data, int width, int height, const
 	png_info_ptr = png_create_info_struct(png_ptr);
 	if (!png_info_ptr)
 	{
-		CONS_Debug(DBG_RENDER, "M_SavePNG: Error on allocate for libpng\n");
+		*error = "Failed to allocate memory for libpng";
 		png_destroy_write_struct(&png_ptr,  NULL);
 		fclose(png_FILE);
 		remove(filename);
@@ -1306,7 +1307,7 @@ boolean M_SavePNG(const char *filename, void *data, int width, int height, const
 	if (setjmp(png_jmpbuf(png_ptr)))
 #endif
 	{
-		//CONS_Debug(DBG_RENDER, "libpng write error on %s\n", filename);
+		*error = "libpng write error";
 		png_destroy_write_struct(&png_ptr, &png_info_ptr);
 		fclose(png_FILE);
 		remove(filename);
@@ -1457,6 +1458,7 @@ void M_DoScreenShot(void)
 #if NUMSCREENS > 2
 	const char *freename = NULL, *pathname = ".";
 	boolean ret = false;
+	char *error = "Unknown error";
 	UINT8 *linear = NULL;
 
 	// Don't take multiple screenshots, obviously
@@ -1497,13 +1499,13 @@ void M_DoScreenShot(void)
 	// save the pcx file
 #ifdef HWRENDER
 	if (rendermode == render_opengl)
-		ret = HWR_Screenshot(va(pandf,pathname,freename));
+		ret = HWR_Screenshot(va(pandf,pathname,freename), &error);
 	else
 #endif
 	{
 		M_CreateScreenShotPalette();
 #ifdef USE_PNG
-		ret = M_SavePNG(va(pandf,pathname,freename), linear, vid.width, vid.height, screenshot_palette);
+		ret = M_SavePNG(va(pandf,pathname,freename), linear, vid.width, vid.height, screenshot_palette, &error);
 #else
 		ret = WritePCXfile(va(pandf,pathname,freename), linear, vid.width, vid.height, screenshot_palette);
 #endif
@@ -1518,7 +1520,7 @@ failure:
 	else
 	{
 		if (freename)
-			CONS_Alert(CONS_ERROR, M_GetText("Couldn't create screen shot %s in %s\n"), freename, pathname);
+			CONS_Alert(CONS_ERROR, M_GetText("Couldn't create screen shot %s in %s (%s)\n"), freename, pathname, error);
 		else
 			CONS_Alert(CONS_ERROR, M_GetText("Couldn't create screen shot in %s (all 10000 slots used!)\n"), pathname);
 
diff --git a/src/m_misc.h b/src/m_misc.h
index 3d42b4244..990e15b3c 100644
--- a/src/m_misc.h
+++ b/src/m_misc.h
@@ -64,7 +64,7 @@ void FIL_ForceExtension(char *path, const char *extension);
 boolean FIL_CheckExtension(const char *in);
 
 #ifdef HAVE_PNG
-boolean M_SavePNG(const char *filename, void *data, int width, int height, const UINT8 *palette);
+boolean M_SavePNG(const char *filename, void *data, int width, int height, const UINT8 *palette, char **error);
 #endif
 
 extern boolean takescreenshot;

From 9ded0d1770c8dd071d1d7fd7ade73504f4db2c6d Mon Sep 17 00:00:00 2001
From: Jimita the Cat <lazymyuutsu@gmail.com>
Date: Wed, 2 Jan 2019 01:01:57 -0300
Subject: [PATCH 17/49] dumb

(cherry picked from commit 892e65071281e1aa2bd6158748120cf4b7cd81c2)
---
 src/hardware/hw_draw.c |  6 +++---
 src/hardware/hw_main.h |  2 +-
 src/m_misc.c           | 18 ++++++++----------
 src/m_misc.h           |  2 +-
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/hardware/hw_draw.c b/src/hardware/hw_draw.c
index eb1db7d70..eca6edfc1 100644
--- a/src/hardware/hw_draw.c
+++ b/src/hardware/hw_draw.c
@@ -1196,14 +1196,14 @@ UINT8 *HWR_GetScreenshot(void)
 	return buf;
 }
 
-boolean HWR_Screenshot(const char *pathname, char **error)
+boolean HWR_Screenshot(const char *pathname)
 {
 	boolean ret;
 	UINT8 *buf = malloc(vid.width * vid.height * 3 * sizeof (*buf));
 
 	if (!buf)
 	{
-		*error = "Failed to allocate memory for HWR_Screenshot";
+		CONS_Debug(DBG_RENDER, "HWR_Screenshot: Failed to allocate memory\n");
 		return false;
 	}
 
@@ -1211,7 +1211,7 @@ boolean HWR_Screenshot(const char *pathname, char **error)
 	HWD.pfnReadRect(0, 0, vid.width, vid.height, vid.width * 3, (void *)buf);
 
 #ifdef USE_PNG
-	ret = M_SavePNG(pathname, buf, vid.width, vid.height, NULL, &*error);	// c_irl
+	ret = M_SavePNG(pathname, buf, vid.width, vid.height, NULL);
 #else
 	ret = saveTGA(pathname, buf, vid.width, vid.height);
 #endif
diff --git a/src/hardware/hw_main.h b/src/hardware/hw_main.h
index 109c5cb20..67c2f5430 100644
--- a/src/hardware/hw_main.h
+++ b/src/hardware/hw_main.h
@@ -53,7 +53,7 @@ void HWR_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 color);
 void HWR_DrawPic(INT32 x,INT32 y,lumpnum_t lumpnum);
 
 UINT8 *HWR_GetScreenshot(void);
-boolean HWR_Screenshot(const char *pathname, char **error);
+boolean HWR_Screenshot(const char *pathname);
 
 void HWR_AddCommands(void);
 void HWR_CorrectSWTricks(void);
diff --git a/src/m_misc.c b/src/m_misc.c
index 40d8c103f..a63c31ce1 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -1262,9 +1262,8 @@ void M_StopMovie(void)
   * \param height   Height of the picture.
   * \param palette  Palette of image data.
   *  \note if palette is NULL, BGR888 format
-  * \param error    Error string to return, if screenshot failed.
   */
-boolean M_SavePNG(const char *filename, void *data, int width, int height, const UINT8 *palette, char **error)
+boolean M_SavePNG(const char *filename, void *data, int width, int height, const UINT8 *palette)
 {
 	png_structp png_ptr;
 	png_infop png_info_ptr;
@@ -1278,14 +1277,14 @@ boolean M_SavePNG(const char *filename, void *data, int width, int height, const
 	png_FILE = fopen(filename,"wb");
 	if (!png_FILE)
 	{
-		*error = "Failed to open file for write";
+		CONS_Debug(DBG_RENDER, "M_SavePNG: Error on opening %s for write\n", filename);
 		return false;
 	}
 
 	png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, PNG_error, PNG_warn);
 	if (!png_ptr)
 	{
-		*error = "Failed to initialize libpng";
+		CONS_Debug(DBG_RENDER, "M_SavePNG: Error on initialize libpng\n");
 		fclose(png_FILE);
 		remove(filename);
 		return false;
@@ -1294,7 +1293,7 @@ boolean M_SavePNG(const char *filename, void *data, int width, int height, const
 	png_info_ptr = png_create_info_struct(png_ptr);
 	if (!png_info_ptr)
 	{
-		*error = "Failed to allocate memory for libpng";
+		CONS_Debug(DBG_RENDER, "M_SavePNG: Error on allocate for libpng\n");
 		png_destroy_write_struct(&png_ptr,  NULL);
 		fclose(png_FILE);
 		remove(filename);
@@ -1307,7 +1306,7 @@ boolean M_SavePNG(const char *filename, void *data, int width, int height, const
 	if (setjmp(png_jmpbuf(png_ptr)))
 #endif
 	{
-		*error = "libpng write error";
+		//CONS_Debug(DBG_RENDER, "libpng write error on %s\n", filename);
 		png_destroy_write_struct(&png_ptr, &png_info_ptr);
 		fclose(png_FILE);
 		remove(filename);
@@ -1458,7 +1457,6 @@ void M_DoScreenShot(void)
 #if NUMSCREENS > 2
 	const char *freename = NULL, *pathname = ".";
 	boolean ret = false;
-	char *error = "Unknown error";
 	UINT8 *linear = NULL;
 
 	// Don't take multiple screenshots, obviously
@@ -1499,13 +1497,13 @@ void M_DoScreenShot(void)
 	// save the pcx file
 #ifdef HWRENDER
 	if (rendermode == render_opengl)
-		ret = HWR_Screenshot(va(pandf,pathname,freename), &error);
+		ret = HWR_Screenshot(va(pandf,pathname,freename));
 	else
 #endif
 	{
 		M_CreateScreenShotPalette();
 #ifdef USE_PNG
-		ret = M_SavePNG(va(pandf,pathname,freename), linear, vid.width, vid.height, screenshot_palette, &error);
+		ret = M_SavePNG(va(pandf,pathname,freename), linear, vid.width, vid.height, screenshot_palette);
 #else
 		ret = WritePCXfile(va(pandf,pathname,freename), linear, vid.width, vid.height, screenshot_palette);
 #endif
@@ -1520,7 +1518,7 @@ failure:
 	else
 	{
 		if (freename)
-			CONS_Alert(CONS_ERROR, M_GetText("Couldn't create screen shot %s in %s (%s)\n"), freename, pathname, error);
+			CONS_Alert(CONS_ERROR, M_GetText("Couldn't create screen shot %s in %s\n"), freename, pathname);
 		else
 			CONS_Alert(CONS_ERROR, M_GetText("Couldn't create screen shot in %s (all 10000 slots used!)\n"), pathname);
 
diff --git a/src/m_misc.h b/src/m_misc.h
index 990e15b3c..3d42b4244 100644
--- a/src/m_misc.h
+++ b/src/m_misc.h
@@ -64,7 +64,7 @@ void FIL_ForceExtension(char *path, const char *extension);
 boolean FIL_CheckExtension(const char *in);
 
 #ifdef HAVE_PNG
-boolean M_SavePNG(const char *filename, void *data, int width, int height, const UINT8 *palette, char **error);
+boolean M_SavePNG(const char *filename, void *data, int width, int height, const UINT8 *palette);
 #endif
 
 extern boolean takescreenshot;

From 3c2adbb7d187d6a77b2b45762bd29e150ed2bc4c Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Mon, 23 Mar 2020 17:08:44 -0700
Subject: [PATCH 18/49] Fix whacky history

---
 src/m_misc.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/m_misc.c b/src/m_misc.c
index a63c31ce1..acd150169 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -672,7 +672,7 @@ static void PNG_warn(png_structp PNG, png_const_charp pngtext)
 	CONS_Debug(DBG_RENDER, "libpng warning at %p: %s", PNG, pngtext);
 }
 
-static void M_PNGhdr(png_structp png_ptr, png_infop png_info_ptr, PNG_CONST png_uint_32 width, PNG_CONST png_uint_32 height, const boolean palette)
+static void M_PNGhdr(png_structp png_ptr, png_infop png_info_ptr, PNG_CONST png_uint_32 width, PNG_CONST png_uint_32 height, PNG_CONST png_byte *palette)
 {
 	const png_byte png_interlace = PNG_INTERLACE_NONE; //PNG_INTERLACE_ADAM7
 	if (palette)
@@ -680,15 +680,13 @@ static void M_PNGhdr(png_structp png_ptr, png_infop png_info_ptr, PNG_CONST png_
 		png_colorp png_PLTE = png_malloc(png_ptr, sizeof(png_color)*256); //palette
 		png_uint_16 i;
 
-		RGBA_t *pal = ((cv_screenshot_colorprofile.value)
-		? pLocalPalette
-		: pMasterPalette);
+		const png_byte *pal = palette;
 
 		for (i = 0; i < 256; i++)
 		{
-			png_PLTE[i].red   = pal[i].s.red;
-			png_PLTE[i].green = pal[i].s.green;
-			png_PLTE[i].blue  = pal[i].s.blue;
+			png_PLTE[i].red   = *pal; pal++;
+			png_PLTE[i].green = *pal; pal++;
+			png_PLTE[i].blue  = *pal; pal++;
 		}
 
 		png_set_IHDR(png_ptr, png_info_ptr, width, height, 8, PNG_COLOR_TYPE_PALETTE,
@@ -964,7 +962,7 @@ static void M_PNGfix_acTL(png_structp png_ptr, png_infop png_info_ptr,
 #endif
 }
 
-static boolean M_SetupaPNG(png_const_charp filename, boolean palette)
+static boolean M_SetupaPNG(png_const_charp filename, png_bytep pal)
 {
 	apng_FILE = fopen(filename,"wb+"); // + mode for reading
 	if (!apng_FILE)
@@ -1016,7 +1014,7 @@ static boolean M_SetupaPNG(png_const_charp filename, boolean palette)
 	png_set_compression_strategy(apng_ptr, cv_zlib_strategya.value);
 	png_set_compression_window_bits(apng_ptr, cv_zlib_window_bitsa.value);
 
-	M_PNGhdr(apng_ptr, apng_info_ptr, vid.width, vid.height, palette);
+	M_PNGhdr(apng_ptr, apng_info_ptr, vid.width, vid.height, pal);
 
 	M_PNGText(apng_ptr, apng_info_ptr, true);
 

From 1a759a49049d72a0d0352459ffa0ec767427abef Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Sun, 10 Nov 2019 00:04:11 -0300
Subject: [PATCH 19/49] GIF recording

(cherry picked from commit d467d2b2295a9660631774b9edb29555cc5c30fe)
---
 src/hardware/hw_main.c |  4 ++--
 src/m_anigif.c         | 52 +++++++++++++++++++++++++++++++++++++++---
 src/m_misc.c           |  8 ++-----
 src/r_data.h           |  2 ++
 src/sdl/i_video.c      |  5 ++--
 src/v_video.c          | 27 ++++++++++++++++++----
 src/v_video.h          | 12 ++++++++++
 7 files changed, 91 insertions(+), 19 deletions(-)

diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index 73e65cceb..a22e5b586 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -582,7 +582,7 @@ static void HWR_RenderPlane(sector_t *sector, extrasubsector_t *xsub, boolean is
 	if (nrPlaneVerts < 3)   //not even a triangle ?
 		return;
 
-	if ((UINT32)nrPlaneVerts > UINT16_MAX) // FIXME: exceeds plVerts size
+	if (nrPlaneVerts > INT16_MAX) // FIXME: exceeds plVerts size
 	{
 		CONS_Debug(DBG_RENDER, "polygon size of %d exceeds max value of %d vertices\n", nrPlaneVerts, UINT16_MAX);
 		return;
@@ -3229,7 +3229,7 @@ static void HWR_RenderPolyObjectPlane(polyobj_t *polysector, boolean isceiling,
 	if (nrPlaneVerts < 3)   //not even a triangle ?
 		return;
 
-	if (nrPlaneVerts > UINT16_MAX) // FIXME: exceeds plVerts size
+	if (nrPlaneVerts > INT16_MAX) // FIXME: exceeds plVerts size
 	{
 		CONS_Debug(DBG_RENDER, "polygon size of %s exceeds max value of %d vertices\n", sizeu1(nrPlaneVerts), UINT16_MAX);
 		return;
diff --git a/src/m_anigif.c b/src/m_anigif.c
index 64254163d..1e5ece33b 100644
--- a/src/m_anigif.c
+++ b/src/m_anigif.c
@@ -20,6 +20,10 @@
 #include "i_video.h"
 #include "m_misc.h"
 
+#ifdef HWRENDER
+#include "hardware/hw_main.h"
+#endif
+
 // GIFs are always little-endian
 #include "byteptr.h"
 
@@ -457,6 +461,32 @@ const UINT8 gifframe_gchead[4] = {0x21,0xF9,0x04,0x04}; // GCE, bytes, packed by
 static UINT8 *gifframe_data = NULL;
 static size_t gifframe_size = 8192;
 
+#ifdef HWRENDER
+static void hwrconvert(void)
+{
+	UINT8 *linear = HWR_GetScreenshot();
+	UINT8 *dest = screens[2];
+	UINT8 r, g, b;
+	INT32 x, y;
+	size_t i = 0;
+
+	InitColorLUT();
+
+	for (y = 0; y < vid.height; y++)
+	{
+		for (x = 0; x < vid.width; x++, i += 3)
+		{
+			r = (UINT8)linear[i];
+			g = (UINT8)linear[i + 1];
+			b = (UINT8)linear[i + 2];
+			dest[(y * vid.width) + x] = colorlookup[r >> SHIFTCOLORBITS][g >> SHIFTCOLORBITS][b >> SHIFTCOLORBITS];
+		}
+	}
+
+	free(linear);
+}
+#endif
+
 //
 // GIF_framewrite
 // writes a frame into the file.
@@ -482,7 +512,12 @@ static void GIF_framewrite(void)
 		GIF_optimizeregion(cur_screen, movie_screen, &blitx, &blity, &blitw, &blith);
 
 		// blit to temp screen
-		I_ReadScreen(movie_screen);
+		if (rendermode == render_soft)
+			I_ReadScreen(movie_screen);
+#ifdef HWRENDER
+		else if (rendermode == render_opengl)
+			hwrconvert();
+#endif
 	}
 	else
 	{
@@ -491,7 +526,18 @@ static void GIF_framewrite(void)
 		blith = vid.height;
 
 		if (gif_frames == 0)
-			I_ReadScreen(movie_screen);
+		{
+			if (rendermode == render_soft)
+				I_ReadScreen(movie_screen);
+#ifdef HWRENDER
+			else if (rendermode == render_opengl)
+			{
+				hwrconvert();
+				VID_BlitLinearScreen(screens[2], screens[0], vid.width*vid.bpp, vid.height, vid.width*vid.bpp, vid.rowbytes);
+			}
+#endif
+		}
+
 		movie_screen = screens[0];
 	}
 
@@ -580,7 +626,7 @@ static void GIF_framewrite(void)
 //
 INT32 GIF_open(const char *filename)
 {
-#ifdef HWRENDER
+#if 0
 	if (rendermode != render_soft)
 	{
 		CONS_Alert(CONS_WARNING, M_GetText("GIFs cannot be taken in non-software modes!\n"));
diff --git a/src/m_misc.c b/src/m_misc.c
index acd150169..800d34e79 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -1120,12 +1120,8 @@ void M_StartMovie(void)
 	switch (cv_moviemode.value)
 	{
 		case MM_GIF:
-			if (rendermode == render_soft)
-			{
-				moviemode = M_StartMovieGIF(pathname);
-				break;
-			}
-			/* FALLTHRU */
+			moviemode = M_StartMovieGIF(pathname);
+			break;
 		case MM_APNG:
 			moviemode = M_StartMovieAPNG(pathname);
 			break;
diff --git a/src/r_data.h b/src/r_data.h
index cd61bbaac..e5dd3764a 100644
--- a/src/r_data.h
+++ b/src/r_data.h
@@ -99,6 +99,8 @@ void R_MakeInvertmap(void);
 #endif
 const char *R_ColormapNameForNum(INT32 num);
 
+UINT8 NearestColor(UINT8 r, UINT8 g, UINT8 b);
+
 extern INT32 numtextures;
 
 #endif
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index c900417ab..1a8175dc3 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -1647,6 +1647,7 @@ INT32 VID_SetMode(INT32 modeNum)
 	//Impl_SetWindowName("SRB2Kart "VERSIONSTRING);
 
 	SDLSetMode(vid.width, vid.height, USE_FULLSCREEN);
+	Impl_VideoSetupBuffer();
 
 	if (rendermode == render_soft)
 	{
@@ -1655,8 +1656,6 @@ INT32 VID_SetMode(INT32 modeNum)
 			SDL_FreeSurface(bufSurface);
 			bufSurface = NULL;
 		}
-
-		Impl_VideoSetupBuffer();
 	}
 
 	return SDL_TRUE;
@@ -1779,7 +1778,7 @@ static void Impl_VideoSetupSDLBuffer(void)
 static void Impl_VideoSetupBuffer(void)
 {
 	// Set up game's software render buffer
-	if (rendermode == render_soft)
+	//if (rendermode == render_soft)
 	{
 		vid.rowbytes = vid.width * vid.bpp;
 		vid.direct = NULL;
diff --git a/src/v_video.c b/src/v_video.c
index c482debda..2fbdbb1f9 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -2867,6 +2867,27 @@ Unoptimized version
 #endif
 }
 
+// Taken from my videos-in-SRB2 project
+// Generates a color look-up table
+// which has up to 64 colors at each channel
+// (see the defines in v_video.h)
+
+UINT8 colorlookup[CLUTSIZE][CLUTSIZE][CLUTSIZE];
+
+void InitColorLUT(void)
+{
+	UINT8 r, g, b;
+	static boolean clutinit = false;
+	if (!clutinit)
+	{
+		for (r = 0; r < CLUTSIZE; r++)
+			for (g = 0; g < CLUTSIZE; g++)
+				for (b = 0; b < CLUTSIZE; b++)
+					colorlookup[r][g][b] = NearestColor(r << SHIFTCOLORBITS, g << SHIFTCOLORBITS, b << SHIFTCOLORBITS);
+		clutinit = true;
+	}
+}
+
 // V_Init
 // old software stuff, buffers are allocated at video mode setup
 // here we set the screens[x] pointers accordingly
@@ -2878,13 +2899,9 @@ void V_Init(void)
 	const INT32 screensize = vid.rowbytes * vid.height;
 
 	LoadMapPalette();
-	// hardware modes do not use screens[] pointers
+
 	for (i = 0; i < NUMSCREENS; i++)
 		screens[i] = NULL;
-	if (rendermode != render_soft)
-	{
-		return; // be sure to cause a NULL read/write error so we detect it, in case of..
-	}
 
 	// start address of NUMSCREENS * width*height vidbuffers
 	if (base)
diff --git a/src/v_video.h b/src/v_video.h
index 7478c6903..c9751a34a 100644
--- a/src/v_video.h
+++ b/src/v_video.h
@@ -36,6 +36,18 @@ cv_rsaturation, cv_ysaturation, cv_gsaturation, cv_csaturation, cv_bsaturation,
 // Allocates buffer screens, call before R_Init.
 void V_Init(void);
 
+// Taken from my videos-in-SRB2 project
+// Generates a color look-up table
+// which has up to 64 colors at each channel
+
+#define COLORBITS 6
+#define SHIFTCOLORBITS (8-COLORBITS)
+#define CLUTSIZE (1<<COLORBITS)
+
+extern UINT8 colorlookup[CLUTSIZE][CLUTSIZE][CLUTSIZE];
+
+void InitColorLUT(void);
+
 // Set the current RGB palette lookup to use for palettized graphics
 void V_SetPalette(INT32 palettenum);
 

From 53f78b76934909dc3ae8af5fcb50b37c7cdac930 Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Mon, 11 Nov 2019 00:02:22 -0300
Subject: [PATCH 20/49] Recreate the CLUT when the palette changes

(cherry picked from commit 6e0ff4a4a40306a59c8b18d03ae86560e6a52a4a)
---
 src/v_video.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/v_video.c b/src/v_video.c
index 2fbdbb1f9..41505eef3 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -2878,13 +2878,15 @@ void InitColorLUT(void)
 {
 	UINT8 r, g, b;
 	static boolean clutinit = false;
-	if (!clutinit)
+	static RGBA_t *lastpalette = NULL;
+	if ((!clutinit) || (lastpalette != pLocalPalette))
 	{
 		for (r = 0; r < CLUTSIZE; r++)
 			for (g = 0; g < CLUTSIZE; g++)
 				for (b = 0; b < CLUTSIZE; b++)
 					colorlookup[r][g][b] = NearestColor(r << SHIFTCOLORBITS, g << SHIFTCOLORBITS, b << SHIFTCOLORBITS);
 		clutinit = true;
+		lastpalette = pLocalPalette;
 	}
 }
 

From 2e62f5c793355b9b566eae4f5c77bdedb444a528 Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Tue, 17 Dec 2019 15:20:22 -0300
Subject: [PATCH 21/49] Don't use the local palette, because OpenGL mixes it
 into the textures themselves

(cherry picked from commit 0af71fafc57fb842a8c7a9a4853d8c7fbb2bf7fc)
---
 src/m_anigif.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/m_anigif.c b/src/m_anigif.c
index 1e5ece33b..fb9ebaffd 100644
--- a/src/m_anigif.c
+++ b/src/m_anigif.c
@@ -432,8 +432,11 @@ static void GIF_headwrite(void)
 
 	// write color table
 	{
-		RGBA_t *pal = ((cv_screenshot_colorprofile.value)
-		? pLocalPalette
+		RGBA_t *pal = ((cv_screenshot_colorprofile.value
+#ifdef HWRENDER
+		&& (rendermode == render_soft)
+#endif
+		) ? pLocalPalette
 		: pMasterPalette);
 
 		for (i = 0; i < 256; i++)

From b8f5166d8e08b237d5fc993b9465725faa156218 Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Tue, 17 Dec 2019 15:37:43 -0300
Subject: [PATCH 22/49] Avoid recreating the color LUT mid-recording-frame

(cherry picked from commit c3f0e6aa4472f0754a7f392759b9f93cb3c7651b)
---
 src/m_anigif.c | 21 +++++++++++++--------
 src/v_video.c  |  6 +++---
 src/v_video.h  |  2 +-
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/m_anigif.c b/src/m_anigif.c
index fb9ebaffd..c298ad705 100644
--- a/src/m_anigif.c
+++ b/src/m_anigif.c
@@ -33,6 +33,7 @@ consvar_t cv_gif_downscale =  {"gif_downscale", "On", CV_SAVE, CV_OnOff, NULL, 0
 #ifdef HAVE_ANIGIF
 static boolean gif_optimize = false; // So nobody can do something dumb
 static boolean gif_downscale = false; // like changing cvars mid output
+static RGBA_t *gif_palette = NULL;
 
 static FILE *gif_out = NULL;
 static INT32 gif_frames = 0;
@@ -432,13 +433,7 @@ static void GIF_headwrite(void)
 
 	// write color table
 	{
-		RGBA_t *pal = ((cv_screenshot_colorprofile.value
-#ifdef HWRENDER
-		&& (rendermode == render_soft)
-#endif
-		) ? pLocalPalette
-		: pMasterPalette);
-
+		RGBA_t *pal = gif_palette;
 		for (i = 0; i < 256; i++)
 		{
 			WRITEUINT8(p, pal[i].s.red);
@@ -473,7 +468,7 @@ static void hwrconvert(void)
 	INT32 x, y;
 	size_t i = 0;
 
-	InitColorLUT();
+	InitColorLUT(gif_palette);
 
 	for (y = 0; y < vid.height; y++)
 	{
@@ -643,6 +638,16 @@ INT32 GIF_open(const char *filename)
 
 	gif_optimize = (!!cv_gif_optimize.value);
 	gif_downscale = (!!cv_gif_downscale.value);
+
+	// GIF color table
+	// In hardware mode, uses the master palette
+	gif_palette = ((cv_screenshot_colorprofile.value
+#ifdef HWRENDER
+	&& (rendermode == render_soft)
+#endif
+	) ? pLocalPalette
+	: pMasterPalette);
+
 	GIF_headwrite();
 	gif_frames = 0;
 	return 1;
diff --git a/src/v_video.c b/src/v_video.c
index 41505eef3..3300e16bc 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -2874,19 +2874,19 @@ Unoptimized version
 
 UINT8 colorlookup[CLUTSIZE][CLUTSIZE][CLUTSIZE];
 
-void InitColorLUT(void)
+void InitColorLUT(RGBA_t *palette)
 {
 	UINT8 r, g, b;
 	static boolean clutinit = false;
 	static RGBA_t *lastpalette = NULL;
-	if ((!clutinit) || (lastpalette != pLocalPalette))
+	if ((!clutinit) || (lastpalette != palette))
 	{
 		for (r = 0; r < CLUTSIZE; r++)
 			for (g = 0; g < CLUTSIZE; g++)
 				for (b = 0; b < CLUTSIZE; b++)
 					colorlookup[r][g][b] = NearestColor(r << SHIFTCOLORBITS, g << SHIFTCOLORBITS, b << SHIFTCOLORBITS);
 		clutinit = true;
-		lastpalette = pLocalPalette;
+		lastpalette = palette;
 	}
 }
 
diff --git a/src/v_video.h b/src/v_video.h
index c9751a34a..4e78e9f9e 100644
--- a/src/v_video.h
+++ b/src/v_video.h
@@ -46,7 +46,7 @@ void V_Init(void);
 
 extern UINT8 colorlookup[CLUTSIZE][CLUTSIZE][CLUTSIZE];
 
-void InitColorLUT(void);
+void InitColorLUT(RGBA_t *palette);
 
 // Set the current RGB palette lookup to use for palettized graphics
 void V_SetPalette(INT32 palettenum);

From f106ba7ac4913618574c5392caa639a20648c18f Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Mon, 27 Jan 2020 13:55:13 -0300
Subject: [PATCH 23/49] Fix color LUT using the wrong palette

(cherry picked from commit 636093a59ddd95b25d79c4ebff51dc6412de1956)
---
 src/m_anigif.c | 18 +++++-------------
 src/r_data.c   | 12 ++++++++----
 src/r_data.h   |  3 ++-
 src/v_video.c  |  3 +--
 src/v_video.h  |  5 +----
 5 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/src/m_anigif.c b/src/m_anigif.c
index c298ad705..08b0903de 100644
--- a/src/m_anigif.c
+++ b/src/m_anigif.c
@@ -624,14 +624,6 @@ static void GIF_framewrite(void)
 //
 INT32 GIF_open(const char *filename)
 {
-#if 0
-	if (rendermode != render_soft)
-	{
-		CONS_Alert(CONS_WARNING, M_GetText("GIFs cannot be taken in non-software modes!\n"));
-		return 0;
-	}
-#endif
-
 	gif_out = fopen(filename, "wb");
 	if (!gif_out)
 		return 0;
@@ -640,13 +632,13 @@ INT32 GIF_open(const char *filename)
 	gif_downscale = (!!cv_gif_downscale.value);
 
 	// GIF color table
-	// In hardware mode, uses the master palette
-	gif_palette = ((cv_screenshot_colorprofile.value
+	// In hardware mode, forces the local palette
 #ifdef HWRENDER
-	&& (rendermode == render_soft)
+	if (rendermode == render_opengl)
+		gif_palette = pLocalPalette;
+	else
 #endif
-	) ? pLocalPalette
-	: pMasterPalette);
+		gif_palette = ((cv_screenshot_colorprofile.value) ? pLocalPalette : pMasterPalette);
 
 	GIF_headwrite();
 	gif_frames = 0;
diff --git a/src/r_data.c b/src/r_data.c
index 843ed2acb..b37431870 100644
--- a/src/r_data.c
+++ b/src/r_data.c
@@ -1427,16 +1427,20 @@ INT32 R_CreateColormap(char *p1, char *p2, char *p3)
 
 // Thanks to quake2 source!
 // utils3/qdata/images.c
-UINT8 NearestColor(UINT8 r, UINT8 g, UINT8 b)
+UINT8 NearestPaletteColor(UINT8 r, UINT8 g, UINT8 b, RGBA_t *palette)
 {
 	int dr, dg, db;
 	int distortion, bestdistortion = 256 * 256 * 4, bestcolor = 0, i;
 
+	// Use master palette if none specified
+	if (palette == NULL)
+		palette = pMasterPalette;
+
 	for (i = 0; i < 256; i++)
 	{
-		dr = r - pMasterPalette[i].s.red;
-		dg = g - pMasterPalette[i].s.green;
-		db = b - pMasterPalette[i].s.blue;
+		dr = r - palette[i].s.red;
+		dg = g - palette[i].s.green;
+		db = b - palette[i].s.blue;
 		distortion = dr*dr + dg*dg + db*db;
 		if (distortion < bestdistortion)
 		{
diff --git a/src/r_data.h b/src/r_data.h
index e5dd3764a..86ba0885b 100644
--- a/src/r_data.h
+++ b/src/r_data.h
@@ -99,7 +99,8 @@ void R_MakeInvertmap(void);
 #endif
 const char *R_ColormapNameForNum(INT32 num);
 
-UINT8 NearestColor(UINT8 r, UINT8 g, UINT8 b);
+UINT8 NearestPaletteColor(UINT8 r, UINT8 g, UINT8 b, RGBA_t *palette);
+#define NearestColor(r, g, b) NearestPaletteColor(r, g, b, NULL)
 
 extern INT32 numtextures;
 
diff --git a/src/v_video.c b/src/v_video.c
index 3300e16bc..517cae719 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -2867,7 +2867,6 @@ Unoptimized version
 #endif
 }
 
-// Taken from my videos-in-SRB2 project
 // Generates a color look-up table
 // which has up to 64 colors at each channel
 // (see the defines in v_video.h)
@@ -2884,7 +2883,7 @@ void InitColorLUT(RGBA_t *palette)
 		for (r = 0; r < CLUTSIZE; r++)
 			for (g = 0; g < CLUTSIZE; g++)
 				for (b = 0; b < CLUTSIZE; b++)
-					colorlookup[r][g][b] = NearestColor(r << SHIFTCOLORBITS, g << SHIFTCOLORBITS, b << SHIFTCOLORBITS);
+					colorlookup[r][g][b] = NearestPaletteColor(r << SHIFTCOLORBITS, g << SHIFTCOLORBITS, b << SHIFTCOLORBITS, palette);
 		clutinit = true;
 		lastpalette = palette;
 	}
diff --git a/src/v_video.h b/src/v_video.h
index 4e78e9f9e..ee7a681d8 100644
--- a/src/v_video.h
+++ b/src/v_video.h
@@ -36,10 +36,7 @@ cv_rsaturation, cv_ysaturation, cv_gsaturation, cv_csaturation, cv_bsaturation,
 // Allocates buffer screens, call before R_Init.
 void V_Init(void);
 
-// Taken from my videos-in-SRB2 project
-// Generates a color look-up table
-// which has up to 64 colors at each channel
-
+// Color look-up table
 #define COLORBITS 6
 #define SHIFTCOLORBITS (8-COLORBITS)
 #define CLUTSIZE (1<<COLORBITS)

From d64dc5b2a8a6f6695db6accfa73b1e4297e38b17 Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Wed, 29 Jan 2020 13:47:55 -0300
Subject: [PATCH 24/49] Local Color Table for GIF movie mode

(cherry picked from commit 5a330803ec5bea2ca7b6b30bf7972b11753b571d)
---
 src/d_netcmd.c |  1 +
 src/m_anigif.c | 89 ++++++++++++++++++++++++++++++++++++++------------
 src/m_anigif.h |  2 +-
 3 files changed, 71 insertions(+), 21 deletions(-)

diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 36cb01adf..21bdd033e 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -805,6 +805,7 @@ void D_RegisterClientCommands(void)
 	// GIF variables
 	CV_RegisterVar(&cv_gif_optimize);
 	CV_RegisterVar(&cv_gif_downscale);
+	CV_RegisterVar(&cv_gif_localcolortable);
 
 #ifdef WALLSPLATS
 	CV_RegisterVar(&cv_splats);
diff --git a/src/m_anigif.c b/src/m_anigif.c
index 08b0903de..31bc11070 100644
--- a/src/m_anigif.c
+++ b/src/m_anigif.c
@@ -19,6 +19,7 @@
 #include "v_video.h"
 #include "i_video.h"
 #include "m_misc.h"
+#include "st_stuff.h" // st_palette
 
 #ifdef HWRENDER
 #include "hardware/hw_main.h"
@@ -29,10 +30,12 @@
 
 consvar_t cv_gif_optimize = {"gif_optimize", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_gif_downscale =  {"gif_downscale", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_gif_localcolortable =  {"gif_localcolortable", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 #ifdef HAVE_ANIGIF
 static boolean gif_optimize = false; // So nobody can do something dumb
 static boolean gif_downscale = false; // like changing cvars mid output
+static boolean gif_localcolortable = false;
 static RGBA_t *gif_palette = NULL;
 
 static FILE *gif_out = NULL;
@@ -393,6 +396,41 @@ const UINT8 gifhead_nsid[19] = {0x21,0xFF,0x0B, // extension block + size
 	0x4E,0x45,0x54,0x53,0x43,0x41,0x50,0x45,0x32,0x2E,0x30, // NETSCAPE2.0
 	0x03,0x01,0xFF,0xFF,0x00}; // sub-block, repetitions
 
+
+//
+// GIF_setpalette
+// determine the gif palette.
+//
+static void GIF_setpalette(void)
+{
+	// In hardware mode, uses the master palette
+	size_t palnum = (rendermode == render_soft) ? ((gif_localcolortable) ? max(st_palette, 0) : 0) : 0;
+	gif_palette = ((cv_screenshot_colorprofile.value
+#ifdef HWRENDER
+	&& (rendermode == render_soft)
+#endif
+	) ? &pLocalPalette[palnum*256]
+	: &pMasterPalette[palnum*256]);
+}
+
+//
+// GIF_palwrite
+// writes the gif palette.
+// used both for the header and the local color table.
+//
+static UINT8 *GIF_palwrite(UINT8 *p)
+{
+	INT32 i;
+	RGBA_t *pal = gif_palette;
+	for (i = 0; i < 256; i++)
+	{
+		WRITEUINT8(p, pal[i].s.red);
+		WRITEUINT8(p, pal[i].s.green);
+		WRITEUINT8(p, pal[i].s.blue);
+	}
+	return p;
+}
+
 //
 // GIF_headwrite
 // writes the gif header to the currently open output file.
@@ -402,8 +440,10 @@ static void GIF_headwrite(void)
 {
 	UINT8 *gifhead = Z_Malloc(800, PU_STATIC, NULL);
 	UINT8 *p = gifhead;
-	INT32 i;
+	UINT8 *last_p;
 	UINT16 rwidth, rheight;
+	size_t totalbytes;
+	INT32 i;
 
 	if (!gif_out)
 		return;
@@ -423,30 +463,37 @@ static void GIF_headwrite(void)
 		rwidth = vid.width;
 		rheight = vid.height;
 	}
+
+	last_p = p;
 	WRITEUINT16(p, rwidth);
 	WRITEUINT16(p, rheight);
 
 	// colors, aspect, etc
-	WRITEUINT8(p, 0xFF); // TRANSPARENTPIXEL
+	WRITEUINT8(p, (gif_localcolortable ? 0xF0 : 0xF7)); // (0xF7 = 1111 0111)
 	WRITEUINT8(p, 0x00);
 	WRITEUINT8(p, 0x00);
 
+	// Lactozilla: should be 800 without a local color table
+	totalbytes = sizeof(gifhead_base) + sizeof(gifhead_nsid) + (p - last_p);
+
 	// write color table
+	if (!gif_localcolortable)
 	{
-		RGBA_t *pal = gif_palette;
-		for (i = 0; i < 256; i++)
-		{
-			WRITEUINT8(p, pal[i].s.red);
-			WRITEUINT8(p, pal[i].s.green);
-			WRITEUINT8(p, pal[i].s.blue);
-		}
+		p = GIF_palwrite(p);
+		totalbytes += (256 * 3);
+	}
+	else
+	{
+		// write a dummy palette
+		for (i = 0; i < 6; i++, totalbytes++)
+			WRITEUINT8(p, 0);
 	}
 
 	// write extension block
 	WRITEMEM(p, gifhead_nsid, sizeof(gifhead_nsid));
 
 	// write to file and be done with it!
-	fwrite(gifhead, 1, 800, gif_out);
+	fwrite(gifhead, 1, totalbytes, gif_out);
 	Z_Free(gifhead);
 }
 
@@ -566,7 +613,15 @@ static void GIF_framewrite(void)
 		WRITEUINT16(p, (UINT16)(blity / scrbuf_downscaleamt));
 		WRITEUINT16(p, (UINT16)(blitw / scrbuf_downscaleamt));
 		WRITEUINT16(p, (UINT16)(blith / scrbuf_downscaleamt));
-		WRITEUINT8(p, 0); // no local table of colors
+
+		if (!gif_localcolortable)
+			WRITEUINT8(p, 0); // no local table of colors
+		else
+		{
+			WRITEUINT8(p, 0x87);  // (0x87 = 1000 0111)
+			GIF_setpalette();
+			p = GIF_palwrite(p);
+		}
 
 		scrbuf_pos = movie_screen + blitx + (blity * vid.width);
 		scrbuf_writeend = scrbuf_pos + (blitw - 1) + ((blith - 1) * vid.width);
@@ -630,15 +685,9 @@ INT32 GIF_open(const char *filename)
 
 	gif_optimize = (!!cv_gif_optimize.value);
 	gif_downscale = (!!cv_gif_downscale.value);
-
-	// GIF color table
-	// In hardware mode, forces the local palette
-#ifdef HWRENDER
-	if (rendermode == render_opengl)
-		gif_palette = pLocalPalette;
-	else
-#endif
-		gif_palette = ((cv_screenshot_colorprofile.value) ? pLocalPalette : pMasterPalette);
+	gif_localcolortable = (!!cv_gif_localcolortable.value);
+	if (!gif_localcolortable)
+		GIF_setpalette();
 
 	GIF_headwrite();
 	gif_frames = 0;
diff --git a/src/m_anigif.h b/src/m_anigif.h
index 6d94ecf8c..bec481d59 100644
--- a/src/m_anigif.h
+++ b/src/m_anigif.h
@@ -27,6 +27,6 @@ void GIF_frame(void);
 INT32 GIF_close(void);
 #endif
 
-extern consvar_t cv_gif_optimize, cv_gif_downscale;
+extern consvar_t cv_gif_optimize, cv_gif_downscale, cv_gif_localcolortable;
 
 #endif

From e75baf70b0bd6ebee402c0b22b15df154fecde4f Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Wed, 29 Jan 2020 13:56:39 -0300
Subject: [PATCH 25/49] Uh

(cherry picked from commit 999e72ab325301d248837f5337eb8f90143231ef)
---
 src/m_anigif.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/m_anigif.c b/src/m_anigif.c
index 31bc11070..c10d70229 100644
--- a/src/m_anigif.c
+++ b/src/m_anigif.c
@@ -434,7 +434,6 @@ static UINT8 *GIF_palwrite(UINT8 *p)
 //
 // GIF_headwrite
 // writes the gif header to the currently open output file.
-// NOTE that this code does not accomodate for palette changes.
 //
 static void GIF_headwrite(void)
 {

From 6f5416954e14fa3f8895624dbf87715760813bd7 Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Wed, 29 Jan 2020 17:31:27 -0300
Subject: [PATCH 26/49] Only write a Local Color Table if the frame's palette
 differs from the header's palette

(cherry picked from commit 85211dcc09c922e0d42b4eeea387dcecc8e989ae)
---
 src/m_anigif.c | 73 +++++++++++++++++++++++++-------------------------
 1 file changed, 37 insertions(+), 36 deletions(-)

diff --git a/src/m_anigif.c b/src/m_anigif.c
index c10d70229..b914cb14c 100644
--- a/src/m_anigif.c
+++ b/src/m_anigif.c
@@ -35,8 +35,12 @@ consvar_t cv_gif_localcolortable =  {"gif_localcolortable", "On", CV_SAVE, CV_On
 #ifdef HAVE_ANIGIF
 static boolean gif_optimize = false; // So nobody can do something dumb
 static boolean gif_downscale = false; // like changing cvars mid output
+
+// Palette handling
 static boolean gif_localcolortable = false;
-static RGBA_t *gif_palette = NULL;
+static boolean gif_colorprofile = false;
+static RGBA_t *gif_headerpalette = NULL;
+static RGBA_t *gif_framepalette = NULL;
 
 static FILE *gif_out = NULL;
 static INT32 gif_frames = 0;
@@ -398,14 +402,13 @@ const UINT8 gifhead_nsid[19] = {0x21,0xFF,0x0B, // extension block + size
 
 
 //
-// GIF_setpalette
-// determine the gif palette.
+// GIF_getpalette
+// determine the palette for the current frame.
 //
-static void GIF_setpalette(void)
+static RGBA_t *GIF_getpalette(size_t palnum)
 {
 	// In hardware mode, uses the master palette
-	size_t palnum = (rendermode == render_soft) ? ((gif_localcolortable) ? max(st_palette, 0) : 0) : 0;
-	gif_palette = ((cv_screenshot_colorprofile.value
+	return ((gif_colorprofile
 #ifdef HWRENDER
 	&& (rendermode == render_soft)
 #endif
@@ -416,12 +419,11 @@ static void GIF_setpalette(void)
 //
 // GIF_palwrite
 // writes the gif palette.
-// used both for the header and the local color table.
+// used both for the header and local color tables.
 //
-static UINT8 *GIF_palwrite(UINT8 *p)
+static UINT8 *GIF_palwrite(UINT8 *p, RGBA_t *pal)
 {
 	INT32 i;
-	RGBA_t *pal = gif_palette;
 	for (i = 0; i < 256; i++)
 	{
 		WRITEUINT8(p, pal[i].s.red);
@@ -439,10 +441,7 @@ static void GIF_headwrite(void)
 {
 	UINT8 *gifhead = Z_Malloc(800, PU_STATIC, NULL);
 	UINT8 *p = gifhead;
-	UINT8 *last_p;
 	UINT16 rwidth, rheight;
-	size_t totalbytes;
-	INT32 i;
 
 	if (!gif_out)
 		return;
@@ -463,36 +462,22 @@ static void GIF_headwrite(void)
 		rheight = vid.height;
 	}
 
-	last_p = p;
 	WRITEUINT16(p, rwidth);
 	WRITEUINT16(p, rheight);
 
 	// colors, aspect, etc
-	WRITEUINT8(p, (gif_localcolortable ? 0xF0 : 0xF7)); // (0xF7 = 1111 0111)
+	WRITEUINT8(p, 0xF7); // (0xF7 = 1111 0111)
 	WRITEUINT8(p, 0x00);
 	WRITEUINT8(p, 0x00);
 
-	// Lactozilla: should be 800 without a local color table
-	totalbytes = sizeof(gifhead_base) + sizeof(gifhead_nsid) + (p - last_p);
-
 	// write color table
-	if (!gif_localcolortable)
-	{
-		p = GIF_palwrite(p);
-		totalbytes += (256 * 3);
-	}
-	else
-	{
-		// write a dummy palette
-		for (i = 0; i < 6; i++, totalbytes++)
-			WRITEUINT8(p, 0);
-	}
+	p = GIF_palwrite(p, gif_headerpalette);
 
 	// write extension block
 	WRITEMEM(p, gifhead_nsid, sizeof(gifhead_nsid));
 
 	// write to file and be done with it!
-	fwrite(gifhead, 1, totalbytes, gif_out);
+	fwrite(gifhead, 1, 800, gif_out);
 	Z_Free(gifhead);
 }
 
@@ -514,7 +499,7 @@ static void hwrconvert(void)
 	INT32 x, y;
 	size_t i = 0;
 
-	InitColorLUT(gif_palette);
+	InitColorLUT(gif_framepalette);
 
 	for (y = 0; y < vid.height; y++)
 	{
@@ -540,6 +525,7 @@ static void GIF_framewrite(void)
 	UINT8 *p;
 	UINT8 *movie_screen = screens[2];
 	INT32 blitx, blity, blitw, blith;
+	boolean palchanged;
 
 	if (!gifframe_data)
 		gifframe_data = Z_Malloc(gifframe_size, PU_STATIC, NULL);
@@ -548,8 +534,18 @@ static void GIF_framewrite(void)
 	if (!gif_out)
 		return;
 
+	// Lactozilla: Compare the header's palette with the current frame's palette and see if it changed.
+	if (gif_localcolortable)
+	{
+		gif_framepalette = GIF_getpalette((rendermode == render_soft) ? ((gif_localcolortable) ? max(st_palette, 0) : 0) : 0);
+		palchanged = memcmp(gif_headerpalette, gif_framepalette, sizeof(RGBA_t) * 256);
+	}
+	else
+		palchanged = false;
+
 	// Compare image data (for optimizing GIF)
-	if (gif_optimize && gif_frames > 0)
+	// If the palette has changed, the entire frame is considered to be different.
+	if (gif_optimize && gif_frames > 0 && (!palchanged))
 	{
 		// before blit movie_screen points to last frame, cur_screen points to this frame
 		UINT8 *cur_screen = screens[0];
@@ -617,9 +613,14 @@ static void GIF_framewrite(void)
 			WRITEUINT8(p, 0); // no local table of colors
 		else
 		{
-			WRITEUINT8(p, 0x87);  // (0x87 = 1000 0111)
-			GIF_setpalette();
-			p = GIF_palwrite(p);
+			if (palchanged)
+			{
+				// The palettes are different, so write the Local Color Table!
+				WRITEUINT8(p, 0x87); // (0x87 = 1000 0111)
+				p = GIF_palwrite(p, gif_framepalette);
+			}
+			else
+				WRITEUINT8(p, 0); // They are equal, no Local Color Table needed.
 		}
 
 		scrbuf_pos = movie_screen + blitx + (blity * vid.width);
@@ -685,8 +686,8 @@ INT32 GIF_open(const char *filename)
 	gif_optimize = (!!cv_gif_optimize.value);
 	gif_downscale = (!!cv_gif_downscale.value);
 	gif_localcolortable = (!!cv_gif_localcolortable.value);
-	if (!gif_localcolortable)
-		GIF_setpalette();
+	gif_colorprofile = (!!cv_screenshot_colorprofile.value);
+	gif_headerpalette = GIF_getpalette(0);
 
 	GIF_headwrite();
 	gif_frames = 0;

From 21a168d41013445e90093c7c5428cec37cb2ab0e Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Mon, 3 Feb 2020 02:24:22 -0300
Subject: [PATCH 27/49] What

(cherry picked from commit d1e8744583b9a868665b4b3a5e4803a29829f7a0)
---
 src/m_anigif.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/m_anigif.c b/src/m_anigif.c
index b914cb14c..15528599b 100644
--- a/src/m_anigif.c
+++ b/src/m_anigif.c
@@ -537,7 +537,7 @@ static void GIF_framewrite(void)
 	// Lactozilla: Compare the header's palette with the current frame's palette and see if it changed.
 	if (gif_localcolortable)
 	{
-		gif_framepalette = GIF_getpalette((rendermode == render_soft) ? ((gif_localcolortable) ? max(st_palette, 0) : 0) : 0);
+		gif_framepalette = GIF_getpalette(max(st_palette, 0));
 		palchanged = memcmp(gif_headerpalette, gif_framepalette, sizeof(RGBA_t) * 256);
 	}
 	else

From ef028e5822c4c1f19f81ec5aa4d9505dc087b818 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Mon, 23 Mar 2020 17:50:51 -0700
Subject: [PATCH 28/49] Add a comment because this is confusing

---
 src/m_anigif.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/m_anigif.c b/src/m_anigif.c
index 15528599b..eef94a522 100644
--- a/src/m_anigif.c
+++ b/src/m_anigif.c
@@ -466,6 +466,10 @@ static void GIF_headwrite(void)
 	WRITEUINT16(p, rheight);
 
 	// colors, aspect, etc
+	/*
+	also these are magical values, check out
+	https://tronche.com/computer-graphics/gif/gif89a.html#screen-descriptor
+	*/
 	WRITEUINT8(p, 0xF7); // (0xF7 = 1111 0111)
 	WRITEUINT8(p, 0x00);
 	WRITEUINT8(p, 0x00);

From 0a0dede69e509ec5905b04222387bba1fe84e3b2 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Tue, 24 Mar 2020 15:13:07 -0700
Subject: [PATCH 29/49] Revert "Correcting gamma to match base SRB2."

This reverts commit cdf8c54f2d1feae314daebbaee61f0e03e1fb929.
---
 src/v_video.c | 32 ++++----------------------------
 1 file changed, 4 insertions(+), 28 deletions(-)

diff --git a/src/v_video.c b/src/v_video.c
index 517cae719..d7e8b64c1 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -120,6 +120,7 @@ http://http.developer.nvidia.com/GPUGems2/gpugems2_chapter24.html
 Please check it out if you're trying to maintain this.
 toast 18/04/17
 */
+
 float Cubepal[2][2][2][3];
 
 // returns whether to apply cube, selectively avoiding expensive operations
@@ -305,31 +306,6 @@ static boolean InitCube(void)
 	return true;
 }
 
-/*
-So it turns out that the way gamma was implemented previously, the default
-colour profile of the game was messed up. Since this bad decision has been
-around for a long time, and the intent is to keep the base game looking the
-same, I'm not gonna be the one to remove this base modification.
-toast 20/04/17
-*/
-const UINT8 correctiontable[256] =
-	{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,
-	17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,
-	33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,
-	49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,
-	65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,
-	81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,
-	97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,
-	113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,
-	128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
-	144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
-	160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
-	176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
-	192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
-	208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
-	224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
-	240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255};
-
 // keep a copy of the palette so that we can get the RGB value for a color index at any time.
 static void LoadPalette(const char *lumpname)
 {
@@ -347,9 +323,9 @@ static void LoadPalette(const char *lumpname)
 	pal = W_CacheLumpNum(lumpnum, PU_CACHE);
 	for (i = 0; i < palsize; i++)
 	{
-		pMasterPalette[i].s.red = pLocalPalette[i].s.red = correctiontable[*pal++];
-		pMasterPalette[i].s.green = pLocalPalette[i].s.green = correctiontable[*pal++];
-		pMasterPalette[i].s.blue = pLocalPalette[i].s.blue = correctiontable[*pal++];
+		pMasterPalette[i].s.red = pLocalPalette[i].s.red = *pal++;
+		pMasterPalette[i].s.green = pLocalPalette[i].s.green = *pal++;
+		pMasterPalette[i].s.blue = pLocalPalette[i].s.blue = *pal++;
 		pMasterPalette[i].s.alpha = pLocalPalette[i].s.alpha = 0xFF;
 
 		// lerp of colour cubing!

From e9110b660cbd21bd62f56e0ea422e47fbc4e38d5 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Tue, 24 Mar 2020 15:36:44 -0700
Subject: [PATCH 30/49] Better directory structure

(cherry picked from commit 8ee0a9309b289a1a3d1a7260a44a43c776180686)

# Conflicts:
#	src/m_menu.c
#	src/m_menu.h
#	src/m_misc.h
---
 src/d_main.c     |  6 +++++-
 src/d_netcmd.c   |  2 ++
 src/m_misc.c     | 44 ++++++++++++++++++++++++++++++--------------
 src/m_misc.h     |  2 +-
 src/sdl/i_main.c | 36 ++++++++++++++++++++++++++++++------
 5 files changed, 68 insertions(+), 22 deletions(-)

diff --git a/src/d_main.c b/src/d_main.c
index 88c501345..b63f6ba42 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -152,6 +152,7 @@ char srb2path[256] = ".";
 #endif
 boolean usehome = true;
 const char *pandf = "%s" PATHSEP "%s";
+static char addonsdir[MAX_WADPATH];
 
 //
 // EVENT HANDLING
@@ -1090,7 +1091,6 @@ void D_SRB2Main(void)
 			// can't use sprintf since there is %u in savegamename
 			strcatbf(savegamename, srb2home, PATHSEP);
 
-			I_mkdir(srb2home, 0700);
 #else
 			snprintf(srb2home, sizeof srb2home, "%s", userhome);
 			snprintf(downloaddir, sizeof downloaddir, "%s", userhome);
@@ -1111,6 +1111,10 @@ void D_SRB2Main(void)
 #endif
 	}
 
+	// Create addons dir
+	snprintf(addonsdir, sizeof addonsdir, "%s%s%s", srb2home, PATHSEP, "addons");
+	I_mkdir(addonsdir, 0755);
+
 	// rand() needs seeded regardless of password
 	srand((unsigned int)time(NULL));
 
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 88621ee66..f061e3090 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -790,6 +790,8 @@ void D_RegisterClientCommands(void)
 	CV_RegisterVar(&cv_screenshot_option);
 	CV_RegisterVar(&cv_screenshot_folder);
 	CV_RegisterVar(&cv_moviemode);
+	CV_RegisterVar(&cv_movie_option);
+	CV_RegisterVar(&cv_movie_folder);
 	// PNG variables
 	CV_RegisterVar(&cv_zlib_level);
 	CV_RegisterVar(&cv_zlib_memory);
diff --git a/src/m_misc.c b/src/m_misc.c
index f4a4ec291..9b1bff285 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -107,6 +107,9 @@ consvar_t cv_screenshot_folder = {"screenshot_folder", "", CV_SAVE, NULL, NULL,
 static CV_PossibleValue_t moviemode_cons_t[] = {{MM_GIF, "GIF"}, {MM_APNG, "aPNG"}, {MM_SCREENSHOT, "Screenshots"}, {0, NULL}};
 consvar_t cv_moviemode = {"moviemode_mode", "GIF", CV_SAVE|CV_CALL, moviemode_cons_t, Moviemode_mode_Onchange, 0, NULL, NULL, 0, 0, NULL};
 
+consvar_t cv_movie_option = {"movie_option", "Default", CV_SAVE|CV_CALL, screenshot_cons_t, Moviemode_option_Onchange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_movie_folder = {"movie_folder", "", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
+
 static CV_PossibleValue_t zlib_mem_level_t[] = {
 	{1, "(Min Memory) 1"},
 	{2, "2"}, {3, "3"}, {4, "4"}, {5, "5"}, {6, "6"}, {7, "7"},
@@ -1080,19 +1083,25 @@ static inline moviemode_t M_StartMovieGIF(const char *pathname)
 void M_StartMovie(void)
 {
 #if NUMSCREENS > 2
-	const char *pathname = ".";
+	char pathname[MAX_WADPATH];
 
 	if (moviemode)
 		return;
 
-	if (cv_screenshot_option.value == 0)
-		pathname = usehome ? srb2home : srb2path;
-	else if (cv_screenshot_option.value == 1)
-		pathname = srb2home;
-	else if (cv_screenshot_option.value == 2)
-		pathname = srb2path;
-	else if (cv_screenshot_option.value == 3 && *cv_screenshot_folder.string != '\0')
-		pathname = cv_screenshot_folder.string;
+	if (cv_movie_option.value == 0)
+		strcpy(pathname, usehome ? srb2home : srb2path);
+	else if (cv_movie_option.value == 1)
+		strcpy(pathname, srb2home);
+	else if (cv_movie_option.value == 2)
+		strcpy(pathname, srb2path);
+	else if (cv_movie_option.value == 3 && *cv_movie_folder.string != '\0')
+		strcpy(pathname, cv_screenshot_folder.string);
+
+	if (cv_movie_option.value != 3)
+	{
+		strcat(pathname, PATHSEP"movies"PATHSEP);
+		I_mkdir(pathname, 0755);
+	}
 
 	if (rendermode == render_none)
 		I_Error("Can't make a movie without a render system\n");
@@ -1424,7 +1433,8 @@ void M_ScreenShot(void)
 void M_DoScreenShot(void)
 {
 #if NUMSCREENS > 2
-	const char *freename = NULL, *pathname = ".";
+	const char *freename = NULL;
+	char pathname[MAX_WADPATH];
 	boolean ret = false;
 	UINT8 *linear = NULL;
 
@@ -1432,13 +1442,19 @@ void M_DoScreenShot(void)
 	takescreenshot = false;
 
 	if (cv_screenshot_option.value == 0)
-		pathname = usehome ? srb2home : srb2path;
+		strcpy(pathname, usehome ? srb2home : srb2path);
 	else if (cv_screenshot_option.value == 1)
-		pathname = srb2home;
+		strcpy(pathname, srb2home);
 	else if (cv_screenshot_option.value == 2)
-		pathname = srb2path;
+		strcpy(pathname, srb2path);
 	else if (cv_screenshot_option.value == 3 && *cv_screenshot_folder.string != '\0')
-		pathname = cv_screenshot_folder.string;
+		strcpy(pathname, cv_screenshot_folder.string);
+
+	if (cv_screenshot_option.value != 3)
+	{
+		strcat(pathname, PATHSEP"screenshots"PATHSEP);
+		I_mkdir(pathname, 0755);
+	}
 
 #ifdef USE_PNG
 	if (rendermode != render_none)
diff --git a/src/m_misc.h b/src/m_misc.h
index 658028b44..990555971 100644
--- a/src/m_misc.h
+++ b/src/m_misc.h
@@ -30,7 +30,7 @@ typedef enum {
 extern moviemode_t moviemode;
 
 extern consvar_t cv_screenshot_option, cv_screenshot_folder;
-extern consvar_t cv_moviemode;
+extern consvar_t cv_moviemode, cv_movie_folder, cv_movie_option;
 extern consvar_t cv_zlib_memory, cv_zlib_level, cv_zlib_strategy, cv_zlib_window_bits;
 extern consvar_t cv_zlib_memorya, cv_zlib_levela, cv_zlib_strategya, cv_zlib_window_bitsa;
 extern consvar_t cv_apng_delay;
diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index 41a9d7cd6..5aea78210 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -26,6 +26,8 @@
 #include <unistd.h>
 #endif
 
+#include "time.h" // For log timestamps
+
 #ifdef HAVE_SDL
 
 #ifdef HAVE_TTF
@@ -114,6 +116,7 @@ int main(int argc, char **argv)
 #endif
 {
 	const char *logdir = NULL;
+	char logfile[MAX_WADPATH];
 	myargc = argc;
 	myargv = argv; /// \todo pull out path to exe from this string
 
@@ -125,15 +128,35 @@ int main(int argc, char **argv)
 #endif
 #endif
 
-	logdir = D_Home();
-
 #ifdef LOGMESSAGES
+	if (!M_CheckParm("-nolog"))
+	{
+		logdir = D_Home();
+
+		time_t my_time;
+		struct tm * timeinfo;
+		char buf[26];
+		my_time = time(NULL);
+		timeinfo = localtime(&my_time);
+
+		strftime(buf, 26, "%Y-%m-%d %H-%M-%S", timeinfo);
+		strcpy(logfile, va("log-%s.txt", buf));
+
 #ifdef DEFAULTDIR
-	if (logdir)
-		logstream = fopen(va("%s/"DEFAULTDIR"/log.txt",logdir), "wt");
-	else
+		if (logdir)
+		{
+			// Create dirs here because D_SRB2Main() is too late.
+			I_mkdir(va("%s%s"DEFAULTDIR, logdir, PATHSEP), 0755);
+			I_mkdir(va("%s%s"DEFAULTDIR"%slogs",logdir, PATHSEP, PATHSEP), 0755);
+			logstream = fopen(va("%s%s"DEFAULTDIR"%slogs%s%s",logdir, PATHSEP, PATHSEP, PATHSEP, logfile), "wt");
+		}
+		else
 #endif
-		logstream = fopen("./log.txt", "wt");
+		{
+			I_mkdir("."PATHSEP"logs"PATHSEP, 0755);
+			logstream = fopen(va("."PATHSEP"logs"PATHSEP"%s", logfile), "wt");
+		}
+	}
 #endif
 
 	//I_OutputMsg("I_StartupSystem() ...\n");
@@ -161,6 +184,7 @@ int main(int argc, char **argv)
 	CONS_Printf("Setting up SRB2Kart...\n");
 	D_SRB2Main();
 	CONS_Printf("Entering main game loop...\n");
+	CONS_Printf("%s\n", logfile);
 	// never return
 	D_SRB2Loop();
 

From d6c8306858c656d0254effa14f430d077b2c4fc8 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Sun, 8 Sep 2019 16:54:40 -0400
Subject: [PATCH 31/49] Fix this mistake

(cherry picked from commit cc80cd77c531d23f88ae5f7ee417a453172fdc09)
---
 src/m_misc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/m_misc.c b/src/m_misc.c
index 9b1bff285..8c0070270 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -107,7 +107,7 @@ consvar_t cv_screenshot_folder = {"screenshot_folder", "", CV_SAVE, NULL, NULL,
 static CV_PossibleValue_t moviemode_cons_t[] = {{MM_GIF, "GIF"}, {MM_APNG, "aPNG"}, {MM_SCREENSHOT, "Screenshots"}, {0, NULL}};
 consvar_t cv_moviemode = {"moviemode_mode", "GIF", CV_SAVE|CV_CALL, moviemode_cons_t, Moviemode_mode_Onchange, 0, NULL, NULL, 0, 0, NULL};
 
-consvar_t cv_movie_option = {"movie_option", "Default", CV_SAVE|CV_CALL, screenshot_cons_t, Moviemode_option_Onchange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_movie_option = {"movie_option", "Default", CV_SAVE, screenshot_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_movie_folder = {"movie_folder", "", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 static CV_PossibleValue_t zlib_mem_level_t[] = {
@@ -1095,7 +1095,7 @@ void M_StartMovie(void)
 	else if (cv_movie_option.value == 2)
 		strcpy(pathname, srb2path);
 	else if (cv_movie_option.value == 3 && *cv_movie_folder.string != '\0')
-		strcpy(pathname, cv_screenshot_folder.string);
+		strcpy(pathname, cv_movie_folder.string);
 
 	if (cv_movie_option.value != 3)
 	{

From 5653a7214192d37ff97145adcad12f5b315f355f Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Fri, 20 Sep 2019 17:22:09 +0100
Subject: [PATCH 32/49] * Resolve compiling issues with logmessages. * Improve
 logfile print. (I know Steel wanted it gone entirely, but I feel like it's
 relevant to have it in game..?)

(cherry picked from commit 113568095a609c662e33e67f311c94e28be127d9)
---
 src/sdl/i_main.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index 5aea78210..10f14f36f 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -131,11 +131,12 @@ int main(int argc, char **argv)
 #ifdef LOGMESSAGES
 	if (!M_CheckParm("-nolog"))
 	{
-		logdir = D_Home();
-
 		time_t my_time;
 		struct tm * timeinfo;
 		char buf[26];
+
+		logdir = D_Home();
+
 		my_time = time(NULL);
 		timeinfo = localtime(&my_time);
 
@@ -183,8 +184,11 @@ int main(int argc, char **argv)
 	// startup SRB2
 	CONS_Printf("Setting up SRB2Kart...\n");
 	D_SRB2Main();
+#ifdef LOGMESSAGES
+	if (!M_CheckParm("-nolog"))
+		CONS_Printf("Logfile: %s\n", logfile);
+#endif
 	CONS_Printf("Entering main game loop...\n");
-	CONS_Printf("%s\n", logfile);
 	// never return
 	D_SRB2Loop();
 

From f400d33947b3d517a9265791c53da5138eea7f6a Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Fri, 20 Sep 2019 17:43:41 +0100
Subject: [PATCH 33/49] Mark new-style log names as loaded.

(cherry picked from commit c36123aa5687c5151aad98fd1941412f7407ae52)
---
 src/filesrch.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/filesrch.c b/src/filesrch.c
index d132e9fb4..1be74f9b9 100644
--- a/src/filesrch.c
+++ b/src/filesrch.c
@@ -868,7 +868,7 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
 					}
 					else if (ext == EXT_TXT)
 					{
-						if (!strcmp(dent->d_name, "log.txt") || !strcmp(dent->d_name, "errorlog.txt"))
+						if (!strncmp(dent->d_name, "log-", 4) || !strcmp(dent->d_name, "errorlog.txt"))
 							ext |= EXT_LOADED;
 					}
 

From 6274b9fde11a7e985b85246cc9b66983798425c5 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Mon, 7 Oct 2019 17:55:31 -0700
Subject: [PATCH 34/49] ferror does not return errno, are you stupid?

Use M_FileError to return the proper error description, or "end-of-file".

(cherry picked from commit 2f521f2eb18a79fd7e0a6aca2f2b7b6113042d6c)
---
 src/d_netfil.c        |  4 ++--
 src/m_argv.c          |  2 +-
 src/m_misc.c          | 10 ++++++++++
 src/m_misc.h          |  2 ++
 src/sdl12/sdl_sound.c |  2 +-
 src/w_wad.c           | 12 ++++++------
 6 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/d_netfil.c b/src/d_netfil.c
index 155700807..cac5a2d80 100644
--- a/src/d_netfil.c
+++ b/src/d_netfil.c
@@ -742,7 +742,7 @@ void SV_FileSendTicker(void)
 		if (ram)
 			M_Memcpy(p->data, &f->id.ram[transfer[i].position], size);
 		else if (fread(p->data, 1, size, transfer[i].currentfile) != size)
-			I_Error("SV_FileSendTicker: can't read %s byte on %s at %d because %s", sizeu1(size), f->id.filename, transfer[i].position, strerror(ferror(transfer[i].currentfile)));
+			I_Error("SV_FileSendTicker: can't read %s byte on %s at %d because %s", sizeu1(size), f->id.filename, transfer[i].position, M_FileError(transfer[i].currentfile));
 		p->position = LONG(transfer[i].position);
 		// Put flag so receiver knows the total size
 		if (transfer[i].position + size == f->size)
@@ -818,7 +818,7 @@ void Got_Filetxpak(void)
 		// We can receive packet in the wrong order, anyway all os support gaped file
 		fseek(file->file, pos, SEEK_SET);
 		if (fwrite(netbuffer->u.filetxpak.data,size,1,file->file) != 1)
-			I_Error("Can't write to %s: %s\n",filename, strerror(ferror(file->file)));
+			I_Error("Can't write to %s: %s\n",filename, M_FileError(file->file));
 		file->currentsize += size;
 
 		// Finished?
diff --git a/src/m_argv.c b/src/m_argv.c
index e8bfdd3db..a23f938a8 100644
--- a/src/m_argv.c
+++ b/src/m_argv.c
@@ -166,7 +166,7 @@ void M_FindResponseFile(void)
 			if (!file)
 				I_Error("No more free memory for the response file");
 			if (fread(file, size, 1, handle) != 1)
-				I_Error("Couldn't read response file because %s", strerror(ferror(handle)));
+				I_Error("Couldn't read response file because %s", M_FileError(handle));
 			fclose(handle);
 
 			// keep all the command line arguments following @responsefile
diff --git a/src/m_misc.c b/src/m_misc.c
index 8c0070270..91f8f18c5 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -2371,3 +2371,13 @@ void M_SetupMemcpy(void)
 	M_Memcpy = cpu_cpy;
 #endif
 }
+
+/** Return the appropriate message for a file error or end of file.
+*/
+const char *M_FileError(FILE *fp)
+{
+	if (ferror(fp))
+		return strerror(errno);
+	else
+		return "end-of-file";
+}
diff --git a/src/m_misc.h b/src/m_misc.h
index 990555971..fb4012b8e 100644
--- a/src/m_misc.h
+++ b/src/m_misc.h
@@ -100,6 +100,8 @@ void strcatbf(char *s1, const char *s2, const char *s3);
 
 void M_SetupMemcpy(void);
 
+const char *M_FileError(FILE *handle);
+
 // counting bits, for weapon ammo code, usually
 FUNCMATH UINT8 M_CountBits(UINT32 num, UINT8 size);
 
diff --git a/src/sdl12/sdl_sound.c b/src/sdl12/sdl_sound.c
index ed1afd8e2..1a7525fee 100644
--- a/src/sdl12/sdl_sound.c
+++ b/src/sdl12/sdl_sound.c
@@ -1435,7 +1435,7 @@ static boolean LoadSong(void *data, size_t lumplength, size_t selectpos)
 
 	if (fwrite(data, lumplength, 1, midfile) == 0)
 	{
-		CONS_Printf(M_GetText("Couldn't write music into file %s because %s\n"), tempname, strerror(ferror(midfile)));
+		CONS_Printf(M_GetText("Couldn't write music into file %s because %s\n"), tempname, M_FileError(midfile));
 		Z_Free(data);
 		fclose(midfile);
 		return false;
diff --git a/src/w_wad.c b/src/w_wad.c
index da82a276d..734308956 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -366,7 +366,7 @@ static lumpinfo_t* ResGetLumpsWad (FILE* handle, UINT16* nlmp, const char* filen
 	// read the header
 	if (fread(&header, 1, sizeof header, handle) < sizeof header)
 	{
-		CONS_Alert(CONS_ERROR, M_GetText("Can't read wad header because %s\n"), strerror(ferror(handle)));
+		CONS_Alert(CONS_ERROR, M_GetText("Can't read wad header because %s\n"), M_FileError(handle));
 		return NULL;
 	}
 
@@ -389,7 +389,7 @@ static lumpinfo_t* ResGetLumpsWad (FILE* handle, UINT16* nlmp, const char* filen
 	if (fseek(handle, header.infotableofs, SEEK_SET) == -1
 		|| fread(fileinfo, 1, i, handle) < i)
 	{
-		CONS_Alert(CONS_ERROR, M_GetText("Corrupt wadfile directory (%s)\n"), strerror(ferror(handle)));
+		CONS_Alert(CONS_ERROR, M_GetText("Corrupt wadfile directory (%s)\n"), M_FileError(handle));
 		free(fileinfov);
 		return NULL;
 	}
@@ -410,7 +410,7 @@ static lumpinfo_t* ResGetLumpsWad (FILE* handle, UINT16* nlmp, const char* filen
 				handle) < sizeof realsize)
 			{
 				I_Error("corrupt compressed file: %s; maybe %s", /// \todo Avoid the bailout?
-					filename, strerror(ferror(handle)));
+					filename, M_FileError(handle));
 			}
 			realsize = LONG(realsize);
 			if (realsize != 0)
@@ -548,7 +548,7 @@ static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp)
 	fseek(handle, -4, SEEK_CUR);
 	if (fread(&zend, 1, sizeof zend, handle) < sizeof zend)
 	{
-		CONS_Alert(CONS_ERROR, "Corrupt central directory (%s)\n", strerror(ferror(handle)));
+		CONS_Alert(CONS_ERROR, "Corrupt central directory (%s)\n", M_FileError(handle));
 		return NULL;
 	}
 	numlumps = zend.entries;
@@ -565,7 +565,7 @@ static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp)
 
 		if (fread(zentry, 1, sizeof(zentry_t), handle) < sizeof(zentry_t))
 		{
-			CONS_Alert(CONS_ERROR, "Failed to read central directory (%s)\n", strerror(ferror(handle)));
+			CONS_Alert(CONS_ERROR, "Failed to read central directory (%s)\n", M_FileError(handle));
 			Z_Free(lumpinfo);
 			free(zentry);
 			return NULL;
@@ -585,7 +585,7 @@ static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp)
 		fullname = malloc(zentry->namelen + 1);
 		if (fgets(fullname, zentry->namelen + 1, handle) != fullname)
 		{
-			CONS_Alert(CONS_ERROR, "Unable to read lumpname (%s)\n", strerror(ferror(handle)));
+			CONS_Alert(CONS_ERROR, "Unable to read lumpname (%s)\n", M_FileError(handle));
 			Z_Free(lumpinfo);
 			free(zentry);
 			free(fullname);

From c79ceca65e0dbb21c693bd573acc05d2908e2523 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Mon, 7 Oct 2019 18:10:33 -0700
Subject: [PATCH 35/49] Forgot includes

(cherry picked from commit 92dd9d20663c8c601053354326fd9412694e3078)
---
 src/m_argv.c | 1 +
 src/m_misc.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/m_argv.c b/src/m_argv.c
index a23f938a8..e1046f8a7 100644
--- a/src/m_argv.c
+++ b/src/m_argv.c
@@ -16,6 +16,7 @@
 #include "doomdef.h"
 #include "command.h"
 #include "m_argv.h"
+#include "m_misc.h"
 
 /**	\brief number of arg
 */
diff --git a/src/m_misc.c b/src/m_misc.c
index 91f8f18c5..a7bcd6ff4 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -23,6 +23,8 @@
 #include <unistd.h>
 #endif
 
+#include <errno.h>
+
 // Extended map support.
 #include <ctype.h>
 

From ccde660cdf19ed01eda5a49063fb629f061ed838 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Mon, 23 Dec 2019 15:31:50 -0800
Subject: [PATCH 36/49] -logfile to let the user change the log file name

(cherry picked from commit d9d13764e6840e036c095c6d87838a4dfede80f4)
---
 src/sdl/i_main.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index 10f14f36f..61e15f2ba 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -133,15 +133,19 @@ int main(int argc, char **argv)
 	{
 		time_t my_time;
 		struct tm * timeinfo;
-		char buf[26];
+		const char *format;
 
 		logdir = D_Home();
 
 		my_time = time(NULL);
 		timeinfo = localtime(&my_time);
 
-		strftime(buf, 26, "%Y-%m-%d %H-%M-%S", timeinfo);
-		strcpy(logfile, va("log-%s.txt", buf));
+		if (M_CheckParm("-logfile") && M_IsNextParm())
+			format = M_GetNextParm();
+		else
+			format = "log-%Y-%m-%d %H-%M-%S.txt";
+
+		strftime(logfile, sizeof logfile, format, timeinfo);
 
 #ifdef DEFAULTDIR
 		if (logdir)

From 599452af7beb4e14a4d1c57b7b1ddf59d82881db Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Mon, 23 Dec 2019 15:34:27 -0800
Subject: [PATCH 37/49] Change default log filename to not use a space

bleh

(cherry picked from commit c285000c5668ab82545ec9ee4989aabf65e2585e)
---
 src/sdl/i_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index 61e15f2ba..82367aaaa 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -143,7 +143,7 @@ int main(int argc, char **argv)
 		if (M_CheckParm("-logfile") && M_IsNextParm())
 			format = M_GetNextParm();
 		else
-			format = "log-%Y-%m-%d %H-%M-%S.txt";
+			format = "log-%Y-%m-%d_%H-%M-%S.txt";
 
 		strftime(logfile, sizeof logfile, format, timeinfo);
 

From 45a2e22abc767b4e3076db09c256162dbb0629db Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Mon, 23 Dec 2019 17:21:58 -0800
Subject: [PATCH 38/49] -logdir lets the user change the log directory

(cherry picked from commit 457e986b7514c0e9fa921c1961344012443ac164)
---
 src/m_misc.c     | 73 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/m_misc.h     |  4 +++
 src/sdl/i_main.c | 34 ++++++++++++++++------
 3 files changed, 102 insertions(+), 9 deletions(-)

diff --git a/src/m_misc.c b/src/m_misc.c
index a7bcd6ff4..2754bac74 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -2383,3 +2383,76 @@ const char *M_FileError(FILE *fp)
 	else
 		return "end-of-file";
 }
+
+/** Return the number of parts of this path.
+*/
+int M_PathParts(const char *path)
+{
+	int n;
+	const char *p;
+	const char *t;
+	for (n = 0, p = path ;; ++n)
+	{
+		t = p;
+		if (( p = strchr(p, PATHSEP[0]) ))
+			p += strspn(p, PATHSEP);
+		else
+		{
+			if (*t)/* there is something after the final delimiter */
+				n++;
+			break;
+		}
+	}
+	return n;
+}
+
+/** Check whether a path is an absolute path.
+*/
+boolean M_IsPathAbsolute(const char *path)
+{
+#ifdef _WIN32
+	return ( strncmp(&path[1], ":\\", 2) == 0 );
+#else
+	return ( path[0] == '/' );
+#endif
+}
+
+/** I_mkdir for each part of the path.
+*/
+void M_MkdirEach(const char *cpath, int start, int mode)
+{
+	char path[MAX_WADPATH];
+	char *p;
+	char *t;
+	strlcpy(path, cpath, sizeof path);
+#ifdef _WIN32
+	if (strncmp(&path[1], ":\\", 2) == 0)
+		p = &path[3];
+	else
+#endif
+		p = path;
+	for (; start > 0; --start)
+	{
+		p += strspn(p, PATHSEP);
+		if (!( p = strchr(p, PATHSEP[0]) ))
+			return;
+	}
+	p += strspn(p, PATHSEP);
+	for (;;)
+	{
+		t = p;
+		if (( p = strchr(p, PATHSEP[0]) ))
+		{
+			*p = '\0';
+			I_mkdir(path, mode);
+			*p = PATHSEP[0];
+			p += strspn(p, PATHSEP);
+		}
+		else
+		{
+			if (*t)
+				I_mkdir(path, mode);
+			break;
+		}
+	}
+}
diff --git a/src/m_misc.h b/src/m_misc.h
index fb4012b8e..0a82322b0 100644
--- a/src/m_misc.h
+++ b/src/m_misc.h
@@ -102,6 +102,10 @@ void M_SetupMemcpy(void);
 
 const char *M_FileError(FILE *handle);
 
+int     M_PathParts      (const char *path);
+boolean M_IsPathAbsolute (const char *path);
+void    M_MkdirEach      (const char *path, int start, int mode);
+
 // counting bits, for weapon ammo code, usually
 FUNCMATH UINT8 M_CountBits(UINT32 num, UINT8 size);
 
diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index 82367aaaa..e7f47bfae 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -20,6 +20,7 @@
 #include "../doomdef.h"
 #include "../m_argv.h"
 #include "../d_main.h"
+#include "../m_misc.h"/* path shit */
 #include "../i_system.h"
 
 #ifdef __GNUC__
@@ -134,6 +135,8 @@ int main(int argc, char **argv)
 		time_t my_time;
 		struct tm * timeinfo;
 		const char *format;
+		const char *reldir;
+		int left;
 
 		logdir = D_Home();
 
@@ -145,24 +148,37 @@ int main(int argc, char **argv)
 		else
 			format = "log-%Y-%m-%d_%H-%M-%S.txt";
 
-		strftime(logfile, sizeof logfile, format, timeinfo);
+		if (M_CheckParm("-logdir") && M_IsNextParm())
+			reldir = M_GetNextParm();
+		else
+			reldir = "logs";
 
+		if (M_IsPathAbsolute(reldir))
+		{
+			left = snprintf(logfile, sizeof logfile,
+					"%s"PATHSEP, reldir);
+		}
+		else
 #ifdef DEFAULTDIR
 		if (logdir)
 		{
-			// Create dirs here because D_SRB2Main() is too late.
-			I_mkdir(va("%s%s"DEFAULTDIR, logdir, PATHSEP), 0755);
-			I_mkdir(va("%s%s"DEFAULTDIR"%slogs",logdir, PATHSEP, PATHSEP), 0755);
-			logstream = fopen(va("%s%s"DEFAULTDIR"%slogs%s%s",logdir, PATHSEP, PATHSEP, PATHSEP, logfile), "wt");
+			left = snprintf(logfile, sizeof logfile,
+					"%s"PATHSEP DEFAULTDIR PATHSEP"%s"PATHSEP, logdir, reldir);
 		}
 		else
-#endif
+#endif/*DEFAULTDIR*/
 		{
-			I_mkdir("."PATHSEP"logs"PATHSEP, 0755);
-			logstream = fopen(va("."PATHSEP"logs"PATHSEP"%s", logfile), "wt");
+			left = snprintf(logfile, sizeof logfile,
+					"."PATHSEP"%s"PATHSEP, reldir);
 		}
+#endif/*LOGMESSAGES*/
+
+		M_MkdirEach(logfile, M_PathParts(logdir) - 1, 0755);
+
+		strftime(&logfile[left], sizeof logfile - left, format, timeinfo);
+
+		logstream = fopen(logfile, "wt");
 	}
-#endif
 
 	//I_OutputMsg("I_StartupSystem() ...\n");
 	I_StartupSystem();

From b4f93fea8e16f7695a4fb665cb3312487fe7205c Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Mon, 23 Dec 2019 17:40:43 -0800
Subject: [PATCH 39/49] Let an asbolute path work with -logfile

(cherry picked from commit 5fbe77cdda7ec52bc2ca10ab9253df8dc56d2317)
---
 src/m_misc.c     | 18 ++++++++++++++-
 src/m_misc.h     |  1 +
 src/sdl/i_main.c | 58 +++++++++++++++++++++++++++++++-----------------
 3 files changed, 56 insertions(+), 21 deletions(-)

diff --git a/src/m_misc.c b/src/m_misc.c
index 2754bac74..8363e9d17 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -2419,11 +2419,15 @@ boolean M_IsPathAbsolute(const char *path)
 
 /** I_mkdir for each part of the path.
 */
-void M_MkdirEach(const char *cpath, int start, int mode)
+void M_MkdirEachUntil(const char *cpath, int start, int end, int mode)
 {
 	char path[MAX_WADPATH];
 	char *p;
 	char *t;
+
+	if (end > 0 && end <= start)
+		return;
+
 	strlcpy(path, cpath, sizeof path);
 #ifdef _WIN32
 	if (strncmp(&path[1], ":\\", 2) == 0)
@@ -2431,6 +2435,10 @@ void M_MkdirEach(const char *cpath, int start, int mode)
 	else
 #endif
 		p = path;
+
+	if (end > 0)
+		end -= start;
+
 	for (; start > 0; --start)
 	{
 		p += strspn(p, PATHSEP);
@@ -2440,6 +2448,9 @@ void M_MkdirEach(const char *cpath, int start, int mode)
 	p += strspn(p, PATHSEP);
 	for (;;)
 	{
+		if (end > 0 && !--end)
+			break;
+
 		t = p;
 		if (( p = strchr(p, PATHSEP[0]) ))
 		{
@@ -2456,3 +2467,8 @@ void M_MkdirEach(const char *cpath, int start, int mode)
 		}
 	}
 }
+
+void M_MkdirEach(const char *path, int start, int mode)
+{
+	M_MkdirEachUntil(path, start, -1, mode);
+}
diff --git a/src/m_misc.h b/src/m_misc.h
index 0a82322b0..9e43b20c9 100644
--- a/src/m_misc.h
+++ b/src/m_misc.h
@@ -105,6 +105,7 @@ const char *M_FileError(FILE *handle);
 int     M_PathParts      (const char *path);
 boolean M_IsPathAbsolute (const char *path);
 void    M_MkdirEach      (const char *path, int start, int mode);
+void    M_MkdirEachUntil (const char *path, int start, int end, int mode);
 
 // counting bits, for weapon ammo code, usually
 FUNCMATH UINT8 M_CountBits(UINT32 num, UINT8 size);
diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index e7f47bfae..7059348b7 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -137,6 +137,7 @@ int main(int argc, char **argv)
 		const char *format;
 		const char *reldir;
 		int left;
+		boolean fileabs;
 
 		logdir = D_Home();
 
@@ -144,38 +145,55 @@ int main(int argc, char **argv)
 		timeinfo = localtime(&my_time);
 
 		if (M_CheckParm("-logfile") && M_IsNextParm())
+		{
 			format = M_GetNextParm();
+			fileabs = M_IsPathAbsolute(format);
+		}
 		else
+		{
 			format = "log-%Y-%m-%d_%H-%M-%S.txt";
+			fileabs = false;
+		}
 
-		if (M_CheckParm("-logdir") && M_IsNextParm())
-			reldir = M_GetNextParm();
-		else
-			reldir = "logs";
-
-		if (M_IsPathAbsolute(reldir))
+		if (fileabs)
 		{
-			left = snprintf(logfile, sizeof logfile,
-					"%s"PATHSEP, reldir);
+			strftime(logfile, sizeof logfile, format, timeinfo);
+
+			M_MkdirEachUntil(logfile,
+					M_PathParts(logdir) - 1,
+					M_PathParts(logfile) - 1, 0755);
 		}
 		else
+		{
+			if (M_CheckParm("-logdir") && M_IsNextParm())
+				reldir = M_GetNextParm();
+			else
+				reldir = "logs";
+
+			if (M_IsPathAbsolute(reldir))
+			{
+				left = snprintf(logfile, sizeof logfile,
+						"%s"PATHSEP, reldir);
+			}
+			else
 #ifdef DEFAULTDIR
-		if (logdir)
-		{
-			left = snprintf(logfile, sizeof logfile,
-					"%s"PATHSEP DEFAULTDIR PATHSEP"%s"PATHSEP, logdir, reldir);
-		}
-		else
+			if (logdir)
+			{
+				left = snprintf(logfile, sizeof logfile,
+						"%s"PATHSEP DEFAULTDIR PATHSEP"%s"PATHSEP, logdir, reldir);
+			}
+			else
 #endif/*DEFAULTDIR*/
-		{
-			left = snprintf(logfile, sizeof logfile,
-					"."PATHSEP"%s"PATHSEP, reldir);
-		}
+			{
+				left = snprintf(logfile, sizeof logfile,
+						"."PATHSEP"%s"PATHSEP, reldir);
+			}
 #endif/*LOGMESSAGES*/
 
-		M_MkdirEach(logfile, M_PathParts(logdir) - 1, 0755);
+			M_MkdirEach(logfile, M_PathParts(logdir) - 1, 0755);
 
-		strftime(&logfile[left], sizeof logfile - left, format, timeinfo);
+			strftime(&logfile[left], sizeof logfile - left, format, timeinfo);
+		}
 
 		logstream = fopen(logfile, "wt");
 	}

From 294dfbacc5886dfa13ea708e932cedbd72b854f7 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Mon, 23 Dec 2019 17:43:42 -0800
Subject: [PATCH 40/49] Create directories from -logfile too

(cherry picked from commit 98cb238d36e0f85d9d4b4d2cff59c720e1630bdd)
---
 src/sdl/i_main.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index 7059348b7..932861353 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -158,10 +158,6 @@ int main(int argc, char **argv)
 		if (fileabs)
 		{
 			strftime(logfile, sizeof logfile, format, timeinfo);
-
-			M_MkdirEachUntil(logfile,
-					M_PathParts(logdir) - 1,
-					M_PathParts(logfile) - 1, 0755);
 		}
 		else
 		{
@@ -190,11 +186,13 @@ int main(int argc, char **argv)
 			}
 #endif/*LOGMESSAGES*/
 
-			M_MkdirEach(logfile, M_PathParts(logdir) - 1, 0755);
-
 			strftime(&logfile[left], sizeof logfile - left, format, timeinfo);
 		}
 
+		M_MkdirEachUntil(logfile,
+				M_PathParts(logdir) - 1,
+				M_PathParts(logfile) - 1, 0755);
+
 		logstream = fopen(logfile, "wt");
 	}
 

From 10a9a05cd89ed234062b5464c41efc8b8c78ae79 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Mon, 23 Dec 2019 18:20:04 -0800
Subject: [PATCH 41/49] symlink latest-log.txt on nix, copy to the real log
 file everywhere else

(cherry picked from commit 25525a6aae84581ac03ca3089950ad4ff25b8512)
---
 src/doomdef.h      |  1 +
 src/sdl/i_main.c   | 40 +++++++++++++++++++++++++++++-----------
 src/sdl/i_system.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 75 insertions(+), 11 deletions(-)

diff --git a/src/doomdef.h b/src/doomdef.h
index bb21e3d0f..a3e473acc 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -138,6 +138,7 @@
 
 #ifdef LOGMESSAGES
 extern FILE *logstream;
+extern char logfilename[1024];
 #endif
 
 //#define DEVELOP // Disable this for release builds to remove excessive cheat commands and enable MD5 checking and stuff, all in one go. :3
diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index 932861353..0550b8e02 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -23,10 +23,14 @@
 #include "../m_misc.h"/* path shit */
 #include "../i_system.h"
 
-#ifdef __GNUC__
+#if defined (__GNUC__) || defined (__unix__)
 #include <unistd.h>
 #endif
 
+#ifdef __unix__
+#include <errno.h>
+#endif
+
 #include "time.h" // For log timestamps
 
 #ifdef HAVE_SDL
@@ -48,6 +52,7 @@ extern int SDL_main(int argc, char *argv[]);
 
 #ifdef LOGMESSAGES
 FILE *logstream = NULL;
+char logfilename[1024];
 #endif
 
 #ifndef DOXYGEN
@@ -117,7 +122,6 @@ int main(int argc, char **argv)
 #endif
 {
 	const char *logdir = NULL;
-	char logfile[MAX_WADPATH];
 	myargc = argc;
 	myargv = argv; /// \todo pull out path to exe from this string
 
@@ -157,7 +161,7 @@ int main(int argc, char **argv)
 
 		if (fileabs)
 		{
-			strftime(logfile, sizeof logfile, format, timeinfo);
+			strftime(logfilename, sizeof logfilename, format, timeinfo);
 		}
 		else
 		{
@@ -168,32 +172,46 @@ int main(int argc, char **argv)
 
 			if (M_IsPathAbsolute(reldir))
 			{
-				left = snprintf(logfile, sizeof logfile,
+				left = snprintf(logfilename, sizeof logfilename,
 						"%s"PATHSEP, reldir);
 			}
 			else
 #ifdef DEFAULTDIR
 			if (logdir)
 			{
-				left = snprintf(logfile, sizeof logfile,
+				left = snprintf(logfilename, sizeof logfilename,
 						"%s"PATHSEP DEFAULTDIR PATHSEP"%s"PATHSEP, logdir, reldir);
 			}
 			else
 #endif/*DEFAULTDIR*/
 			{
-				left = snprintf(logfile, sizeof logfile,
+				left = snprintf(logfilename, sizeof logfilename,
 						"."PATHSEP"%s"PATHSEP, reldir);
 			}
 #endif/*LOGMESSAGES*/
 
-			strftime(&logfile[left], sizeof logfile - left, format, timeinfo);
+			strftime(&logfilename[left], sizeof logfilename - left,
+					format, timeinfo);
 		}
 
-		M_MkdirEachUntil(logfile,
+		M_MkdirEachUntil(logfilename,
 				M_PathParts(logdir) - 1,
-				M_PathParts(logfile) - 1, 0755);
+				M_PathParts(logfilename) - 1, 0755);
 
-		logstream = fopen(logfile, "wt");
+#ifdef __unix__
+		logstream = fopen(logfilename, "w");
+#ifdef DEFAULTDIR
+		if (symlink(logfilename,
+					va("%s/"DEFAULTDIR"/latest-log.txt", logdir)) == -1)
+#else
+		if (symlink(logfilename, va("%s/latest-log.txt", logdir)) == -1)
+#endif/*DEFAULTDIR*/
+		{
+			I_OutputMsg("Error symlinking latest-log.txt: %s\n", strerror(errno));
+		}
+#else/*__unix__*/
+		logstream = fopen("latest-log.txt", "wt+");
+#endif/*__unix__*/
 	}
 
 	//I_OutputMsg("I_StartupSystem() ...\n");
@@ -222,7 +240,7 @@ int main(int argc, char **argv)
 	D_SRB2Main();
 #ifdef LOGMESSAGES
 	if (!M_CheckParm("-nolog"))
-		CONS_Printf("Logfile: %s\n", logfile);
+		CONS_Printf("Logfile: %s\n", logfilename);
 #endif
 	CONS_Printf("Entering main game loop...\n");
 	// never return
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index f75a42117..2ccdec5c4 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -3268,6 +3268,48 @@ void I_RemoveExitFunc(void (*func)())
 	}
 }
 
+#ifndef __unix__
+static void Shittycopyerror(const char *name)
+{
+	I_OutputMsg(
+			"Error copying log file: %s: %s\n",
+			name,
+			strerror(errno)
+	);
+}
+
+static void Shittylogcopy(void)
+{
+	char buf[8192];
+	FILE *fp;
+	int n;
+	if (fseek(logstream, 0, SEEK_SET) == -1)
+	{
+		Shittycopyerror("fseek");
+	}
+	else if (( fp = fopen(logfilename, "wt") ))
+	{
+		while (( n = fread(buf, 1, sizeof buf, logstream) ))
+		{
+			if (fwrite(buf, 1, n, fp) < n)
+			{
+				Shittycopyerror("fwrite");
+				break;
+			}
+		}
+		if (ferror(logstream))
+		{
+			Shittycopyerror("fread");
+		}
+		fclose(fp);
+	}
+	else
+	{
+		Shittycopyerror(logfilename);
+	}
+}
+#endif/*__unix__*/
+
 //
 //  Closes down everything. This includes restoring the initial
 //  palette and video mode, and removing whatever mouse, keyboard, and
@@ -3286,6 +3328,9 @@ void I_ShutdownSystem(void)
 	if (logstream)
 	{
 		I_OutputMsg("I_ShutdownSystem(): end of logstream.\n");
+#ifndef __unix__
+		Shittylogcopy();
+#endif
 		fclose(logstream);
 		logstream = NULL;
 	}

From d1de8cc2ebcc0dcd6bd2a0fc638a6928f6959ca5 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Tue, 24 Dec 2019 01:55:47 -0800
Subject: [PATCH 42/49] Overwrite an already existing symlink

(cherry picked from commit f2c2836301d4dc59242d09f08a5473341c4d692c)
---
 src/sdl/i_main.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index 0550b8e02..f8dcc3c3b 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -142,6 +142,7 @@ int main(int argc, char **argv)
 		const char *reldir;
 		int left;
 		boolean fileabs;
+		const char *link;
 
 		logdir = D_Home();
 
@@ -201,11 +202,12 @@ int main(int argc, char **argv)
 #ifdef __unix__
 		logstream = fopen(logfilename, "w");
 #ifdef DEFAULTDIR
-		if (symlink(logfilename,
-					va("%s/"DEFAULTDIR"/latest-log.txt", logdir)) == -1)
+		link = va("%s/"DEFAULTDIR"/latest-log.txt", logdir);
 #else
-		if (symlink(logfilename, va("%s/latest-log.txt", logdir)) == -1)
+		link = va("%s/latest-log.txt", logdir);
 #endif/*DEFAULTDIR*/
+		unlink(link);
+		if (symlink(logfilename, link) == -1)
 		{
 			I_OutputMsg("Error symlinking latest-log.txt: %s\n", strerror(errno));
 		}

From 7ef8e81713dc2f20b4855e1389d34772d45e5cdc Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Tue, 24 Dec 2019 01:58:39 -0800
Subject: [PATCH 43/49] Correct usage of logdir

(cherry picked from commit b7b4945c36fb95f406a365d64f109cfc83ad4d63)
---
 src/sdl/i_main.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index f8dcc3c3b..816142d72 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -202,10 +202,11 @@ int main(int argc, char **argv)
 #ifdef __unix__
 		logstream = fopen(logfilename, "w");
 #ifdef DEFAULTDIR
-		link = va("%s/"DEFAULTDIR"/latest-log.txt", logdir);
-#else
-		link = va("%s/latest-log.txt", logdir);
+		if (logdir)
+			link = va("%s/"DEFAULTDIR"/latest-log.txt", logdir);
+		else
 #endif/*DEFAULTDIR*/
+			link = "latest-log.txt";
 		unlink(link);
 		if (symlink(logfilename, link) == -1)
 		{

From f74adb0ad99d72ce710dd0d34da9f7231cacc4af Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Sat, 28 Dec 2019 22:14:23 -0300
Subject: [PATCH 44/49] Fix logfiles crashing Windoze

(cherry picked from commit 3bb7fd4cbf2bb92f5548cafad00b80cb366395a4)
---
 src/sdl/i_main.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index 816142d72..9daca99fa 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -195,9 +195,12 @@ int main(int argc, char **argv)
 					format, timeinfo);
 		}
 
-		M_MkdirEachUntil(logfilename,
-				M_PathParts(logdir) - 1,
-				M_PathParts(logfilename) - 1, 0755);
+		if (logdir)
+		{
+			M_MkdirEachUntil(logfilename,
+					M_PathParts(logdir) - 1,
+					M_PathParts(logfilename) - 1, 0755);
+		}
 
 #ifdef __unix__
 		logstream = fopen(logfilename, "w");

From 21a3067936003c441460a3b721d838dae57c619f Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Sat, 28 Dec 2019 22:18:41 -0300
Subject: [PATCH 45/49] Fix M_PathParts instead

(cherry picked from commit 244f0b228fefb69fb59c1f7f70d4815c0388a634)
---
 src/m_misc.c     | 2 ++
 src/sdl/i_main.c | 9 +++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/m_misc.c b/src/m_misc.c
index 8363e9d17..f2f3bbdf5 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -2391,6 +2391,8 @@ int M_PathParts(const char *path)
 	int n;
 	const char *p;
 	const char *t;
+	if (path == NULL)
+		return 0;
 	for (n = 0, p = path ;; ++n)
 	{
 		t = p;
diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index 9daca99fa..816142d72 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -195,12 +195,9 @@ int main(int argc, char **argv)
 					format, timeinfo);
 		}
 
-		if (logdir)
-		{
-			M_MkdirEachUntil(logfilename,
-					M_PathParts(logdir) - 1,
-					M_PathParts(logfilename) - 1, 0755);
-		}
+		M_MkdirEachUntil(logfilename,
+				M_PathParts(logdir) - 1,
+				M_PathParts(logfilename) - 1, 0755);
 
 #ifdef __unix__
 		logstream = fopen(logfilename, "w");

From bee6bbf619de1f725184d23a4522f8cc80135274 Mon Sep 17 00:00:00 2001
From: Sally Cochenour <tehrealsalt@gmail.com>
Date: Sat, 28 Mar 2020 03:56:39 -0400
Subject: [PATCH 46/49] Firework frames for fire shield

---
 src/dehacked.c | 10 ++++++++++
 src/info.c     | 54 +++++++++++++++++++++++++++++++++++++++++---------
 src/info.h     | 10 ++++++++++
 src/p_mobj.c   | 21 ++++++++++++++++++--
 4 files changed, 84 insertions(+), 11 deletions(-)

diff --git a/src/dehacked.c b/src/dehacked.c
index 247101a80..e2a95eb83 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -6710,6 +6710,15 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
 	"S_FLAMESHIELDDASH6",
 	"S_FLAMESHIELDDASH7",
 	"S_FLAMESHIELDDASH8",
+	"S_FLAMESHIELDDASH9",
+	"S_FLAMESHIELDDASH10",
+	"S_FLAMESHIELDDASH11",
+	"S_FLAMESHIELDDASH12",
+
+	"S_FLAMESHIELDDASH2_UNDERLAY",
+	"S_FLAMESHIELDDASH5_UNDERLAY",
+	"S_FLAMESHIELDDASH8_UNDERLAY",
+	"S_FLAMESHIELDDASH11_UNDERLAY",
 
 	"S_FLAMESHIELDPAPER",
 	"S_FLAMESHIELDLINE1",
@@ -7876,6 +7885,7 @@ static const char *const MOBJTYPE_LIST[] = {  // array length left dynamic for s
 	"MT_THUNDERSHIELD", // Shields
 	"MT_BUBBLESHIELD",
 	"MT_FLAMESHIELD",
+	"MT_FLAMESHIELDUNDERLAY",
 	"MT_FLAMESHIELDPAPER",
 	"MT_BUBBLESHIELDTRAP",
 
diff --git a/src/info.c b/src/info.c
index 934f509fc..33e1622b2 100644
--- a/src/info.c
+++ b/src/info.c
@@ -2921,14 +2921,23 @@ state_t states[NUMSTATES] =
 	{SPR_FLMS, FF_FULLBRIGHT|8,   2, {NULL}, 0, 0, S_FLAMESHIELD18},		// S_FLAMESHIELD17
 	{SPR_FLMS, FF_FULLBRIGHT|17,  2, {NULL}, 0, 0, S_FLAMESHIELD1},			// S_FLAMESHIELD18
 
-	{SPR_FLMD, FF_FULLBRIGHT|1, 2, {NULL},               0, 0, S_FLAMESHIELDDASH2},	// S_FLAMESHIELDDASH1
-	{SPR_FLMD, FF_FULLBRIGHT,   2, {A_FlameShieldPaper}, 0, 2, S_FLAMESHIELDDASH3},	// S_FLAMESHIELDDASH2
-	{SPR_FLMD, FF_FULLBRIGHT|2, 2, {NULL},               0, 0, S_FLAMESHIELDDASH4},	// S_FLAMESHIELDDASH3
-	{SPR_FLMD, FF_FULLBRIGHT,   2, {A_FlameShieldPaper}, 1, 3, S_FLAMESHIELDDASH5},	// S_FLAMESHIELDDASH4
-	{SPR_FLMD, FF_FULLBRIGHT|3, 2, {NULL},               0, 0, S_FLAMESHIELDDASH6},	// S_FLAMESHIELDDASH5
-	{SPR_FLMD, FF_FULLBRIGHT,   2, {A_FlameShieldPaper}, 2, 0, S_FLAMESHIELDDASH7},	// S_FLAMESHIELDDASH6
-	{SPR_FLMD, FF_FULLBRIGHT|4, 2, {NULL},               0, 0, S_FLAMESHIELDDASH8},	// S_FLAMESHIELDDASH7
-	{SPR_FLMD, FF_FULLBRIGHT,   2, {A_FlameShieldPaper}, 3, 1, S_FLAMESHIELDDASH1},	// S_FLAMESHIELDDASH8
+	{SPR_FLMD, FF_FULLBRIGHT|1, 1, {NULL},               0, 0, S_FLAMESHIELDDASH2},		// S_FLAMESHIELDDASH1
+	{SPR_FLMD, FF_FULLBRIGHT|5, 1, {NULL},               0, 0, S_FLAMESHIELDDASH3},		// S_FLAMESHIELDDASH2
+	{SPR_FLMD, FF_FULLBRIGHT,   1, {A_FlameShieldPaper}, 0, 2, S_FLAMESHIELDDASH4},		// S_FLAMESHIELDDASH3
+	{SPR_FLMD, FF_FULLBRIGHT|2, 1, {NULL},               0, 0, S_FLAMESHIELDDASH5},		// S_FLAMESHIELDDASH4
+	{SPR_FLMD, FF_FULLBRIGHT|6, 1, {NULL},               0, 0, S_FLAMESHIELDDASH6},		// S_FLAMESHIELDDASH5
+	{SPR_FLMD, FF_FULLBRIGHT,   1, {A_FlameShieldPaper}, 1, 3, S_FLAMESHIELDDASH7},		// S_FLAMESHIELDDASH6
+	{SPR_FLMD, FF_FULLBRIGHT|3, 1, {NULL},               0, 0, S_FLAMESHIELDDASH8},		// S_FLAMESHIELDDASH7
+	{SPR_FLMD, FF_FULLBRIGHT|7, 1, {NULL},               0, 0, S_FLAMESHIELDDASH9},		// S_FLAMESHIELDDASH8
+	{SPR_FLMD, FF_FULLBRIGHT,   1, {A_FlameShieldPaper}, 2, 0, S_FLAMESHIELDDASH10},	// S_FLAMESHIELDDASH9
+	{SPR_FLMD, FF_FULLBRIGHT|4, 1, {NULL},               0, 0, S_FLAMESHIELDDASH11},	// S_FLAMESHIELDDASH10
+	{SPR_FLMD, FF_FULLBRIGHT|8, 1, {NULL},               0, 0, S_FLAMESHIELDDASH12},	// S_FLAMESHIELDDASH11
+	{SPR_FLMD, FF_FULLBRIGHT,   1, {A_FlameShieldPaper}, 3, 1, S_FLAMESHIELDDASH1},		// S_FLAMESHIELDDASH12
+
+	{SPR_FLMD, FF_FULLBRIGHT|9, 2, {NULL}, 0, 0, S_NULL},	// S_FLAMESHIELDDASH2_UNDERLAY
+	{SPR_FLMD, FF_FULLBRIGHT|10, 2, {NULL}, 0, 0, S_NULL},	// S_FLAMESHIELDDASH5_UNDERLAY
+	{SPR_FLMD, FF_FULLBRIGHT|11, 2, {NULL}, 0, 0, S_NULL},	// S_FLAMESHIELDDASH8_UNDERLAY
+	{SPR_FLMD, FF_FULLBRIGHT|12, 2, {NULL}, 0, 0, S_NULL},	// S_FLAMESHIELDDASH11_UNDERLAY
 
 	{SPR_FLMP, FF_FULLBRIGHT|FF_PAPERSPRITE, 3, {NULL}, 0, 0, S_NULL}, // S_FLAMESHIELDPAPER
 	{SPR_FLML, FF_FULLBRIGHT|FF_PAPERSPRITE|FF_ANIMATE, 7, {NULL}, 6, 1, S_NULL}, // S_FLAMESHIELDLINE1
@@ -16277,6 +16286,33 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		S_NULL          // raisestate
 	},
 
+	{           // MT_FLAMESHIELDUNDERLAY
+	    -1,             // doomednum
+	    S_FLAMESHIELDDASH2_UNDERLAY, // spawnstate
+	    1000,           // spawnhealth
+	    S_NULL,         // seestate
+	    sfx_None,       // seesound
+	    8,              // reactiontime
+	    sfx_None,       // attacksound
+	    S_NULL,         // painstate
+	    0,              // painchance
+	    sfx_None,       // painsound
+	    S_NULL,         // meleestate
+	    S_NULL,         // missilestate
+	    S_NULL,         // deathstate
+	    S_NULL,         // xdeathstate
+	    sfx_None,       // deathsound
+	    0,              // speed
+	    8<<FRACBITS,    // radius
+	    16<<FRACBITS,   // height
+	    -1,             // display offset
+	    100,            // mass
+	    0,              // damage
+	    sfx_None,       // activesound
+	    MF_NOBLOCKMAP|MF_NOCLIP|MF_NOGRAVITY|MF_DONTENCOREMAP, // flags
+	    S_NULL          // raisestate
+	},
+
 	{           // MT_FLAMESHIELDPAPER
 	    -1,             // doomednum
 	    S_FLAMESHIELDPAPER, // spawnstate
@@ -16300,7 +16336,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 	    100,            // mass
 	    0,              // damage
 	    sfx_None,       // activesound
-	    MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DONTENCOREMAP, // flags
+	    MF_NOBLOCKMAP|MF_NOCLIP|MF_NOGRAVITY|MF_DONTENCOREMAP, // flags
 	    S_NULL          // raisestate
 	},
 
diff --git a/src/info.h b/src/info.h
index c1ab2528b..af105d6fc 100644
--- a/src/info.h
+++ b/src/info.h
@@ -3609,6 +3609,15 @@ typedef enum state
 	S_FLAMESHIELDDASH6,
 	S_FLAMESHIELDDASH7,
 	S_FLAMESHIELDDASH8,
+	S_FLAMESHIELDDASH9,
+	S_FLAMESHIELDDASH10,
+	S_FLAMESHIELDDASH11,
+	S_FLAMESHIELDDASH12,
+
+	S_FLAMESHIELDDASH2_UNDERLAY,
+	S_FLAMESHIELDDASH5_UNDERLAY,
+	S_FLAMESHIELDDASH8_UNDERLAY,
+	S_FLAMESHIELDDASH11_UNDERLAY,
 
 	S_FLAMESHIELDPAPER,
 	S_FLAMESHIELDLINE1,
@@ -4807,6 +4816,7 @@ typedef enum mobj_type
 	MT_THUNDERSHIELD, // Shields
 	MT_BUBBLESHIELD,
 	MT_FLAMESHIELD,
+	MT_FLAMESHIELDUNDERLAY,
 	MT_FLAMESHIELDPAPER,
 	MT_BUBBLESHIELDTRAP,
 
diff --git a/src/p_mobj.c b/src/p_mobj.c
index e2621fe52..666818ef3 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -8652,6 +8652,7 @@ void P_MobjThinker(mobj_t *mobj)
 		{
 			fixed_t destx, desty;
 			statenum_t curstate;
+			statenum_t underlayst = S_NULL;
 			INT32 flamemax = mobj->target->player->kartstuff[k_flamelength] * flameseg;
 
 			if (!mobj->target || !mobj->target->health || !mobj->target->player
@@ -8666,9 +8667,18 @@ void P_MobjThinker(mobj_t *mobj)
 
 			if (mobj->target->player->kartstuff[k_flamedash])
 			{
-				if (!(curstate >= S_FLAMESHIELDDASH1 && curstate <= S_FLAMESHIELDDASH8))
+				if (!(curstate >= S_FLAMESHIELDDASH1 && curstate <= S_FLAMESHIELDDASH12))
 					P_SetMobjState(mobj, S_FLAMESHIELDDASH1);
 
+				if (curstate == S_FLAMESHIELDDASH2)
+					underlayst = S_FLAMESHIELDDASH2_UNDERLAY;
+				else if (curstate == S_FLAMESHIELDDASH5)
+					underlayst = S_FLAMESHIELDDASH5_UNDERLAY;
+				else if (curstate == S_FLAMESHIELDDASH8)
+					underlayst = S_FLAMESHIELDDASH8_UNDERLAY;
+				else if (curstate == S_FLAMESHIELDDASH11)
+					underlayst = S_FLAMESHIELDDASH11_UNDERLAY;
+
 				if (leveltime & 1)
 				{
 					UINT8 i;
@@ -8696,7 +8706,7 @@ void P_MobjThinker(mobj_t *mobj)
 			}
 			else
 			{
-				if (curstate >= S_FLAMESHIELDDASH1 && curstate <= S_FLAMESHIELDDASH8)
+				if (curstate >= S_FLAMESHIELDDASH1 && curstate <= S_FLAMESHIELDDASH12)
 					P_SetMobjState(mobj, S_FLAMESHIELD1);
 			}
 
@@ -8745,6 +8755,13 @@ void P_MobjThinker(mobj_t *mobj)
 				mobj->angle = R_PointToAngle2(0, 0, mobj->target->momx, mobj->target->momy);
 			else
 				mobj->angle = mobj->target->angle;
+
+			if (underlayst != S_NULL)
+			{
+				mobj_t *underlay = P_SpawnMobj(mobj->target->x, mobj->target->y, mobj->target->z, MT_FLAMESHIELDUNDERLAY);
+				underlay->angle = mobj->angle;
+				P_SetMobjState(underlay, underlayst);
+			}
 			break;
 		}
 		case MT_ROCKETSNEAKER:

From 9a8e3aecd9fa4482ffb201bd4e3ec0e17681f2c0 Mon Sep 17 00:00:00 2001
From: Sally Cochenour <tehrealsalt@gmail.com>
Date: Sat, 28 Mar 2020 06:19:25 -0400
Subject: [PATCH 47/49] Fix papersprite appearing on wrong frames

---
 src/info.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/info.c b/src/info.c
index 33e1622b2..981773387 100644
--- a/src/info.c
+++ b/src/info.c
@@ -2939,7 +2939,7 @@ state_t states[NUMSTATES] =
 	{SPR_FLMD, FF_FULLBRIGHT|11, 2, {NULL}, 0, 0, S_NULL},	// S_FLAMESHIELDDASH8_UNDERLAY
 	{SPR_FLMD, FF_FULLBRIGHT|12, 2, {NULL}, 0, 0, S_NULL},	// S_FLAMESHIELDDASH11_UNDERLAY
 
-	{SPR_FLMP, FF_FULLBRIGHT|FF_PAPERSPRITE, 3, {NULL}, 0, 0, S_NULL}, // S_FLAMESHIELDPAPER
+	{SPR_FLMP, FF_FULLBRIGHT|FF_PAPERSPRITE, 2, {NULL}, 0, 0, S_NULL}, // S_FLAMESHIELDPAPER
 	{SPR_FLML, FF_FULLBRIGHT|FF_PAPERSPRITE|FF_ANIMATE, 7, {NULL}, 6, 1, S_NULL}, // S_FLAMESHIELDLINE1
 	{SPR_FLML, FF_FULLBRIGHT|FF_PAPERSPRITE|FF_ANIMATE|7, 7, {NULL}, 6, 1, S_NULL}, // S_FLAMESHIELDLINE2
 	{SPR_FLML, FF_FULLBRIGHT|FF_PAPERSPRITE|FF_ANIMATE|14, 7, {NULL}, 6, 1, S_NULL}, // S_FLAMESHIELDLINE3

From 1b6256bd89a4d7c1214ecd25ea92f5b6e201bb51 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Sat, 28 Mar 2020 20:57:27 -0700
Subject: [PATCH 48/49] Use the 2.2 frame characters

---
 src/r_things.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/r_things.h b/src/r_things.h
index a50e0803d..470e32fb2 100644
--- a/src/r_things.h
+++ b/src/r_things.h
@@ -219,7 +219,7 @@ char *GetPlayerFacePic(INT32 skinnum);
 // Future: [[ ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyz!@ ]]
 FUNCMATH FUNCINLINE static ATTRINLINE char R_Frame2Char(UINT8 frame)
 {
-#if 1 // 2.1 compat
+#if 0 // 2.1 compat
 	return 'A' + frame;
 #else
 	if (frame < 26) return 'A' + frame;
@@ -233,7 +233,7 @@ FUNCMATH FUNCINLINE static ATTRINLINE char R_Frame2Char(UINT8 frame)
 
 FUNCMATH FUNCINLINE static ATTRINLINE UINT8 R_Char2Frame(char cn)
 {
-#if 1 // 2.1 compat
+#if 0 // 2.1 compat
 	if (cn == '+') return '\\' - 'A'; // PK3 can't use backslash, so use + instead
 	return cn - 'A';
 #else

From 896f752d94498c45565513f0332f03558a11c5eb Mon Sep 17 00:00:00 2001
From: Sally Cochenour <tehrealsalt@gmail.com>
Date: Sun, 29 Mar 2020 08:39:15 -0400
Subject: [PATCH 49/49] Fix the compile errors I got

- void out link variable in non-unix to prevent unused variable error
- change n's type to size_t from int to prevent unsigned signed comparison
---
 src/sdl/i_main.c   | 1 +
 src/sdl/i_system.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index 816142d72..841997165 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -213,6 +213,7 @@ int main(int argc, char **argv)
 			I_OutputMsg("Error symlinking latest-log.txt: %s\n", strerror(errno));
 		}
 #else/*__unix__*/
+		(void)link;
 		logstream = fopen("latest-log.txt", "wt+");
 #endif/*__unix__*/
 	}
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index 2ccdec5c4..73292d8e1 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -3282,7 +3282,7 @@ static void Shittylogcopy(void)
 {
 	char buf[8192];
 	FILE *fp;
-	int n;
+	size_t n;
 	if (fseek(logstream, 0, SEEK_SET) == -1)
 	{
 		Shittycopyerror("fseek");