From 11a4ca28d79dc3e63c1ef90beaee8c6f930a3889 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Thu, 6 Aug 2020 17:59:09 -0700
Subject: [PATCH] Remove PF_SKIDDOWN, just use PF_FAULT

---
 src/d_player.h  | 3 ++-
 src/dehacked.c  | 3 ++-
 src/k_kart.c    | 4 ++--
 src/k_respawn.c | 2 +-
 src/p_user.c    | 4 ++--
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/d_player.h b/src/d_player.h
index d51f23601..3d17350c2 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -113,7 +113,8 @@ typedef enum
 	// Spill rings after falling
 	PF_NIGHTSFALL        = 1<<24,
 	PF_DRILLING          = 1<<25,
-	PF_SKIDDOWN          = 1<<26,
+
+	// free: 1<<26
 
 	/*** TAG STUFF ***/
 	PF_TAGGED            = 1<<27, // Player has been tagged and awaits the next round in hide and seek.
diff --git a/src/dehacked.c b/src/dehacked.c
index 7a97920cd..ffe234c51 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -8569,7 +8569,8 @@ static const char *const PLAYERFLAG_LIST[] = {
 	// Spill rings after falling
 	"NIGHTSFALL",
 	"DRILLING",
-	"SKIDDOWN",
+
+	"\x01", // free: 1<<26 (name un-matchable)
 
 	/*** TAG STUFF ***/
 	"TAGGED", // Player has been tagged and awaits the next round in hide and seek.
diff --git a/src/k_kart.c b/src/k_kart.c
index eac90b665..493ffc035 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -3605,7 +3605,7 @@ void K_DriftDustHandling(mobj_t *spawner)
 
 	if (spawner->player)
 	{
-		if (spawner->player->pflags & PF_SKIDDOWN)
+		if (spawner->player->pflags & PF_FAULT)
 		{
 			anglediff = abs((signed)(spawner->angle - spawner->player->frameangle));
 			if (leveltime % 6 == 0)
@@ -5316,7 +5316,7 @@ void K_KartPlayerHUDUpdate(player_t *player)
 	if (player->karthud[khud_tauntvoices])
 		player->karthud[khud_tauntvoices]--;
 
-	if (!(player->pflags & PF_SKIDDOWN))
+	if (!(player->pflags & PF_FAULT))
 		player->karthud[khud_fault] = 0;
 	else if (player->karthud[khud_fault] > 0 && player->karthud[khud_fault] < 2*TICRATE)
 		player->karthud[khud_fault]++;
diff --git a/src/k_respawn.c b/src/k_respawn.c
index fc2093c83..a6543d425 100644
--- a/src/k_respawn.c
+++ b/src/k_respawn.c
@@ -111,7 +111,7 @@ void K_DoIngameRespawn(player_t *player)
 	if (leveltime < starttime) // FAULT
 	{
 		player->powers[pw_nocontrol] = (starttime - leveltime) + 50;
-		player->pflags |= PF_SKIDDOWN|PF_FAULT; // cheeky pflag reuse
+		player->pflags |= PF_FAULT;
 		S_StartSound(player->mo, sfx_s3k83);
 		player->karthud[khud_fault] = 1;
 	}
diff --git a/src/p_user.c b/src/p_user.c
index 8d6014926..b7f12fb53 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -5859,7 +5859,7 @@ static void P_MovePlayer(player_t *player)
 		else
 			player->frameangle -= (ANGLE_11hh * speed);
 	}
-	else if (player->powers[pw_nocontrol] && player->pflags & PF_SKIDDOWN)
+	else if (player->powers[pw_nocontrol] && player->pflags & PF_FAULT)
 	{
 		if (player->mo->state != &states[S_KART_SPIN])
 			P_SetPlayerMobjState(player->mo, S_KART_SPIN);
@@ -9047,7 +9047,7 @@ void P_PlayerThink(player_t *player)
 	if (player->powers[pw_nocontrol] & ((1<<15)-1) && player->powers[pw_nocontrol] < UINT16_MAX)
 	{
 		if (!(--player->powers[pw_nocontrol]))
-			player->pflags &= ~PF_SKIDDOWN;
+			player->pflags &= ~PF_FAULT;
 	}
 	else
 		player->powers[pw_nocontrol] = 0;