From 3041ec3695c66ec9c8bb0094dafe0acba7cd9d6b Mon Sep 17 00:00:00 2001
From: WofWca <wofwca@protonmail.com>
Date: Thu, 6 Nov 2025 12:15:05 +0400
Subject: [PATCH] refactor: name some magic numbers in `bg_pmove`

---
 code/game/bg_pmove.c  | 18 +++++++++---------
 code/game/bg_public.h |  3 +++
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/code/game/bg_pmove.c b/code/game/bg_pmove.c
index 5465c579..85696ed8 100644
--- a/code/game/bg_pmove.c
+++ b/code/game/bg_pmove.c
@@ -1256,8 +1256,8 @@ static void PM_CheckDuck (void)
 			VectorSet( pm->maxs, 42, 42, 42 );
 		}
 		else {
-			VectorSet( pm->mins, -15, -15, MINS_Z );
-			VectorSet( pm->maxs, 15, 15, 16 );
+			VectorSet( pm->mins, -PLAYER_WIDTH, -PLAYER_WIDTH, MINS_Z );
+			VectorSet( pm->maxs, PLAYER_WIDTH, PLAYER_WIDTH, 16 );
 		}
 		pm->ps->pm_flags |= PMF_DUCKED;
 		pm->ps->viewheight = CROUCH_VIEWHEIGHT;
@@ -1265,11 +1265,11 @@ static void PM_CheckDuck (void)
 	}
 	pm->ps->pm_flags &= ~PMF_INVULEXPAND;
 
-	pm->mins[0] = -15;
-	pm->mins[1] = -15;
+	pm->mins[0] = -PLAYER_WIDTH;
+	pm->mins[1] = -PLAYER_WIDTH;
 
-	pm->maxs[0] = 15;
-	pm->maxs[1] = 15;
+	pm->maxs[0] = PLAYER_WIDTH;
+	pm->maxs[1] = PLAYER_WIDTH;
 
 	pm->mins[2] = MINS_Z;
 
@@ -1289,7 +1289,7 @@ static void PM_CheckDuck (void)
 		if (pm->ps->pm_flags & PMF_DUCKED)
 		{
 			// try to stand up
-			pm->maxs[2] = 32;
+			pm->maxs[2] = DEFAULT_HEIGHT;
 			pm->trace (&trace, pm->ps->origin, pm->mins, pm->maxs, pm->ps->origin, pm->ps->clientNum, pm->tracemask );
 			if (!trace.allsolid)
 				pm->ps->pm_flags &= ~PMF_DUCKED;
@@ -1298,12 +1298,12 @@ static void PM_CheckDuck (void)
 
 	if (pm->ps->pm_flags & PMF_DUCKED)
 	{
-		pm->maxs[2] = 16;
+		pm->maxs[2] = CROUCH_HEIGHT;
 		pm->ps->viewheight = CROUCH_VIEWHEIGHT;
 	}
 	else
 	{
-		pm->maxs[2] = 32;
+		pm->maxs[2] = DEFAULT_HEIGHT;
 		pm->ps->viewheight = DEFAULT_VIEWHEIGHT;
 	}
 }
diff --git a/code/game/bg_public.h b/code/game/bg_public.h
index fa898c44..7114c81c 100644
--- a/code/game/bg_public.h
+++ b/code/game/bg_public.h
@@ -46,8 +46,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #define	VOTE_TIME			30000	// 30 seconds before vote times out
 
+#define PLAYER_WIDTH		15
 #define	MINS_Z				-24
+#define DEFAULT_HEIGHT		32
 #define	DEFAULT_VIEWHEIGHT	26
+#define CROUCH_HEIGHT		16
 #define CROUCH_VIEWHEIGHT	12
 #define	DEAD_VIEWHEIGHT		-16