From 38495d44497b58ffa672364640dfa284b831e974 Mon Sep 17 00:00:00 2001
From: NepDisk <nepdisk@noreply.codeberg.org>
Date: Sat, 14 Jun 2025 16:46:49 -0400
Subject: [PATCH] Fix some clang warnings

---
 src/g_game.c   | 2 +-
 src/hu_stuff.c | 4 ++--
 src/p_mobj.c   | 2 +-
 src/r_segs.cpp | 6 ++----
 src/r_skins.c  | 2 +-
 src/v_video.c  | 2 +-
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/g_game.c b/src/g_game.c
index 5b5d33969..91c259448 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -2531,7 +2531,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
 		starpostnum = players[player].starpostnum;
 		starposttime = players[player].starposttime;
 		prevcheck = players[player].prevcheck;
-		prevcheck = players[player].nextcheck;
+		nextcheck = players[player].nextcheck;
 		lastsafelap = players[player].lastsafelap;
 		lastsafestarpost = players[player].lastsafestarpost;
 		bigwaypointgap = players[player].bigwaypointgap;
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index 5aa55c976..4cf04d528 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -922,7 +922,7 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
 
 // Handles key input and string input
 //
-static inline boolean HU_keyInChatString(char *s, char ch)
+/*static inline boolean HU_keyInChatString(char *s, char ch)
 {
 	size_t l;
 
@@ -983,7 +983,7 @@ static inline boolean HU_keyInChatString(char *s, char ch)
 		return false; // did not eat key
 
 	return true; // ate the key
-}
+}*/
 
 //
 //
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 1d462aa89..11e10c829 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -7780,7 +7780,7 @@ static boolean P_MobjDeadThink(mobj_t *mobj)
 		{
 			P_SetObjectMomZ(mobj, -2*FRACUNIT/3, true);
 
-			if (mobj->player && (skins[mobj->player->skin].flags && SF_OLDDEATH))
+			if (mobj->player && (skins[mobj->player->skin].flags & SF_OLDDEATH))
 			{
 				mobj->player->drawangle -= ANGLE_22h;
 			}
diff --git a/src/r_segs.cpp b/src/r_segs.cpp
index 0565d5256..ead2fe3e6 100644
--- a/src/r_segs.cpp
+++ b/src/r_segs.cpp
@@ -688,8 +688,7 @@ void R_RenderMaskedSegRange(drawseg_t *drawseg, INT32 x1, INT32 x2)
 template <typename T>
 static constexpr T saturating_add(T x, T y) noexcept
 {
-	INT64 z;
-	z = static_cast<INT64>(x) + static_cast<INT64>(y);
+	INT64 z = static_cast<INT64>(x) + static_cast<INT64>(y);
 	if (z > static_cast<INT64>(std::numeric_limits<T>::max()))
 	{
 		z = static_cast<INT64>(std::numeric_limits<T>::max());
@@ -704,8 +703,7 @@ static constexpr T saturating_add(T x, T y) noexcept
 template <typename T>
 static constexpr T saturating_mul(T x, T y) noexcept
 {
-	INT64 z;
-	z = static_cast<INT64>(x) * static_cast<INT64>(y);
+	INT64 z = static_cast<INT64>(x) * static_cast<INT64>(y);
 	if (z > static_cast<INT64>(std::numeric_limits<T>::max()))
 	{
 		z = static_cast<INT64>(std::numeric_limits<T>::max());
diff --git a/src/r_skins.c b/src/r_skins.c
index 16b479643..15f2034a7 100644
--- a/src/r_skins.c
+++ b/src/r_skins.c
@@ -173,7 +173,7 @@ UINT32 R_GetSkinAvailabilities(void)
 	{
 		if (unlockables[i].type == SECRET_SKIN && unlockables[i].unlocked)
 		{
-			UINT8 s = min(unlockables[i].variable, MAXSKINS);
+			UINT16 s = min(unlockables[i].variable, MAXSKINS);
 			response |= (1 << s);
 		}
 	}
diff --git a/src/v_video.c b/src/v_video.c
index 061027dc1..e4d39cd40 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -1571,7 +1571,7 @@ void V_DrawVhsEffect(boolean rewind)
 	fixed_t uby = upbary>>FRACBITS, dby = downbary>>FRACBITS;
 
 #ifdef HWRENDER
-	if ((rendermode == render_opengl))
+	if (rendermode == render_opengl)
 	{
 		HWR_RenderVhsEffect(uby, dby, updistort, downdistort, barsize);
 		return;