From 391526cf73cce1050632173d2533f410a3c0d1db Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 5 Mar 2026 22:35:59 -0500
Subject: [PATCH 001/291] Changed Macro definitions to constexpr

---
 src/common/beamdef.h   |  24 +--
 src/common/cl_entity.h |   4 +-
 src/common/com_model.h |  47 +++--
 src/common/const.h     | 439 ++++++++++++++++++++---------------------
 4 files changed, 254 insertions(+), 260 deletions(-)

diff --git a/src/common/beamdef.h b/src/common/beamdef.h
index cc4d3047..ecd14bcf 100644
--- a/src/common/beamdef.h
+++ b/src/common/beamdef.h
@@ -18,18 +18,18 @@
 #pragma once
 #endif
 
-#define FBEAM_STARTENTITY 0x00000001
-#define FBEAM_ENDENTITY 0x00000002
-#define FBEAM_FADEIN 0x00000004
-#define FBEAM_FADEOUT 0x00000008
-#define FBEAM_SINENOISE 0x00000010
-#define FBEAM_SOLID 0x00000020
-#define FBEAM_SHADEIN 0x00000040
-#define FBEAM_SHADEOUT 0x00000080
-#define FBEAM_STARTVISIBLE 0x10000000 // Has this client actually seen this beam's start entity yet?
-#define FBEAM_ENDVISIBLE 0x20000000	  // Has this client actually seen this beam's end entity yet?
-#define FBEAM_ISACTIVE 0x40000000
-#define FBEAM_FOREVER 0x80000000
+constexpr int FBEAM_STARTENTITY = 0x00000001;
+constexpr int FBEAM_ENDENTITY = 0x00000002;
+constexpr int FBEAM_FADEIN = 0x00000004;
+constexpr int FBEAM_FADEOUT = 0x00000008;
+constexpr int FBEAM_SINENOISE = 0x00000010;
+constexpr int FBEAM_SOLID = 0x00000020;
+constexpr int FBEAM_SHADEIN = 0x00000040;
+constexpr int FBEAM_SHADEOUT = 0x00000080;
+constexpr int FBEAM_STARTVISIBLE = 0x10000000; // Has this client actually seen this beam's start e= ntity yet?;
+constexpr int FBEAM_ENDVISIBLE = 0x20000000;	  // Has this client actually seen this beam's end e= ntity yet?;
+constexpr int FBEAM_ISACTIVE = 0x40000000;
+constexpr int FBEAM_FOREVER = 0x80000000;
 
 typedef struct beam_s BEAM;
 struct beam_s
diff --git a/src/common/cl_entity.h b/src/common/cl_entity.h
index dbf3981d..0ff88bc8 100644
--- a/src/common/cl_entity.h
+++ b/src/common/cl_entity.h
@@ -60,8 +60,8 @@ typedef struct
 
 typedef struct cl_entity_s cl_entity_t;
 
-#define HISTORY_MAX 64 // Must be power of 2
-#define HISTORY_MASK (HISTORY_MAX - 1)
+constexpr unsigned int HISTORY_MAX = 64; // Must be power of 2
+constexpr unsigned int HISTORY_MASK = (HISTORY_MAX - 1);
 
 #if !defined(ENTITY_STATEH)
 #include "entity_state.h"
diff --git a/src/common/com_model.h b/src/common/com_model.h
index 1694a5c9..e138cf38 100644
--- a/src/common/com_model.h
+++ b/src/common/com_model.h
@@ -24,33 +24,30 @@
 #pragma once
 #endif
 
-#define STUDIO_RENDER 1
-#define STUDIO_EVENTS 2
-
-#define MAX_CLIENTS 32
-#define MAX_EDICTS 2048
-
-#define MAX_MODEL_NAME 64
-#define MAX_MAP_HULLS 4
-#define MIPLEVELS 4
-#define NUM_AMBIENTS 4 // automatic ambient sounds
-#define MAXLIGHTMAPS 4
-#define PLANE_ANYZ 5
-
-#define ALIAS_Z_CLIP_PLANE 5
+constexpr unsigned int STUDIO_RENDER = 1;
+constexpr unsigned int STUDIO_EVENTS = 2;
+constexpr unsigned int MAX_MAP_HULLS = 4;
+constexpr unsigned int MIPLEVELS = 4;
+constexpr unsigned int NUM_AMBIENTS = 4; // automatic ambient sounds
+constexpr unsigned int MAXLIGHTMAPS = 4;
+constexpr unsigned int PLANE_ANYZ = 5;
+constexpr unsigned int MAX_CLIENTS = 32;
+constexpr unsigned int MAX_MODEL_NAME = 64;
+constexpr unsigned int MAX_EDICTS = 2048;
+
+constexpr unsigned int ALIAS_Z_CLIP_PLANE = 5;
 
 // flags in finalvert_t.flags
-#define ALIAS_LEFT_CLIP 0x0001
-#define ALIAS_TOP_CLIP 0x0002
-#define ALIAS_RIGHT_CLIP 0x0004
-#define ALIAS_BOTTOM_CLIP 0x0008
-#define ALIAS_Z_CLIP 0x0010
-#define ALIAS_ONSEAM 0x0020
-#define ALIAS_XY_CLIP_MASK 0x000F
-
-#define ZISCALE ((float)0x8000)
+constexpr int ALIAS_LEFT_CLIP = 0x0001;
+constexpr int ALIAS_TOP_CLIP = 0x0002;
+constexpr int ALIAS_RIGHT_CLIP = 0x0004;
+constexpr int ALIAS_BOTTOM_CLIP = 0x0008;
+constexpr int ALIAS_Z_CLIP = 0x0010;
+constexpr int ALIAS_ONSEAM = 0x0020;
+constexpr int ALIAS_XY_CLIP_MASK = 0x000F;
+constexpr float ZISCALE = ((float)0x8000);
 
-#define CACHE_SIZE 32 // used to align key data structures
+constexpr int CACHE_SIZE = 32; // used to align key data structures
 
 typedef enum
 {
@@ -159,7 +156,7 @@ typedef struct
 #ifdef HARDWARE_MODE
 // 06/23/2002 MAH
 // This structure is only need for hardware rendering
-#define VERTEXSIZE 7
+constexpr int VERTEXSIZE = 7;
 
 typedef struct glpoly_s
 {
diff --git a/src/common/const.h b/src/common/const.h
index c37c7ab2..1db60ce8 100644
--- a/src/common/const.h
+++ b/src/common/const.h
@@ -22,23 +22,23 @@
 #include "Platform.h"
 
 // edict->flags
-#define FL_FLY (1 << 0)	 // Changes the SV_Movestep() behavior to not need to be on ground
-#define FL_SWIM (1 << 1) // Changes the SV_Movestep() behavior to not need to be on ground (but stay in water)
-#define FL_CONVEYOR (1 << 2)
-#define FL_CLIENT (1 << 3)
-#define FL_INWATER (1 << 4)
-#define FL_MONSTER (1 << 5)
-#define FL_GODMODE (1 << 6)
-#define FL_NOTARGET (1 << 7)
-#define FL_SKIPLOCALHOST (1 << 8)  // Don't send entity to local host, it's predicting this entity itself
-#define FL_ONGROUND (1 << 9)	   // At rest / on the ground
-#define FL_PARTIALGROUND (1 << 10) // not all corners are valid
-#define FL_WATERJUMP (1 << 11)	   // player jumping out of water
-#define FL_FROZEN (1 << 12)		   // Player is frozen for 3rd person camera
-#define FL_FAKECLIENT (1 << 13)	   // JAC: fake client, simulated server side; don't send network messages to them
-#define FL_DUCKING (1 << 14)	   // Player flag -- Player is fully crouched
-#define FL_FLOAT (1 << 15)		   // Apply floating force to this entity when in water
-#define FL_GRAPHED (1 << 16)	   // worldgraph has this ent listed as something that blocks a connection
+constexpr int FL_FLY = (1 << 0);	 // Changes the SV_Movestep() behavior to not need to be on ground
+constexpr int FL_SWIM = (1 << 1); // Changes the SV_Movestep() behavior to not need to be on ground (but stay in water)
+constexpr int FL_CONVEYOR = (1 << 2);
+constexpr int FL_CLIENT = (1 << 3);
+constexpr int FL_INWATER = (1 << 4);
+constexpr int FL_MONSTER = (1 << 5);
+constexpr int FL_GODMODE = (1 << 6);
+constexpr int FL_NOTARGET = (1 << 7);
+constexpr int FL_SKIPLOCALHOST = (1 << 8); // Don't send entity to local host, it's predicting this entity itself
+constexpr int FL_ONGROUND = (1 << 9);	   // At rest / on the ground
+constexpr int FL_PARTIALGROUND = (1 << 10);// not all corners are valid
+constexpr int FL_WATERJUMP = (1 << 11);   // player jumping out of water
+constexpr int FL_FROZEN = (1 << 12);	   // Player is frozen for 3rd person camera
+constexpr int FL_FAKECLIENT = (1 << 13);  // JAC: fake client, simulated server side; don't send network messages to them
+constexpr int FL_DUCKING = (1 << 14);	   // Player flag -- Player is fully crouched
+constexpr int FL_FLOAT = (1 << 15);	   // Apply floating force to this entity when in water
+constexpr int FL_GRAPHED = (1 << 16);	   // worldgraph has this ent listed as something that blocks a connection
 
 // UNDONE: Do we need these?
 #define FL_IMMUNE_WATER (1 << 17)
@@ -46,79 +46,79 @@
 #define FL_CLIENTONLY (1 << 18)		// Strip edicts
 #define FL_IMMUNE_LAVA (1 << 19)
 
-#define FL_PROXY (1 << 20)		  // This is a spectator proxy
-#define FL_ALWAYSTHINK (1 << 21)  // Brush model flag -- call think every frame regardless of nextthink - ltime (for constantly changing velocity/path)
-#define FL_BASEVELOCITY (1 << 22) // Base velocity has been applied this frame (used to convert base velocity into momentum)
-#define FL_MONSTERCLIP (1 << 23)  // Only collide in with monsters who have FL_MONSTERCLIP set
-#define FL_ONTRAIN (1 << 24)	  // Player is _controlling_ a train, so movement commands should be ignored on client during prediction.
-#define FL_WORLDBRUSH (1 << 25)	  // Not moveable/removeable brush entity (really part of the world, but represented as an entity for transparency or something)
-#define FL_SPECTATOR (1 << 26)	  // This client is a spectator, don't run touch functions, etc.
-#define FL_CUSTOMENTITY (1 << 29) // This is a custom entity
-#define FL_KILLME (1 << 30)		  // This entity is marked for death -- This allows the engine to kill ents at the appropriate time
-#define FL_DORMANT (1 << 31)	  // Entity is dormant, no updates to client
+constexpr int FL_PROXY = (1 << 20);		  // This is a spectator proxy
+constexpr int FL_ALWAYSTHINK = (1 << 21); // Brush model flag -- call think every frame regardless of nextthink - ltime (for constantly changing velocity/path)
+constexpr int FL_BASEVELOCITY = (1 << 22);// Base velocity has been applied this frame (used to convert base velocity into momentum)
+constexpr int FL_MONSTERCLIP = (1 << 23); // Only collide in with monsters who have FL_MONSTERCLIP set
+constexpr int FL_ONTRAIN = (1 << 24);	  // Player is _controlling_ a train, so movement commands should be ignored on client during prediction.
+constexpr int FL_WORLDBRUSH = (1 << 25);	  // Not moveable/removeable brush entity (really part of the world, but represented as an entity for transparency or something)
+constexpr int FL_SPECTATOR = (1 << 26);	  // This client is a spectator, don't run touch functions, etc.
+constexpr int FL_CUSTOMENTITY = (1 << 29); // This is a custom entity
+constexpr int FL_KILLME = (1 << 30);		  // This entity is marked for death -- This allows the engine to kill ents at the appropriate time
+constexpr int FL_DORMANT = (1 << 31);	  // Entity is dormant, no updates to client
 
 // Goes into globalvars_t.trace_flags
-#define FTRACE_SIMPLEBOX (1 << 0) // Traceline with a simple box
+constexpr int FTRACE_SIMPLEBOX = (1 << 0); // Traceline with a simple box
 
 // walkmove modes
-#define WALKMOVE_NORMAL 0	 // normal walkmove
-#define WALKMOVE_WORLDONLY 1 // doesn't hit ANY entities, no matter what the solid type
-#define WALKMOVE_CHECKONLY 2 // move, but don't touch triggers
+ constexpr int WALKMOVE_NORMAL = 0;	 // normal walkmove
+ constexpr int WALKMOVE_WORLDONLY = 1; // doesn't hit ANY entities, no matter what the solid type
+ constexpr int WALKMOVE_CHECKONLY = 2; // move, but don't touch triggers
 
 // edict->movetype values
-#define MOVETYPE_NONE 0 // never moves
-//#define	MOVETYPE_ANGLENOCLIP	1
-//#define	MOVETYPE_ANGLECLIP		2
-#define MOVETYPE_WALK 3			  // Player only - moving on the ground
-#define MOVETYPE_STEP 4			  // gravity, special edge handling -- monsters use this
-#define MOVETYPE_FLY 5			  // No gravity, but still collides with stuff
-#define MOVETYPE_TOSS 6			  // gravity/collisions
-#define MOVETYPE_PUSH 7			  // no clip to world, push and crush
-#define MOVETYPE_NOCLIP 8		  // No gravity, no collisions, still do velocity/avelocity
-#define MOVETYPE_FLYMISSILE 9	  // extra size to monsters
-#define MOVETYPE_BOUNCE 10		  // Just like Toss, but reflect velocity when contacting surfaces
-#define MOVETYPE_BOUNCEMISSILE 11 // bounce w/o gravity
-#define MOVETYPE_FOLLOW 12		  // track movement of aiment
-#define MOVETYPE_PUSHSTEP 13	  // BSP model that needs physics/world collisions (uses nearest hull for world collision)
+ constexpr int MOVETYPE_NONE = 0;
+ constexpr int MOVETYPE_ANGLENOCLIP = 1;
+ constexpr int MOVETYPE_ANGLECLIP = 2;
+ constexpr int MOVETYPE_WALK = 3;		  // Player only - moving on the ground
+ constexpr int MOVETYPE_STEP = 4;		  // gravity, special edge handling -- monsters use this
+ constexpr int MOVETYPE_FLY = 5;		  // No gravity, but still collides with stuff
+ constexpr int MOVETYPE_TOSS = 6;		  // gravity/collisions
+ constexpr int MOVETYPE_PUSH = 7;		  // no clip to world, push and crush
+ constexpr int MOVETYPE_NOCLIP = 8;  // No gravity, no collisions, still do velocity/avelocity
+ constexpr int MOVETYPE_FLYMISSILE = 9; // extra size to monsters
+ constexpr int MOVETYPE_BOUNCE = 10;		  // Just like Toss, but reflect velocity when contacting surfaces
+ constexpr int MOVETYPE_BOUNCEMISSILE = 11;// bounce w/o gravity
+ constexpr int MOVETYPE_FOLLOW = 12;		  // track movement of aiment
+ constexpr int MOVETYPE_PUSHSTEP = 13;  // BSP model that needs physics/world collisions (uses nearest hull for world collision)
 
 // edict->solid values
 // NOTE: Some movetypes will cause collisions independent of SOLID_NOT/SOLID_TRIGGER when the entity moves
 // SOLID only effects OTHER entities colliding with this one when they move - UGH!
-#define SOLID_NOT 0		 // no interaction with other objects
-#define SOLID_TRIGGER 1	 // touch on edge, but not blocking
-#define SOLID_BBOX 2	 // touch on edge, block
-#define SOLID_SLIDEBOX 3 // touch on edge, but not an onground
-#define SOLID_BSP 4		 // bsp clip, touch on edge, block
+constexpr int SOLID_NOT = 0;	 // no interaction with other objects
+constexpr int SOLID_TRIGGER = 1;	 // touch on edge, but not blocking
+constexpr int SOLID_BBOX = 2;	 // touch on edge, block
+constexpr int SOLID_SLIDEBOX = 3;// touch on edge, but not an onground
+constexpr int SOLID_BSP = 4;	 // bsp clip, touch on edge, block
 
 // edict->deadflag values
-#define DEAD_NO 0	 // alive
-#define DEAD_DYING 1 // playing death animation or still falling off of a ledge waiting to hit ground
-#define DEAD_DEAD 2	 // dead. lying still.
-#define DEAD_RESPAWNABLE 3
-#define DEAD_DISCARDBODY 4
+constexpr int DEAD_NO = 0;	 // alive
+constexpr int DEAD_DYING = 1; // playing death animation or still falling off of a ledge waiting to hit ground
+constexpr int DEAD_DEAD = 2;	 // dead. lying still.
+constexpr int DEAD_RESPAWNABLE = 3;
+constexpr int DEAD_DISCARDBODY = 4;
 
-#define DAMAGE_NO 0
-#define DAMAGE_YES 1
-#define DAMAGE_AIM 2
+constexpr int DAMAGE_NO = 0;
+constexpr int DAMAGE_YES = 1;
+constexpr int DAMAGE_AIM = 2;
 
 // entity effects
-#define EF_BRIGHTFIELD 1 // swirling cloud of particles
-#define EF_MUZZLEFLASH 2 // single frame ELIGHT on entity attachment 0
-#define EF_BRIGHTLIGHT 4 // DLIGHT centered at entity origin
-#define EF_DIMLIGHT 8	 // player flashlight
-#define EF_INVLIGHT 16	 // get lighting from ceiling
-#define EF_NOINTERP 32	 // don't interpolate the next frame
-#define EF_LIGHT 64		 // rocket flare glow sprite
-#define EF_NODRAW 128	 // don't draw entity
+constexpr int EF_BRIGHTFIELD = 1; // swirling cloud of particles
+constexpr int EF_MUZZLEFLASH = 2; // single frame ELIGHT on entity attachment 0
+constexpr int EF_BRIGHTLIGHT = 4;// DLIGHT centered at entity origin
+constexpr int EF_DIMLIGHT = 8;	 // player flashlight
+constexpr int EF_INVLIGHT = 16;	 // get lighting from ceiling
+constexpr int EF_NOINTERP = 32;	 // don't interpolate the next frame
+constexpr int EF_LIGHT = 64;	 // rocket flare glow sprite
+constexpr int EF_NODRAW = 128;	 // don't draw entity
 
 // entity flags
-#define EFLAG_SLERP 1 // do studio interpolation of this entity
-#define EFLAG_FLESH_SOUND 2
+constexpr int EFLAG_SLERP = 1; // do studio interpolation of this entity
+constexpr int EFLAG_FLESH_SOUND = 2;
 
 //
 // temp entity events
 //
-#define TE_BEAMPOINTS 0 // beam effect between two points
+constexpr int TE_BEAMPOINTS = 0; // beam effect between two points
 // coord coord coord (start position)
 // coord coord coord (end position)
 // short (sprite index)
@@ -131,7 +131,7 @@
 // byte (brightness)
 // byte (scroll speed in 0.1's)
 
-#define TE_BEAMENTPOINT 1 // beam effect between point and entity
+constexpr int TE_BEAMENTPOINT = 1; // beam effect between point and entity
 // short (start entity)
 // coord coord coord (end position)
 // short (sprite index)
@@ -144,10 +144,10 @@
 // byte (brightness)
 // byte (scroll speed in 0.1's)
 
-#define TE_GUNSHOT 2 // particle effect plus ricochet sound
+constexpr int TE_GUNSHOT = 2; // particle effect plus ricochet sound
 // coord coord coord (position)
 
-#define TE_EXPLOSION 3 // additive sprite, 2 dynamic lights, flickering particles, explosion sound, move vertically 8 pps
+constexpr int TE_EXPLOSION = 3; // additive sprite, 2 dynamic lights, flickering particles, explosion sound, move vertically 8 pps
 // coord coord coord (position)
 // short (sprite index)
 // byte (scale in 0.1's)
@@ -155,26 +155,26 @@
 // byte (flags)
 //
 // The Explosion effect has some flags to control performance/aesthetic features:
-#define TE_EXPLFLAG_NONE 0		  // all flags clear makes default Half-Life explosion
-#define TE_EXPLFLAG_NOADDITIVE 1  // sprite will be drawn opaque (ensure that the sprite you send is a non-additive sprite)
-#define TE_EXPLFLAG_NODLIGHTS 2	  // do not render dynamic lights
-#define TE_EXPLFLAG_NOSOUND 4	  // do not play client explosion sound
-#define TE_EXPLFLAG_NOPARTICLES 8 // do not draw particles
+constexpr int TE_EXPLFLAG_NONE = 0;	  // all flags clear makes default Half-Life explosion
+constexpr int TE_EXPLFLAG_NOADDITIVE = 1;  // sprite will be drawn opaque (ensure that the sprite you send is a non-additive sprite)
+constexpr int TE_EXPLFLAG_NODLIGHTS = 2;	  // do not render dynamic lights
+constexpr int TE_EXPLFLAG_NOSOUND = 4;  // do not play client explosion sound
+constexpr int TE_EXPLFLAG_NOPARTICLES = 8; // do not draw particles
 
-#define TE_TAREXPLOSION 4 // Quake1 "tarbaby" explosion with sound
+constexpr int TE_TAREXPLOSION = 4; // Quake1 "tarbaby" explosion with sound
 // coord coord coord (position)
 
-#define TE_SMOKE 5 // alphablend sprite, move vertically 30 pps
+constexpr int TE_SMOKE = 5; // alphablend sprite, move vertically 30 pps
 // coord coord coord (position)
 // short (sprite index)
 // byte (scale in 0.1's)
 // byte (framerate)
 
-#define TE_TRACER 6 // tracer effect from point to point
+constexpr int TE_TRACER = 6; // tracer effect from point to point
 // coord, coord, coord (start)
 // coord, coord, coord (end)
 
-#define TE_LIGHTNING 7 // TE_BEAMPOINTS with simplified parameters
+constexpr int TE_LIGHTNING = 7; // TE_BEAMPOINTS with simplified parameters
 // coord, coord, coord (start)
 // coord, coord, coord (end)
 // byte (life in 0.1's)
@@ -182,7 +182,7 @@
 // byte (amplitude in 0.01's)
 // short (sprite model index)
 
-#define TE_BEAMENTS 8
+constexpr int TE_BEAMENTS = 8;
 // short (start entity)
 // short (end entity)
 // short (sprite index)
@@ -195,33 +195,33 @@
 // byte (brightness)
 // byte (scroll speed in 0.1's)
 
-#define TE_SPARKS 9 // 8 random tracers with gravity, ricochet sprite
+constexpr int TE_SPARKS = 9; // 8 random tracers with gravity, ricochet sprite
 // coord coord coord (position)
 
-#define TE_LAVASPLASH 10 // Quake1 lava splash
+constexpr int TE_LAVASPLASH = 10; // Quake1 lava splash
 // coord coord coord (position)
 
-#define TE_TELEPORT 11 // Quake1 teleport splash
+constexpr int TE_TELEPORT = 11; // Quake1 teleport splash
 // coord coord coord (position)
 
-#define TE_EXPLOSION2 12 // Quake1 colormaped (base palette) particle explosion with sound
+constexpr int TE_EXPLOSION2 = 12; // Quake1 colormaped (base palette) particle explosion with sound
 // coord coord coord (position)
 // byte (starting color)
 // byte (num colors)
 
-#define TE_BSPDECAL 13 // Decal from the .BSP file
+constexpr int TE_BSPDECAL = 13; // Decal from the .BSP file
 // coord, coord, coord (x,y,z), decal position (center of texture in world)
 // short (texture index of precached decal texture name)
 // short (entity index)
 // [optional - only included if previous short is non-zero (not the world)] short (index of model of above entity)
 
-#define TE_IMPLOSION 14 // tracers moving toward a point
+constexpr int TE_IMPLOSION = 14; // tracers moving toward a point
 // coord, coord, coord (position)
 // byte (radius)
 // byte (count)
 // byte (life in 0.1's)
 
-#define TE_SPRITETRAIL 15 // line of moving glow sprites with gravity, fadeout, and collisions
+constexpr int TE_SPRITETRAIL = 15; // line of moving glow sprites with gravity, fadeout, and collisions
 // coord, coord, coord (start)
 // coord, coord, coord (end)
 // short (sprite index)
@@ -231,21 +231,21 @@
 // byte (velocity along vector in 10's)
 // byte (randomness of velocity in 10's)
 
-#define TE_BEAM 16 // obsolete
+constexpr int TE_BEAM = 16; // obsolete
 
-#define TE_SPRITE 17 // additive sprite, plays 1 cycle
+constexpr int TE_SPRITE = 17; // additive sprite, plays 1 cycle
 // coord, coord, coord (position)
 // short (sprite index)
 // byte (scale in 0.1's)
 // byte (brightness)
 
-#define TE_BEAMSPRITE 18 // A beam with a sprite at the end
+constexpr int TE_BEAMSPRITE = 18; // A beam with a sprite at the end
 // coord, coord, coord (start position)
 // coord, coord, coord (end position)
 // short (beam sprite index)
 // short (end sprite index)
 
-#define TE_BEAMTORUS 19 // screen aligned beam ring, expands to max radius over lifetime
+constexpr int TE_BEAMTORUS = 19; // screen aligned beam ring, expands to max radius over lifetime
 // coord coord coord (center position)
 // coord coord coord (axis and radius)
 // short (sprite index)
@@ -258,7 +258,7 @@
 // byte (brightness)
 // byte (scroll speed in 0.1's)
 
-#define TE_BEAMDISK 20 // disk that expands to max radius over lifetime
+constexpr int TE_BEAMDISK = 20; // disk that expands to max radius over lifetime
 // coord coord coord (center position)
 // coord coord coord (axis and radius)
 // short (sprite index)
@@ -271,7 +271,7 @@
 // byte (brightness)
 // byte (scroll speed in 0.1's)
 
-#define TE_BEAMCYLINDER 21 // cylinder that expands to max radius over lifetime
+constexpr int TE_BEAMCYLINDER = 21; // cylinder that expands to max radius over lifetime
 // coord coord coord (center position)
 // coord coord coord (axis and radius)
 // short (sprite index)
@@ -284,7 +284,7 @@
 // byte (brightness)
 // byte (scroll speed in 0.1's)
 
-#define TE_BEAMFOLLOW 22 // create a line of decaying beam segments until entity stops moving
+constexpr int TE_BEAMFOLLOW = 22; // create a line of decaying beam segments until entity stops moving
 // short (entity:attachment to follow)
 // short (sprite index)
 // byte (life in 0.1's)
@@ -292,10 +292,10 @@
 // byte,byte,byte (color)
 // byte (brightness)
 
-#define TE_GLOWSPRITE 23
+constexpr int TE_GLOWSPRITE = 23;
 // coord, coord, coord (pos) short (model index) byte (scale / 10)
 
-#define TE_BEAMRING 24 // connect a beam ring to two entities
+constexpr int TE_BEAMRING = 24; // connect a beam ring to two entities
 // short (start entity)
 // short (end entity)
 // short (sprite index)
@@ -308,7 +308,7 @@
 // byte (brightness)
 // byte (scroll speed in 0.1's)
 
-#define TE_STREAK_SPLASH 25 // oriented shower of tracers
+constexpr int TE_STREAK_SPLASH = 25; // oriented shower of tracers
 // coord coord coord (start position)
 // coord coord coord (direction vector)
 // byte (color)
@@ -316,9 +316,9 @@
 // short (base speed)
 // short (ramdon velocity)
 
-#define TE_BEAMHOSE 26 // obsolete
+constexpr int TE_BEAMHOSE = 26; // obsolete
 
-#define TE_DLIGHT 27 // dynamic light, effect world, minor entity effect
+constexpr int TE_DLIGHT = 27; // dynamic light, effect world, minor entity effect
 // coord, coord, coord (pos)
 // byte (radius in 10's)
 // byte byte byte (color)
@@ -326,7 +326,7 @@
 // byte (life in 10's)
 // byte (decay rate in 10's)
 
-#define TE_ELIGHT 28 // point entity light, no world effect
+constexpr int TE_ELIGHT = 28; // point entity light, no world effect
 // short (entity:attachment to follow)
 // coord coord coord (initial position)
 // coord (radius)
@@ -334,7 +334,7 @@
 // byte (life in 0.1's)
 // coord (decay rate)
 
-#define TE_TEXTMESSAGE 29
+constexpr int TE_TEXTMESSAGE = 29;
 // short 1.2.13 x (-1 = center)
 // short 1.2.13 y (-1 = center)
 // byte Effect 0 = fade in/fade out
@@ -348,53 +348,53 @@
 // ushort 8.8 hold time
 // optional ushort 8.8 fxtime	(time the highlight lags behing the leading text in effect 2)
 // string text message		(512 chars max sz string)
-#define TE_LINE 30
+constexpr int TE_LINE = 30;
 // coord, coord, coord		startpos
 // coord, coord, coord		endpos
 // short life in 0.1 s
 // 3 bytes r, g, b
 
-#define TE_BOX 31
+constexpr int TE_BOX = 31;
 // coord, coord, coord		boxmins
 // coord, coord, coord		boxmaxs
 // short life in 0.1 s
 // 3 bytes r, g, b
 
-#define TE_KILLBEAM 99 // kill all beams attached to entity
+constexpr int TE_KILLBEAM = 99; // kill all beams attached to entity
 // short (entity)
 
-#define TE_LARGEFUNNEL 100
+constexpr int TE_LARGEFUNNEL = 100;
 // coord coord coord (funnel position)
 // short (sprite index)
 // short (flags)
 
-#define TE_BLOODSTREAM 101 // particle spray
+constexpr int TE_BLOODSTREAM = 101; // particle spray
 // coord coord coord (start position)
 // coord coord coord (spray vector)
 // byte (color)
 // byte (speed)
 
-#define TE_SHOWLINE 102 // line of particles every 5 units, dies in 30 seconds
+constexpr int TE_SHOWLINE = 102; // line of particles every 5 units, dies in 30 seconds
 // coord coord coord (start position)
 // coord coord coord (end position)
 
-#define TE_BLOOD 103 // particle spray
+constexpr int TE_BLOOD = 103; // particle spray
 // coord coord coord (start position)
 // coord coord coord (spray vector)
 // byte (color)
 // byte (speed)
 
-#define TE_DECAL 104 // Decal applied to a brush entity (not the world)
+constexpr int TE_DECAL = 104; // Decal applied to a brush entity (not the world)
 // coord, coord, coord (x,y,z), decal position (center of texture in world)
 // byte (texture index of precached decal texture name)
 // short (entity index)
 
-#define TE_FIZZ 105 // create alpha sprites inside of entity, float upwards
+constexpr int TE_FIZZ = 105; // create alpha sprites inside of entity, float upwards
 // short (entity)
 // short (sprite index)
 // byte (density)
 
-#define TE_MODEL 106 // create a moving model that bounces and makes a sound when it hits
+constexpr int TE_MODEL = 106; // create a moving model that bounces and makes a sound when it hits
 // coord, coord, coord (position)
 // coord, coord, coord (velocity)
 // angle (initial yaw)
@@ -402,14 +402,14 @@
 // byte (bounce sound type)
 // byte (life in 0.1's)
 
-#define TE_EXPLODEMODEL 107 // spherical shower of models, picks from set
+constexpr int TE_EXPLODEMODEL = 107; // spherical shower of models, picks from set
 // coord, coord, coord (origin)
 // coord (velocity)
 // short (model index)
 // short (count)
 // byte (life in 0.1's)
 
-#define TE_BREAKMODEL 108 // box of models or sprites
+constexpr int TE_BREAKMODEL = 108; // box of models or sprites
 // coord, coord, coord (position)
 // coord, coord, coord (size)
 // coord, coord, coord (velocity)
@@ -419,12 +419,12 @@
 // byte (life in 0.1 secs)
 // byte (flags)
 
-#define TE_GUNSHOTDECAL 109 // decal and ricochet sound
+constexpr int TE_GUNSHOTDECAL = 109; // decal and ricochet sound
 // coord, coord, coord (position)
 // short (entity index???)
 // byte (decal???)
 
-#define TE_SPRITE_SPRAY 110 // spay of alpha sprites
+constexpr int TE_SPRITE_SPRAY = 110; // spay of alpha sprites
 // coord, coord, coord (position)
 // coord, coord, coord (velocity)
 // short (sprite index)
@@ -432,18 +432,18 @@
 // byte (speed)
 // byte (noise)
 
-#define TE_ARMOR_RICOCHET 111 // quick spark sprite, client ricochet sound.
+constexpr int TE_ARMOR_RICOCHET = 111; // quick spark sprite, client ricochet sound.
 // coord, coord, coord (position)
 // byte (scale in 0.1's)
 
-#define TE_PLAYERDECAL 112 // ???
+constexpr int TE_PLAYERDECAL = 112; // ???
 // byte (playerindex)
 // coord, coord, coord (position)
 // short (entity???)
 // byte (decal number???)
 // [optional] short (model index???)
 
-#define TE_BUBBLES 113 // create alpha sprites inside of box, float upwards
+constexpr int TE_BUBBLES = 113; // create alpha sprites inside of box, float upwards
 // coord, coord, coord (min start position)
 // coord, coord, coord (max start position)
 // coord (float height)
@@ -451,7 +451,7 @@
 // byte (count)
 // coord (speed)
 
-#define TE_BUBBLETRAIL 114 // create alpha sprites along a line, float upwards
+constexpr int TE_BUBBLETRAIL = 114; // create alpha sprites along a line, float upwards
 // coord, coord, coord (min start position)
 // coord, coord, coord (max start position)
 // coord (float height)
@@ -459,34 +459,34 @@
 // byte (count)
 // coord (speed)
 
-#define TE_BLOODSPRITE 115 // spray of opaque sprite1's that fall, single sprite2 for 1..2 secs (this is a high-priority tent)
+constexpr int TE_BLOODSPRITE = 115; // spray of opaque sprite1's that fall, single sprite2 for 1..2 secs (this is a high-priority tent)
 // coord, coord, coord (position)
 // short (sprite1 index)
 // short (sprite2 index)
 // byte (color)
 // byte (scale)
 
-#define TE_WORLDDECAL 116 // Decal applied to the world brush
+constexpr int TE_WORLDDECAL = 116; // Decal applied to the world brush
 // coord, coord, coord (x,y,z), decal position (center of texture in world)
 // byte (texture index of precached decal texture name)
 
-#define TE_WORLDDECALHIGH 117 // Decal (with texture index > 256) applied to world brush
+constexpr int TE_WORLDDECALHIGH = 117; // Decal (with texture index > 256) applied to world brush
 // coord, coord, coord (x,y,z), decal position (center of texture in world)
 // byte (texture index of precached decal texture name - 256)
 
-#define TE_DECALHIGH 118 // Same as TE_DECAL, but the texture index was greater than 256
+constexpr int TE_DECALHIGH = 118; // Same as TE_DECAL, but the texture index was greater than 256
 // coord, coord, coord (x,y,z), decal position (center of texture in world)
 // byte (texture index of precached decal texture name - 256)
 // short (entity index)
 
-#define TE_PROJECTILE 119 // Makes a projectile (like a nail) (this is a high-priority tent)
+constexpr int TE_PROJECTILE = 119; // Makes a projectile (like a nail) (this is a high-priority tent)
 // coord, coord, coord (position)
 // coord, coord, coord (velocity)
 // short (modelindex)
 // byte (life)
 // byte (owner)  projectile won't collide with owner (if owner == 0, projectile will hit any client).
 
-#define TE_SPRAY 120 // Throws a shower of sprites or models
+constexpr int TE_SPRAY = 120; // Throws a shower of sprites or models
 // coord, coord, coord (position)
 // coord, coord, coord (direction)
 // short (modelindex)
@@ -495,19 +495,19 @@
 // byte (noise)
 // byte (rendermode)
 
-#define TE_PLAYERSPRITES 121 // sprites emit from a player's bounding box (ONLY use for players!)
+constexpr int TE_PLAYERSPRITES = 121; // sprites emit from a player's bounding box (ONLY use for players!)
 // byte (playernum)
 // short (sprite modelindex)
 // byte (count)
 // byte (variance) (0 = no variance in size) (10 = 10% variance in size)
 
-#define TE_PARTICLEBURST 122 // very similar to lavasplash.
+constexpr int TE_PARTICLEBURST = 122; // very similar to lavasplash.
 // coord (origin)
 // short (radius)
 // byte (particle color)
 // byte (duration * 10) (will be randomized a bit)
 
-#define TE_FIREFIELD 123 // makes a field of fire.
+constexpr int TE_FIREFIELD = 123; // makes a field of fire.
 // coord (origin)
 // short (radius) (fire is made in a square around origin. -radius, -radius to radius, radius)
 // short (modelindex)
@@ -516,23 +516,23 @@
 // byte (duration (in seconds) * 10) (will be randomized a bit)
 //
 // to keep network traffic low, this message has associated flags that fit into a byte:
-#define TEFIRE_FLAG_ALLFLOAT 1	// all sprites will drift upwards as they animate
-#define TEFIRE_FLAG_SOMEFLOAT 2 // some of the sprites will drift upwards. (50% chance)
-#define TEFIRE_FLAG_LOOP 4		// if set, sprite plays at 15 fps, otherwise plays at whatever rate stretches the animation over the sprite's duration.
-#define TEFIRE_FLAG_ALPHA 8		// if set, sprite is rendered alpha blended at 50% else, opaque
-#define TEFIRE_FLAG_PLANAR 16	// if set, all fire sprites have same initial Z instead of randomly filling a cube.
-#define TEFIRE_FLAG_ADDITIVE 32 // if set, sprite is rendered non-opaque with additive
-
-#define TE_PLAYERATTACHMENT 124 // attaches a TENT to a player (this is a high-priority tent)
+constexpr int TEFIRE_FLAG_ALLFLOAT = 1;	// all sprites will drift upwards as they animate
+constexpr int TEFIRE_FLAG_SOMEFLOAT = 2; // some of the sprites will drift upwards. (50% chance)
+constexpr int TEFIRE_FLAG_LOOP = 4;		// if set, sprite plays at 15 fps, otherwise plays at whatever rate stretches the animation over the sprite's duration.
+constexpr int TEFIRE_FLAG_ALPHA = 8;		// if set, sprite is rendered alpha blended at 50% else, opaque
+constexpr int TEFIRE_FLAG_PLANAR = 16;// if set, all fire sprites have same initial Z instead of randomly filling a cube.
+constexpr int TEFIRE_FLAG_ADDITIVE = 32; // if set, sprite is rendered non-opaque with additive
+
+constexpr int TE_PLAYERATTACHMENT = 124; // attaches a TENT to a player (this is a high-priority tent)
 // byte (entity index of player)
 // coord (vertical offset) ( attachment origin.z = player origin.z + vertical offset )
 // short (model index)
 // short (life * 10 );
 
-#define TE_KILLPLAYERATTACHMENTS 125 // will expire all TENTS attached to a player.
+constexpr int TE_KILLPLAYERATTACHMENTS = 125; // will expire all TENTS attached to a player.
 // byte (entity index of player)
 
-#define TE_MULTIGUNSHOT 126 // much more compact shotgun message
+constexpr int TE_MULTIGUNSHOT = 126; // much more compact shotgun message
 // This message is used to make a client approximate a 'spray' of gunfire.
 // Any weapon that fires more than one bullet per frame and fires in a bit of a spread is
 // a good candidate for MULTIGUNSHOT use. (shotguns)
@@ -551,7 +551,7 @@
 // byte (count)
 // byte (bullethole decal texture index)
 
-#define TE_USERTRACER 127 // larger message than the standard tracer, but allows some customization.
+constexpr int TE_USERTRACER = 127; // larger message than the standard tracer, but allows some customization.
 // coord (origin)
 // coord (origin)
 // coord (origin)
@@ -562,81 +562,79 @@
 // byte ( color ) this is an index into an array of color vectors in the engine. (0 - )
 // byte ( length * 10 )
 
-#define MSG_BROADCAST 0		 // unreliable to all
-#define MSG_ONE 1			 // reliable to one (msg_entity)
-#define MSG_ALL 2			 // reliable to all
-#define MSG_INIT 3			 // write to the init string
-#define MSG_PVS 4			 // Ents in PVS of org
-#define MSG_PAS 5			 // Ents in PAS of org
-#define MSG_PVS_R 6			 // Reliable to PVS
-#define MSG_PAS_R 7			 // Reliable to PAS
-#define MSG_ONE_UNRELIABLE 8 // Send to one client, but don't put in reliable stream, put in unreliable datagram ( could be dropped )
-#define MSG_SPEC 9			 // Sends to all spectator proxies
+constexpr int MSG_BROADCAST = 0;		 // unreliable to all
+constexpr int MSG_ONE = 1;		 // reliable to one (msg_entity)
+constexpr int MSG_ALL = 2;		 // reliable to all
+constexpr int MSG_INIT = 3;			 // write to the init string
+constexpr int MSG_PVS = 4;	 // Ents in PVS of org
+constexpr int MSG_PAS = 5;	 // Ents in PAS of org
+constexpr int MSG_PVS_R = 6;		 // Reliable to PVS
+constexpr int MSG_PAS_R = 7;		 // Reliable to PAS
+constexpr int MSG_ONE_UNRELIABLE = 8; // Send to one client, but don't put in reliable stream, put in unreliable datagram ( could be dropped )
+constexpr int MSG_SPEC = 9;			 // Sends to all spectator proxies
 
 // contents of a spot in the world
-#define CONTENTS_EMPTY -1
-#define CONTENTS_SOLID -2
-#define CONTENTS_WATER -3
-#define CONTENTS_SLIME -4
-#define CONTENTS_LAVA -5
-#define CONTENTS_SKY -6
+constexpr int CONTENTS_EMPTY = -1;
+constexpr int CONTENTS_SOLID = -2;
+constexpr int CONTENTS_WATER = -3;
+constexpr int CONTENTS_SLIME = -4;
+constexpr int CONTENTS_LAVA  = -5;
+constexpr int CONTENTS_SKY   = -6;
 /* These additional contents constants are defined in bspfile.h
-#define	CONTENTS_ORIGIN		-7		// removed at csg time
-#define	CONTENTS_CLIP		-8		// changed to contents_solid
-#define	CONTENTS_CURRENT_0		-9
-#define	CONTENTS_CURRENT_90		-10
-#define	CONTENTS_CURRENT_180	-11
-#define	CONTENTS_CURRENT_270	-12
-#define	CONTENTS_CURRENT_UP		-13
-#define	CONTENTS_CURRENT_DOWN	-14
-
-#define CONTENTS_TRANSLUCENT	-15
+constexpr int	CONTENTS_ORIGIN		-7		// removed at csg time
+constexpr int	CONTENTS_CLIP		-8		// changed to contents_solid
+constexpr int	CONTENTS_CURRENT_0		-9
+constexpr int	CONTENTS_CURRENT_90		-10
+constexpr int	CONTENTS_CURRENT_180	-11
+constexpr int	CONTENTS_CURRENT_270	-12
+constexpr int	CONTENTS_CURRENT_UP		-13
+constexpr int	CONTENTS_CURRENT_DOWN	-14
+
+constexpr int CONTENTS_TRANSLUCENT	-15
 */
-#define CONTENTS_LADDER -16
-
-#define CONTENT_FLYFIELD -17
-#define CONTENT_GRAVITY_FLYFIELD -18
-#define CONTENT_FOG -19
-
-#define CONTENT_EMPTY -1
-#define CONTENT_SOLID -2
-#define CONTENT_WATER -3
-#define CONTENT_SLIME -4
-#define CONTENT_LAVA -5
-#define CONTENT_SKY -6
+constexpr int CONTENTS_LADDER  = -16;
+constexpr int CONTENT_FLYFIELD = -17;
+constexpr int CONTENT_GRAVITY_FLYFIELD = -18;
+constexpr int CONTENT_FOG = -19;
+constexpr int CONTENT_EMPTY = -1;
+constexpr int CONTENT_SOLID = -2;
+constexpr int CONTENT_WATER = -3;
+constexpr int CONTENT_SLIME = -4;
+constexpr int CONTENT_LAVA = -5;
+constexpr int CONTENT_SKY = -6;
 
 // channels
-#define CHAN_AUTO 0
-#define CHAN_WEAPON 1
-#define CHAN_VOICE 2
-#define CHAN_ITEM 3
-#define CHAN_BODY 4
-#define CHAN_STREAM 5			  // allocate stream channel from the static or dynamic area
-#define CHAN_STATIC 6			  // allocate channel from the static area
-#define CHAN_NETWORKVOICE_BASE 7  // voice data coming across the network
-#define CHAN_NETWORKVOICE_END 500 // network voice data reserves slots (CHAN_NETWORKVOICE_BASE through CHAN_NETWORKVOICE_END).
+constexpr int CHAN_AUTO = 0;
+constexpr int CHAN_WEAPON = 1;
+constexpr int CHAN_VOICE = 2;
+constexpr int CHAN_ITEM = 3;
+constexpr int CHAN_BODY = 4;
+constexpr int CHAN_STREAM = 5;			  // allocate stream channel from the static or dynamic area
+constexpr int CHAN_STATIC = 6;			  // allocate channel from the static area
+constexpr int CHAN_NETWORKVOICE_BASE = 7;  // voice data coming across the network
+constexpr int CHAN_NETWORKVOICE_END = 500; // network voice data reserves slots (CHAN_NETWORKVOICE_BASE through CHAN_NETWORKVOICE_END).
 
 // attenuation values
-#define ATTN_NONE 0
-#define ATTN_NORM (float)0.8
-#define ATTN_IDLE (float)2
-#define ATTN_STATIC (float)1.25
+constexpr float ATTN_NONE = 0.0f;
+constexpr float ATTN_NORM = 0.8f;
+constexpr float ATTN_IDLE = 2.0f;
+constexpr float ATTN_STATIC = 1.25f;
 
 // pitch values
-#define PITCH_NORM 100 // non-pitch shifted
-#define PITCH_LOW 95   // other values are possible - 0-255, where 255 is very high
-#define PITCH_HIGH 120
+constexpr int PITCH_NORM = 100; // non-pitch shifted
+constexpr int PITCH_LOW = 95;  // other values are possible - 0-255, where 255 is very high
+constexpr int PITCH_HIGH = 120;
 
 // volume values
-#define VOL_NORM 1.0
+constexpr float VOL_NORM = 1.0;
 
 // plats
-#define PLAT_LOW_TRIGGER 1
+constexpr int PLAT_LOW_TRIGGER = 1;
 
 // Trains
-#define SF_TRAIN_WAIT_RETRIGGER 1
-#define SF_TRAIN_START_ON 4 // Train is initially moving
-#define SF_TRAIN_PASSABLE 8 // Train is not solid -- used to make water trains
+constexpr int SF_TRAIN_WAIT_RETRIGGER = 1;
+constexpr int SF_TRAIN_START_ON = 4; // Train is initially moving
+constexpr int SF_TRAIN_PASSABLE = 8; // Train is not solid -- used to make water trains
 
 // buttons
 #ifndef IN_BUTTONS_H
@@ -645,32 +643,31 @@
 
 // Break Model Defines
 
-#define BREAK_TYPEMASK 0x4F
-#define BREAK_GLASS 0x01
-#define BREAK_METAL 0x02
-#define BREAK_FLESH 0x04
-#define BREAK_WOOD 0x08
-
-#define BREAK_SMOKE 0x10
-#define BREAK_TRANS 0x20
-#define BREAK_CONCRETE 0x40
-#define BREAK_2 0x80
+constexpr int BREAK_TYPEMASK = 0x4F;
+constexpr int BREAK_GLASS = 0x01;
+constexpr int BREAK_METAL = 0x02;
+constexpr int BREAK_FLESH = 0x04;
+constexpr int BREAK_WOOD = 0x08;
+constexpr int BREAK_SMOKE = 0x10;
+constexpr int BREAK_TRANS = 0x20;
+constexpr int BREAK_CONCRETE = 0x40;
+constexpr int BREAK_2 = 0x80;
 
 // Colliding temp entity sounds
 
-#define BOUNCE_GLASS BREAK_GLASS
-#define BOUNCE_METAL BREAK_METAL
-#define BOUNCE_FLESH BREAK_FLESH
-#define BOUNCE_WOOD BREAK_WOOD
-#define BOUNCE_SHRAP 0x10
-#define BOUNCE_SHELL 0x20
-#define BOUNCE_CONCRETE BREAK_CONCRETE
-#define BOUNCE_SHOTSHELL 0x80
+constexpr int BOUNCE_GLASS = BREAK_GLASS;
+constexpr int BOUNCE_METAL = BREAK_METAL;
+constexpr int BOUNCE_FLESH = BREAK_FLESH;
+constexpr int BOUNCE_WOOD  = BREAK_WOOD;
+constexpr int BOUNCE_SHRAP = 0x10;
+constexpr int BOUNCE_SHELL = 0x20;
+constexpr int BOUNCE_CONCRETE = BREAK_CONCRETE;
+constexpr int BOUNCE_SHOTSHELL = 0x80;
 
 // Temp entity bounce sound types
-#define TE_BOUNCE_NULL 0
-#define TE_BOUNCE_SHELL 1
-#define TE_BOUNCE_SHOTSHELL 2
+constexpr int TE_BOUNCE_NULL = 0;
+constexpr int TE_BOUNCE_SHELL = 1;
+constexpr int TE_BOUNCE_SHOTSHELL = 2;
 
 // Rendering constants
 enum

From 12f1fb1e9cedcd2f22dbee5f6afc0bb13f22dd2a Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Fri, 6 Mar 2026 00:03:50 -0500
Subject: [PATCH 002/291] resolving merge conflict

---
 src/common/const.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/common/const.h b/src/common/const.h
index 1db60ce8..6a2fdcb8 100644
--- a/src/common/const.h
+++ b/src/common/const.h
@@ -41,10 +41,10 @@ constexpr int FL_FLOAT = (1 << 15);	   // Apply floating force to this entity wh
 constexpr int FL_GRAPHED = (1 << 16);	   // worldgraph has this ent listed as something that blocks a connection
 
 // UNDONE: Do we need these?
-#define FL_IMMUNE_WATER (1 << 17)
+constexpr int FL_IMMUNE_WATER = (1 << 17);
 //#define FL_IMMUNE_SLIME (1 << 18)
-#define FL_CLIENTONLY (1 << 18)		// Strip edicts
-#define FL_IMMUNE_LAVA (1 << 19)
+constexpr int FL_CLIENTONLY = (1 << 18);		// Strip edicts
+constexpr int FL_IMMUNE_LAVA = (1 << 19);
 
 constexpr int FL_PROXY = (1 << 20);		  // This is a spectator proxy
 constexpr int FL_ALWAYSTHINK = (1 << 21); // Brush model flag -- call think every frame regardless of nextthink - ltime (for constantly changing velocity/path)

From 4702e80b2d95bff92975d742000c7a56009e0b74 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Fri, 6 Mar 2026 00:04:32 -0500
Subject: [PATCH 003/291] Remove debug call causing compile error.
 ItemThinkProgress type not found.

---
 src/game/shared/weapons/giattack.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/shared/weapons/giattack.cpp b/src/game/shared/weapons/giattack.cpp
index 78b440c6..0f20fd9f 100644
--- a/src/game/shared/weapons/giattack.cpp
+++ b/src/game/shared/weapons/giattack.cpp
@@ -780,7 +780,7 @@ void CGenericItem::StrikeLand()
 	if (bUnderleveled)
 		flDamage *= 0.5; //this might be working
 
-	SetDebugProgress(ItemThinkProgress, "CGenericItem::StrikeLand - Call DoDamage");
+	//SetDebugProgress(ItemThinkProgress, "CGenericItem::StrikeLand - Call DoDamage");
 	int bitsDamage = DMG_CLUB;
 	if (!m_pPlayer)
 		bitsDamage |= DMG_SIMPLEBBOX;

From b6225f308f71dc792b1b86f07f5330b07d0e52e8 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Fri, 6 Mar 2026 08:59:57 -0500
Subject: [PATCH 004/291] Removed unsigned

---
 src/common/beamdef.h   |  4 ++--
 src/common/cl_entity.h |  4 ++--
 src/common/com_model.h | 20 ++++++++++----------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/common/beamdef.h b/src/common/beamdef.h
index ecd14bcf..69876ceb 100644
--- a/src/common/beamdef.h
+++ b/src/common/beamdef.h
@@ -26,8 +26,8 @@ constexpr int FBEAM_SINENOISE = 0x00000010;
 constexpr int FBEAM_SOLID = 0x00000020;
 constexpr int FBEAM_SHADEIN = 0x00000040;
 constexpr int FBEAM_SHADEOUT = 0x00000080;
-constexpr int FBEAM_STARTVISIBLE = 0x10000000; // Has this client actually seen this beam's start e= ntity yet?;
-constexpr int FBEAM_ENDVISIBLE = 0x20000000;	  // Has this client actually seen this beam's end e= ntity yet?;
+constexpr int FBEAM_STARTVISIBLE = 0x10000000; // Has this client actually seen this beam's start entity yet?;
+constexpr int FBEAM_ENDVISIBLE = 0x20000000;	  // Has this client actually seen this beam's end entity yet?;
 constexpr int FBEAM_ISACTIVE = 0x40000000;
 constexpr int FBEAM_FOREVER = 0x80000000;
 
diff --git a/src/common/cl_entity.h b/src/common/cl_entity.h
index 0ff88bc8..c6b2f646 100644
--- a/src/common/cl_entity.h
+++ b/src/common/cl_entity.h
@@ -60,8 +60,8 @@ typedef struct
 
 typedef struct cl_entity_s cl_entity_t;
 
-constexpr unsigned int HISTORY_MAX = 64; // Must be power of 2
-constexpr unsigned int HISTORY_MASK = (HISTORY_MAX - 1);
+constexpr int HISTORY_MAX = 64; // Must be power of 2
+constexpr int HISTORY_MASK = (HISTORY_MAX - 1);
 
 #if !defined(ENTITY_STATEH)
 #include "entity_state.h"
diff --git a/src/common/com_model.h b/src/common/com_model.h
index e138cf38..0299728f 100644
--- a/src/common/com_model.h
+++ b/src/common/com_model.h
@@ -24,16 +24,16 @@
 #pragma once
 #endif
 
-constexpr unsigned int STUDIO_RENDER = 1;
-constexpr unsigned int STUDIO_EVENTS = 2;
-constexpr unsigned int MAX_MAP_HULLS = 4;
-constexpr unsigned int MIPLEVELS = 4;
-constexpr unsigned int NUM_AMBIENTS = 4; // automatic ambient sounds
-constexpr unsigned int MAXLIGHTMAPS = 4;
-constexpr unsigned int PLANE_ANYZ = 5;
-constexpr unsigned int MAX_CLIENTS = 32;
-constexpr unsigned int MAX_MODEL_NAME = 64;
-constexpr unsigned int MAX_EDICTS = 2048;
+constexpr int STUDIO_RENDER = 1;
+constexpr int STUDIO_EVENTS = 2;
+constexpr int MAX_MAP_HULLS = 4;
+constexpr int MIPLEVELS = 4;
+constexpr int NUM_AMBIENTS = 4; // automatic ambient sounds
+constexpr int MAXLIGHTMAPS = 4;
+constexpr int PLANE_ANYZ = 5;
+constexpr int MAX_CLIENTS = 32;
+constexpr int MAX_MODEL_NAME = 64;
+constexpr int MAX_EDICTS = 2048;
 
 constexpr unsigned int ALIAS_Z_CLIP_PLANE = 5;
 

From 39b0bc983a0946a0906c0125e23d90cb78bed538 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Fri, 6 Mar 2026 09:04:37 -0500
Subject: [PATCH 005/291] Fixed commented line syntax as precaution incase
 uncommented.

---
 src/common/const.h | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/common/const.h b/src/common/const.h
index 6a2fdcb8..d505c04f 100644
--- a/src/common/const.h
+++ b/src/common/const.h
@@ -581,16 +581,16 @@ constexpr int CONTENTS_SLIME = -4;
 constexpr int CONTENTS_LAVA  = -5;
 constexpr int CONTENTS_SKY   = -6;
 /* These additional contents constants are defined in bspfile.h
-constexpr int	CONTENTS_ORIGIN		-7		// removed at csg time
-constexpr int	CONTENTS_CLIP		-8		// changed to contents_solid
-constexpr int	CONTENTS_CURRENT_0		-9
-constexpr int	CONTENTS_CURRENT_90		-10
-constexpr int	CONTENTS_CURRENT_180	-11
-constexpr int	CONTENTS_CURRENT_270	-12
-constexpr int	CONTENTS_CURRENT_UP		-13
-constexpr int	CONTENTS_CURRENT_DOWN	-14
-
-constexpr int CONTENTS_TRANSLUCENT	-15
+constexpr int	CONTENTS_ORIGIN	=	-7;		// removed at csg time
+constexpr int	CONTENTS_CLIP =		-8;		// changed to contents_solid
+constexpr int	CONTENTS_CURRENT_0 =	-9;
+constexpr int	CONTENTS_CURRENT_90 =	-10;
+constexpr int	CONTENTS_CURRENT_180 =	-11;
+constexpr int	CONTENTS_CURRENT_270 =	-12;
+constexpr int	CONTENTS_CURRENT_UP	=	-13;
+constexpr int	CONTENTS_CURRENT_DOWN =	-14;
+
+constexpr int CONTENTS_TRANSLUCENT =	-15;
 */
 constexpr int CONTENTS_LADDER  = -16;
 constexpr int CONTENT_FLYFIELD = -17;

From 99c7d3012af03246093cfb0f3dc4ecab78985ca7 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 7 Mar 2026 03:19:35 -0500
Subject: [PATCH 006/291] changes more macros to constexpr

---
 src/common/const.h   |  2 +-
 src/common/cvardef.h | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/common/const.h b/src/common/const.h
index d505c04f..b0ab4a66 100644
--- a/src/common/const.h
+++ b/src/common/const.h
@@ -42,7 +42,7 @@ constexpr int FL_GRAPHED = (1 << 16);	   // worldgraph has this ent listed as so
 
 // UNDONE: Do we need these?
 constexpr int FL_IMMUNE_WATER = (1 << 17);
-//#define FL_IMMUNE_SLIME (1 << 18)
+//constexpr int FL_IMMUNE_SLIME (1 << 18);
 constexpr int FL_CLIENTONLY = (1 << 18);		// Strip edicts
 constexpr int FL_IMMUNE_LAVA = (1 << 19);
 
diff --git a/src/common/cvardef.h b/src/common/cvardef.h
index 979e7e42..fcde0475 100644
--- a/src/common/cvardef.h
+++ b/src/common/cvardef.h
@@ -15,20 +15,20 @@
 #ifndef CVARDEF_H
 #define CVARDEF_H
 
-#define FCVAR_ARCHIVE (1 << 0)		 // set to cause it to be saved to vars.rc
-#define FCVAR_USERINFO (1 << 1)		 // changes the client's info string
-#define FCVAR_SERVER (1 << 2)		 // notifies players when changed
-#define FCVAR_EXTDLL (1 << 3)		 // defined by external DLL
-#define FCVAR_CLIENTDLL (1 << 4)	 // defined by the client dll
-#define FCVAR_PROTECTED (1 << 5)	 // It's a server cvar, but we don't send the data since it's a password, etc.  Sends 1 if it's not bland/zero, 0 otherwise as value
-#define FCVAR_SPONLY (1 << 6)		 // This cvar cannot be changed by clients connected to a multiplayer server.
-#define FCVAR_PRINTABLEONLY (1 << 7) // This cvar's string cannot contain unprintable characters ( e.g., used for player name etc ).
-#define FCVAR_UNLOGGED (1 << 8)		 // If this is a FCVAR_SERVER, don't log changes to the log file / console if we are creating a log
-#define FCVAR_NOEXTRAWHITEPACE (1<<9) // strip trailing/leading white space from this cvar
-#define FCVAR_PRIVILEGED (1 << 10)		// only available in privileged mode
-#define FCVAR_FILTERABLE (1 << 11)		// filtered in unprivileged mode if cl_filterstuffcmd is 1
-#define FCVAR_ISEXECUTED	(1 << 12)	// This cvar's string contains a value that will be executed as a cfg file; don't allow commands to be appended to it
-#define FCVAR_ISPATH		(1 << 13)	// This cvar's string is a path or filename; don't allow absolute paths, escaping to another directory or backslashes
+constexpr int FCVAR_ARCHIVE = (1 << 0);		 // set to cause it to be saved to vars.rc
+constexpr int FCVAR_USERINFO = (1 << 1);		 // changes the client's info string
+constexpr int FCVAR_SERVER = (1 << 2);	 // notifies players when changed
+constexpr int FCVAR_EXTDLL = (1 << 3); // defined by external DLL
+constexpr int FCVAR_CLIENTDLL = (1 << 4); // defined by the client dll
+constexpr int FCVAR_PROTECTED = (1 << 5); // It's a server cvar, but we don't send the data since it's a password, etc.  Sends 1 if it's not bland/zero, 0 otherwise as value
+constexpr int FCVAR_SPONLY = (1 << 6);	 // This cvar cannot be changed by clients connected to a multiplayer server.
+constexpr int FCVAR_PRINTABLEONLY = (1 << 7);// This cvar's string cannot contain unprintable characters ( e.g., used for player name etc ).
+constexpr int FCVAR_UNLOGGED = (1 << 8);	 // If this is a FCVAR_SERVER, don't log changes to the log file / console if we are creating a log
+constexpr int FCVAR_NOEXTRAWHITEPACE = (1 << 9); // strip trailing/leading white space from this cvar
+constexpr int FCVAR_PRIVILEGED = (1 << 10);	// only available in privileged mode
+constexpr int FCVAR_FILTERABLE = (1 << 11);	// filtered in unprivileged mode if cl_filterstuffcmd is 1
+constexpr int FCVAR_ISEXECUTED = (1 << 12);// This cvar's string contains a value that will be executed as a cfg file; don't allow commands to be appended to it
+constexpr int FCVAR_ISPATH = (1 << 13);// This cvar's string is a path or filename; don't allow absolute paths, escaping to another directory or backslashes
 
 typedef struct cvar_s
 {

From 1e75ea2603274e78f0d33bdd792c0e1dd7ad06b7 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 7 Mar 2026 03:23:37 -0500
Subject: [PATCH 007/291] changed more macros to constexpr

---
 src/common/director_cmds.h | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/common/director_cmds.h b/src/common/director_cmds.h
index ddff7e08..852b955c 100644
--- a/src/common/director_cmds.h
+++ b/src/common/director_cmds.h
@@ -8,26 +8,26 @@
 // director_cmds.h
 // sub commands for svc_director
 
-#define DRC_ACTIVE 0 // tells client that he's an spectator and will get director command
-#define DRC_STATUS 1 // send status infos about proxy
-#define DRC_CAMERA 2 // set the actual director camera position
-#define DRC_EVENT 3  // informs the dircetor about ann important game event
+constexpr int DRC_ACTIVE =  0; // tells client that he's an spectator and will get director command
+constexpr int DRC_STATUS =  1; // send status infos about proxy
+constexpr int DRC_CAMERA =  2; // set the actual director camera position
+constexpr int DRC_EVENT = 3; // informs the dircetor about ann important game event
 
-#define DRC_FLAG_PRIO_MASK 0x0F //	priorities between 0 and 15 (15 most important)
-#define DRC_FLAG_SIDE (1 << 4)
-#define DRC_FLAG_DRAMATIC (1 << 5)
+constexpr int DRC_FLAG_PRIO_MASK = 0x0F; //	priorities between 0 and 15 (15 most important)
+constexpr int DRC_FLAG_SIDE = (1 << 4);
+constexpr int DRC_FLAG_DRAMATIC = (1 << 5);
 
 // commands of the director API function CallDirectorProc(...)
 
-#define DRCAPI_NOP 0               // no operation
-#define DRCAPI_ACTIVE 1            // de/acivates director mode in engine
-#define DRCAPI_STATUS 2            // request proxy information
-#define DRCAPI_SETCAM 3            // set camera n to given position and angle
-#define DRCAPI_GETCAM 4            // request camera n position and angle
-#define DRCAPI_DIRPLAY 5           // set director time and play with normal speed
-#define DRCAPI_DIRFREEZE 6         // freeze directo at this time
-#define DRCAPI_SETVIEWMODE 7       // overview or 4 cameras
-#define DRCAPI_SETOVERVIEWPARAMS 8 // sets parameter for overview mode
-#define DRCAPI_SETFOCUS 9          // set the camera which has the input focus
-#define DRCAPI_GETTARGETS 10       // queries engine for player list
-#define DRCAPI_SETVIEWPOINTS 11    // gives engine all waypoints
+constexpr int DRCAPI_NOP = 0;               // no operation
+constexpr int DRCAPI_ACTIVE = 1;            // de/acivates director mode in engine
+constexpr int DRCAPI_STATUS = 2;            // request proxy information
+constexpr int DRCAPI_SETCAM = 3;            // set camera n to given position and angle
+constexpr int DRCAPI_GETCAM = 4;            // request camera n position and angle
+constexpr int DRCAPI_DIRPLAY = 5;           // set director time and play with normal speed
+constexpr int DRCAPI_DIRFREEZE = 6;         // freeze directo at this time
+constexpr int DRCAPI_SETVIEWMODE = 7;       // overview or 4 cameras
+constexpr int DRCAPI_SETOVERVIEWPARAMS = 8; // sets parameter for overview mode
+constexpr int DRCAPI_SETFOCUS = 9;          // set the camera which has the input focus
+constexpr int DRCAPI_GETTARGETS = 10;       // queries engine for player list
+constexpr int DRCAPI_SETVIEWPOINTS = 11;    // gives engine all waypoints

From b8c0fda959cd28debc19474fc52b7c76e8942fbb Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 7 Mar 2026 03:25:00 -0500
Subject: [PATCH 008/291] Changed more macros to constexpr int

---
 src/common/dll_state.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/common/dll_state.h b/src/common/dll_state.h
index a23ae742..9fb3eba2 100644
--- a/src/common/dll_state.h
+++ b/src/common/dll_state.h
@@ -7,17 +7,17 @@
 
 //DLL State Flags
 
-#define DLL_INACTIVE 0 // no dll
-#define DLL_ACTIVE 1   // dll is running
-#define DLL_PAUSED 2   // dll is paused
-#define DLL_CLOSE 3    // closing down dll
-#define DLL_TRANS 4    // Level Transition
+constexpr int DLL_INACTIVE = 0; // no dll
+constexpr int DLL_ACTIVE = 1;   // dll is running
+constexpr int DLL_PAUSED = 2;   // dll is paused
+constexpr int DLL_CLOSE = 3;    // closing down dll
+constexpr int DLL_TRANS = 4;    // Level Transition
 
 // DLL Pause reasons
 
-#define DLL_NORMAL 0  // User hit Esc or something.
-#define DLL_QUIT 4    // Quit now
-#define DLL_RESTART 6 // Switch to launcher for linux, does a quit but returns 1
+constexpr int DLL_NORMAL = 0;  // User hit Esc or something.
+constexpr int DLL_QUIT = 4;    // Quit now
+constexpr int DLL_RESTART = 6; // Switch to launcher for linux, does a quit but returns 1
 
 // DLL Substate info ( not relevant )
-#define ENG_NORMAL (1 << 0)
+constexpr int ENG_NORMAL = (1 << 0);

From fb982ece5878535311cd6fda6b48d6f7a5a9eb7a Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 7 Mar 2026 03:26:11 -0500
Subject: [PATCH 009/291] changed more macros to constexpr

---
 src/common/engine_launcher_api.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/common/engine_launcher_api.h b/src/common/engine_launcher_api.h
index 503c7aad..59bc7563 100644
--- a/src/common/engine_launcher_api.h
+++ b/src/common/engine_launcher_api.h
@@ -14,11 +14,11 @@
 
 //typedef void ( *xcommand_t ) ( void );
 
-#define RENDERTYPE_UNDEFINED 0
-#define RENDERTYPE_SOFTWARE 1
-#define RENDERTYPE_HARDWARE 2
+constexpr int RENDERTYPE_UNDEFINED = 0;
+constexpr int RENDERTYPE_SOFTWARE = 1;
+constexpr int RENDERTYPE_HARDWARE = 2;
 
-#define ENGINE_LAUNCHER_API_VERSION 1
+constexpr int ENGINE_LAUNCHER_API_VERSION = 1;
 
 typedef struct engine_api_s
 {

From bbd769817bf54886f6fbe3af2692cea8ba93664e Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 7 Mar 2026 03:27:12 -0500
Subject: [PATCH 010/291] Changed more macros to constexpr

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

diff --git a/src/common/entity_state.h b/src/common/entity_state.h
index e26c99a4..7acc136a 100644
--- a/src/common/entity_state.h
+++ b/src/common/entity_state.h
@@ -19,8 +19,8 @@
 #endif
 
 // For entityType below
-#define ENTITY_NORMAL (1 << 0)
-#define ENTITY_BEAM (1 << 1)
+constexpr int ENTITY_NORMAL  = (1 << 0);
+constexpr int ENTITY_BEAM = (1 << 1);
 
 // Entity state is used for the baseline and for delta compression of a packet of
 //  entities that is sent to a client.

From 993ccc5b0f22a4f3041507cf118edeb48f7d947d Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 7 Mar 2026 03:29:25 -0500
Subject: [PATCH 011/291] fixed constexpr inited as unsignedf.

---
 src/common/com_model.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/com_model.h b/src/common/com_model.h
index 0299728f..ffdfb681 100644
--- a/src/common/com_model.h
+++ b/src/common/com_model.h
@@ -35,7 +35,7 @@ constexpr int MAX_CLIENTS = 32;
 constexpr int MAX_MODEL_NAME = 64;
 constexpr int MAX_EDICTS = 2048;
 
-constexpr unsigned int ALIAS_Z_CLIP_PLANE = 5;
+constexpr int ALIAS_Z_CLIP_PLANE = 5;
 
 // flags in finalvert_t.flags
 constexpr int ALIAS_LEFT_CLIP = 0x0001;

From 00255a5927096a2407375266c25cd3c8a8ecb74a Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 7 Mar 2026 03:54:21 -0500
Subject: [PATCH 012/291] Changed macros to constexpr where applicable

---
 src/common/entity_types.h | 10 +++----
 src/common/event_args.h   |  4 +--
 src/common/event_flags.h  | 14 ++++-----
 src/common/hltv.h         | 61 +++++++++++++++++++--------------------
 src/common/interface.cpp  |  1 +
 src/common/interface.h    |  3 +-
 src/public/interface.h    |  2 +-
 7 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/src/common/entity_types.h b/src/common/entity_types.h
index 473793f5..3cfd8ca6 100644
--- a/src/common/entity_types.h
+++ b/src/common/entity_types.h
@@ -16,11 +16,11 @@
 #if !defined(ENTITY_TYPESH)
 #define ENTITY_TYPESH
 
-#define ET_NORMAL 0
-#define ET_PLAYER 1
-#define ET_TEMPENTITY 2
-#define ET_BEAM 3
+constexpr int ET_NORMAL = 0;
+constexpr int ET_PLAYER = 1;
+constexpr int ET_TEMPENTITY = 2;
+constexpr int ET_BEAM = 3;
 // BMODEL or SPRITE that was split across BSP nodes
-#define ET_FRAGMENTED 4
+constexpr int ET_FRAGMENTED = 4;
 
 #endif // !ENTITY_TYPESH
diff --git a/src/common/event_args.h b/src/common/event_args.h
index 01bfe051..e4d732d9 100644
--- a/src/common/event_args.h
+++ b/src/common/event_args.h
@@ -19,10 +19,10 @@
 #endif
 
 // Event was invoked with stated origin
-#define FEVENT_ORIGIN (1 << 0)
+constexpr int FEVENT_ORIGIN = (1 << 0);
 
 // Event was invoked with stated angles
-#define FEVENT_ANGLES (1 << 1)
+constexpr int FEVENT_ANGLES = (1 << 1);
 
 typedef struct event_args_s
 {
diff --git a/src/common/event_flags.h b/src/common/event_flags.h
index ba4a768d..7e6c4f7d 100644
--- a/src/common/event_flags.h
+++ b/src/common/event_flags.h
@@ -19,29 +19,29 @@
 #endif
 
 // Skip local host for event send.
-#define FEV_NOTHOST (1 << 0)
+constexpr int FEV_NOTHOST = (1 << 0);
 
 // Send the event reliably.  You must specify the origin and angles and use
 // PLAYBACK_EVENT_FULL for this to work correctly on the server for anything
 // that depends on the event origin/angles.  I.e., the origin/angles are not
 // taken from the invoking edict for reliable events.
-#define FEV_RELIABLE (1 << 1)
+constexpr int FEV_RELIABLE = (1 << 1);
 
 // Don't restrict to PAS/PVS, send this event to _everybody_ on the server ( useful for stopping CHAN_STATIC
 //  sounds started by client event when client is not in PVS anymore ( hwguy in TFC e.g. ).
-#define FEV_GLOBAL (1 << 2)
+constexpr int FEV_GLOBAL = (1 << 2);
 
 // If this client already has one of these events in its queue, just update the event instead of sending it as a duplicate
 //
-#define FEV_UPDATE (1 << 3)
+constexpr int FEV_UPDATE = (1 << 3);
 
 // Only send to entity specified as the invoker
-#define FEV_HOSTONLY (1 << 4)
+constexpr int FEV_HOSTONLY = (1 << 4);
 
 // Only send if the event was created on the server.
-#define FEV_SERVER (1 << 5)
+constexpr int FEV_SERVER = (1 << 5);
 
 // Only issue event client side ( from shared code )
-#define FEV_CLIENT (1 << 6)
+constexpr int FEV_CLIENT = (1 << 6);
 
 #endif
diff --git a/src/common/hltv.h b/src/common/hltv.h
index 4b6deca1..8dafe189 100644
--- a/src/common/hltv.h
+++ b/src/common/hltv.h
@@ -11,43 +11,42 @@
 #ifndef HLTV_H
 #define HLTV_H
 
-#define TYPE_CLIENT 0      // client is a normal HL client (default)
-#define TYPE_PROXY 1       // client is another proxy
-#define TYPE_COMMENTATOR 3 // client is a commentator
-#define TYPE_DEMO 4        // client is a demo file
+constexpr int TYPE_CLIENT = 0;      // client is a normal HL client (default)
+constexpr int TYPE_PROXY = 1;       // client is another proxy
+constexpr int TYPE_COMMENTATOR = 3; // client is a commentator
+constexpr int TYPE_DEMO = 4;        // client is a demo file
 // sub commands of svc_hltv:
-#define HLTV_ACTIVE 0 // tells client that he's an spectator and will get director commands
-#define HLTV_STATUS 1 // send status infos about proxy
-#define HLTV_LISTEN 2 // tell client to listen to a multicast stream
+constexpr int HLTV_ACTIVE = 0; // tells client that he's an spectator and will get director commands
+constexpr int HLTV_STATUS = 1; // send status infos about proxy
+constexpr int HLTV_LISTEN = 2; // tell client to listen to a multicast stream
 
 // sub commands of svc_director:
-#define DRC_CMD_NONE 0       // NULL director command
-#define DRC_CMD_START 1      // start director mode
-#define DRC_CMD_EVENT 2      // informs about director command
-#define DRC_CMD_MODE 3       // switches camera modes
-#define DRC_CMD_CAMERA 4     // sets camera registers
-#define DRC_CMD_TIMESCALE 5  // sets time scale
-#define DRC_CMD_MESSAGE 6    // send HUD centerprint
-#define DRC_CMD_SOUND 7      // plays a particular sound
-#define DRC_CMD_STATUS 8     // status info about broadcast
-#define DRC_CMD_BANNER 9     // banner file name for HLTV gui
-#define DRC_CMD_FADE 10      // send screen fade command
-#define DRC_CMD_SHAKE 11     // send screen shake command
-#define DRC_CMD_STUFFTEXT 12 // like the normal svc_stufftext but as director command
+constexpr int DRC_CMD_NONE = 0;       // NULL director command
+constexpr int DRC_CMD_START = 1;      // start director mode
+constexpr int DRC_CMD_EVENT = 2;      // informs about director command
+constexpr int DRC_CMD_MODE = 3;       // switches camera modes
+constexpr int DRC_CMD_CAMERA = 4;     // sets camera registers
+constexpr int DRC_CMD_TIMESCALE = 5;  // sets time scale
+constexpr int DRC_CMD_MESSAGE = 6;    // send HUD centerprint
+constexpr int DRC_CMD_SOUND = 7;      // plays a particular sound
+constexpr int DRC_CMD_STATUS = 8;     // status info about broadcast
+constexpr int DRC_CMD_BANNER = 9;     // banner file name for HLTV gui
+constexpr int DRC_CMD_FADE = 10;      // send screen fade command
+constexpr int DRC_CMD_SHAKE = 11;     // send screen shake command
+constexpr int DRC_CMD_STUFFTEXT = 12; // like the normal svc_stufftext but as director command
 
 #define DRC_CMD_LAST 12
 
 // HLTV_EVENT event flags
-#define DRC_FLAG_PRIO_MASK 0x0F      // priorities between 0 and 15 (15 most important)
-#define DRC_FLAG_SIDE (1 << 4)       //
-#define DRC_FLAG_DRAMATIC (1 << 5)   // is a dramatic scene
-#define DRC_FLAG_SLOWMOTION (1 << 6) // would look good in SloMo
-#define DRC_FLAG_FACEPLAYER (1 << 7) // player is doning something (reload/defuse bomb etc)
-#define DRC_FLAG_INTRO (1 << 8)      // is a introduction scene
-#define DRC_FLAG_FINAL (1 << 9)      // is a final scene
-#define DRC_FLAG_NO_RANDOM (1 << 10) // don't randomize event data
-
-#define MAX_DIRECTOR_CMD_PARAMETERS 4
-#define MAX_DIRECTOR_CMD_STRING 128
+constexpr int DRC_FLAG_PRIO_MASK = 0x0F;      // priorities between 0 and 15 (15 most important)
+constexpr int DRC_FLAG_SIDE = (1 << 4);       //
+constexpr int DRC_FLAG_DRAMATIC = (1 << 5);   // is a dramatic scene
+constexpr int DRC_FLAG_SLOWMOTION = (1 << 6); // would look good in SloMo
+constexpr int DRC_FLAG_FACEPLAYER = (1 << 7); // player is doning something (reload/defuse bomb etc)
+constexpr int DRC_FLAG_INTRO = (1 << 8);      // is a introduction scene
+constexpr int DRC_FLAG_FINAL = (1 << 9);      // is a final scene
+constexpr int DRC_FLAG_NO_RANDOM = (1 << 10); // don't randomize event data
+constexpr int MAX_DIRECTOR_CMD_PARAMETERS = 4;
+constexpr int MAX_DIRECTOR_CMD_STRING = 128;
 
 #endif // HLTV_H
diff --git a/src/common/interface.cpp b/src/common/interface.cpp
index 3a4e1ea8..40c5900c 100644
--- a/src/common/interface.cpp
+++ b/src/common/interface.cpp
@@ -61,6 +61,7 @@ EXPORT_FUNCTION IBaseInterface *CreateInterface(const char *pName, int *pReturnC
 #ifdef _WIN32
 HINTERFACEMODULE Sys_LoadModule(const char *pModuleName)
 {
+	//preprocessor protection
 	return (HINTERFACEMODULE)LoadLibrary(pModuleName);
 }
 
diff --git a/src/common/interface.h b/src/common/interface.h
index bdbd57c8..16b467fa 100644
--- a/src/common/interface.h
+++ b/src/common/interface.h
@@ -32,7 +32,7 @@ class IBaseInterface
 	virtual ~IBaseInterface() {}
 };
 
-#define CREATEINTERFACE_PROCNAME "CreateInterface"
+constexpr const char* CREATEINTERFACE_PROCNAME = "CreateInterface";
 typedef IBaseInterface *(*CreateInterfaceFn)(const char *pName, int *pReturnCode);
 
 typedef IBaseInterface *(*InstantiateInterfaceFn)();
@@ -80,6 +80,7 @@ class InterfaceReg
 	EXPOSE_SINGLE_INTERFACE_GLOBALVAR(className, interfaceName, versionName, __g_##className##_singleton)
 
 #ifdef WIN32
+//this is recommended standard practice, keep this as macro.
 #define EXPORT_FUNCTION __declspec(dllexport)
 #else
 #define EXPORT_FUNCTION
diff --git a/src/public/interface.h b/src/public/interface.h
index 82b8fe04..39cc0bf8 100644
--- a/src/public/interface.h
+++ b/src/public/interface.h
@@ -43,8 +43,8 @@ class IBaseInterface
 	virtual			~IBaseInterface() {}
 };
 
+constexpr const char* CREATEINTERFACE_PROCNAME = "CreateInterface";
 
-#define CREATEINTERFACE_PROCNAME	"CreateInterface"
 typedef IBaseInterface* (*CreateInterfaceFn)(const char *pName, int *pReturnCode);
 
 

From fadbe4edb87d30c846ef2bb2dcd9ef265e60788d Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 7 Mar 2026 18:36:25 -0500
Subject: [PATCH 013/291] Changed macros to constexpr

---
 src/common/in_buttons.h | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/common/in_buttons.h b/src/common/in_buttons.h
index 79129201..c16a2bc4 100644
--- a/src/common/in_buttons.h
+++ b/src/common/in_buttons.h
@@ -18,21 +18,21 @@
 #pragma once
 #endif
 
-#define IN_ATTACK (1 << 0)
-#define IN_JUMP (1 << 1)
-#define IN_DUCK (1 << 2)
-#define IN_FORWARD (1 << 3)
-#define IN_BACK (1 << 4)
-#define IN_USE (1 << 5)
-#define IN_CANCEL (1 << 6)
-#define IN_LEFT (1 << 7)
-#define IN_RIGHT (1 << 8)
-#define IN_MOVELEFT (1 << 9)
-#define IN_MOVERIGHT (1 << 10)
-#define IN_ATTACK2 (1 << 11)
-#define IN_RUN (1 << 12)
-#define IN_RELOAD (1 << 13)
-#define IN_ALT1 (1 << 14)
-#define IN_SCORE (1 << 15) // Used by client.dll for when scoreboard is held down
+constexpr int IN_ATTACK = (1 << 0);
+constexpr int IN_JUMP = (1 << 1);
+constexpr int IN_DUCK = (1 << 2);
+constexpr int IN_FORWARD = (1 << 3);
+constexpr int IN_BACK = (1 << 4);
+constexpr int IN_USE = (1 << 5);
+constexpr int IN_CANCEL = (1 << 6);
+constexpr int IN_LEFT = (1 << 7);
+constexpr int IN_RIGHT = (1 << 8);
+constexpr int IN_MOVELEFT = (1 << 9);
+constexpr int IN_MOVERIGHT = (1 << 10);
+constexpr int IN_ATTACK2 = (1 << 11);
+constexpr int IN_RUN = (1 << 12);
+constexpr int IN_RELOAD = (1 << 13);
+constexpr int IN_ALT1 = (1 << 14);
+constexpr int IN_SCORE = (1 << 15);// Used by client.dll for when scoreboard is held down
 
 #endif // IN_BUTTONS_H

From b3057a935dce3056fc5726f7d34aeb30bb34a422 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 14:34:19 -0400
Subject: [PATCH 014/291] Changes some Macros to functions.

---
 src/common/mathlib.h                   | 50 ++++++++++++++++----------
 src/game/client/hud_spectator.cpp      |  2 +-
 src/game/client/view.cpp               |  4 +--
 src/game/server/hl/util.h              |  5 +--
 src/game/shared/hl/vector.h            | 29 ++++++++-------
 src/game/shared/movement/pm_math.cpp   | 46 +++++++++---------------
 src/game/shared/movement/pm_shared.cpp |  4 +--
 7 files changed, 72 insertions(+), 68 deletions(-)

diff --git a/src/common/mathlib.h b/src/common/mathlib.h
index 583acdf1..ee70e6f3 100644
--- a/src/common/mathlib.h
+++ b/src/common/mathlib.h
@@ -39,34 +39,46 @@ typedef int fixed16_t;
 struct mplane_s;
 
 extern Vector vec3_origin;
-extern int nanmask;
+constexpr int nanmask = 255 << 23;
 
-#define IS_NAN(x) (((*(int*)&x) & nanmask) == nanmask)
+inline static bool IS_NAN(float x) {
 
-#define VectorSubtract(a, b, c)   \
-	{                             \
-		(c)[0] = (a)[0] - (b)[0]; \
-		(c)[1] = (a)[1] - (b)[1]; \
-		(c)[2] = (a)[2] - (b)[2]; \
+	if ((((*(int*)&x) & nanmask) == nanmask)) {
+		return true;
 	}
-#define VectorAdd(a, b, c)        \
-	{                             \
-		(c)[0] = (a)[0] + (b)[0]; \
-		(c)[1] = (a)[1] + (b)[1]; \
-		(c)[2] = (a)[2] + (b)[2]; \
-	}
-#define VectorCopy(a, b) \
-	{                    \
-		(b)[0] = (a)[0]; \
-		(b)[1] = (a)[1]; \
-		(b)[2] = (a)[2]; \
+	else {
+		return false;
 	}
+};
+
+
+inline void VectorSubtract(const float* a, const float* b, float* c)
+{
+	c[0] = a[0] - b[0];
+	c[1] = a[1] - b[1];
+	c[2] = a[2] - b[2];
+};
+
+inline void VectorAdd(const float* a, const float* b, float* c)
+{
+	(c)[0] = (a)[0] + (b)[0];
+	(c)[1] = (a)[1] + (b)[1];
+	(c)[2] = (a)[2] + (b)[2];
+};
+
+inline void VectorCopy(const float* source, float* destination)
+{
+	(destination)[0] = (source)[0];
+	(destination)[1] = (source)[1];
+	(destination)[2] = (source)[2];
+};
+
 inline void VectorClear(float* a)
 {
 	a[0] = 0.0;
 	a[1] = 0.0;
 	a[2] = 0.0;
-}
+};
 
 void VectorMA(const float* veca, float scale, const float* vecb, float* vecc);
 
diff --git a/src/game/client/hud_spectator.cpp b/src/game/client/hud_spectator.cpp
index fe79639f..0f330464 100644
--- a/src/game/client/hud_spectator.cpp
+++ b/src/game/client/hud_spectator.cpp
@@ -412,7 +412,7 @@ int CHudSpectator::Draw(float flTime)
 		VectorNormalize(right);
 		VectorScale(right, m_moveDelta, right);
 
-		VectorAdd(m_mapOrigin, right, m_mapOrigin)
+		VectorAdd(m_mapOrigin, right, m_mapOrigin);
 	}
 
 	// Only draw the icon names only if map mode is in Main Mode
diff --git a/src/game/client/view.cpp b/src/game/client/view.cpp
index 6aee0ffd..b60cc2fa 100644
--- a/src/game/client/view.cpp
+++ b/src/game/client/view.cpp
@@ -1648,8 +1648,8 @@ void V_CalcSpectatorRefdef(struct ref_params_s *pparams)
 
 	// write back new values into pparams
 	VectorCopy(v_cl_angles, pparams->cl_viewangles);
-	VectorCopy(v_angles, pparams->viewangles)
-		VectorCopy(v_origin, pparams->vieworg);
+	VectorCopy(v_angles, pparams->viewangles);
+	VectorCopy(v_origin, pparams->vieworg);
 }
 extern float newfov;
 void V_CalcMirrorRefdef(struct ref_params_s *pparams)
diff --git a/src/game/server/hl/util.h b/src/game/server/hl/util.h
index 4ce391b7..0f7aa26b 100644
--- a/src/game/server/hl/util.h
+++ b/src/game/server/hl/util.h
@@ -80,8 +80,9 @@ typedef int EOFFSET;
 typedef int BOOL;
 
 // In case this ever changes
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
+#ifndef PI
+#define PI
+constexpr double M_PI = 3.14159265358979323846;
 #endif
 
 // Keeps clutter down a bit, when declaring external entity/global method prototypes
diff --git a/src/game/shared/hl/vector.h b/src/game/shared/hl/vector.h
index 5fcb01f7..92a90a72 100644
--- a/src/game/shared/hl/vector.h
+++ b/src/game/shared/hl/vector.h
@@ -87,13 +87,13 @@ class Vector // same data-layout as engine's vec3_t,
 	}
 
 	// Operators
-	inline Vector operator-(void) const { return Vector(-x, -y, -z); }
-	inline int operator==(const Vector &v) const { return x == v.x && y == v.y && z == v.z; }
-	inline int operator!=(const Vector &v) const { return !(*this == v); }
-	inline Vector operator+(const Vector &v) const { return Vector(x + v.x, y + v.y, z + v.z); }
-	inline Vector operator-(const Vector &v) const { return Vector(x - v.x, y - v.y, z - v.z); }
-	inline Vector operator*(float fl) const { return Vector(x * fl, y * fl, z * fl); }
-	inline Vector operator/(float fl) const { return Vector(x / fl, y / fl, z / fl); }
+	inline Vector operator- (void) const { return Vector(-x, -y, -z); }
+	inline bool   operator==(const Vector &v) const { return x == v.x && y == v.y && z == v.z; }
+	inline bool   operator!=(const Vector &v) const { return !(*this == v); }
+	inline Vector operator+ (const Vector &v) const { return Vector(x + v.x, y + v.y, z + v.z); }
+	inline Vector operator- (const Vector &v) const { return Vector(x - v.x, y - v.y, z - v.z); }
+	inline Vector operator* (float fl) const { return Vector(x * fl, y * fl, z * fl); }
+	inline Vector operator/ (float fl) const { return Vector(x / fl, y / fl, z / fl); }
 
 	// By Dogg
 	inline Vector& operator+=(const Vector &v) { x += v.x; y += v.y; z += v.z; return *this; }
@@ -103,16 +103,17 @@ class Vector // same data-layout as engine's vec3_t,
 
 	// Methods
 	inline void CopyToArray(float *rgfl) const { rgfl[0] = x, rgfl[1] = y, rgfl[2] = z; }
-	inline float Length(void) const { return sqrt(x * x + y * y + z * z); }
+	inline float Length(void) const { return sqrt((x * x) + (y * y) + (z * z)); }
 	operator float *() { return &x; }			  // Vectors will now automatically convert to float * when needed
 	operator const float *() const { return &x; } // Vectors will now automatically convert to float * when needed
+
 	inline Vector Normalize(void) const
 	{
 		float flLen = Length();
 		if (flLen == 0)
-			return Vector(0, 0, 1); // ????
+			return Vector{0, 0, 1 }; // ????
 		flLen = 1 / flLen;
-		return Vector(x * flLen, y * flLen, z * flLen);
+		return Vector{ x * flLen, y * flLen, z * flLen };
 	}
 
 	inline Vector2D Make2D(void) const
@@ -124,12 +125,14 @@ class Vector // same data-layout as engine's vec3_t,
 
 		return Vec2;
 	}
-	inline float Length2D(void) const { return sqrt(x * x + y * y); }
+
+	inline float Length2D(void) const { return sqrt( (x * x) + (y * y) ); }
 
 	// Members
-	vec_t x, y, z;
+	vec_t x, y, z; //just floats
 };
-inline Vector operator*(float fl, const Vector &v) { return v * fl; }
+
+inline Vector operator*(float fl, const Vector& v) { return v * fl; }
 inline float DotProduct(const Vector &a, const Vector &b) { return (a.x * b.x + a.y * b.y + a.z * b.z); }
 inline Vector CrossProduct(const Vector &a, const Vector &b) { return Vector(a.y * b.z - a.z * b.y, a.z * b.x - a.x * b.z, a.x * b.y - a.y * b.x); }
 
diff --git a/src/game/shared/movement/pm_math.cpp b/src/game/shared/movement/pm_math.cpp
index d4e6bcf4..9086983f 100644
--- a/src/game/shared/movement/pm_math.cpp
+++ b/src/game/shared/movement/pm_math.cpp
@@ -19,16 +19,14 @@
 #include "const.h"
 
 // up / down
-#define PITCH 0
+constexpr int PITCH = 0;
 // left / right
-#define YAW 1
+constexpr int YAW = 1;
 // fall over
-#define ROLL 2
+constexpr int ROLL = 2;
 
 #pragma warning(disable : 4244)
 
-int nanmask = 255 << 23;
-
 float anglemod(float a)
 {
 	a = static_cast<float>(360.0f / 65536) * (static_cast<int>(a * static_cast<float>(65536 / 360.0f)) & 65535);
@@ -395,28 +393,18 @@ ConcatTransforms
 */
 void ConcatTransforms(float in1[3][4], float in2[3][4], float out[3][4])
 {
-	out[0][0] = in1[0][0] * in2[0][0] + in1[0][1] * in2[1][0] +
-				in1[0][2] * in2[2][0];
-	out[0][1] = in1[0][0] * in2[0][1] + in1[0][1] * in2[1][1] +
-				in1[0][2] * in2[2][1];
-	out[0][2] = in1[0][0] * in2[0][2] + in1[0][1] * in2[1][2] +
-				in1[0][2] * in2[2][2];
-	out[0][3] = in1[0][0] * in2[0][3] + in1[0][1] * in2[1][3] +
-				in1[0][2] * in2[2][3] + in1[0][3];
-	out[1][0] = in1[1][0] * in2[0][0] + in1[1][1] * in2[1][0] +
-				in1[1][2] * in2[2][0];
-	out[1][1] = in1[1][0] * in2[0][1] + in1[1][1] * in2[1][1] +
-				in1[1][2] * in2[2][1];
-	out[1][2] = in1[1][0] * in2[0][2] + in1[1][1] * in2[1][2] +
-				in1[1][2] * in2[2][2];
-	out[1][3] = in1[1][0] * in2[0][3] + in1[1][1] * in2[1][3] +
-				in1[1][2] * in2[2][3] + in1[1][3];
-	out[2][0] = in1[2][0] * in2[0][0] + in1[2][1] * in2[1][0] +
-				in1[2][2] * in2[2][0];
-	out[2][1] = in1[2][0] * in2[0][1] + in1[2][1] * in2[1][1] +
-				in1[2][2] * in2[2][1];
-	out[2][2] = in1[2][0] * in2[0][2] + in1[2][1] * in2[1][2] +
-				in1[2][2] * in2[2][2];
-	out[2][3] = in1[2][0] * in2[0][3] + in1[2][1] * in2[1][3] +
-				in1[2][2] * in2[2][3] + in1[2][3];
+	out[0][0] = in1[0][0] * in2[0][0] + in1[0][1] * in2[1][0] + in1[0][2] * in2[2][0];
+	out[0][1] = in1[0][0] * in2[0][1] + in1[0][1] * in2[1][1] +	in1[0][2] * in2[2][1];
+	out[0][2] = in1[0][0] * in2[0][2] + in1[0][1] * in2[1][2] +	in1[0][2] * in2[2][2];
+	out[0][3] = in1[0][0] * in2[0][3] + in1[0][1] * in2[1][3] +	in1[0][2] * in2[2][3] + in1[0][3];
+
+	out[1][0] = in1[1][0] * in2[0][0] + in1[1][1] * in2[1][0] +	in1[1][2] * in2[2][0];
+	out[1][1] = in1[1][0] * in2[0][1] + in1[1][1] * in2[1][1] +	in1[1][2] * in2[2][1];
+	out[1][2] = in1[1][0] * in2[0][2] + in1[1][1] * in2[1][2] +	in1[1][2] * in2[2][2];
+	out[1][3] = in1[1][0] * in2[0][3] + in1[1][1] * in2[1][3] +	in1[1][2] * in2[2][3] + in1[1][3];
+
+	out[2][0] = in1[2][0] * in2[0][0] + in1[2][1] * in2[1][0] +	in1[2][2] * in2[2][0];
+	out[2][1] = in1[2][0] * in2[0][1] + in1[2][1] * in2[1][1] +	in1[2][2] * in2[2][1];
+	out[2][2] = in1[2][0] * in2[0][2] + in1[2][1] * in2[1][2] +	in1[2][2] * in2[2][2];
+	out[2][3] = in1[2][0] * in2[0][3] + in1[2][1] * in2[1][3] +	in1[2][2] * in2[2][3] + in1[2][3];
 }
diff --git a/src/game/shared/movement/pm_shared.cpp b/src/game/shared/movement/pm_shared.cpp
index bf6086cc..85a2d760 100644
--- a/src/game/shared/movement/pm_shared.cpp
+++ b/src/game/shared/movement/pm_shared.cpp
@@ -1991,7 +1991,7 @@ void PM_SpectatorMove(void)
 		speed = Length(pmove->velocity);
 		if (speed < 1)
 		{
-			VectorCopy(vec3_origin, pmove->velocity)
+			VectorCopy(vec3_origin, pmove->velocity);
 		}
 		else
 		{
@@ -2560,7 +2560,7 @@ void PM_Physics_Toss()
 			VectorScale(pmove->velocity, (1.0 - trace.fraction) * pmove->frametime * 0.9, move);
 			trace = PM_PushEntity(move);
 		}
-		VectorSubtract(pmove->velocity, base, pmove->velocity)
+		VectorSubtract(pmove->velocity, base, pmove->velocity);
 	}
 
 	// check for in water

From 57cddfabc309a88f3801aec90d75a64938d4dc86 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 14:36:55 -0400
Subject: [PATCH 015/291] Renamed M_PI to PI. Changes macro to constexpr int.
 Rename M_PI to PI in used routines

---
 src/common/const.h                            |  2 ++
 src/common/mathlib.h                          |  4 ---
 src/game/client/hud.cpp                       |  2 +-
 src/game/client/render/studio_util.cpp        |  4 +--
 src/game/client/render/studio_util.h          | 10 ++-----
 .../client/render/studiomodelrenderer.cpp     | 14 ++++-----
 src/game/client/view.cpp                      |  8 ++---
 src/game/server/hl/animating.cpp              |  2 +-
 src/game/server/hl/func_tank.cpp              |  4 +--
 src/game/server/hl/util.h                     |  5 ----
 src/game/server/monsters/npcscript.cpp        |  2 +-
 src/game/shared/movement/pm_math.cpp          | 30 +++++++++----------
 src/game/shared/ms/script.cpp                 |  4 +--
 src/game/shared/weapons/giattack.cpp          |  2 +-
 14 files changed, 41 insertions(+), 52 deletions(-)

diff --git a/src/common/const.h b/src/common/const.h
index b0ab4a66..b6c6e46f 100644
--- a/src/common/const.h
+++ b/src/common/const.h
@@ -21,6 +21,8 @@
 
 #include "Platform.h"
 
+constexpr double PI = 3.14159265358979323846;
+
 // edict->flags
 constexpr int FL_FLY = (1 << 0);	 // Changes the SV_Movestep() behavior to not need to be on ground
 constexpr int FL_SWIM = (1 << 1); // Changes the SV_Movestep() behavior to not need to be on ground (but stay in water)
diff --git a/src/common/mathlib.h b/src/common/mathlib.h
index ee70e6f3..69ee49ec 100644
--- a/src/common/mathlib.h
+++ b/src/common/mathlib.h
@@ -32,10 +32,6 @@ typedef int fixed4_t;
 typedef int fixed8_t;
 typedef int fixed16_t;
 
-#ifndef M_PI
-#define M_PI 3.14159265358979323846 // matches value in gcc v2 math.h
-#endif
-
 struct mplane_s;
 
 extern Vector vec3_origin;
diff --git a/src/game/client/hud.cpp b/src/game/client/hud.cpp
index 53628b5c..211952e9 100644
--- a/src/game/client/hud.cpp
+++ b/src/game/client/hud.cpp
@@ -765,7 +765,7 @@ int CHud::MsgFunc_SetFOV(const char *pszName, int iSize, void *pbuf)
 		m_iFOV = newfov;
 	}
 
-	ClFOV = cosf((m_iFOV / 2.0) * (M_PI / 180));
+	ClFOV = cosf((m_iFOV / 2.0) * (PI / 180));
 
 	// the clients fov is actually set in the client data update section of the hud
 
diff --git a/src/game/client/render/studio_util.cpp b/src/game/client/render/studio_util.cpp
index 78bfded6..a172878a 100644
--- a/src/game/client/render/studio_util.cpp
+++ b/src/game/client/render/studio_util.cpp
@@ -96,8 +96,8 @@ void QuaternionSlerp( vec4_t p, vec4_t q, float t, vec4_t qt )
 		qt[1] = q[0];
 		qt[2] = -q[3];
 		qt[3] = q[2];
-		sclp = sin( (1.0 - t) * (0.5 * M_PI));
-		sclq = sin( t * (0.5 * M_PI));
+		sclp = sin( (1.0 - t) * (0.5 * PI));
+		sclq = sin( t * (0.5 * PI));
 		for (i = 0; i < 3; i++)
 		{
 			qt[i] = sclp * p[i] + sclq * qt[i];
diff --git a/src/game/client/render/studio_util.h b/src/game/client/render/studio_util.h
index 7a2aa47b..aa784528 100644
--- a/src/game/client/render/studio_util.h
+++ b/src/game/client/render/studio_util.h
@@ -7,18 +7,14 @@
 
 #pragma once
 
-#ifndef M_PI
-#define M_PI 3.14159265358979323846 // matches value in gcc v2 math.h
-#endif
-
 #ifndef PITCH
 // MOVEMENT INFO
 // up / down
-#define PITCH 0
+constexpr int PITCH = 0;
 // left / right
-#define YAW 1
+constexpr int YAW = 1;
 // fall over
-#define ROLL 2
+constexpr int ROLL = 2;
 #endif
 
 #define FDotProduct(a, b) (fabs((a[0]) * (b[0])) + fabs((a[1]) * (b[1])) + fabs((a[2]) * (b[2])))
diff --git a/src/game/client/render/studiomodelrenderer.cpp b/src/game/client/render/studiomodelrenderer.cpp
index 917f33ed..df3f2400 100644
--- a/src/game/client/render/studiomodelrenderer.cpp
+++ b/src/game/client/render/studiomodelrenderer.cpp
@@ -186,7 +186,7 @@ void CStudioModelRenderer::StudioCalcBoneAdj(float dadt, float* adj, const byte*
 		case STUDIO_XR:
 		case STUDIO_YR:
 		case STUDIO_ZR:
-			adj[j] = value * (M_PI / 180.0);
+			adj[j] = value * (PI / 180.0);
 			break;
 		case STUDIO_X:
 		case STUDIO_Y:
@@ -280,13 +280,13 @@ void CStudioModelRenderer::StudioCalcBoneQuaterion(int frame, float s, mstudiobo
 					if( pbone->parent == -1 )
 					{
 						animrot += orig1;
-						animrot -= M_PI/2;
+						animrot -= PI/2;
 					}
 					animrot *= -1;
 
 					if( pbone->parent == -1 )
 					{
-						animrot += M_PI/2;
+						animrot += PI/2;
 						animrot -= (-orig1);
 					}
 
@@ -317,8 +317,8 @@ void CStudioModelRenderer::StudioCalcBoneQuaterion(int frame, float s, mstudiobo
 		/*if( FBitSet(m_pCurrentEntity->curstate.oldbuttons,MSRDR_FLIPPED) )
 			if( pbone->parent != -1 )
 			{
-				if( angle[0] > M_PI ) angle[0] -= M_PI*2;
-				if( angle[0] < -M_PI ) angle[0] += M_PI*2;
+				if( angle[0] > PI ) angle[0] -= PI*2;
+				if( angle[0] < -PI ) angle[0] += PI*2;
 				 for (int j = 0; j < 2; j++)
 					if( panim->offset[j+1+3] == 0 )
 					{
@@ -1704,7 +1704,7 @@ void CStudioModelRenderer::StudioEstimateGait(entity_state_t* pplayer)
 	}
 	else
 	{
-		m_pPlayerInfo->gaityaw = (atan2(est_velocity[1], est_velocity[0]) * 180 / M_PI);
+		m_pPlayerInfo->gaityaw = (atan2(est_velocity[1], est_velocity[0]) * 180 / PI);
 		if (m_pPlayerInfo->gaityaw > 180)
 			m_pPlayerInfo->gaityaw = 180;
 		if (m_pPlayerInfo->gaityaw < -180)
@@ -2593,7 +2593,7 @@ void CStudioModelRenderer::ModifyBone(mstudiobone_t* pbone, Vector& angle)
 	if (Bone == 2)
 		Value = Pitch * 0.3f; //0.2
 
-	angle.z += -Value * (M_PI / 180.0);
+	angle.z += -Value * (PI / 180.0);
 }
 
 void CStudioModelRenderer::RegisterExtraData(cl_entity_t& Ent)
diff --git a/src/game/client/view.cpp b/src/game/client/view.cpp
index b60cc2fa..26ae18f4 100644
--- a/src/game/client/view.cpp
+++ b/src/game/client/view.cpp
@@ -217,11 +217,11 @@ float V_CalcBob(struct ref_params_s *pparams)
 
 	if (cycle < cl_bobup->value)
 	{
-		cycle = M_PI * cycle / cl_bobup->value;
+		cycle = PI * cycle / cl_bobup->value;
 	}
 	else
 	{
-		cycle = M_PI + M_PI * (cycle - cl_bobup->value) / (1.0 - cl_bobup->value);
+		cycle = PI + PI * (cycle - cl_bobup->value) / (1.0 - cl_bobup->value);
 	}
 
 	// bob is proportional to simulated velocity in the xy plane
@@ -1820,11 +1820,11 @@ float CalcFov(float fov_x, float width, float height)
 	if (fov_x < 1 || fov_x > 179)
 		fov_x = 90; // error, set to 90
 
-	x = width / tan(fov_x / 360 * M_PI);
+	x = width / tan(fov_x / 360 * PI);
 
 	a = atan(height / x);
 
-	a = a * 360 / M_PI;
+	a = a * 360 / PI;
 
 	return a;
 }
diff --git a/src/game/server/hl/animating.cpp b/src/game/server/hl/animating.cpp
index 856ab391..c801872c 100644
--- a/src/game/server/hl/animating.cpp
+++ b/src/game/server/hl/animating.cpp
@@ -263,7 +263,7 @@ void CBaseAnimating ::SetSequenceBox(void)
 	{
 		// expand box for rotation
 		// find min / max for rotations
-		float yaw = pev->angles.y * (M_PI / 180.0);
+		float yaw = pev->angles.y * (PI / 180.0);
 
 		Vector xvector, yvector;
 		xvector.x = cos(yaw);
diff --git a/src/game/server/hl/func_tank.cpp b/src/game/server/hl/func_tank.cpp
index 5e018c24..d7a529d9 100644
--- a/src/game/server/hl/func_tank.cpp
+++ b/src/game/server/hl/func_tank.cpp
@@ -633,12 +633,12 @@ void CFuncTank::AdjustAnglesForBarrel(Vector &angles, float distance)
 		if (m_barrelPos.y)
 		{
 			r2 = m_barrelPos.y * m_barrelPos.y;
-			angles.y += (180.0 / M_PI) * atan2(m_barrelPos.y, sqrt(d2 - r2));
+			angles.y += (180.0 / PI) * atan2(m_barrelPos.y, sqrt(d2 - r2));
 		}
 		if (m_barrelPos.z)
 		{
 			r2 = m_barrelPos.z * m_barrelPos.z;
-			angles.x += (180.0 / M_PI) * atan2(-m_barrelPos.z, sqrt(d2 - r2));
+			angles.x += (180.0 / PI) * atan2(-m_barrelPos.z, sqrt(d2 - r2));
 		}
 	}
 }
diff --git a/src/game/server/hl/util.h b/src/game/server/hl/util.h
index 0f7aa26b..570ff87b 100644
--- a/src/game/server/hl/util.h
+++ b/src/game/server/hl/util.h
@@ -80,11 +80,6 @@ typedef int EOFFSET;
 typedef int BOOL;
 
 // In case this ever changes
-#ifndef PI
-#define PI
-constexpr double M_PI = 3.14159265358979323846;
-#endif
-
 // Keeps clutter down a bit, when declaring external entity/global method prototypes
 #define DECLARE_GLOBAL_METHOD(MethodName)  extern void UTIL_DLLEXPORT MethodName( void )
 #define GLOBAL_METHOD(funcname)					void UTIL_DLLEXPORT funcname(void)
diff --git a/src/game/server/monsters/npcscript.cpp b/src/game/server/monsters/npcscript.cpp
index 4476a412..3fea933e 100644
--- a/src/game/server/monsters/npcscript.cpp
+++ b/src/game/server/monsters/npcscript.cpp
@@ -270,7 +270,7 @@ bool CMSMonster::Script_ExecuteCmd(CScript *Script, SCRIPT_EVENT &Event, scriptc
 	else if (Cmd.Name() == "fov")
 	{
 		if (Params.size() >= 1)
-			m_flFieldOfView = cosf((atof(Params[0]) / 2.0) * (M_PI / 180));
+			m_flFieldOfView = cosf((atof(Params[0]) / 2.0) * (PI / 180));
 
 		else
 			ERROR_MISSING_PARMS;
diff --git a/src/game/shared/movement/pm_math.cpp b/src/game/shared/movement/pm_math.cpp
index 9086983f..095ac6db 100644
--- a/src/game/shared/movement/pm_math.cpp
+++ b/src/game/shared/movement/pm_math.cpp
@@ -38,13 +38,13 @@ void AngleVectors(const Vector& angles, Vector* forward, Vector* right, Vector*
 	float angle;
 	float sr, sp, sy, cr, cp, cy;
 
-	angle = angles[YAW] * (M_PI * 2 / 360);
+	angle = angles[YAW] * (PI * 2 / 360);
 	sy = sin(angle);
 	cy = cos(angle);
-	angle = angles[PITCH] * (M_PI * 2 / 360);
+	angle = angles[PITCH] * (PI * 2 / 360);
 	sp = sin(angle);
 	cp = cos(angle);
-	angle = angles[ROLL] * (M_PI * 2 / 360);
+	angle = angles[ROLL] * (PI * 2 / 360);
 	sr = sin(angle);
 	cr = cos(angle);
 
@@ -73,13 +73,13 @@ void AngleVectorsTranspose(const Vector& angles, Vector* forward, Vector* right,
 	float angle;
 	float sr, sp, sy, cr, cp, cy;
 
-	angle = angles[YAW] * (M_PI * 2 / 360);
+	angle = angles[YAW] * (PI * 2 / 360);
 	sy = sin(angle);
 	cy = cos(angle);
-	angle = angles[PITCH] * (M_PI * 2 / 360);
+	angle = angles[PITCH] * (PI * 2 / 360);
 	sp = sin(angle);
 	cp = cos(angle);
-	angle = angles[ROLL] * (M_PI * 2 / 360);
+	angle = angles[ROLL] * (PI * 2 / 360);
 	sr = sin(angle);
 	cr = cos(angle);
 
@@ -108,13 +108,13 @@ void AngleMatrix(const float* angles, float (*matrix)[4])
 	float angle;
 	float sr, sp, sy, cr, cp, cy;
 
-	angle = angles[YAW] * (M_PI * 2 / 360);
+	angle = angles[YAW] * (PI * 2 / 360);
 	sy = sin(angle);
 	cy = cos(angle);
-	angle = angles[PITCH] * (M_PI * 2 / 360);
+	angle = angles[PITCH] * (PI * 2 / 360);
 	sp = sin(angle);
 	cp = cos(angle);
-	angle = angles[ROLL] * (M_PI * 2 / 360);
+	angle = angles[ROLL] * (PI * 2 / 360);
 	sr = sin(angle);
 	cr = cos(angle);
 
@@ -138,13 +138,13 @@ void AngleIMatrix(const Vector& angles, float matrix[3][4])
 	float angle;
 	float sr, sp, sy, cr, cp, cy;
 
-	angle = angles[YAW] * (M_PI * 2 / 360);
+	angle = angles[YAW] * (PI * 2 / 360);
 	sy = sin(angle);
 	cy = cos(angle);
-	angle = angles[PITCH] * (M_PI * 2 / 360);
+	angle = angles[PITCH] * (PI * 2 / 360);
 	sp = sin(angle);
 	cp = cos(angle);
-	angle = angles[ROLL] * (M_PI * 2 / 360);
+	angle = angles[ROLL] * (PI * 2 / 360);
 	sr = sin(angle);
 	cr = cos(angle);
 
@@ -236,7 +236,7 @@ float AngleBetweenVectors(const Vector& v1, const Vector& v2)
 		return 0.0f;
 
 	angle = acos(DotProduct(v1, v2)) / (l1 * l2);
-	angle = (angle * 180.0f) / M_PI;
+	angle = (angle * 180.0f) / PI;
 
 	return angle;
 }
@@ -370,12 +370,12 @@ void VectorAngles(const float* forward, float* angles)
 	}
 	else
 	{
-		yaw = (atan2(forward[1], forward[0]) * 180 / M_PI);
+		yaw = (atan2(forward[1], forward[0]) * 180 / PI);
 		if (yaw < 0)
 			yaw += 360;
 
 		tmp = sqrt(forward[0] * forward[0] + forward[1] * forward[1]);
-		pitch = (atan2(forward[2], tmp) * 180 / M_PI);
+		pitch = (atan2(forward[2], tmp) * 180 / PI);
 		if (pitch < 0)
 			pitch += 360;
 	}
diff --git a/src/game/shared/ms/script.cpp b/src/game/shared/ms/script.cpp
index 0ee2f575..d9610df2 100644
--- a/src/game/shared/ms/script.cpp
+++ b/src/game/shared/ms/script.cpp
@@ -610,7 +610,7 @@ msstring CScript::ScriptGetter_Angles3d(msstring& FullName, msstring& ParserName
 		else
 		{
 			if (Vec_Org.x)
-				lyaw = (atan2(Vec_Org.y, Vec_Org.x) * 180 / M_PI);
+				lyaw = (atan2(Vec_Org.y, Vec_Org.x) * 180 / PI);
 			else if (Vec_Org.y > 0)
 				lyaw = 90;
 			else
@@ -620,7 +620,7 @@ msstring CScript::ScriptGetter_Angles3d(msstring& FullName, msstring& ParserName
 				lyaw += 360;
 
 			lforward = sqrt(Vec_Org.x*Vec_Org.x + Vec_Org.y*Vec_Org.y);
-			lpitch = (atan2(Vec_Org.y, lforward) * 180 / M_PI);
+			lpitch = (atan2(Vec_Org.y, lforward) * 180 / PI);
 			if (lpitch < 0)
 				lpitch += 360;
 		}
diff --git a/src/game/shared/weapons/giattack.cpp b/src/game/shared/weapons/giattack.cpp
index 0f20fd9f..2c579a50 100644
--- a/src/game/shared/weapons/giattack.cpp
+++ b/src/game/shared/weapons/giattack.cpp
@@ -1048,7 +1048,7 @@ void CGenericItem::ChargeThrowProj()
 		float LoweredSpreadDeg = CurrentAttack->flAccBest + ((CurrentAttack->flAccuracyDefault - CurrentAttack->flAccBest) * (1 - flTimeHeldAdjusted));
 
 		float Spread = V_max(LoweredSpreadDeg, 0);
-		float VeerAng = RANDOM_FLOAT(0.0f, M_PI);
+		float VeerAng = RANDOM_FLOAT(0.0f, PI);
 		vAngle.x += cosf(VeerAng) * Spread; //Veer off at the angle, multiplied by the spread
 		vAngle.y += sinf(VeerAng) * Spread;
 

From 5767676942575826d128135b74c1efbabefcc09d Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 14:48:42 -0400
Subject: [PATCH 016/291] commented out unused macro

---
 src/common/mathlib.h | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/common/mathlib.h b/src/common/mathlib.h
index 69ee49ec..7c64983f 100644
--- a/src/common/mathlib.h
+++ b/src/common/mathlib.h
@@ -160,10 +160,11 @@ extern DLONG dlong;
 #define restore_fpu_cw() /* */
 #endif
 
-#define BOX_ON_PLANE_SIDE(emins, emaxs, p)                                                                 \
-	(((p)->type < 3) ? (                                                                                   \
-						   ((p)->dist <= (emins)[(p)->type]) ? 1                                           \
-															 : (                                           \
-																   ((p)->dist >= (emaxs)[(p)->type]) ? 2   \
-																									 : 3)) \
-					 : BoxOnPlaneSide((emins), (emaxs), (p)))
+//#define BOX_ON_PLANE_SIDE(emins, emaxs, p)                                                                 \
+//	(((p)->type < 3) ? (                                                                                   \
+//						   ((p)->dist <= (emins)[(p)->type]) ? 1                                           \
+//															 : (                                           \
+//																   ((p)->dist >= (emaxs)[(p)->type]) ? 2   \
+//																									 : 3)) \
+//					 : BoxOnPlaneSide((emins), (emaxs), (p)))
+//
\ No newline at end of file

From 2ae701a4adbc73bd8ed3a72aaf0705bca5ae5d19 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 15:01:10 -0400
Subject: [PATCH 017/291] Chanced V_min and V_max from macros to templated
 functions.

---
 src/common/Platform.h | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/common/Platform.h b/src/common/Platform.h
index bcfb4a8d..ff2ea200 100644
--- a/src/common/Platform.h
+++ b/src/common/Platform.h
@@ -3,7 +3,7 @@
 
 // Allow "DEBUG" in addition to default "_DEBUG"
 #ifdef _DEBUG
-#define DEBUG 1
+constexpr int DEBUG = 1
 #endif
 
 // Silence certain warnings
@@ -41,7 +41,16 @@ using word = unsigned short;
 // #undef ARRAYSIZE
 // #endif
 // #define ARRAYSIZE(p) (sizeof(p) / sizeof(p[0]))
-#define V_min(a, b) (((a) < (b)) ? (a) : (b))
-#define V_max(a, b) (((a) > (b)) ? (a) : (b))
+
+
+template <typename T1, typename T2>
+auto V_min(const T1& a, const T2& b) {
+	return (a < b) ? a : b;
+}
+
+template <typename T1, typename T2>
+auto V_max(const T1& a, const T2& b) {
+	return (a > b) ? a : b;
+}
 
 #endif
\ No newline at end of file

From ac0e5709f10f5a9780b02947b5766760fb925307 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 15:01:58 -0400
Subject: [PATCH 018/291] Added semicolons to template blocks for sureness.

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

diff --git a/src/common/Platform.h b/src/common/Platform.h
index ff2ea200..6089b66c 100644
--- a/src/common/Platform.h
+++ b/src/common/Platform.h
@@ -46,11 +46,11 @@ using word = unsigned short;
 template <typename T1, typename T2>
 auto V_min(const T1& a, const T2& b) {
 	return (a < b) ? a : b;
-}
+};
 
 template <typename T1, typename T2>
 auto V_max(const T1& a, const T2& b) {
 	return (a > b) ? a : b;
-}
+};
 
 #endif
\ No newline at end of file

From 5d8f4f03952f26ee052f51d4bb5b1117d1841eaf Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 15:03:24 -0400
Subject: [PATCH 019/291] changes macro defines to constexpr

---
 src/common/net_api.h | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/common/net_api.h b/src/common/net_api.h
index e4af8269..980d92e9 100644
--- a/src/common/net_api.h
+++ b/src/common/net_api.h
@@ -15,22 +15,22 @@
 #include "netadr.h"
 #endif
 
-#define NETAPI_REQUEST_SERVERLIST (0) // Doesn't need a remote address
-#define NETAPI_REQUEST_PING (1)
-#define NETAPI_REQUEST_RULES (2)
-#define NETAPI_REQUEST_PLAYERS (3)
-#define NETAPI_REQUEST_DETAILS (4)
+constexpr int NETAPI_REQUEST_SERVERLIST = 0; // Doesn't need a remote address
+constexpr int NETAPI_REQUEST_PING = 1;
+constexpr int NETAPI_REQUEST_RULES = 2;
+constexpr int NETAPI_REQUEST_PLAYERS = 3;
+constexpr int NETAPI_REQUEST_DETAILS = 4;
 
 // Set this flag for things like broadcast requests, etc. where the engine should not
 //  kill the request hook after receiving the first response
-#define FNETAPI_MULTIPLE_RESPONSE (1 << 0)
+constexpr int FNETAPI_MULTIPLE_RESPONSE = (1 << 0);
 
 typedef void (*net_api_response_func_t)(struct net_response_s *response);
 
-#define NET_SUCCESS (0)
-#define NET_ERROR_TIMEOUT (1 << 0)
-#define NET_ERROR_PROTO_UNSUPPORTED (1 << 1)
-#define NET_ERROR_UNDEFINED (1 << 2)
+constexpr int NET_SUCCESS = 0;
+constexpr int NET_ERROR_TIMEOUT = 1 << 0;
+constexpr int NET_ERROR_PROTO_UNSUPPORTED = 1 << 1;
+constexpr int NET_ERROR_UNDEFINED = 1 << 2;
 
 typedef struct net_adrlist_s
 {

From 1cd9519d8702b4512523c59338a556219c37f2e4 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 15:09:09 -0400
Subject: [PATCH 020/291] Changed macros to constexpr. Fixed Vector not
 accurately being passed into sscanf : 377 in findentities.cpp

---
 src/common/qfont.h                  | 2 +-
 src/game/shared/ms/findentities.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/qfont.h b/src/common/qfont.h
index 665ed97d..f6f7831d 100644
--- a/src/common/qfont.h
+++ b/src/common/qfont.h
@@ -20,7 +20,7 @@
 
 // Font stuff
 
-#define NUM_GLYPHS 256
+constexpr int NUM_GLYPHS = 256;
 
 typedef struct
 {
diff --git a/src/game/shared/ms/findentities.cpp b/src/game/shared/ms/findentities.cpp
index 952621a0..e0a16f91 100644
--- a/src/game/shared/ms/findentities.cpp
+++ b/src/game/shared/ms/findentities.cpp
@@ -374,7 +374,7 @@ bool CCylinderFilter::SetFromString(msstring vsString)
 	float vRadiusSquared;
 	float vPosZ;
 	float vNegZ;
-	bool bOk = sscanf(vsString.c_str(), "Cyl((%f,%f,%f),%f,%f,%f,%f)", &vOrigin, &vRadius, &vRadiusSquared, &vPosZ, &vNegZ) == 7;
+	bool bOk = sscanf(vsString.c_str(), "Cyl((%f,%f,%f),%f,%f,%f,%f)", &vOrigin.x, &vOrigin.y, &vOrigin.z, &vRadius, &vRadiusSquared, &vPosZ, &vNegZ) == 7;
 	if (bOk)
 	{
 		mOrigin = vOrigin;

From f335879fb15a096f76c63602d004ea31dbd907f1 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 15:09:41 -0400
Subject: [PATCH 021/291] Changes more macro definitions to constexpr

---
 src/common/r_efx.h | 48 +++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/common/r_efx.h b/src/common/r_efx.h
index d42c4ee9..eb638cb2 100644
--- a/src/common/r_efx.h
+++ b/src/common/r_efx.h
@@ -59,32 +59,32 @@ color24 gTracerColors[] =
 */
 
 // Temporary entity array
-#define TENTPRIORITY_LOW 0
-#define TENTPRIORITY_HIGH 1
+constexpr int TENTPRIORITY_LOW = 0;
+constexpr int TENTPRIORITY_HIGH = 1;
 
 // TEMPENTITY flags
-#define FTENT_NONE 0x00000000
-#define FTENT_SINEWAVE 0x00000001
-#define FTENT_GRAVITY 0x00000002
-#define FTENT_ROTATE 0x00000004
-#define FTENT_SLOWGRAVITY 0x00000008
-#define FTENT_SMOKETRAIL 0x00000010
-#define FTENT_COLLIDEWORLD 0x00000020
-#define FTENT_FLICKER 0x00000040
-#define FTENT_FADEOUT 0x00000080
-#define FTENT_SPRANIMATE 0x00000100
-#define FTENT_HITSOUND 0x00000200
-#define FTENT_SPIRAL 0x00000400
-#define FTENT_SPRCYCLE 0x00000800
-#define FTENT_COLLIDEALL 0x00001000		// will collide with world and slideboxes
-#define FTENT_PERSIST 0x00002000		// tent is not removed when unable to draw
-#define FTENT_COLLIDEKILL 0x00004000	// tent is removed upon collision with anything
-#define FTENT_PLYRATTACHMENT 0x00008000 // tent is attached to a player (owner)
-#define FTENT_SPRANIMATELOOP 0x00010000 // animating sprite doesn't die when last frame is displayed
-#define FTENT_SPARKSHOWER 0x00020000
-#define FTENT_NOMODEL 0x00040000	  // Doesn't have a model, never try to draw ( it just triggers other things )
-#define FTENT_CLIENTCUSTOM 0x00080000 // Must specify callback.  Callback function is responsible for killing tempent and updating fields ( unless other flags specify how to do things )
-#define FTENT_SKIPENT 0x00100000	  // AUG2013_25 Thothie - Skip collision checks for stored ent index
+constexpr int FTENT_NONE = 0x00000000;
+constexpr int FTENT_SINEWAVE = 0x00000001;
+constexpr int FTENT_GRAVITY = 0x00000002;
+constexpr int FTENT_ROTATE = 0x00000004;
+constexpr int FTENT_SLOWGRAVITY = 0x00000008;
+constexpr int FTENT_SMOKETRAIL = 0x00000010;
+constexpr int FTENT_COLLIDEWORLD = 0x00000020;
+constexpr int FTENT_FLICKER = 0x00000040;
+constexpr int FTENT_FADEOUT = 0x00000080;
+constexpr int FTENT_SPRANIMATE = 0x00000100;
+constexpr int FTENT_HITSOUND = 0x00000200;
+constexpr int FTENT_SPIRAL = 0x00000400;
+constexpr int FTENT_SPRCYCLE = 0x00000800;
+constexpr int FTENT_COLLIDEALL = 0x00001000;	// will collide with world and slideboxes
+constexpr int FTENT_PERSIST = 0x00002000;		// tent is not removed when unable to draw
+constexpr int FTENT_COLLIDEKILL = 0x00004000;	// tent is removed upon collision with anything
+constexpr int FTENT_PLYRATTACHMENT = 0x00008000; // tent is attached to a player (owner)
+constexpr int FTENT_SPRANIMATELOOP = 0x00010000; // animating sprite doesn't die when last frame is displayed
+constexpr int FTENT_SPARKSHOWER = 0x00020000;
+constexpr int FTENT_NOMODEL = 0x00040000;	  // Doesn't have a model, never try to draw ( it just triggers other things )
+constexpr int FTENT_CLIENTCUSTOM = 0x00080000; // Must specify callback.  Callback function is responsible for killing tempent and updating fields ( unless other flags specify how to do things )
+constexpr int FTENT_SKIPENT = 0x00100000;  // AUG2013_25 Thothie - Skip collision checks for stored ent index
 
 typedef struct tempent_s TEMPENTITY;
 typedef struct tempent_s

From fa3ecbfb262e683e37b4fd837440b499a13393d5 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 15:12:52 -0400
Subject: [PATCH 022/291] Changed more macrodefines to constexpr

---
 src/common/r_studioint.h |  4 ++--
 src/common/triangleapi.h | 17 ++++++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/common/r_studioint.h b/src/common/r_studioint.h
index 3e9caa52..7d28782a 100644
--- a/src/common/r_studioint.h
+++ b/src/common/r_studioint.h
@@ -11,7 +11,7 @@
 #pragma once
 #endif
 
-#define STUDIO_INTERFACE_VERSION 1
+constexpr int STUDIO_INTERFACE_VERSION = 1;
 
 typedef struct engine_studio_api_s
 {
@@ -126,7 +126,7 @@ typedef struct r_studio_interface_s
 extern r_studio_interface_t *pStudioAPI;
 
 // server blending
-#define SV_BLENDING_INTERFACE_VERSION 1
+constexpr int SV_BLENDING_INTERFACE_VERSION = 1;
 
 typedef struct sv_blending_interface_s
 {
diff --git a/src/common/triangleapi.h b/src/common/triangleapi.h
index 5e85cb03..3440f7c9 100644
--- a/src/common/triangleapi.h
+++ b/src/common/triangleapi.h
@@ -24,15 +24,14 @@ typedef enum
 	TRI_NONE = 1,
 } TRICULLSTYLE;
 
-#define TRI_API_VERSION 1
-
-#define TRI_TRIANGLES 0
-#define TRI_TRIANGLE_FAN 1
-#define TRI_QUADS 2
-#define TRI_POLYGON 3
-#define TRI_LINES 4
-#define TRI_TRIANGLE_STRIP 5
-#define TRI_QUAD_STRIP 6
+constexpr int TRI_API_VERSION = 1;
+constexpr int TRI_TRIANGLES = 0;
+constexpr int TRI_TRIANGLE_FAN = 1;
+constexpr int TRI_QUADS = 2;
+constexpr int TRI_POLYGON = 3;
+constexpr int TRI_LINES = 4;
+constexpr int TRI_TRIANGLE_STRIP = 5;
+constexpr int TRI_QUAD_STRIP = 6;
 
 typedef struct triangleapi_s
 {

From b78ed64d6dfecc7baee95d1c74b6d706970b376e Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 15:39:44 -0400
Subject: [PATCH 023/291] Removed unused dyanmic defines. Changed macro defs to
 constexpr

---
 src/game/server/player/player.h | 54 +++++++++++++++------------------
 1 file changed, 25 insertions(+), 29 deletions(-)

diff --git a/src/game/server/player/player.h b/src/game/server/player/player.h
index 4d235087..b5d08053 100644
--- a/src/game/server/player/player.h
+++ b/src/game/server/player/player.h
@@ -22,12 +22,12 @@
 #include "mscharacter.h"
 #include "iscript.h"
 
-#define MAX_ID_RANGE 2048
-#define SBAR_STRING_SIZE 128
-#define NUM_MAX_ITEMS 100 //Thothie APR2011_28
+constexpr int MAX_ID_RANGE = 2048;
+constexpr int SBAR_STRING_SIZE = 128;
+constexpr int NUM_MAX_ITEMS = 100; //Thothie APR2011_28
 
 // was 1500, but there shouldn't be any issues with increasing.
-#define NUM_MAX_STACK 9999 //stack is stored as either a unsigned short, so that's the actual max it can be.
+constexpr int NUM_MAX_STACK = 9999; //stack is stored as either a unsigned short, so that's the actual max it can be.
 
 enum sbar_data
 {
@@ -37,7 +37,7 @@ enum sbar_data
 	SBAR_END,
 };
 
-#define CHAT_INTERVAL 1.0f
+constexpr float CHAT_INTERVAL = 1.0f;
 //Master Sword
 
 class CStat;
@@ -100,7 +100,7 @@ struct quickslot_t //Quickslots for items, spells
 	quickslottype_e Type;
 	uint ID;
 };
-#define MAX_QUICKSLOTS 36 //MiB MAR2012 - Increase quickslots
+constexpr int MAX_QUICKSLOTS = 36; //MiB MAR2012 - Increase quickslots
 
 #include "sharedmenu.h"
 
@@ -114,10 +114,9 @@ void MSGSend_PlayerInfo(CBasePlayer *pSendToPlayer, CBasePlayer *pPlayer);
 //macros (just to shorten things up a bit)
 #define CREATE_ENT(item) (CBaseEntity *)GET_PRIVATE(CREATE_NAMED_ENTITY(MAKE_STRING(item)));
 
-#define VAR_NPC_ANIM_TORSO "game.monster.torso_anim"
-#define VAR_NPC_ANIM_LEGS "game.monster.legs_anim"
-
-#define PLAYER_SCRIPT "player/player"
+constexpr const char* VAR_NPC_ANIM_TORSO = "game.monster.torso_anim";
+constexpr const char* VAR_NPC_ANIM_LEGS = "game.monster.legs_anim";
+constexpr const char* PLAYER_SCRIPT = "player/player";
 //#define mCH m_pOwner->iCurrentHand
 
 /*//#define Wielded( iHand ) ((Hand[iHand])?Hand[iHand]->Wielded:(PlayerHands?PlayerHands->Wielded:FALSE))
@@ -125,34 +124,31 @@ void MSGSend_PlayerInfo(CBasePlayer *pSendToPlayer, CBasePlayer *pPlayer);
 //#define CHWielded ((Hand[iCurrentHand])?Hand[iCurrentHand]->Wielded:(PlayerHands?PlayerHands->Wielded:FALSE))
 #define CHWielded Wielded(iCurrentHand)*/
 
-#define CH Hand[iCurrentHand]
-#define MAX_PLAYER_HANDS 2
-#define MAX_PLAYER_HANDITEMS 3
-#define MAX_KEYHISTORY 10
+constexpr int MAX_PLAYER_HANDS = 2;
+constexpr int MAX_PLAYER_HANDITEMS = 3;
+constexpr int MAX_KEYHISTORY = 10;
+constexpr int MSGFLAG_SPAWN = (1 << 0);
 
-#define mSStat m_pOwner->GetSkillStat
-#define mNStat m_pOwner->GetNatStat
 
-#define MSGFLAG_SPAWN (1 << 0)
 
 //-----------------
 
-#define PLAYER_FATAL_FALL_SPEED 1024															  // approx 60 feet
-#define PLAYER_MAX_SAFE_FALL_SPEED 580															  // approx 20 feet
-#define DAMAGE_FOR_FALL_SPEED (float)100 / (PLAYER_FATAL_FALL_SPEED - PLAYER_MAX_SAFE_FALL_SPEED) // damage per unit per second.
-#define PLAYER_MIN_BOUNCE_SPEED 200
-#define PLAYER_FALL_PUNCH_THRESHHOLD (float)350 // won't punch player's screen/make scrape noise unless player falling at least this fast.
+constexpr int PLAYER_FATAL_FALL_SPEED = 1024;															  // approx 60 feet
+constexpr int PLAYER_MAX_SAFE_FALL_SPEED = 580;														  // approx 20 feet
+constexpr float DAMAGE_FOR_FALL_SPEED = 100.0f / (PLAYER_FATAL_FALL_SPEED - PLAYER_MAX_SAFE_FALL_SPEED); // damage per unit per second.
+constexpr int PLAYER_MIN_BOUNCE_SPEED = 200;
+constexpr float PLAYER_FALL_PUNCH_THRESHHOLD = 350.0f;// won't punch player's screen/make scrape noise unless player falling at least this fast.
 
 //
 // Player PHYSICS FLAGS bits
 //
-#define PFLAG_ONLADDER (1 << 0)
-#define PFLAG_ONSWING (1 << 0)
-#define PFLAG_ONTRAIN (1 << 1)
-#define PFLAG_ONBARNACLE (1 << 2)
-#define PFLAG_DUCKING (1 << 3)	// In the process of ducking, but totally squatted yet
-#define PFLAG_USING (1 << 4)	// Using a continuous entity
-#define PFLAG_OBSERVER (1 << 5) // player is locked in stationary cam mode. Spectators can move, observers can't.
+constexpr int PFLAG_ONLADDER = (1 << 0);
+constexpr int PFLAG_ONSWING = (1 << 0);
+constexpr int PFLAG_ONTRAIN = (1 << 1);
+constexpr int PFLAG_ONBARNACLE = (1 << 2);
+constexpr int PFLAG_DUCKING = (1 << 3);	// In the process of ducking, but totally squatted yet
+constexpr int PFLAG_USING = (1 << 4);	// Using a continuous entity
+constexpr int PFLAG_OBSERVER = (1 << 5); // player is locked in stationary cam mode. Spectators can move, observers can't.
 
 //
 // generic player

From a7fdc164510a3f829101dccbb09303c7c734af50 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 16:17:33 -0400
Subject: [PATCH 024/291] Removed unreferenced variable

---
 src/game/server/gamerules/team.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/game/server/gamerules/team.cpp b/src/game/server/gamerules/team.cpp
index 187f20ca..cbf25b27 100644
--- a/src/game/server/gamerules/team.cpp
+++ b/src/game/server/gamerules/team.cpp
@@ -20,7 +20,6 @@ CTeam *CTeam::CreateTeam(const char *pszName, ulong ID)
 
 	//Create new team
 	CTeam* NewTeam = msnew CTeam;
-    char pszTeamName[MAX_TEAMNAME_LEN + 1];
 
 	strncpy((char*)NewTeam->m_TeamName, pszName, MAX_TEAMNAME_LEN);
 	NewTeam->m_ID = RANDOM_LONG(0, LONG_MAX); //Assign Unique ID

From f2742aded67d41eea48592ce7e741a018a1dc3a3 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 16:18:10 -0400
Subject: [PATCH 025/291] changed defines to enums

---
 src/game/server/hl/schedule.h        | 382 ++++++++++++++-------------
 src/game/server/monsters/msmonster.h |  34 ++-
 2 files changed, 212 insertions(+), 204 deletions(-)

diff --git a/src/game/server/hl/schedule.h b/src/game/server/hl/schedule.h
index 43ac067f..173da264 100644
--- a/src/game/server/hl/schedule.h
+++ b/src/game/server/hl/schedule.h
@@ -19,62 +19,62 @@
 #ifndef	SCHEDULE_H
 #define	SCHEDULE_H
 
-#define	TASKSTATUS_NEW				0			// Just started
-#define TASKSTATUS_RUNNING			1			// Running task & movement
-#define TASKSTATUS_RUNNING_MOVEMENT	2			// Just running movement
-#define TASKSTATUS_RUNNING_TASK		3			// Just running task
-#define TASKSTATUS_COMPLETE			4			// Completed, get next task
-
+enum {
+	TASKSTATUS_NEW = 0,			// Just started
+	TASKSTATUS_RUNNING = 1,		// Running task & movement
+	TASKSTATUS_RUNNING_MOVEMENT = 2,			// Just running movement
+	TASKSTATUS_RUNNING_TASK = 3,			// Just running task
+	TASKSTATUS_COMPLETE = 4		// Completed, get next task
+};
 
 //=========================================================
 // These are the schedule types
 //=========================================================
 typedef enum 
 {
-		SCHED_NONE = 0,
-		SCHED_IDLE_STAND,
-		SCHED_IDLE_WALK,
-		SCHED_WAKE_ANGRY,
-		SCHED_WAKE_CALLED,
-		SCHED_ALERT_FACE,
-		SCHED_ALERT_SMALL_FLINCH,
-		SCHED_ALERT_BIG_FLINCH,
-		SCHED_ALERT_STAND,
-		SCHED_INVESTIGATE_SOUND,
-		SCHED_COMBAT_FACE,
-		SCHED_COMBAT_STAND,
-		SCHED_CHASE_ENEMY,
-		SCHED_CHASE_ENEMY_FAILED,
-		SCHED_VICTORY_DANCE,
-		SCHED_TARGET_FACE,
-		SCHED_TARGET_CHASE,
-		SCHED_SMALL_FLINCH,
-		SCHED_TAKE_COVER_FROM_ENEMY,
-		SCHED_TAKE_COVER_FROM_BEST_SOUND,
-		SCHED_TAKE_COVER_FROM_ORIGIN,
-		SCHED_COWER, // usually a last resort!
-		SCHED_MELEE_ATTACK1,
-		SCHED_MELEE_ATTACK2,
-		SCHED_RANGE_ATTACK1,
-		SCHED_RANGE_ATTACK2,
-		SCHED_SPECIAL_ATTACK1,
-		SCHED_SPECIAL_ATTACK2,
-		SCHED_STANDOFF,
-		SCHED_ARM_WEAPON,
-		SCHED_RELOAD,
-		SCHED_GUARD,
-		SCHED_AMBUSH,
-		SCHED_DIE,
-		SCHED_WAIT_TRIGGER,
-		SCHED_FOLLOW,
-		SCHED_SLEEP,
-		SCHED_WAKE,
-		SCHED_BARNACLE_VICTIM_GRAB,
-		SCHED_BARNACLE_VICTIM_CHOMP,
-		SCHED_AISCRIPT,
-		SCHED_FAIL,
-
-		LAST_COMMON_SCHEDULE			// Leave this at the bottom
+	SCHED_NONE = 0,
+	SCHED_IDLE_STAND,
+	SCHED_IDLE_WALK,
+	SCHED_WAKE_ANGRY,
+	SCHED_WAKE_CALLED,
+	SCHED_ALERT_FACE,
+	SCHED_ALERT_SMALL_FLINCH,
+	SCHED_ALERT_BIG_FLINCH,
+	SCHED_ALERT_STAND,
+	SCHED_INVESTIGATE_SOUND,
+	SCHED_COMBAT_FACE,
+	SCHED_COMBAT_STAND,
+	SCHED_CHASE_ENEMY,
+	SCHED_CHASE_ENEMY_FAILED,
+	SCHED_VICTORY_DANCE,
+	SCHED_TARGET_FACE,
+	SCHED_TARGET_CHASE,
+	SCHED_SMALL_FLINCH,
+	SCHED_TAKE_COVER_FROM_ENEMY,
+	SCHED_TAKE_COVER_FROM_BEST_SOUND,
+	SCHED_TAKE_COVER_FROM_ORIGIN,
+	SCHED_COWER, // usually a last resort!
+	SCHED_MELEE_ATTACK1,
+	SCHED_MELEE_ATTACK2,
+	SCHED_RANGE_ATTACK1,
+	SCHED_RANGE_ATTACK2,
+	SCHED_SPECIAL_ATTACK1,
+	SCHED_SPECIAL_ATTACK2,
+	SCHED_STANDOFF,
+	SCHED_ARM_WEAPON,
+	SCHED_RELOAD,
+	SCHED_GUARD,
+	SCHED_AMBUSH,
+	SCHED_DIE,
+	SCHED_WAIT_TRIGGER,
+	SCHED_FOLLOW,
+	SCHED_SLEEP,
+	SCHED_WAKE,
+	SCHED_BARNACLE_VICTIM_GRAB,
+	SCHED_BARNACLE_VICTIM_CHOMP,
+	SCHED_AISCRIPT,
+	SCHED_FAIL,
+	LAST_COMMON_SCHEDULE			// Leave this at the bottom
 } SCHEDULE_TYPE;
 
 //=========================================================
@@ -82,97 +82,97 @@ typedef enum
 //=========================================================
 typedef enum 
 {
-		TASK_INVALID = 0,
-		TASK_WAIT,
-		TASK_WAIT_FACE_ENEMY,
-		TASK_WAIT_PVS,
-		TASK_SUGGEST_STATE,
-		TASK_WALK_TO_TARGET,
-		TASK_RUN_TO_TARGET,
-		TASK_MOVE_TO_TARGET_RANGE,
-		TASK_GET_PATH_TO_ENEMY,
-		TASK_GET_PATH_TO_ENEMY_LKP,
-		TASK_GET_PATH_TO_ENEMY_CORPSE,
-		TASK_GET_PATH_TO_LEADER,
-		TASK_GET_PATH_TO_SPOT,
-		TASK_GET_PATH_TO_TARGET,
-		TASK_GET_PATH_TO_HINTNODE,
-		TASK_GET_PATH_TO_LASTPOSITION,
-		TASK_GET_PATH_TO_BESTSOUND,
-		TASK_GET_PATH_TO_BESTSCENT,
-		TASK_RUN_PATH,	
-		TASK_WALK_PATH,	
-		TASK_STRAFE_PATH,
-		TASK_CLEAR_MOVE_WAIT,
-		TASK_STORE_LASTPOSITION,
-		TASK_CLEAR_LASTPOSITION,
-		TASK_PLAY_ACTIVE_IDLE,
-		TASK_FIND_HINTNODE,
-		TASK_CLEAR_HINTNODE,
-		TASK_SMALL_FLINCH,
-		TASK_FACE_IDEAL,
-		TASK_FACE_ROUTE,
-		TASK_FACE_ENEMY,
-		TASK_FACE_HINTNODE,
-		TASK_FACE_TARGET,
-		TASK_FACE_LASTPOSITION,
-		TASK_RANGE_ATTACK1,
-		TASK_RANGE_ATTACK2,		
-		TASK_MELEE_ATTACK1,		
-		TASK_MELEE_ATTACK2,		
-		TASK_RELOAD,
-		TASK_RANGE_ATTACK1_NOTURN,
-		TASK_RANGE_ATTACK2_NOTURN,		
-		TASK_MELEE_ATTACK1_NOTURN,		
-		TASK_MELEE_ATTACK2_NOTURN,		
-		TASK_RELOAD_NOTURN,
-		TASK_SPECIAL_ATTACK1,
-		TASK_SPECIAL_ATTACK2,
-		TASK_CROUCH,
-		TASK_STAND,
-		TASK_GUARD,
-		TASK_STEP_LEFT,
-		TASK_STEP_RIGHT,
-		TASK_STEP_FORWARD,
-		TASK_STEP_BACK,
-		TASK_DODGE_LEFT,
-		TASK_DODGE_RIGHT,
-		TASK_SOUND_ANGRY,
-		TASK_SOUND_DEATH,
-		TASK_SET_ACTIVITY,
-		TASK_SET_SCHEDULE,
-		TASK_SET_FAIL_SCHEDULE,
-		TASK_CLEAR_FAIL_SCHEDULE,
-		TASK_PLAY_SEQUENCE,
-		TASK_PLAY_SEQUENCE_FACE_ENEMY,
-		TASK_PLAY_SEQUENCE_FACE_TARGET,
-		TASK_SOUND_IDLE,
-		TASK_SOUND_WAKE,
-		TASK_SOUND_PAIN,
-		TASK_SOUND_DIE,
-		TASK_FIND_COVER_FROM_BEST_SOUND,// tries lateral cover first, then node cover
-		TASK_FIND_COVER_FROM_ENEMY,// tries lateral cover first, then node cover
-		TASK_FIND_LATERAL_COVER_FROM_ENEMY,
-		TASK_FIND_NODE_COVER_FROM_ENEMY,
-		TASK_FIND_NEAR_NODE_COVER_FROM_ENEMY,// data for this one is the MAXIMUM acceptable distance to the cover.
-		TASK_FIND_FAR_NODE_COVER_FROM_ENEMY,// data for this one is there MINIMUM aceptable distance to the cover.
-		TASK_FIND_COVER_FROM_ORIGIN,
-		TASK_EAT,
-		TASK_DIE,
-		TASK_WAIT_FOR_SCRIPT,
-		TASK_PLAY_SCRIPT,
-		TASK_ENABLE_SCRIPT,
-		TASK_PLANT_ON_SCRIPT,
-		TASK_FACE_SCRIPT,
-		TASK_WAIT_RANDOM,
-		TASK_WAIT_INDEFINITE,
-		TASK_STOP_MOVING,
-		TASK_TURN_LEFT,
-		TASK_TURN_RIGHT,
-		TASK_REMEMBER,
-		TASK_FORGET,
-		TASK_WAIT_FOR_MOVEMENT,			// wait until MovementIsComplete()
-		LAST_COMMON_TASK, // LEAVE THIS AT THE BOTTOM!! (sjb)
+	TASK_INVALID = 0,
+	TASK_WAIT,
+	TASK_WAIT_FACE_ENEMY,
+	TASK_WAIT_PVS,
+	TASK_SUGGEST_STATE,
+	TASK_WALK_TO_TARGET,
+	TASK_RUN_TO_TARGET,
+	TASK_MOVE_TO_TARGET_RANGE,
+	TASK_GET_PATH_TO_ENEMY,
+	TASK_GET_PATH_TO_ENEMY_LKP,
+	TASK_GET_PATH_TO_ENEMY_CORPSE,
+	TASK_GET_PATH_TO_LEADER,
+	TASK_GET_PATH_TO_SPOT,
+	TASK_GET_PATH_TO_TARGET,
+	TASK_GET_PATH_TO_HINTNODE,
+	TASK_GET_PATH_TO_LASTPOSITION,
+	TASK_GET_PATH_TO_BESTSOUND,
+	TASK_GET_PATH_TO_BESTSCENT,
+	TASK_RUN_PATH,	
+	TASK_WALK_PATH,	
+	TASK_STRAFE_PATH,
+	TASK_CLEAR_MOVE_WAIT,
+	TASK_STORE_LASTPOSITION,
+	TASK_CLEAR_LASTPOSITION,
+	TASK_PLAY_ACTIVE_IDLE,
+	TASK_FIND_HINTNODE,
+	TASK_CLEAR_HINTNODE,
+	TASK_SMALL_FLINCH,
+	TASK_FACE_IDEAL,
+	TASK_FACE_ROUTE,
+	TASK_FACE_ENEMY,
+	TASK_FACE_HINTNODE,
+	TASK_FACE_TARGET,
+	TASK_FACE_LASTPOSITION,
+	TASK_RANGE_ATTACK1,
+	TASK_RANGE_ATTACK2,		
+	TASK_MELEE_ATTACK1,		
+	TASK_MELEE_ATTACK2,		
+	TASK_RELOAD,
+	TASK_RANGE_ATTACK1_NOTURN,
+	TASK_RANGE_ATTACK2_NOTURN,		
+	TASK_MELEE_ATTACK1_NOTURN,		
+	TASK_MELEE_ATTACK2_NOTURN,		
+	TASK_RELOAD_NOTURN,
+	TASK_SPECIAL_ATTACK1,
+	TASK_SPECIAL_ATTACK2,
+	TASK_CROUCH,
+	TASK_STAND,
+	TASK_GUARD,
+	TASK_STEP_LEFT,
+	TASK_STEP_RIGHT,
+	TASK_STEP_FORWARD,
+	TASK_STEP_BACK,
+	TASK_DODGE_LEFT,
+	TASK_DODGE_RIGHT,
+	TASK_SOUND_ANGRY,
+	TASK_SOUND_DEATH,
+	TASK_SET_ACTIVITY,
+	TASK_SET_SCHEDULE,
+	TASK_SET_FAIL_SCHEDULE,
+	TASK_CLEAR_FAIL_SCHEDULE,
+	TASK_PLAY_SEQUENCE,
+	TASK_PLAY_SEQUENCE_FACE_ENEMY,
+	TASK_PLAY_SEQUENCE_FACE_TARGET,
+	TASK_SOUND_IDLE,
+	TASK_SOUND_WAKE,
+	TASK_SOUND_PAIN,
+	TASK_SOUND_DIE,
+	TASK_FIND_COVER_FROM_BEST_SOUND,// tries lateral cover first, then node cover
+	TASK_FIND_COVER_FROM_ENEMY,// tries lateral cover first, then node cover
+	TASK_FIND_LATERAL_COVER_FROM_ENEMY,
+	TASK_FIND_NODE_COVER_FROM_ENEMY,
+	TASK_FIND_NEAR_NODE_COVER_FROM_ENEMY,// data for this one is the MAXIMUM acceptable distance to the cover.
+	TASK_FIND_FAR_NODE_COVER_FROM_ENEMY,// data for this one is there MINIMUM aceptable distance to the cover.
+	TASK_FIND_COVER_FROM_ORIGIN,
+	TASK_EAT,
+	TASK_DIE,
+	TASK_WAIT_FOR_SCRIPT,
+	TASK_PLAY_SCRIPT,
+	TASK_ENABLE_SCRIPT,
+	TASK_PLANT_ON_SCRIPT,
+	TASK_FACE_SCRIPT,
+	TASK_WAIT_RANDOM,
+	TASK_WAIT_INDEFINITE,
+	TASK_STOP_MOVING,
+	TASK_TURN_LEFT,
+	TASK_TURN_RIGHT,
+	TASK_REMEMBER,
+	TASK_FORGET,
+	TASK_WAIT_FOR_MOVEMENT,			// wait until MovementIsComplete()
+	LAST_COMMON_TASK, // LEAVE THIS AT THE BOTTOM!! (sjb)
 } SHARED_TASKS;
 
 
@@ -229,62 +229,64 @@ struct WayPoint_t
 
 // these MoveFlag values are assigned to a WayPoint's TYPE in order to demonstrate the 
 // type of movement the monster should use to get there.
-#define bits_MF_TO_TARGETENT		( 1 << 0 ) // local move to targetent.
-#define bits_MF_TO_ENEMY			( 1 << 1 ) // local move to enemy
-#define bits_MF_TO_COVER			( 1 << 2 ) // local move to a hiding place
-#define bits_MF_TO_DETOUR			( 1 << 3 ) // local move to detour point.
-#define bits_MF_TO_PATHCORNER		( 1 << 4 ) // local move to a path corner
-#define bits_MF_TO_NODE				( 1 << 5 ) // local move to a node
-#define bits_MF_TO_LOCATION			( 1 << 6 ) // local move to an arbitrary point
-#define bits_MF_IS_GOAL				( 1 << 7 ) // this waypoint is the goal of the whole move.
-#define bits_MF_DONT_SIMPLIFY		( 1 << 8 ) // Don't let the route code simplify this waypoint
 
+enum {
+	bits_MF_TO_TARGETENT  = ( 1 << 0 ), // local move to targetent.
+	bits_MF_TO_ENEMY      = ( 1 << 1 ), // local move to enemy
+	bits_MF_TO_COVER	    = ( 1 << 2 ), // local move to a hiding place
+	bits_MF_TO_DETOUR		= ( 1 << 3 ), // local move to detour point.
+	bits_MF_TO_PATHCORNER	= ( 1 << 4 ), // local move to a path corner
+	bits_MF_TO_NODE	    = ( 1 << 5 ), // local move to a node
+	bits_MF_TO_LOCATION	= ( 1 << 6 ), // local move to an arbitrary point
+	bits_MF_IS_GOAL       = ( 1 << 7 ), // this waypoint is the goal of the whole move.
+	bits_MF_DONT_SIMPLIFY	= ( 1 << 8 ), // Don't let the route code simplify this waypoint
+	bits_MF_NOT_TO_MASK = (bits_MF_IS_GOAL | bits_MF_DONT_SIMPLIFY)
+};
 // If you define any flags that aren't _TO_ flags, add them here so we can mask
 // them off when doing compares.
-#define bits_MF_NOT_TO_MASK (bits_MF_IS_GOAL | bits_MF_DONT_SIMPLIFY)
-
-#define MOVEGOAL_NONE				(0)
-#define MOVEGOAL_TARGETENT			(bits_MF_TO_TARGETENT)
-#define MOVEGOAL_ENEMY				(bits_MF_TO_ENEMY)
-#define MOVEGOAL_PATHCORNER			(bits_MF_TO_PATHCORNER)
-#define MOVEGOAL_LOCATION			(bits_MF_TO_LOCATION)
-#define MOVEGOAL_NODE				(bits_MF_TO_NODE)
 
+enum {
+	MOVEGOAL_NONE       = 0,
+	MOVEGOAL_TARGETENT  = bits_MF_TO_TARGETENT,
+	MOVEGOAL_ENEMY      = bits_MF_TO_ENEMY,
+	MOVEGOAL_PATHCORNER = bits_MF_TO_PATHCORNER,
+	MOVEGOAL_LOCATION   = bits_MF_TO_LOCATION,
+	MOVEGOAL_NODE       = bits_MF_TO_NODE
+};
 // these bits represent conditions that may befall the monster, of which some are allowed 
 // to interrupt certain schedules. 
-#define bits_COND_NO_AMMO_LOADED		( 1 << 0 ) // weapon needs to be reloaded!
-#define	bits_COND_SEE_HATE				( 1 << 1 ) // see something that you hate
-#define bits_COND_SEE_FEAR				( 1 << 2 ) // see something that you are afraid of
-#define bits_COND_SEE_DISLIKE			( 1 << 3 ) // see something that you dislike
-#define bits_COND_SEE_ENEMY				( 1 << 4 ) // target entity is in full view.
-#define bits_COND_ENEMY_OCCLUDED		( 1 << 5 ) // target entity occluded by the world
-#define bits_COND_SMELL_FOOD			( 1 << 6 )
-#define bits_COND_ENEMY_TOOFAR			( 1 << 7 )
-#define bits_COND_LIGHT_DAMAGE			( 1 << 8 ) // hurt a little 
-#define bits_COND_HEAVY_DAMAGE			( 1 << 9 ) // hurt a lot
-#define bits_COND_CAN_RANGE_ATTACK1		( 1 << 10)
-#define bits_COND_CAN_MELEE_ATTACK1		( 1 << 11)
-#define bits_COND_CAN_RANGE_ATTACK2		( 1 << 12)
-#define bits_COND_CAN_MELEE_ATTACK2		( 1 << 13)
-// #define bits_COND_CAN_RANGE_ATTACK3		( 1 << 14)
-#define bits_COND_PROVOKED				( 1 << 15)
-#define bits_COND_NEW_ENEMY				( 1 << 16)
-#define bits_COND_HEAR_SOUND			( 1 << 17) // there is an interesting sound
-#define bits_COND_SMELL					( 1 << 18) // there is an interesting scent
-#define bits_COND_ENEMY_FACING_ME		( 1 << 19) // enemy is facing me
-#define bits_COND_ENEMY_DEAD			( 1 << 20) // enemy was killed. If you get this in combat, try to find another enemy. If you get it in alert, victory dance.
-#define bits_COND_SEE_CLIENT			( 1 << 21) // see a client
-#define bits_COND_SEE_NEMESIS			( 1 << 22) // see my nemesis
-
-#define bits_COND_SPECIAL1				( 1 << 28) // Defined by individual monster
-#define bits_COND_SPECIAL2				( 1 << 29) // Defined by individual monster
-
-#define bits_COND_TASK_FAILED			( 1 << 30)
-#define bits_COND_SCHEDULE_DONE			( 1 << 31)
 
+enum {
+	bits_COND_NO_AMMO_LOADED = (1 << 0),// weapon needs to be reloaded!
+	bits_COND_SEE_HATE = (1 << 1),// see something that you hate
+	bits_COND_SEE_FEAR = (1 << 2),// see something that you are afraid of
+	bits_COND_SEE_DISLIKE = (1 << 3),// see something that you dislike
+	bits_COND_SEE_ENEMY = (1 << 4),// target entity is in full view.
+	bits_COND_ENEMY_OCCLUDED = (1 << 5),// target entity occluded by the world
+	bits_COND_SMELL_FOOD = (1 << 6),
+	bits_COND_ENEMY_TOOFAR = (1 << 7),
+	bits_COND_LIGHT_DAMAGE = (1 << 8),// hurt a little 
+	bits_COND_HEAVY_DAMAGE = (1 << 9),// hurt a lot
+	bits_COND_CAN_RANGE_ATTACK1 = (1 << 10),
+	bits_COND_CAN_MELEE_ATTACK1 = (1 << 11),
+	bits_COND_CAN_RANGE_ATTACK2 = (1 << 12),
+	bits_COND_CAN_MELEE_ATTACK2 = (1 << 13),
+	//bits_COND_CAN_RANGE_ATTACK3     = ( 1 << 14),
+	bits_COND_PROVOKED = (1 << 15),
+	bits_COND_NEW_ENEMY = (1 << 16),
+	bits_COND_HEAR_SOUND = (1 << 17),// there is an interesting sound
+	bits_COND_SMELL = (1 << 18),// there is an interesting scent
+	bits_COND_ENEMY_FACING_ME = (1 << 19),// enemy is facing me
+	bits_COND_ENEMY_DEAD = (1 << 20),// enemy was killed. If you get this in combat, try to find another enemy. If you get it in alert, victory dance.
+	bits_COND_SEE_CLIENT = (1 << 21),// see a client
+	bits_COND_SEE_NEMESIS = (1 << 22),// see my nemesis
+	bits_COND_SPECIAL1 = (1 << 28),// Defined by individual monster
+	bits_COND_SPECIAL2 = (1 << 29),// Defined by individual monster
+	bits_COND_TASK_FAILED = (1 << 30),
+	bits_COND_SCHEDULE_DONE = (1 << 31),
+	bits_COND_ALL_SPECIAL = (bits_COND_SPECIAL1 | bits_COND_SPECIAL2),
+	bits_COND_CAN_ATTACK = (bits_COND_CAN_RANGE_ATTACK1 | bits_COND_CAN_MELEE_ATTACK1 | bits_COND_CAN_RANGE_ATTACK2 | bits_COND_CAN_MELEE_ATTACK2)
 
-#define bits_COND_ALL_SPECIAL			(bits_COND_SPECIAL1 | bits_COND_SPECIAL2)
-
-#define bits_COND_CAN_ATTACK			(bits_COND_CAN_RANGE_ATTACK1 | bits_COND_CAN_MELEE_ATTACK1 | bits_COND_CAN_RANGE_ATTACK2 | bits_COND_CAN_MELEE_ATTACK2)
+};
 
 #endif	// SCHEDULE_H
diff --git a/src/game/server/monsters/msmonster.h b/src/game/server/monsters/msmonster.h
index fee4544c..95d51bf0 100644
--- a/src/game/server/monsters/msmonster.h
+++ b/src/game/server/monsters/msmonster.h
@@ -200,22 +200,28 @@ struct random_monster_t
 //NOV2014_20 - Thothie msmonster_random [end]
 
 //Frame conditions
-#define FC_STEP (1 << 1)  //Monster walked up a step this frame
-#define FC_JUMP (1 << 2)  //Monster began a jump this frame
-#define FC_AVOID (1 << 3) //Monster is avoiding an object this frame
+
+enum {
+	FC_STEP = (1 << 1),  //Monster walked up a step this frame
+	FC_JUMP = (1 << 2),  //Monster began a jump this frame
+	FC_AVOID = (1 << 3) //Monster is avoiding an object this frame
+};
 
 //General Conditions (Added to those defined in schedule.h)
-#define MONSTER_ROAM (1 << 23)			// Monster should roam around
-#define MONSTER_HASMOVEDEST (1 << 24)	// vMoveDest is valid
-#define MONSTER_TRADING (1 << 25)		// NPC is trading with a player
-#define MONSTER_REFLECTIVEDMG (1 << 26) // Damage is reflected back to attacker
-#define MONSTER_NOAI (1 << 27)			// Don't normal script events
-#define MONSTER_OPENCONTAINER (1 << 28) // Player is looking inside a pack
-#define MONSTER_BLIND (1 << 29)			// MAR2008b - Monster is blind
-#define MONSTER_INVISIBLE (1 << 30)		// MAR2008b - Monster is invisible
-
-#define MAX_ENEMYLIST 12
-#define MAX_NPC_HANDS 3
+
+enum {
+	MONSTER_ROAM = (1 << 23),// Monster should roam around
+	MONSTER_HASMOVEDEST = (1 << 24),// vMoveDest is valid
+	MONSTER_TRADING = (1 << 25),// NPC is trading with a player
+	MONSTER_REFLECTIVEDMG = (1 << 26),// Damage is reflected back to attacker
+	MONSTER_NOAI = (1 << 27),// Don't normal script events
+	MONSTER_OPENCONTAINER = (1 << 28),// Player is looking inside a pack
+	MONSTER_BLIND = (1 << 29),// MAR2008b - Monster is blind
+	MONSTER_INVISIBLE = (1 << 30),// MAR2008b - Monster is invisible
+};
+
+constexpr int MAX_ENEMYLIST = 12;
+constexpr int MAX_NPC_HANDS = 3;
 
 class CMSMonster : public CBaseMonster
 {

From 51ffb9d83a59a929f019ab50dc0d1dd4653b6b2a Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 16:22:11 -0400
Subject: [PATCH 026/291] Changed to enum

---
 src/common/beamdef.h | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/common/beamdef.h b/src/common/beamdef.h
index 69876ceb..7c80afc1 100644
--- a/src/common/beamdef.h
+++ b/src/common/beamdef.h
@@ -18,18 +18,20 @@
 #pragma once
 #endif
 
-constexpr int FBEAM_STARTENTITY = 0x00000001;
-constexpr int FBEAM_ENDENTITY = 0x00000002;
-constexpr int FBEAM_FADEIN = 0x00000004;
-constexpr int FBEAM_FADEOUT = 0x00000008;
-constexpr int FBEAM_SINENOISE = 0x00000010;
-constexpr int FBEAM_SOLID = 0x00000020;
-constexpr int FBEAM_SHADEIN = 0x00000040;
-constexpr int FBEAM_SHADEOUT = 0x00000080;
-constexpr int FBEAM_STARTVISIBLE = 0x10000000; // Has this client actually seen this beam's start entity yet?;
-constexpr int FBEAM_ENDVISIBLE = 0x20000000;	  // Has this client actually seen this beam's end entity yet?;
-constexpr int FBEAM_ISACTIVE = 0x40000000;
-constexpr int FBEAM_FOREVER = 0x80000000;
+enum {
+	FBEAM_STARTENTITY  = 0x00000001,
+	FBEAM_ENDENTITY    = 0x00000002,
+	FBEAM_FADEIN       = 0x00000004,
+	FBEAM_FADEOUT      = 0x00000008,
+	FBEAM_SINENOISE    = 0x00000010,
+	FBEAM_SOLID        = 0x00000020,
+	FBEAM_SHADEIN      = 0x00000040,
+	FBEAM_SHADEOUT     = 0x00000080,
+	FBEAM_STARTVISIBLE = 0x10000000, // Has this client actually seen this beam's start entity yet?;
+	FBEAM_ENDVISIBLE   = 0x20000000,	  // Has this client actually seen this beam's end entity yet?;
+	FBEAM_ISACTIVE     = 0x40000000,
+	FBEAM_FOREVER      = 0x80000000
+};
 
 typedef struct beam_s BEAM;
 struct beam_s

From 5ebc2ec17d3961b502c8ae7daef1c13668a64fb6 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 16:25:08 -0400
Subject: [PATCH 027/291] changes flags to enum.

---
 src/common/com_model.h | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/common/com_model.h b/src/common/com_model.h
index ffdfb681..c8466505 100644
--- a/src/common/com_model.h
+++ b/src/common/com_model.h
@@ -38,15 +38,19 @@ constexpr int MAX_EDICTS = 2048;
 constexpr int ALIAS_Z_CLIP_PLANE = 5;
 
 // flags in finalvert_t.flags
-constexpr int ALIAS_LEFT_CLIP = 0x0001;
-constexpr int ALIAS_TOP_CLIP = 0x0002;
-constexpr int ALIAS_RIGHT_CLIP = 0x0004;
-constexpr int ALIAS_BOTTOM_CLIP = 0x0008;
-constexpr int ALIAS_Z_CLIP = 0x0010;
-constexpr int ALIAS_ONSEAM = 0x0020;
-constexpr int ALIAS_XY_CLIP_MASK = 0x000F;
-constexpr float ZISCALE = ((float)0x8000);
 
+
+enum {
+    ALIAS_LEFT_CLIP = 0x0001,
+    ALIAS_TOP_CLIP = 0x0002,
+    ALIAS_RIGHT_CLIP = 0x0004,
+    ALIAS_BOTTOM_CLIP = 0x0008,
+    ALIAS_Z_CLIP = 0x0010,
+    ALIAS_ONSEAM = 0x0020,
+    ALIAS_XY_CLIP_MASK = 0x000F
+};
+
+constexpr float ZISCALE = (float)0x8000;
 constexpr int CACHE_SIZE = 32; // used to align key data structures
 
 typedef enum

From a7782eef343c5129345fe25a3f84a84330763be8 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 16:28:41 -0400
Subject: [PATCH 028/291] Fixed cast warning

---
 src/game/shared/ms/mscharacter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/shared/ms/mscharacter.cpp b/src/game/shared/ms/mscharacter.cpp
index 8ec41031..002f3eec 100644
--- a/src/game/shared/ms/mscharacter.cpp
+++ b/src/game/shared/ms/mscharacter.cpp
@@ -303,7 +303,7 @@ void WriteItem(CPlayer_DataBuffer &gFile, genericitem_full_t &Item)
 	//Writing contained items should be the *LAST* thing you do
 	if (FBitSet(Item.Properties, ITEM_CONTAINER))
 	{
-		gFile.WriteShort(Item.ContainerItems.size()); //[SHORT] Container Item Total
+		gFile.WriteShort(static_cast<short>(Item.ContainerItems.size())); //[SHORT] Container Item Total
 
 		for (int i = 0; i < Item.ContainerItems.size(); i++)
 			WriteItem(gFile, Item.ContainerItems[i]);

From 364c1cbe56d6097a89d17ca056b355b0eee55f6d Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 16:28:51 -0400
Subject: [PATCH 029/291] fixed posix warning

---
 src/game/server/client.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/server/client.cpp b/src/game/server/client.cpp
index c7e3bcbb..b35faa01 100644
--- a/src/game/server/client.cpp
+++ b/src/game/server/client.cpp
@@ -2197,7 +2197,7 @@ const char *GetGameDescription()
 #else
 	char build[8] = {__DATE__[0], __DATE__[1], __DATE__[2], __DATE__[7], __DATE__[8], __DATE__[9], __DATE__[10]};
 	static char gameDesc[64];
-	sprintf(gameDesc, "MS:R - %sa", strupr(build));
+	sprintf(gameDesc, "MS:R - %sa", _strupr(build));
 #endif
 
 	return gameDesc;

From df1c90ecb54b23687596b343663394132bbf5191 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 17:02:01 -0400
Subject: [PATCH 030/291] Fixed cast warnings.

---
 src/game/server/sv_character.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/game/server/sv_character.cpp b/src/game/server/sv_character.cpp
index 1f49890f..0dd83ac8 100644
--- a/src/game/server/sv_character.cpp
+++ b/src/game/server/sv_character.cpp
@@ -584,11 +584,11 @@ void MSChar_Interface::SaveChar(CBasePlayer *pPlayer, savedata_t *pData)
 	//Save skills
 	gFile.WriteByte(CHARDATA_SKILLS1); //[BYTE - CHUNK - STATS]
 	statlist &StatList = pPlayer->m_Stats;
-	gFile.WriteByte(StatList.size()); //[BYTE]
+	gFile.WriteByte(static_cast<byte>(StatList.size())); //[BYTE]
 	for (int i = 0; i < StatList.size(); i++)
 	{
 		CStat &Stat = StatList[i];
-		gFile.WriteByte(Stat.m_SubStats.size()); //[BYTE]
+		gFile.WriteByte(static_cast<byte>(Stat.m_SubStats.size())); //[BYTE]
 		for (int r = 0; r < Stat.m_SubStats.size(); r++)
 		{
 			CSubStat &SubStat = Stat.m_SubStats[r];
@@ -600,7 +600,7 @@ void MSChar_Interface::SaveChar(CBasePlayer *pPlayer, savedata_t *pData)
 	//Save magic spells
 	spellgroup_v &SpellList = pPlayer->m_SpellList;
 	gFile.WriteByte(CHARDATA_SPELLS1); //[BYTE - CHUNK - SPELLS]
-	gFile.WriteByte(SpellList.size()); //[BYTE]
+	gFile.WriteByte(static_cast<byte>(SpellList.size())); //[BYTE]
 
 	for (int s = 0; s < SpellList.size(); s++)
 		gFile.WriteString(SpellList[s]); //[X STRINGS]
@@ -615,7 +615,7 @@ void MSChar_Interface::SaveChar(CBasePlayer *pPlayer, savedata_t *pData)
 		if (pPlayer->Gear[i] != pPlayer->PlayerHands) //Skip player hands
 			WriteList.add(pPlayer->Gear[i]);
 
-	gFile.WriteByte(WriteList.size()); //[BYTE]
+	gFile.WriteByte(static_cast<byte>(WriteList.size())); //[BYTE]
 
 	for (int i = 0; i < WriteList.size(); i++)
 	{
@@ -625,21 +625,21 @@ void MSChar_Interface::SaveChar(CBasePlayer *pPlayer, savedata_t *pData)
 
 	//Save storage items
 	gFile.WriteByte(CHARDATA_STORAGE1);			  //[BYTE - CHUNK - STORAGE ITEMS]
-	gFile.WriteShort(pPlayer->m_Storages.size()); //[SHORT]
+	gFile.WriteShort(static_cast<short>(pPlayer->m_Storages.size())); //[SHORT]
 
 	for (int s = 0; s < pPlayer->m_Storages.size(); s++)
 	{
 		storage_t &Storage = pPlayer->m_Storages[s];
 
 		gFile.WriteString(Storage.Name);		//[STRING]
-		gFile.WriteShort(Storage.Items.size()); //[SHORT]
+		gFile.WriteShort(static_cast<short>(Storage.Items.size())); //[SHORT]
 		for (int i = 0; i < Storage.Items.size(); i++)
 			WriteItem(gFile, Storage.Items[i]); //[X ITEMS]
 	}
 
 	//Save Companions
 	gFile.WriteByte(CHARDATA_COMPANIONS1);			//[BYTE - CHUNK - COMPANIONS]
-	gFile.WriteShort(pPlayer->m_Companions.size()); //[SHORT]
+	gFile.WriteShort(static_cast<short>(pPlayer->m_Companions.size())); //[SHORT]
 	static msstringlist SaveVarName, SaveVarValue;
 	SaveVarName.clearitems();
 	SaveVarValue.clearitems();
@@ -667,7 +667,7 @@ void MSChar_Interface::SaveChar(CBasePlayer *pPlayer, savedata_t *pData)
 				SaveVarValue.add(Script->m_Variables[v].Value);
 			}
 
-		gFile.WriteShort(SaveVarName.size()); //[SHORT]
+		gFile.WriteShort(static_cast<short>(SaveVarName.size())); //[SHORT]
 		for (int var = 0; var < SaveVarName.size(); var++)
 		{
 			gFile.WriteString(SaveVarName[var]);  //[STRING]
@@ -679,7 +679,7 @@ void MSChar_Interface::SaveChar(CBasePlayer *pPlayer, savedata_t *pData)
 
 	//Save Help tips
 	gFile.WriteByte(CHARDATA_HELPTIPS1);				//[BYTE - CHUNK - HELPTIPS]
-	gFile.WriteShort(pPlayer->m_ViewedHelpTips.size()); //[SHORT]
+	gFile.WriteShort(static_cast<short>(pPlayer->m_ViewedHelpTips.size())); //[SHORT]
 	for (int t = 0; t < pPlayer->m_ViewedHelpTips.size(); t++)
 		gFile.WriteString(pPlayer->m_ViewedHelpTips[t]); //[STRING]
 

From f6d7864fc369396ccf9cac91185cb53616160506 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 17:02:27 -0400
Subject: [PATCH 031/291] changed constexpr to enum where appropriate

---
 src/common/const.h | 1238 +++++++++++++++++++++++---------------------
 1 file changed, 638 insertions(+), 600 deletions(-)

diff --git a/src/common/const.h b/src/common/const.h
index b6c6e46f..765cd275 100644
--- a/src/common/const.h
+++ b/src/common/const.h
@@ -24,620 +24,660 @@
 constexpr double PI = 3.14159265358979323846;
 
 // edict->flags
-constexpr int FL_FLY = (1 << 0);	 // Changes the SV_Movestep() behavior to not need to be on ground
-constexpr int FL_SWIM = (1 << 1); // Changes the SV_Movestep() behavior to not need to be on ground (but stay in water)
-constexpr int FL_CONVEYOR = (1 << 2);
-constexpr int FL_CLIENT = (1 << 3);
-constexpr int FL_INWATER = (1 << 4);
-constexpr int FL_MONSTER = (1 << 5);
-constexpr int FL_GODMODE = (1 << 6);
-constexpr int FL_NOTARGET = (1 << 7);
-constexpr int FL_SKIPLOCALHOST = (1 << 8); // Don't send entity to local host, it's predicting this entity itself
-constexpr int FL_ONGROUND = (1 << 9);	   // At rest / on the ground
-constexpr int FL_PARTIALGROUND = (1 << 10);// not all corners are valid
-constexpr int FL_WATERJUMP = (1 << 11);   // player jumping out of water
-constexpr int FL_FROZEN = (1 << 12);	   // Player is frozen for 3rd person camera
-constexpr int FL_FAKECLIENT = (1 << 13);  // JAC: fake client, simulated server side; don't send network messages to them
-constexpr int FL_DUCKING = (1 << 14);	   // Player flag -- Player is fully crouched
-constexpr int FL_FLOAT = (1 << 15);	   // Apply floating force to this entity when in water
-constexpr int FL_GRAPHED = (1 << 16);	   // worldgraph has this ent listed as something that blocks a connection
-
-// UNDONE: Do we need these?
-constexpr int FL_IMMUNE_WATER = (1 << 17);
-//constexpr int FL_IMMUNE_SLIME (1 << 18);
-constexpr int FL_CLIENTONLY = (1 << 18);		// Strip edicts
-constexpr int FL_IMMUNE_LAVA = (1 << 19);
-
-constexpr int FL_PROXY = (1 << 20);		  // This is a spectator proxy
-constexpr int FL_ALWAYSTHINK = (1 << 21); // Brush model flag -- call think every frame regardless of nextthink - ltime (for constantly changing velocity/path)
-constexpr int FL_BASEVELOCITY = (1 << 22);// Base velocity has been applied this frame (used to convert base velocity into momentum)
-constexpr int FL_MONSTERCLIP = (1 << 23); // Only collide in with monsters who have FL_MONSTERCLIP set
-constexpr int FL_ONTRAIN = (1 << 24);	  // Player is _controlling_ a train, so movement commands should be ignored on client during prediction.
-constexpr int FL_WORLDBRUSH = (1 << 25);	  // Not moveable/removeable brush entity (really part of the world, but represented as an entity for transparency or something)
-constexpr int FL_SPECTATOR = (1 << 26);	  // This client is a spectator, don't run touch functions, etc.
-constexpr int FL_CUSTOMENTITY = (1 << 29); // This is a custom entity
-constexpr int FL_KILLME = (1 << 30);		  // This entity is marked for death -- This allows the engine to kill ents at the appropriate time
-constexpr int FL_DORMANT = (1 << 31);	  // Entity is dormant, no updates to client
 
+enum {
+	FL_FLY = (1 << 0),	 // Changes the SV_Movestep() behavior to not need to be on ground
+	FL_SWIM = (1 << 1), // Changes the SV_Movestep() behavior to not need to be on ground (but stay in water)
+	FL_CONVEYOR = (1 << 2),
+	FL_CLIENT = (1 << 3),
+	FL_INWATER = (1 << 4),
+	FL_MONSTER = (1 << 5),
+	FL_GODMODE = (1 << 6),
+	FL_NOTARGET = (1 << 7),
+	FL_SKIPLOCALHOST = (1 << 8), // Don't send entity to local host, it's predicting this entity itself
+	FL_ONGROUND = (1 << 9),	   // At rest / on the ground
+	FL_PARTIALGROUND = (1 << 10),// not all corners are valid
+	FL_WATERJUMP = (1 << 11),   // player jumping out of water
+	FL_FROZEN = (1 << 12),	   // Player is frozen for 3rd person camera
+	FL_FAKECLIENT = (1 << 13),  // JAC: fake client, simulated server side; don't send network messages to them
+	FL_DUCKING = (1 << 14),	   // Player flag -- Player is fully crouched
+	FL_FLOAT = (1 << 15),	   // Apply floating force to this entity when in water
+	FL_GRAPHED = (1 << 16),	   // worldgraph has this ent listed as something that blocks a connection
+    // UNDONE: Do we need these?
+	FL_IMMUNE_WATER = (1 << 17),
+    //FL_IMMUNE_SLIME (1 << 18);
+	FL_CLIENTONLY = (1 << 18),		// Strip edicts
+	FL_IMMUNE_LAVA = (1 << 19),
+	FL_PROXY = (1 << 20),		  // This is a spectator proxy
+	FL_ALWAYSTHINK = (1 << 21), // Brush model flag -- call think every frame regardless of nextthink - ltime (for constantly changing velocity/path)
+	FL_BASEVELOCITY = (1 << 22),// Base velocity has been applied this frame (used to convert base velocity into momentum)
+	FL_MONSTERCLIP = (1 << 23), // Only collide in with monsters who have FL_MONSTERCLIP set
+	FL_ONTRAIN = (1 << 24),	  // Player is _controlling_ a train, so movement commands should be ignored on client during prediction.
+	FL_WORLDBRUSH = (1 << 25),	  // Not moveable/removeable brush entity (really part of the world, but represented as an entity for transparency or something)
+	FL_SPECTATOR = (1 << 26),	  // This client is a spectator, don't run touch functions, etc.
+	FL_CUSTOMENTITY = (1 << 29), // This is a custom entity
+	FL_KILLME = (1 << 30),		  // This entity is marked for death -- This allows the engine to kill ents at the appropriate time
+	FL_DORMANT = (1 << 31)	  // Entity is dormant, no updates to client
+};
 // Goes into globalvars_t.trace_flags
+
 constexpr int FTRACE_SIMPLEBOX = (1 << 0); // Traceline with a simple box
 
 // walkmove modes
- constexpr int WALKMOVE_NORMAL = 0;	 // normal walkmove
- constexpr int WALKMOVE_WORLDONLY = 1; // doesn't hit ANY entities, no matter what the solid type
- constexpr int WALKMOVE_CHECKONLY = 2; // move, but don't touch triggers
+enum {
+	WALKMOVE_NORMAL = 0,	 // normal walkmove
+	WALKMOVE_WORLDONLY = 1, // doesn't hit ANY entities, no matter what the solid type
+	WALKMOVE_CHECKONLY = 2 // move, but don't touch triggers
+};
 
 // edict->movetype values
- constexpr int MOVETYPE_NONE = 0;
- constexpr int MOVETYPE_ANGLENOCLIP = 1;
- constexpr int MOVETYPE_ANGLECLIP = 2;
- constexpr int MOVETYPE_WALK = 3;		  // Player only - moving on the ground
- constexpr int MOVETYPE_STEP = 4;		  // gravity, special edge handling -- monsters use this
- constexpr int MOVETYPE_FLY = 5;		  // No gravity, but still collides with stuff
- constexpr int MOVETYPE_TOSS = 6;		  // gravity/collisions
- constexpr int MOVETYPE_PUSH = 7;		  // no clip to world, push and crush
- constexpr int MOVETYPE_NOCLIP = 8;  // No gravity, no collisions, still do velocity/avelocity
- constexpr int MOVETYPE_FLYMISSILE = 9; // extra size to monsters
- constexpr int MOVETYPE_BOUNCE = 10;		  // Just like Toss, but reflect velocity when contacting surfaces
- constexpr int MOVETYPE_BOUNCEMISSILE = 11;// bounce w/o gravity
- constexpr int MOVETYPE_FOLLOW = 12;		  // track movement of aiment
- constexpr int MOVETYPE_PUSHSTEP = 13;  // BSP model that needs physics/world collisions (uses nearest hull for world collision)
-
+enum {
+	MOVETYPE_NONE = 0,
+	MOVETYPE_ANGLENOCLIP = 1,
+	MOVETYPE_ANGLECLIP = 2,
+	MOVETYPE_WALK = 3,		  // Player only - moving on the ground
+	MOVETYPE_STEP = 4,		  // gravity, special edge handling -- monsters use this
+	MOVETYPE_FLY = 5,		  // No gravity, but still collides with stuff
+	MOVETYPE_TOSS = 6,		  // gravity/collisions
+	MOVETYPE_PUSH = 7,		  // no clip to world, push and crush
+	MOVETYPE_NOCLIP = 8,  // No gravity, no collisions, still do velocity/avelocity
+	MOVETYPE_FLYMISSILE = 9, // extra size to monsters
+	MOVETYPE_BOUNCE = 10,		  // Just like Toss, but reflect velocity when contacting surfaces
+	MOVETYPE_BOUNCEMISSILE = 11,// bounce w/o gravity
+	MOVETYPE_FOLLOW = 12,		  // track movement of aiment
+	MOVETYPE_PUSHSTEP = 13  // BSP model that needs physics/world collisions (uses nearest hull for world collision)
+};
 // edict->solid values
 // NOTE: Some movetypes will cause collisions independent of SOLID_NOT/SOLID_TRIGGER when the entity moves
 // SOLID only effects OTHER entities colliding with this one when they move - UGH!
-constexpr int SOLID_NOT = 0;	 // no interaction with other objects
-constexpr int SOLID_TRIGGER = 1;	 // touch on edge, but not blocking
-constexpr int SOLID_BBOX = 2;	 // touch on edge, block
-constexpr int SOLID_SLIDEBOX = 3;// touch on edge, but not an onground
-constexpr int SOLID_BSP = 4;	 // bsp clip, touch on edge, block
 
+enum {
+	SOLID_NOT = 0, // no interaction with other objects
+	SOLID_TRIGGER = 1,	 // touch on edge, but not blocking
+	SOLID_BBOX = 2,	 // touch on edge, block
+	SOLID_SLIDEBOX = 3,// touch on edge, but not an onground
+	SOLID_BSP = 4	 // bsp clip, touch on edge, block
+};
 // edict->deadflag values
-constexpr int DEAD_NO = 0;	 // alive
-constexpr int DEAD_DYING = 1; // playing death animation or still falling off of a ledge waiting to hit ground
-constexpr int DEAD_DEAD = 2;	 // dead. lying still.
-constexpr int DEAD_RESPAWNABLE = 3;
-constexpr int DEAD_DISCARDBODY = 4;
-
-constexpr int DAMAGE_NO = 0;
-constexpr int DAMAGE_YES = 1;
-constexpr int DAMAGE_AIM = 2;
-
-// entity effects
-constexpr int EF_BRIGHTFIELD = 1; // swirling cloud of particles
-constexpr int EF_MUZZLEFLASH = 2; // single frame ELIGHT on entity attachment 0
-constexpr int EF_BRIGHTLIGHT = 4;// DLIGHT centered at entity origin
-constexpr int EF_DIMLIGHT = 8;	 // player flashlight
-constexpr int EF_INVLIGHT = 16;	 // get lighting from ceiling
-constexpr int EF_NOINTERP = 32;	 // don't interpolate the next frame
-constexpr int EF_LIGHT = 64;	 // rocket flare glow sprite
-constexpr int EF_NODRAW = 128;	 // don't draw entity
+
+enum {
+	DEAD_NO = 0,	 // alive
+	DEAD_DYING = 1, // playing death animation or still falling off of a ledge waiting to hit ground
+	DEAD_DEAD = 2,	 // dead. lying still.
+	DEAD_RESPAWNABLE = 3,
+	DEAD_DISCARDBODY = 4
+};
+
+enum {
+	DAMAGE_NO = 0,
+	DAMAGE_YES = 1,
+	DAMAGE_AIM = 2
+};
+
+enum {
+	// entity effects
+	EF_BRIGHTFIELD = 1, // swirling cloud of particles
+	EF_MUZZLEFLASH = 2, // single frame ELIGHT on entity attachment 0
+	EF_BRIGHTLIGHT = 4,// DLIGHT centered at entity origin
+	EF_DIMLIGHT = 8,	 // player flashlight
+	EF_INVLIGHT = 16,	 // get lighting from ceiling
+	EF_NOINTERP = 32,	 // don't interpolate the next frame
+	EF_LIGHT = 64,	 // rocket flare glow sprite
+	EF_NODRAW = 128	 // don't draw entity
+};
 
 // entity flags
-constexpr int EFLAG_SLERP = 1; // do studio interpolation of this entity
-constexpr int EFLAG_FLESH_SOUND = 2;
+enum {
+	EFLAG_SLERP = 1, // do studio interpolation of this entity
+	EFLAG_FLESH_SOUND = 2
+};
+
+//temp entity explode flags
+
+enum {
+	TE_EXPLFLAG_NONE = 0,  // all flags clear makes default Half-Life explosion
+	TE_EXPLFLAG_NOADDITIVE = 1,  // sprite will be drawn opaque (ensure that the sprite you send is a non-additive sprite)
+	TE_EXPLFLAG_NODLIGHTS = 2,	  // do not render dynamic lights
+	TE_EXPLFLAG_NOSOUND = 4,  // do not play client explosion sound
+	TE_EXPLFLAG_NOPARTICLES = 8 // do not draw particles
+};
+
+
+//temp entity fire flags
+enum {
+	TEFIRE_FLAG_ALLFLOAT = 1,	// all sprites will drift upwards as they animate
+	TEFIRE_FLAG_SOMEFLOAT = 2, // some of the sprites will drift upwards. (50% chance)
+	TEFIRE_FLAG_LOOP = 4,		// if set, sprite plays at 15 fps, otherwise plays at whatever rate stretches the animation over the sprite's duration.
+	TEFIRE_FLAG_ALPHA = 8,		// if set, sprite is rendered alpha blended at 50% else, opaque
+	TEFIRE_FLAG_PLANAR = 16,// if set, all fire sprites have same initial Z instead of randomly filling a cube.
+	TEFIRE_FLAG_ADDITIVE = 32 // if set, sprite is rendered non-opaque with additive
+};
+
+// Temp entity bounce sound types
+
+enum {
+	TE_BOUNCE_NULL = 0,
+	TE_BOUNCE_SHELL = 1,
+	TE_BOUNCE_SHOTSHELL = 2
+};
 
 //
 // temp entity events
 //
-constexpr int TE_BEAMPOINTS = 0; // beam effect between two points
-// coord coord coord (start position)
-// coord coord coord (end position)
-// short (sprite index)
-// byte (starting frame)
-// byte (frame rate in 0.1's)
-// byte (life in 0.1's)
-// byte (line width in 0.1's)
-// byte (noise amplitude in 0.01's)
-// byte,byte,byte (color)
-// byte (brightness)
-// byte (scroll speed in 0.1's)
-
-constexpr int TE_BEAMENTPOINT = 1; // beam effect between point and entity
-// short (start entity)
-// coord coord coord (end position)
-// short (sprite index)
-// byte (starting frame)
-// byte (frame rate in 0.1's)
-// byte (life in 0.1's)
-// byte (line width in 0.1's)
-// byte (noise amplitude in 0.01's)
-// byte,byte,byte (color)
-// byte (brightness)
-// byte (scroll speed in 0.1's)
-
-constexpr int TE_GUNSHOT = 2; // particle effect plus ricochet sound
-// coord coord coord (position)
-
-constexpr int TE_EXPLOSION = 3; // additive sprite, 2 dynamic lights, flickering particles, explosion sound, move vertically 8 pps
-// coord coord coord (position)
-// short (sprite index)
-// byte (scale in 0.1's)
-// byte (framerate)
-// byte (flags)
-//
-// The Explosion effect has some flags to control performance/aesthetic features:
-constexpr int TE_EXPLFLAG_NONE = 0;	  // all flags clear makes default Half-Life explosion
-constexpr int TE_EXPLFLAG_NOADDITIVE = 1;  // sprite will be drawn opaque (ensure that the sprite you send is a non-additive sprite)
-constexpr int TE_EXPLFLAG_NODLIGHTS = 2;	  // do not render dynamic lights
-constexpr int TE_EXPLFLAG_NOSOUND = 4;  // do not play client explosion sound
-constexpr int TE_EXPLFLAG_NOPARTICLES = 8; // do not draw particles
-
-constexpr int TE_TAREXPLOSION = 4; // Quake1 "tarbaby" explosion with sound
-// coord coord coord (position)
-
-constexpr int TE_SMOKE = 5; // alphablend sprite, move vertically 30 pps
-// coord coord coord (position)
-// short (sprite index)
-// byte (scale in 0.1's)
-// byte (framerate)
-
-constexpr int TE_TRACER = 6; // tracer effect from point to point
-// coord, coord, coord (start)
-// coord, coord, coord (end)
-
-constexpr int TE_LIGHTNING = 7; // TE_BEAMPOINTS with simplified parameters
-// coord, coord, coord (start)
-// coord, coord, coord (end)
-// byte (life in 0.1's)
-// byte (width in 0.1's)
-// byte (amplitude in 0.01's)
-// short (sprite model index)
-
-constexpr int TE_BEAMENTS = 8;
-// short (start entity)
-// short (end entity)
-// short (sprite index)
-// byte (starting frame)
-// byte (frame rate in 0.1's)
-// byte (life in 0.1's)
-// byte (line width in 0.1's)
-// byte (noise amplitude in 0.01's)
-// byte,byte,byte (color)
-// byte (brightness)
-// byte (scroll speed in 0.1's)
-
-constexpr int TE_SPARKS = 9; // 8 random tracers with gravity, ricochet sprite
-// coord coord coord (position)
-
-constexpr int TE_LAVASPLASH = 10; // Quake1 lava splash
-// coord coord coord (position)
-
-constexpr int TE_TELEPORT = 11; // Quake1 teleport splash
-// coord coord coord (position)
-
-constexpr int TE_EXPLOSION2 = 12; // Quake1 colormaped (base palette) particle explosion with sound
-// coord coord coord (position)
-// byte (starting color)
-// byte (num colors)
-
-constexpr int TE_BSPDECAL = 13; // Decal from the .BSP file
-// coord, coord, coord (x,y,z), decal position (center of texture in world)
-// short (texture index of precached decal texture name)
-// short (entity index)
-// [optional - only included if previous short is non-zero (not the world)] short (index of model of above entity)
-
-constexpr int TE_IMPLOSION = 14; // tracers moving toward a point
-// coord, coord, coord (position)
-// byte (radius)
-// byte (count)
-// byte (life in 0.1's)
-
-constexpr int TE_SPRITETRAIL = 15; // line of moving glow sprites with gravity, fadeout, and collisions
-// coord, coord, coord (start)
-// coord, coord, coord (end)
-// short (sprite index)
-// byte (count)
-// byte (life in 0.1's)
-// byte (scale in 0.1's)
-// byte (velocity along vector in 10's)
-// byte (randomness of velocity in 10's)
-
-constexpr int TE_BEAM = 16; // obsolete
-
-constexpr int TE_SPRITE = 17; // additive sprite, plays 1 cycle
-// coord, coord, coord (position)
-// short (sprite index)
-// byte (scale in 0.1's)
-// byte (brightness)
-
-constexpr int TE_BEAMSPRITE = 18; // A beam with a sprite at the end
-// coord, coord, coord (start position)
-// coord, coord, coord (end position)
-// short (beam sprite index)
-// short (end sprite index)
-
-constexpr int TE_BEAMTORUS = 19; // screen aligned beam ring, expands to max radius over lifetime
-// coord coord coord (center position)
-// coord coord coord (axis and radius)
-// short (sprite index)
-// byte (starting frame)
-// byte (frame rate in 0.1's)
-// byte (life in 0.1's)
-// byte (line width in 0.1's)
-// byte (noise amplitude in 0.01's)
-// byte,byte,byte (color)
-// byte (brightness)
-// byte (scroll speed in 0.1's)
-
-constexpr int TE_BEAMDISK = 20; // disk that expands to max radius over lifetime
-// coord coord coord (center position)
-// coord coord coord (axis and radius)
-// short (sprite index)
-// byte (starting frame)
-// byte (frame rate in 0.1's)
-// byte (life in 0.1's)
-// byte (line width in 0.1's)
-// byte (noise amplitude in 0.01's)
-// byte,byte,byte (color)
-// byte (brightness)
-// byte (scroll speed in 0.1's)
-
-constexpr int TE_BEAMCYLINDER = 21; // cylinder that expands to max radius over lifetime
-// coord coord coord (center position)
-// coord coord coord (axis and radius)
-// short (sprite index)
-// byte (starting frame)
-// byte (frame rate in 0.1's)
-// byte (life in 0.1's)
-// byte (line width in 0.1's)
-// byte (noise amplitude in 0.01's)
-// byte,byte,byte (color)
-// byte (brightness)
-// byte (scroll speed in 0.1's)
-
-constexpr int TE_BEAMFOLLOW = 22; // create a line of decaying beam segments until entity stops moving
-// short (entity:attachment to follow)
-// short (sprite index)
-// byte (life in 0.1's)
-// byte (line width in 0.1's)
-// byte,byte,byte (color)
-// byte (brightness)
-
-constexpr int TE_GLOWSPRITE = 23;
-// coord, coord, coord (pos) short (model index) byte (scale / 10)
-
-constexpr int TE_BEAMRING = 24; // connect a beam ring to two entities
-// short (start entity)
-// short (end entity)
-// short (sprite index)
-// byte (starting frame)
-// byte (frame rate in 0.1's)
-// byte (life in 0.1's)
-// byte (line width in 0.1's)
-// byte (noise amplitude in 0.01's)
-// byte,byte,byte (color)
-// byte (brightness)
-// byte (scroll speed in 0.1's)
-
-constexpr int TE_STREAK_SPLASH = 25; // oriented shower of tracers
-// coord coord coord (start position)
-// coord coord coord (direction vector)
-// byte (color)
-// short (count)
-// short (base speed)
-// short (ramdon velocity)
-
-constexpr int TE_BEAMHOSE = 26; // obsolete
-
-constexpr int TE_DLIGHT = 27; // dynamic light, effect world, minor entity effect
-// coord, coord, coord (pos)
-// byte (radius in 10's)
-// byte byte byte (color)
-// byte (brightness)
-// byte (life in 10's)
-// byte (decay rate in 10's)
-
-constexpr int TE_ELIGHT = 28; // point entity light, no world effect
-// short (entity:attachment to follow)
-// coord coord coord (initial position)
-// coord (radius)
-// byte byte byte (color)
-// byte (life in 0.1's)
-// coord (decay rate)
-
-constexpr int TE_TEXTMESSAGE = 29;
-// short 1.2.13 x (-1 = center)
-// short 1.2.13 y (-1 = center)
-// byte Effect 0 = fade in/fade out
-// 1 is flickery credits
-// 2 is write out (training room)
-
-// 4 bytes r,g,b,a color1	(text color)
-// 4 bytes r,g,b,a color2	(effect color)
-// ushort 8.8 fadein time
-// ushort 8.8  fadeout time
-// ushort 8.8 hold time
-// optional ushort 8.8 fxtime	(time the highlight lags behing the leading text in effect 2)
-// string text message		(512 chars max sz string)
-constexpr int TE_LINE = 30;
-// coord, coord, coord		startpos
-// coord, coord, coord		endpos
-// short life in 0.1 s
-// 3 bytes r, g, b
-
-constexpr int TE_BOX = 31;
-// coord, coord, coord		boxmins
-// coord, coord, coord		boxmaxs
-// short life in 0.1 s
-// 3 bytes r, g, b
-
-constexpr int TE_KILLBEAM = 99; // kill all beams attached to entity
-// short (entity)
-
-constexpr int TE_LARGEFUNNEL = 100;
-// coord coord coord (funnel position)
-// short (sprite index)
-// short (flags)
-
-constexpr int TE_BLOODSTREAM = 101; // particle spray
-// coord coord coord (start position)
-// coord coord coord (spray vector)
-// byte (color)
-// byte (speed)
-
-constexpr int TE_SHOWLINE = 102; // line of particles every 5 units, dies in 30 seconds
-// coord coord coord (start position)
-// coord coord coord (end position)
-
-constexpr int TE_BLOOD = 103; // particle spray
-// coord coord coord (start position)
-// coord coord coord (spray vector)
-// byte (color)
-// byte (speed)
-
-constexpr int TE_DECAL = 104; // Decal applied to a brush entity (not the world)
-// coord, coord, coord (x,y,z), decal position (center of texture in world)
-// byte (texture index of precached decal texture name)
-// short (entity index)
-
-constexpr int TE_FIZZ = 105; // create alpha sprites inside of entity, float upwards
-// short (entity)
-// short (sprite index)
-// byte (density)
-
-constexpr int TE_MODEL = 106; // create a moving model that bounces and makes a sound when it hits
-// coord, coord, coord (position)
-// coord, coord, coord (velocity)
-// angle (initial yaw)
-// short (model index)
-// byte (bounce sound type)
-// byte (life in 0.1's)
-
-constexpr int TE_EXPLODEMODEL = 107; // spherical shower of models, picks from set
-// coord, coord, coord (origin)
-// coord (velocity)
-// short (model index)
-// short (count)
-// byte (life in 0.1's)
-
-constexpr int TE_BREAKMODEL = 108; // box of models or sprites
-// coord, coord, coord (position)
-// coord, coord, coord (size)
-// coord, coord, coord (velocity)
-// byte (random velocity in 10's)
-// short (sprite or model index)
-// byte (count)
-// byte (life in 0.1 secs)
-// byte (flags)
-
-constexpr int TE_GUNSHOTDECAL = 109; // decal and ricochet sound
-// coord, coord, coord (position)
-// short (entity index???)
-// byte (decal???)
-
-constexpr int TE_SPRITE_SPRAY = 110; // spay of alpha sprites
-// coord, coord, coord (position)
-// coord, coord, coord (velocity)
-// short (sprite index)
-// byte (count)
-// byte (speed)
-// byte (noise)
-
-constexpr int TE_ARMOR_RICOCHET = 111; // quick spark sprite, client ricochet sound.
-// coord, coord, coord (position)
-// byte (scale in 0.1's)
-
-constexpr int TE_PLAYERDECAL = 112; // ???
-// byte (playerindex)
-// coord, coord, coord (position)
-// short (entity???)
-// byte (decal number???)
-// [optional] short (model index???)
-
-constexpr int TE_BUBBLES = 113; // create alpha sprites inside of box, float upwards
-// coord, coord, coord (min start position)
-// coord, coord, coord (max start position)
-// coord (float height)
-// short (model index)
-// byte (count)
-// coord (speed)
-
-constexpr int TE_BUBBLETRAIL = 114; // create alpha sprites along a line, float upwards
-// coord, coord, coord (min start position)
-// coord, coord, coord (max start position)
-// coord (float height)
-// short (model index)
-// byte (count)
-// coord (speed)
-
-constexpr int TE_BLOODSPRITE = 115; // spray of opaque sprite1's that fall, single sprite2 for 1..2 secs (this is a high-priority tent)
-// coord, coord, coord (position)
-// short (sprite1 index)
-// short (sprite2 index)
-// byte (color)
-// byte (scale)
-
-constexpr int TE_WORLDDECAL = 116; // Decal applied to the world brush
-// coord, coord, coord (x,y,z), decal position (center of texture in world)
-// byte (texture index of precached decal texture name)
-
-constexpr int TE_WORLDDECALHIGH = 117; // Decal (with texture index > 256) applied to world brush
-// coord, coord, coord (x,y,z), decal position (center of texture in world)
-// byte (texture index of precached decal texture name - 256)
-
-constexpr int TE_DECALHIGH = 118; // Same as TE_DECAL, but the texture index was greater than 256
-// coord, coord, coord (x,y,z), decal position (center of texture in world)
-// byte (texture index of precached decal texture name - 256)
-// short (entity index)
-
-constexpr int TE_PROJECTILE = 119; // Makes a projectile (like a nail) (this is a high-priority tent)
-// coord, coord, coord (position)
-// coord, coord, coord (velocity)
-// short (modelindex)
-// byte (life)
-// byte (owner)  projectile won't collide with owner (if owner == 0, projectile will hit any client).
-
-constexpr int TE_SPRAY = 120; // Throws a shower of sprites or models
-// coord, coord, coord (position)
-// coord, coord, coord (direction)
-// short (modelindex)
-// byte (count)
-// byte (speed)
-// byte (noise)
-// byte (rendermode)
-
-constexpr int TE_PLAYERSPRITES = 121; // sprites emit from a player's bounding box (ONLY use for players!)
-// byte (playernum)
-// short (sprite modelindex)
-// byte (count)
-// byte (variance) (0 = no variance in size) (10 = 10% variance in size)
-
-constexpr int TE_PARTICLEBURST = 122; // very similar to lavasplash.
-// coord (origin)
-// short (radius)
-// byte (particle color)
-// byte (duration * 10) (will be randomized a bit)
-
-constexpr int TE_FIREFIELD = 123; // makes a field of fire.
-// coord (origin)
-// short (radius) (fire is made in a square around origin. -radius, -radius to radius, radius)
-// short (modelindex)
-// byte (count)
-// byte (flags)
-// byte (duration (in seconds) * 10) (will be randomized a bit)
-//
-// to keep network traffic low, this message has associated flags that fit into a byte:
-constexpr int TEFIRE_FLAG_ALLFLOAT = 1;	// all sprites will drift upwards as they animate
-constexpr int TEFIRE_FLAG_SOMEFLOAT = 2; // some of the sprites will drift upwards. (50% chance)
-constexpr int TEFIRE_FLAG_LOOP = 4;		// if set, sprite plays at 15 fps, otherwise plays at whatever rate stretches the animation over the sprite's duration.
-constexpr int TEFIRE_FLAG_ALPHA = 8;		// if set, sprite is rendered alpha blended at 50% else, opaque
-constexpr int TEFIRE_FLAG_PLANAR = 16;// if set, all fire sprites have same initial Z instead of randomly filling a cube.
-constexpr int TEFIRE_FLAG_ADDITIVE = 32; // if set, sprite is rendered non-opaque with additive
-
-constexpr int TE_PLAYERATTACHMENT = 124; // attaches a TENT to a player (this is a high-priority tent)
-// byte (entity index of player)
-// coord (vertical offset) ( attachment origin.z = player origin.z + vertical offset )
-// short (model index)
-// short (life * 10 );
-
-constexpr int TE_KILLPLAYERATTACHMENTS = 125; // will expire all TENTS attached to a player.
-// byte (entity index of player)
-
-constexpr int TE_MULTIGUNSHOT = 126; // much more compact shotgun message
-// This message is used to make a client approximate a 'spray' of gunfire.
-// Any weapon that fires more than one bullet per frame and fires in a bit of a spread is
-// a good candidate for MULTIGUNSHOT use. (shotguns)
-//
-// NOTE: This effect makes the client do traces for each bullet, these client traces ignore
-//		 entities that have studio models.Traces are 4096 long.
-//
-// coord (origin)
-// coord (origin)
-// coord (origin)
-// coord (direction)
-// coord (direction)
-// coord (direction)
-// coord (x noise * 100)
-// coord (y noise * 100)
-// byte (count)
-// byte (bullethole decal texture index)
-
-constexpr int TE_USERTRACER = 127; // larger message than the standard tracer, but allows some customization.
-// coord (origin)
-// coord (origin)
-// coord (origin)
-// coord (velocity)
-// coord (velocity)
-// coord (velocity)
-// byte ( life * 10 )
-// byte ( color ) this is an index into an array of color vectors in the engine. (0 - )
-// byte ( length * 10 )
-
-constexpr int MSG_BROADCAST = 0;		 // unreliable to all
-constexpr int MSG_ONE = 1;		 // reliable to one (msg_entity)
-constexpr int MSG_ALL = 2;		 // reliable to all
-constexpr int MSG_INIT = 3;			 // write to the init string
-constexpr int MSG_PVS = 4;	 // Ents in PVS of org
-constexpr int MSG_PAS = 5;	 // Ents in PAS of org
-constexpr int MSG_PVS_R = 6;		 // Reliable to PVS
-constexpr int MSG_PAS_R = 7;		 // Reliable to PAS
-constexpr int MSG_ONE_UNRELIABLE = 8; // Send to one client, but don't put in reliable stream, put in unreliable datagram ( could be dropped )
-constexpr int MSG_SPEC = 9;			 // Sends to all spectator proxies
+
+enum {
+	TE_BEAMPOINTS = 0, // beam effect between two points
+	// coord coord coord (start position)
+	// coord coord coord (end position)
+	// short (sprite index)
+	// byte (starting frame)
+	// byte (frame rate in 0.1's)
+	// byte (life in 0.1's)
+	// byte (line width in 0.1's)
+	// byte (noise amplitude in 0.01's)
+	// byte,byte,byte (color)
+	// byte (brightness)
+	// byte (scroll speed in 0.1's)
+
+	TE_BEAMENTPOINT = 1, // beam effect between point and entity
+	// short (start entity)
+	// coord coord coord (end position)
+	// short (sprite index)
+	// byte (starting frame)
+	// byte (frame rate in 0.1's)
+	// byte (life in 0.1's)
+	// byte (line width in 0.1's)
+	// byte (noise amplitude in 0.01's)
+	// byte,byte,byte (color)
+	// byte (brightness)
+	// byte (scroll speed in 0.1's)
+
+	TE_GUNSHOT = 2, // particle effect plus ricochet sound
+	// coord coord coord (position)
+
+	TE_EXPLOSION = 3, // additive sprite, 2 dynamic lights, flickering particles, explosion sound, move vertically 8 pps
+	// coord coord coord (position)
+	// short (sprite index)
+	// byte (scale in 0.1's)
+	// byte (framerate)
+	// byte (flags)
+	//
+	// The Explosion effect has some flags to control performance/aesthetic features:
+
+	TE_TAREXPLOSION = 4, // Quake1 "tarbaby" explosion with sound
+	// coord coord coord (position)
+
+	TE_SMOKE = 5, // alphablend sprite, move vertically 30 pps
+	// coord coord coord (position)
+	// short (sprite index)
+	// byte (scale in 0.1's)
+	// byte (framerate)
+
+	TE_TRACER = 6, // tracer effect from point to point
+	// coord, coord, coord (start)
+	// coord, coord, coord (end)
+
+	TE_LIGHTNING = 7, // TE_BEAMPOINTS with simplified parameters
+	// coord, coord, coord (start)
+	// coord, coord, coord (end)
+	// byte (life in 0.1's)
+	// byte (width in 0.1's)
+	// byte (amplitude in 0.01's)
+	// short (sprite model index)
+
+	TE_BEAMENTS = 8,
+	// short (start entity)
+	// short (end entity)
+	// short (sprite index)
+	// byte (starting frame)
+	// byte (frame rate in 0.1's)
+	// byte (life in 0.1's)
+	// byte (line width in 0.1's)
+	// byte (noise amplitude in 0.01's)
+	// byte,byte,byte (color)
+	// byte (brightness)
+	// byte (scroll speed in 0.1's)
+
+	TE_SPARKS = 9, // 8 random tracers with gravity, ricochet sprite
+	// coord coord coord (position)
+
+	TE_LAVASPLASH = 10, // Quake1 lava splash
+	// coord coord coord (position)
+	
+	TE_TELEPORT = 11, // Quake1 teleport splash
+	// coord coord coord (position)
+	
+	TE_EXPLOSION2 = 12, // Quake1 colormaped (base palette) particle explosion with sound
+	// coord coord coord (position)
+	// byte (starting color)
+	// byte (num colors)
+	
+	TE_BSPDECAL = 13, // Decal from the .BSP file
+	// coord, coord, coord (x,y,z), decal position (center of texture in world)
+	// short (texture index of precached decal texture name)
+	// short (entity index)
+	// [optional - only included if previous short is non-zero (not the world)] short (index of model of above entity)
+	
+	TE_IMPLOSION = 14, // tracers moving toward a point
+	// coord, coord, coord (position)
+	// byte (radius)
+	// byte (count)
+	// byte (life in 0.1's)
+	
+	TE_SPRITETRAIL = 15, // line of moving glow sprites with gravity, fadeout, and collisions
+	// coord, coord, coord (start)
+	// coord, coord, coord (end)
+	// short (sprite index)
+	// byte (count)
+	// byte (life in 0.1's)
+	// byte (scale in 0.1's)
+	// byte (velocity along vector in 10's)
+	// byte (randomness of velocity in 10's)
+	
+	TE_BEAM = 16, // obsolete
+	
+	TE_SPRITE = 17, // additive sprite, plays 1 cycle
+	// coord, coord, coord (position)
+	// short (sprite index)
+	// byte (scale in 0.1's)
+	// byte (brightness)
+	
+	TE_BEAMSPRITE = 18, // A beam with a sprite at the end
+	// coord, coord, coord (start position)
+	// coord, coord, coord (end position)
+	// short (beam sprite index)
+	// short (end sprite index)
+	
+	TE_BEAMTORUS = 19, // screen aligned beam ring, expands to max radius over lifetime
+	// coord coord coord (center position)
+	// coord coord coord (axis and radius)
+	// short (sprite index)
+	// byte (starting frame)
+	// byte (frame rate in 0.1's)
+	// byte (life in 0.1's)
+	// byte (line width in 0.1's)
+	// byte (noise amplitude in 0.01's)
+	// byte,byte,byte (color)
+	// byte (brightness)
+	// byte (scroll speed in 0.1's)
+	
+	TE_BEAMDISK = 20, // disk that expands to max radius over lifetime
+	// coord coord coord (center position)
+	// coord coord coord (axis and radius)
+	// short (sprite index)
+	// byte (starting frame)
+	// byte (frame rate in 0.1's)
+	// byte (life in 0.1's)
+	// byte (line width in 0.1's)
+	// byte (noise amplitude in 0.01's)
+	// byte,byte,byte (color)
+	// byte (brightness)
+	// byte (scroll speed in 0.1's)
+	
+	TE_BEAMCYLINDER = 21, // cylinder that expands to max radius over lifetime
+	// coord coord coord (center position)
+	// coord coord coord (axis and radius)
+	// short (sprite index)
+	// byte (starting frame)
+	// byte (frame rate in 0.1's)
+	// byte (life in 0.1's)
+	// byte (line width in 0.1's)
+	// byte (noise amplitude in 0.01's)
+	// byte,byte,byte (color)
+	// byte (brightness)
+	// byte (scroll speed in 0.1's)
+	
+	TE_BEAMFOLLOW = 22, // create a line of decaying beam segments until entity stops moving
+	// short (entity:attachment to follow)
+	// short (sprite index)
+	// byte (life in 0.1's)
+	// byte (line width in 0.1's)
+	// byte,byte,byte (color)
+	// byte (brightness)
+	
+	TE_GLOWSPRITE = 23,
+	// coord, coord, coord (pos) short (model index) byte (scale / 10)
+	
+	TE_BEAMRING = 24, // connect a beam ring to two entities
+	// short (start entity)
+	// short (end entity)
+	// short (sprite index)
+	// byte (starting frame)
+	// byte (frame rate in 0.1's)
+	// byte (life in 0.1's)
+	// byte (line width in 0.1's)
+	// byte (noise amplitude in 0.01's)
+	// byte,byte,byte (color)
+	// byte (brightness)
+	// byte (scroll speed in 0.1's)
+	
+	TE_STREAK_SPLASH = 25, // oriented shower of tracers
+	// coord coord coord (start position)
+	// coord coord coord (direction vector)
+	// byte (color)
+	// short (count)
+	// short (base speed)
+	// short (ramdon velocity)
+	
+	TE_BEAMHOSE = 26, // obsolete
+	
+	TE_DLIGHT = 27, // dynamic light, effect world, minor entity effect
+	// coord, coord, coord (pos)
+	// byte (radius in 10's)
+	// byte byte byte (color)
+	// byte (brightness)
+	// byte (life in 10's)
+	// byte (decay rate in 10's)
+	
+	TE_ELIGHT = 28, // point entity light, no world effect
+	// short (entity:attachment to follow)
+	// coord coord coord (initial position)
+	// coord (radius)
+	// byte byte byte (color)
+	// byte (life in 0.1's)
+	// coord (decay rate)
+	
+	TE_TEXTMESSAGE = 29,
+	// short 1.2.13 x (-1 = center)
+	// short 1.2.13 y (-1 = center)
+	// byte Effect 0 = fade in/fade out
+	// 1 is flickery credits
+	// 2 is write out (training room)
+	
+	// 4 bytes r,g,b,a color1	(text color)
+	// 4 bytes r,g,b,a color2	(effect color)
+	// ushort 8.8 fadein time
+	// ushort 8.8  fadeout time
+	// ushort 8.8 hold time
+	// optional ushort 8.8 fxtime	(time the highlight lags behing the leading text in effect 2)
+	// string text message		(512 chars max sz string)
+	TE_LINE = 30,
+	// coord, coord, coord		startpos
+	// coord, coord, coord		endpos
+	// short life in 0.1 s
+	// 3 bytes r, g, b
+	
+	TE_BOX = 31,
+	// coord, coord, coord		boxmins
+	// coord, coord, coord		boxmaxs
+	// short life in 0.1 s
+	// 3 bytes r, g, b
+	
+	TE_KILLBEAM = 99, // kill all beams attached to entity
+	// short (entity)
+	
+	TE_LARGEFUNNEL = 100,
+	// coord coord coord (funnel position)
+	// short (sprite index)
+	// short (flags)
+	
+	TE_BLOODSTREAM = 101, // particle spray
+	// coord coord coord (start position)
+	// coord coord coord (spray vector)
+	// byte (color)
+	// byte (speed)
+	
+	TE_SHOWLINE = 102, // line of particles every 5 units, dies in 30 seconds
+	// coord coord coord (start position)
+	// coord coord coord (end position)
+	
+	TE_BLOOD = 103, // particle spray
+	// coord coord coord (start position)
+	// coord coord coord (spray vector)
+	// byte (color)
+	// byte (speed)
+	
+	TE_DECAL = 104, // Decal applied to a brush entity (not the world)
+	// coord, coord, coord (x,y,z), decal position (center of texture in world)
+	// byte (texture index of precached decal texture name)
+	// short (entity index)
+	
+	TE_FIZZ = 105, // create alpha sprites inside of entity, float upwards
+	// short (entity)
+	// short (sprite index)
+	// byte (density)
+	
+	TE_MODEL = 106, // create a moving model that bounces and makes a sound when it hits
+	// coord, coord, coord (position)
+	// coord, coord, coord (velocity)
+	// angle (initial yaw)
+	// short (model index)
+	// byte (bounce sound type)
+	// byte (life in 0.1's)
+	
+	TE_EXPLODEMODEL = 107, // spherical shower of models, picks from set
+	// coord, coord, coord (origin)
+	// coord (velocity)
+	// short (model index)
+	// short (count)
+	// byte (life in 0.1's)
+	
+	TE_BREAKMODEL = 108, // box of models or sprites
+	// coord, coord, coord (position)
+	// coord, coord, coord (size)
+	// coord, coord, coord (velocity)
+	// byte (random velocity in 10's)
+	// short (sprite or model index)
+	// byte (count)
+	// byte (life in 0.1 secs)
+	// byte (flags)
+	
+	TE_GUNSHOTDECAL = 109, // decal and ricochet sound
+	// coord, coord, coord (position)
+	// short (entity index???)
+	// byte (decal???)
+	
+	TE_SPRITE_SPRAY = 110, // spay of alpha sprites
+	// coord, coord, coord (position)
+	// coord, coord, coord (velocity)
+	// short (sprite index)
+	// byte (count)
+	// byte (speed)
+	// byte (noise)
+	
+	TE_ARMOR_RICOCHET = 111, // quick spark sprite, client ricochet sound.
+	// coord, coord, coord (position)
+	// byte (scale in 0.1's)
+	
+	TE_PLAYERDECAL = 112, // ???
+	// byte (playerindex)
+	// coord, coord, coord (position)
+	// short (entity???)
+	// byte (decal number???)
+	// [optional] short (model index???)
+	
+	TE_BUBBLES = 113, // create alpha sprites inside of box, float upwards
+	// coord, coord, coord (min start position)
+	// coord, coord, coord (max start position)
+	// coord (float height)
+	// short (model index)
+	// byte (count)
+	// coord (speed)
+	
+	TE_BUBBLETRAIL = 114, // create alpha sprites along a line, float upwards
+	// coord, coord, coord (min start position)
+	// coord, coord, coord (max start position)
+	// coord (float height)
+	// short (model index)
+	// byte (count)
+	// coord (speed)
+	
+	TE_BLOODSPRITE = 115, // spray of opaque sprite1's that fall, single sprite2 for 1..2 secs (this is a high-priority tent)
+	// coord, coord, coord (position)
+	// short (sprite1 index)
+	// short (sprite2 index)
+	// byte (color)
+	// byte (scale)
+	
+	TE_WORLDDECAL = 116, // Decal applied to the world brush
+	// coord, coord, coord (x,y,z), decal position (center of texture in world)
+	// byte (texture index of precached decal texture name)
+	
+	TE_WORLDDECALHIGH = 117, // Decal (with texture index > 256) applied to world brush
+	// coord, coord, coord (x,y,z), decal position (center of texture in world)
+	// byte (texture index of precached decal texture name - 256)
+	
+	TE_DECALHIGH = 118, // Same as TE_DECAL, but the texture index was greater than 256
+	// coord, coord, coord (x,y,z), decal position (center of texture in world)
+	// byte (texture index of precached decal texture name - 256)
+	// short (entity index)
+	
+	TE_PROJECTILE = 119, // Makes a projectile (like a nail) (this is a high-priority tent)
+	// coord, coord, coord (position)
+	// coord, coord, coord (velocity)
+	// short (modelindex)
+	// byte (life)
+	// byte (owner)  projectile won't collide with owner (if owner == 0, projectile will hit any client).
+	
+	TE_SPRAY = 120, // Throws a shower of sprites or models
+	// coord, coord, coord (position)
+	// coord, coord, coord (direction)
+	// short (modelindex)
+	// byte (count)
+	// byte (speed)
+	// byte (noise)
+	// byte (rendermode)
+	
+	TE_PLAYERSPRITES = 121, // sprites emit from a player's bounding box (ONLY use for players!)
+	// byte (playernum)
+	// short (sprite modelindex)
+	// byte (count)
+	// byte (variance) (0 = no variance in size) (10 = 10% variance in size)
+	
+	TE_PARTICLEBURST = 122, // very similar to lavasplash.
+	// coord (origin)
+	// short (radius)
+	// byte (particle color)
+	// byte (duration * 10) (will be randomized a bit)
+	
+	TE_FIREFIELD = 123, // makes a field of fire.
+	// coord (origin)
+	// short (radius) (fire is made in a square around origin. -radius, -radius to radius, radius)
+	// short (modelindex)
+	// byte (count)
+	// byte (flags)
+	// byte (duration (in seconds) * 10) (will be randomized a bit)
+	//
+	// to keep network traffic low, this message has associated flags that fit into a byte:
+	
+	TE_PLAYERATTACHMENT = 124, // attaches a TENT to a player (this is a high-priority tent)
+	// byte (entity index of player)
+	// coord (vertical offset) ( attachment origin.z = player origin.z + vertical offset )
+	// short (model index)
+	// short (life * 10 ),
+	
+	TE_KILLPLAYERATTACHMENTS = 125, // will expire all TENTS attached to a player.
+	// byte (entity index of player)
+	
+	TE_MULTIGUNSHOT = 126, // much more compact shotgun message
+	// This message is used to make a client approximate a 'spray' of gunfire.
+	// Any weapon that fires more than one bullet per frame and fires in a bit of a spread is
+	// a good candidate for MULTIGUNSHOT use. (shotguns)
+	//
+	// NOTE: This effect makes the client do traces for each bullet, these client traces ignore
+	//		 entities that have studio models.Traces are 4096 long.
+	//
+	// coord (origin)
+	// coord (origin)
+	// coord (origin)
+	// coord (direction)
+	// coord (direction)
+	// coord (direction)
+	// coord (x noise * 100)
+	// coord (y noise * 100)
+	// byte (count)
+	// byte (bullethole decal texture index)
+	
+	TE_USERTRACER = 127 // larger message than the standard tracer, but allows some customization.
+	// coord (origin)
+	// coord (origin)
+	// coord (origin)
+	// coord (velocity)
+	// coord (velocity)
+	// coord (velocity)
+	// byte ( life * 10 )
+	// byte ( color ) this is an index into an array of color vectors in the engine. (0 - )
+	// byte ( length * 10 )
+};
+
+enum {
+	MSG_BROADCAST = 0,		 // unreliable to all
+	MSG_ONE = 1,		 // reliable to one (msg_entity)
+	MSG_ALL = 2,		 // reliable to all
+	MSG_INIT = 3,			 // write to the init string
+	MSG_PVS = 4,	 // Ents in PVS of org
+	MSG_PAS = 5,	 // Ents in PAS of org
+	MSG_PVS_R = 6,		 // Reliable to PVS
+	MSG_PAS_R = 7,		 // Reliable to PAS
+	MSG_ONE_UNRELIABLE = 8, // Send to one client, but don't put in reliable stream, put in unreliable datagram ( could be dropped )
+	MSG_SPEC = 9	 // Sends to all spectator proxies
+};
 
 // contents of a spot in the world
-constexpr int CONTENTS_EMPTY = -1;
-constexpr int CONTENTS_SOLID = -2;
-constexpr int CONTENTS_WATER = -3;
-constexpr int CONTENTS_SLIME = -4;
-constexpr int CONTENTS_LAVA  = -5;
-constexpr int CONTENTS_SKY   = -6;
-/* These additional contents constants are defined in bspfile.h
-constexpr int	CONTENTS_ORIGIN	=	-7;		// removed at csg time
-constexpr int	CONTENTS_CLIP =		-8;		// changed to contents_solid
-constexpr int	CONTENTS_CURRENT_0 =	-9;
-constexpr int	CONTENTS_CURRENT_90 =	-10;
-constexpr int	CONTENTS_CURRENT_180 =	-11;
-constexpr int	CONTENTS_CURRENT_270 =	-12;
-constexpr int	CONTENTS_CURRENT_UP	=	-13;
-constexpr int	CONTENTS_CURRENT_DOWN =	-14;
-
-constexpr int CONTENTS_TRANSLUCENT =	-15;
-*/
-constexpr int CONTENTS_LADDER  = -16;
-constexpr int CONTENT_FLYFIELD = -17;
-constexpr int CONTENT_GRAVITY_FLYFIELD = -18;
-constexpr int CONTENT_FOG = -19;
-constexpr int CONTENT_EMPTY = -1;
-constexpr int CONTENT_SOLID = -2;
-constexpr int CONTENT_WATER = -3;
-constexpr int CONTENT_SLIME = -4;
-constexpr int CONTENT_LAVA = -5;
-constexpr int CONTENT_SKY = -6;
+enum {
+	CONTENTS_EMPTY = -1,
+	CONTENTS_SOLID = -2,
+	CONTENTS_WATER = -3,
+	CONTENTS_SLIME = -4,
+	CONTENTS_LAVA = -5,
+	CONTENTS_SKY = -6,
+	/* These additional contents constants are defined in bspfile.h
+	CONTENTS_ORIGIN	=	-7,		// removed at csg time
+	CONTENTS_CLIP =		-8,		// changed to contents_solid
+	CONTENTS_CURRENT_0 =	-9,
+	CONTENTS_CURRENT_90 =	-10,
+	CONTENTS_CURRENT_180 =	-11,
+	CONTENTS_CURRENT_270 =	-12,
+	CONTENTS_CURRENT_UP	=	-13,
+	CONTENTS_CURRENT_DOWN =	-14,
+	CONTENTS_TRANSLUCENT =	-15,
+	*/
+	CONTENTS_LADDER = -16,
+	CONTENTS_FLYFIELD = -17,
+	CONTENTS_GRAVITY_FLYFIELD = -18,
+	CONTENTS_FOG = -19
+};
 
 // channels
-constexpr int CHAN_AUTO = 0;
-constexpr int CHAN_WEAPON = 1;
-constexpr int CHAN_VOICE = 2;
-constexpr int CHAN_ITEM = 3;
-constexpr int CHAN_BODY = 4;
-constexpr int CHAN_STREAM = 5;			  // allocate stream channel from the static or dynamic area
-constexpr int CHAN_STATIC = 6;			  // allocate channel from the static area
-constexpr int CHAN_NETWORKVOICE_BASE = 7;  // voice data coming across the network
-constexpr int CHAN_NETWORKVOICE_END = 500; // network voice data reserves slots (CHAN_NETWORKVOICE_BASE through CHAN_NETWORKVOICE_END).
+enum {
+	CHAN_AUTO = 0,
+	CHAN_WEAPON = 1,
+	CHAN_VOICE = 2,
+	CHAN_ITEM = 3,
+	CHAN_BODY = 4,
+	CHAN_STREAM = 5,			  // allocate stream channel from the static or dynamic area
+	CHAN_STATIC = 6,			  // allocate channel from the static area
+	CHAN_NETWORKVOICE_BASE = 7,  // voice data coming across the network
+	CHAN_NETWORKVOICE_END = 500 // network voice data reserves slots (CHAN_NETWORKVOICE_BASE through CHAN_NETWORKVOICE_END).
+};
 
 // attenuation values
+
+
 constexpr float ATTN_NONE = 0.0f;
 constexpr float ATTN_NORM = 0.8f;
 constexpr float ATTN_IDLE = 2.0f;
 constexpr float ATTN_STATIC = 1.25f;
 
 // pitch values
-constexpr int PITCH_NORM = 100; // non-pitch shifted
-constexpr int PITCH_LOW = 95;  // other values are possible - 0-255, where 255 is very high
-constexpr int PITCH_HIGH = 120;
-
+enum {
+	PITCH_NORM = 100, // non-pitch shifted
+	PITCH_LOW = 95, // other values are possible - 0-255, where 255 is very high
+	PITCH_HIGH = 120
+};
 // volume values
+
 constexpr float VOL_NORM = 1.0;
 
 // plats
 constexpr int PLAT_LOW_TRIGGER = 1;
 
 // Trains
-constexpr int SF_TRAIN_WAIT_RETRIGGER = 1;
-constexpr int SF_TRAIN_START_ON = 4; // Train is initially moving
-constexpr int SF_TRAIN_PASSABLE = 8; // Train is not solid -- used to make water trains
-
+enum {
+	SF_TRAIN_WAIT_RETRIGGER = 1,
+	SF_TRAIN_START_ON = 4, // Train is initially moving
+	SF_TRAIN_PASSABLE = 8 // Train is not solid -- used to make water trains
+};
 // buttons
 #ifndef IN_BUTTONS_H
 #include "in_buttons.h"
@@ -645,31 +685,29 @@ constexpr int SF_TRAIN_PASSABLE = 8; // Train is not solid -- used to make water
 
 // Break Model Defines
 
-constexpr int BREAK_TYPEMASK = 0x4F;
-constexpr int BREAK_GLASS = 0x01;
-constexpr int BREAK_METAL = 0x02;
-constexpr int BREAK_FLESH = 0x04;
-constexpr int BREAK_WOOD = 0x08;
-constexpr int BREAK_SMOKE = 0x10;
-constexpr int BREAK_TRANS = 0x20;
-constexpr int BREAK_CONCRETE = 0x40;
-constexpr int BREAK_2 = 0x80;
-
+enum {
+	BREAK_TYPEMASK = 0x4F,
+	BREAK_GLASS = 0x01,
+	BREAK_METAL = 0x02,
+	BREAK_FLESH = 0x04,
+	BREAK_WOOD = 0x08,
+	BREAK_SMOKE = 0x10,
+	BREAK_TRANS = 0x20,
+	BREAK_CONCRETE = 0x40,
+	BREAK_2 = 0x80
+};
 // Colliding temp entity sounds
 
-constexpr int BOUNCE_GLASS = BREAK_GLASS;
-constexpr int BOUNCE_METAL = BREAK_METAL;
-constexpr int BOUNCE_FLESH = BREAK_FLESH;
-constexpr int BOUNCE_WOOD  = BREAK_WOOD;
-constexpr int BOUNCE_SHRAP = 0x10;
-constexpr int BOUNCE_SHELL = 0x20;
-constexpr int BOUNCE_CONCRETE = BREAK_CONCRETE;
-constexpr int BOUNCE_SHOTSHELL = 0x80;
-
-// Temp entity bounce sound types
-constexpr int TE_BOUNCE_NULL = 0;
-constexpr int TE_BOUNCE_SHELL = 1;
-constexpr int TE_BOUNCE_SHOTSHELL = 2;
+enum {
+	BOUNCE_GLASS = BREAK_GLASS,
+	BOUNCE_METAL = BREAK_METAL,
+	BOUNCE_FLESH = BREAK_FLESH,
+	BOUNCE_WOOD = BREAK_WOOD,
+	BOUNCE_SHRAP = 0x10,
+	BOUNCE_SHELL = 0x20,
+	BOUNCE_CONCRETE = BREAK_CONCRETE,
+	BOUNCE_SHOTSHELL = 0x80
+};
 
 // Rendering constants
 enum

From f7bd6bf5acf0b447e649a32e773df60531f0eaee Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 17:02:46 -0400
Subject: [PATCH 032/291] FIxed enum name typo after removing duplicate
 declaration.

---
 src/game/server/player/player.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/game/server/player/player.cpp b/src/game/server/player/player.cpp
index d8af019d..0cbc83d8 100644
--- a/src/game/server/player/player.cpp
+++ b/src/game/server/player/player.cpp
@@ -914,12 +914,12 @@ void CBasePlayer::WaterMove()
 		}
 	}
 
-	if (pev->watertype == CONTENT_LAVA) // do damage
+	if (pev->watertype == CONTENTS_LAVA) // do damage
 	{
 		if (pev->dmgtime < gpGlobals->time)
 			TakeDamage(VARS(eoNullEntity), VARS(eoNullEntity), 10 * pev->waterlevel, DMG_BURN);
 	}
-	else if (pev->watertype == CONTENT_SLIME) // do damage
+	else if (pev->watertype == CONTENTS_SLIME) // do damage
 	{
 		pev->dmgtime = gpGlobals->time + 1;
 		TakeDamage(VARS(eoNullEntity), VARS(eoNullEntity), 4 * pev->waterlevel, DMG_ACID);
@@ -2118,7 +2118,7 @@ void CBasePlayer::PostThink()
 	{
 		// ALERT ( at_console, "%f\n", m_flFallVelocity );
 
-		if (pev->watertype == CONTENT_WATER)
+		if (pev->watertype == CONTENTS_WATER)
 		{
 			// Did he hit the world or a non-moving entity?
 			// BUG - this happens all the time in water, especially when

From 4d347e8f426fecc7a90e51d55f850714b8b74585 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 17:05:29 -0400
Subject: [PATCH 033/291] Changed macro defines to constexpr

---
 src/game/server/svglobals.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/game/server/svglobals.h b/src/game/server/svglobals.h
index a506d8b7..2563ae9f 100644
--- a/src/game/server/svglobals.h
+++ b/src/game/server/svglobals.h
@@ -18,7 +18,7 @@ class CBaseEntity;
 // Global game_master entity handle
 extern CBaseEntity* g_pGameMasterEntity;
 
-#define SCRIPT_TYPES 4
+constexpr int SCRIPT_TYPES = 4;
 
 class CSVGlobals
 {
@@ -35,10 +35,10 @@ class CSVGlobals
 	static mslist<scriptlistitem_t> ScriptList[SCRIPT_TYPES];
 };
 
-#define SPAWN_GENERIC "ms_player_spawn"
-#define SPAWN_BEGIN "ms_player_begin"
-#define SPAWN_SPECTATE "ms_player_spec"
-#define OLD_GENERIC_SPAWN "info_player_start"
+constexpr const char* SPAWN_GENERIC = "ms_player_spawn";
+constexpr const char* SPAWN_BEGIN = "ms_player_begin";
+constexpr const char* SPAWN_SPECTATE = "ms_player_spec";
+constexpr const char* OLD_GENERIC_SPAWN = "info_player_start";
 
 #ifdef CVARDEF_H
 extern cvar_s ms_joinreset;

From 45fe66e56a214661f6323fd92de526cc33ef8aac Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 17:07:03 -0400
Subject: [PATCH 034/291] changed constexpr to enum

---
 src/common/cvardef.h | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/common/cvardef.h b/src/common/cvardef.h
index fcde0475..d742c1a2 100644
--- a/src/common/cvardef.h
+++ b/src/common/cvardef.h
@@ -15,21 +15,22 @@
 #ifndef CVARDEF_H
 #define CVARDEF_H
 
-constexpr int FCVAR_ARCHIVE = (1 << 0);		 // set to cause it to be saved to vars.rc
-constexpr int FCVAR_USERINFO = (1 << 1);		 // changes the client's info string
-constexpr int FCVAR_SERVER = (1 << 2);	 // notifies players when changed
-constexpr int FCVAR_EXTDLL = (1 << 3); // defined by external DLL
-constexpr int FCVAR_CLIENTDLL = (1 << 4); // defined by the client dll
-constexpr int FCVAR_PROTECTED = (1 << 5); // It's a server cvar, but we don't send the data since it's a password, etc.  Sends 1 if it's not bland/zero, 0 otherwise as value
-constexpr int FCVAR_SPONLY = (1 << 6);	 // This cvar cannot be changed by clients connected to a multiplayer server.
-constexpr int FCVAR_PRINTABLEONLY = (1 << 7);// This cvar's string cannot contain unprintable characters ( e.g., used for player name etc ).
-constexpr int FCVAR_UNLOGGED = (1 << 8);	 // If this is a FCVAR_SERVER, don't log changes to the log file / console if we are creating a log
-constexpr int FCVAR_NOEXTRAWHITEPACE = (1 << 9); // strip trailing/leading white space from this cvar
-constexpr int FCVAR_PRIVILEGED = (1 << 10);	// only available in privileged mode
-constexpr int FCVAR_FILTERABLE = (1 << 11);	// filtered in unprivileged mode if cl_filterstuffcmd is 1
-constexpr int FCVAR_ISEXECUTED = (1 << 12);// This cvar's string contains a value that will be executed as a cfg file; don't allow commands to be appended to it
-constexpr int FCVAR_ISPATH = (1 << 13);// This cvar's string is a path or filename; don't allow absolute paths, escaping to another directory or backslashes
-
+enum {
+	FCVAR_ARCHIVE = (1 << 0),		 // set to cause it to be saved to vars.rc
+	FCVAR_USERINFO = (1 << 1),		 // changes the client's info string
+	FCVAR_SERVER = (1 << 2),	 // notifies players when changed
+	FCVAR_EXTDLL = (1 << 3), // defined by external DLL
+	FCVAR_CLIENTDLL = (1 << 4), // defined by the client dll
+	FCVAR_PROTECTED = (1 << 5), // It's a server cvar, but we don't send the data since it's a password, etc.  Sends 1 if it's not bland/zero, 0 otherwise as value
+	FCVAR_SPONLY = (1 << 6),	 // This cvar cannot be changed by clients connected to a multiplayer server.
+	FCVAR_PRINTABLEONLY = (1 << 7),// This cvar's string cannot contain unprintable characters ( e.g., used for player name etc ).
+	FCVAR_UNLOGGED = (1 << 8),	 // If this is a FCVAR_SERVER, don't log changes to the log file / console if we are creating a log
+	FCVAR_NOEXTRAWHITEPACE = (1 << 9), // strip trailing/leading white space from this cvar
+	FCVAR_PRIVILEGED = (1 << 10),	// only available in privileged mode
+	FCVAR_FILTERABLE = (1 << 11),	// filtered in unprivileged mode if cl_filterstuffcmd is 1
+	FCVAR_ISEXECUTED = (1 << 12),// This cvar's string contains a value that will be executed as a cfg file; don't allow commands to be appended to it
+	FCVAR_ISPATH = (1 << 13) // This cvar's string is a path or filename; don't allow absolute paths, escaping to another directory or backslashes
+};
 typedef struct cvar_s
 {
 	const char *name;

From 56706fe4182aade63b0575198a24aeb2b7af03c5 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 17:10:58 -0400
Subject: [PATCH 035/291] Fixed warning C5055 after change to enum.

---
 src/game/server/entity.cpp           | 2 +-
 src/game/server/monsters/combat.cpp  | 2 +-
 src/game/shared/weapons/giattack.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/game/server/entity.cpp b/src/game/server/entity.cpp
index 866db8a5..324f2043 100644
--- a/src/game/server/entity.cpp
+++ b/src/game/server/entity.cpp
@@ -57,7 +57,7 @@ void CBaseEntity::SetFollow(CBaseEntity *pTarget, int Flags)
 
 bool CBaseEntity::CanDamage(CBaseEntity *pOther)
 {
-	return (pOther->pev->takedamage > DAMAGE_NO) &&	   //The entity can take damage
+	return (static_cast<int>(pOther->pev->takedamage) > DAMAGE_NO) &&	   //The entity can take damage
 		   (!FBitSet(pOther->pev->flags, FL_GODMODE)); //The entity is not invulnerable;
 }
 
diff --git a/src/game/server/monsters/combat.cpp b/src/game/server/monsters/combat.cpp
index 1294fbcd..f3335eba 100644
--- a/src/game/server/monsters/combat.cpp
+++ b/src/game/server/monsters/combat.cpp
@@ -1046,7 +1046,7 @@ void RadiusDamage(Vector vecSrc, entvars_t *pevInflictor, entvars_t *pevAttacker
 	// iterate on all entities in the vicinity.
 	while ((pEntity = UTIL_FindEntityInSphere(pEntity, vecSrc, flRadius)) != NULL)
 	{
-		if (pEntity->pev->takedamage != DAMAGE_NO)
+		if (static_cast<int>(pEntity->pev->takedamage) != DAMAGE_NO)
 		{
 			// UNDONE: this should check a damage mask, not an ignore
 			if (iClassIgnore != CLASS_NONE && pEntity->Classify() == iClassIgnore)
diff --git a/src/game/shared/weapons/giattack.cpp b/src/game/shared/weapons/giattack.cpp
index 2c579a50..1575461a 100644
--- a/src/game/shared/weapons/giattack.cpp
+++ b/src/game/shared/weapons/giattack.cpp
@@ -1501,7 +1501,7 @@ void DoDamage(damage_t &Damage, hitent_list &Hits)
 		CBaseEntity *pTarget = NULL, *pClosestHit = NULL;
 		while ((pTarget = UTIL_FindEntityInSphere(pTarget, Damage.vecSrc, Damage.flRange)) != NULL)
 		{
-			if (pTarget->pev->takedamage == DAMAGE_NO || //Don't hurt world objects, godmode entities, or the entity I originally struck
+			if (static_cast<int>(pTarget->pev->takedamage) == DAMAGE_NO || //Don't hurt world objects, godmode entities, or the entity I originally struck
 				FBitSet(pTarget->pev->flags, FL_GODMODE) ||
 				!pTarget->IsAlive() ||
 				pTarget == Damage.pInflictor ||

From 4da85782e4665db7e9b43b48910f8a88b6499f27 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 17:13:57 -0400
Subject: [PATCH 036/291] changed const expr to enum

---
 src/common/director_cmds.h | 45 +++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/src/common/director_cmds.h b/src/common/director_cmds.h
index 852b955c..a1f08bf0 100644
--- a/src/common/director_cmds.h
+++ b/src/common/director_cmds.h
@@ -8,26 +8,31 @@
 // director_cmds.h
 // sub commands for svc_director
 
-constexpr int DRC_ACTIVE =  0; // tells client that he's an spectator and will get director command
-constexpr int DRC_STATUS =  1; // send status infos about proxy
-constexpr int DRC_CAMERA =  2; // set the actual director camera position
-constexpr int DRC_EVENT = 3; // informs the dircetor about ann important game event
-
-constexpr int DRC_FLAG_PRIO_MASK = 0x0F; //	priorities between 0 and 15 (15 most important)
-constexpr int DRC_FLAG_SIDE = (1 << 4);
-constexpr int DRC_FLAG_DRAMATIC = (1 << 5);
+enum {
+	DRC_ACTIVE = 0, // tells client that he's an spectator and will get director command
+	DRC_STATUS = 1, // send status infos about proxy
+	DRC_CAMERA = 2, // set the actual director camera position
+	DRC_EVENT = 3   // informs the dircetor about ann important game event
+};
 
+enum {
+	DRC_FLAG_PRIO_MASK = 0x0F, //	priorities between 0 and 15 (15 most important)
+	DRC_FLAG_SIDE = (1 << 4),
+	DRC_FLAG_DRAMATIC = (1 << 5)
+};
 // commands of the director API function CallDirectorProc(...)
 
-constexpr int DRCAPI_NOP = 0;               // no operation
-constexpr int DRCAPI_ACTIVE = 1;            // de/acivates director mode in engine
-constexpr int DRCAPI_STATUS = 2;            // request proxy information
-constexpr int DRCAPI_SETCAM = 3;            // set camera n to given position and angle
-constexpr int DRCAPI_GETCAM = 4;            // request camera n position and angle
-constexpr int DRCAPI_DIRPLAY = 5;           // set director time and play with normal speed
-constexpr int DRCAPI_DIRFREEZE = 6;         // freeze directo at this time
-constexpr int DRCAPI_SETVIEWMODE = 7;       // overview or 4 cameras
-constexpr int DRCAPI_SETOVERVIEWPARAMS = 8; // sets parameter for overview mode
-constexpr int DRCAPI_SETFOCUS = 9;          // set the camera which has the input focus
-constexpr int DRCAPI_GETTARGETS = 10;       // queries engine for player list
-constexpr int DRCAPI_SETVIEWPOINTS = 11;    // gives engine all waypoints
+enum {
+	DRCAPI_NOP = 0,               // no operation
+	DRCAPI_ACTIVE = 1,            // de/acivates director mode in engine
+	DRCAPI_STATUS = 2,            // request proxy information
+	DRCAPI_SETCAM = 3,            // set camera n to given position and angle
+	DRCAPI_GETCAM = 4,            // request camera n position and angle
+	DRCAPI_DIRPLAY = 5,           // set director time and play with normal speed
+	DRCAPI_DIRFREEZE = 6,         // freeze directo at this time
+	DRCAPI_SETVIEWMODE = 7,       // overview or 4 cameras
+	DRCAPI_SETOVERVIEWPARAMS = 8, // sets parameter for overview mode
+	DRCAPI_SETFOCUS = 9,          // set the camera which has the input focus
+	DRCAPI_GETTARGETS = 10,       // queries engine for player list
+	DRCAPI_SETVIEWPOINTS = 11     // gives engine all waypoints
+};
\ No newline at end of file

From a8c5d428f0cf16f38be10ec86d89ddab79192d54 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 17:23:54 -0400
Subject: [PATCH 037/291] changes some constexpr to enums

---
 src/common/const.h     |  8 ++++++--
 src/common/dll_state.h | 28 +++++++++++++++-------------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/common/const.h b/src/common/const.h
index 765cd275..9960916f 100644
--- a/src/common/const.h
+++ b/src/common/const.h
@@ -667,10 +667,14 @@ enum {
 };
 // volume values
 
-constexpr float VOL_NORM = 1.0;
+enum {
+	VOL_NORM = 1
+};
 
 // plats
-constexpr int PLAT_LOW_TRIGGER = 1;
+enum {
+	PLAT_LOW_TRIGGER = 1
+};
 
 // Trains
 enum {
diff --git a/src/common/dll_state.h b/src/common/dll_state.h
index 9fb3eba2..341b6908 100644
--- a/src/common/dll_state.h
+++ b/src/common/dll_state.h
@@ -7,17 +7,19 @@
 
 //DLL State Flags
 
-constexpr int DLL_INACTIVE = 0; // no dll
-constexpr int DLL_ACTIVE = 1;   // dll is running
-constexpr int DLL_PAUSED = 2;   // dll is paused
-constexpr int DLL_CLOSE = 3;    // closing down dll
-constexpr int DLL_TRANS = 4;    // Level Transition
-
-// DLL Pause reasons
-
-constexpr int DLL_NORMAL = 0;  // User hit Esc or something.
-constexpr int DLL_QUIT = 4;    // Quit now
-constexpr int DLL_RESTART = 6; // Switch to launcher for linux, does a quit but returns 1
-
+enum {
+	DLL_INACTIVE = 0, // no dll
+	DLL_ACTIVE = 1,   // dll is running
+	DLL_PAUSED = 2,   // dll is paused
+	DLL_CLOSE = 3,    // closing down dll
+	DLL_TRANS = 4,    // Level Transition
+	// DLL Pause reasons
+	DLL_NORMAL = 0,  // User hit Esc or something.
+	DLL_QUIT = 4,    // Quit now
+	DLL_RESTART = 6 // Switch to launcher for linux, does a quit but returns 1
+};
 // DLL Substate info ( not relevant )
-constexpr int ENG_NORMAL = (1 << 0);
+
+enum {
+	ENG_NORMAL = (1 << 0);
+};
\ No newline at end of file

From c1e1a9fde2e04ad125f6551eed11f19969ebbc2f Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 17:24:37 -0400
Subject: [PATCH 038/291] Changed constexpr to enum

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

diff --git a/src/common/entity_state.h b/src/common/entity_state.h
index 7acc136a..3c6b0a94 100644
--- a/src/common/entity_state.h
+++ b/src/common/entity_state.h
@@ -19,8 +19,10 @@
 #endif
 
 // For entityType below
-constexpr int ENTITY_NORMAL  = (1 << 0);
-constexpr int ENTITY_BEAM = (1 << 1);
+enum {
+	ENTITY_NORMAL = (1 << 0),
+	ENTITY_BEAM = (1 << 1)
+};
 
 // Entity state is used for the baseline and for delta compression of a packet of
 //  entities that is sent to a client.

From 7570a31f031d04027337b33097fd89c1ca9e5d19 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 17:25:32 -0400
Subject: [PATCH 039/291] changed constexpr to enum

---
 src/common/entity_types.h | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/common/entity_types.h b/src/common/entity_types.h
index 3cfd8ca6..d472c3cc 100644
--- a/src/common/entity_types.h
+++ b/src/common/entity_types.h
@@ -16,11 +16,13 @@
 #if !defined(ENTITY_TYPESH)
 #define ENTITY_TYPESH
 
-constexpr int ET_NORMAL = 0;
-constexpr int ET_PLAYER = 1;
-constexpr int ET_TEMPENTITY = 2;
-constexpr int ET_BEAM = 3;
-// BMODEL or SPRITE that was split across BSP nodes
-constexpr int ET_FRAGMENTED = 4;
+enum {
+	ET_NORMAL = 0,
+	ET_PLAYER = 1,
+	ET_TEMPENTITY = 2,
+	ET_BEAM = 3,
+	// BMODEL or SPRITE that was split across BSP nodes
+	ET_FRAGMENTED = 4
+};
 
 #endif // !ENTITY_TYPESH

From 9cd0a706cd9d37a5e73b52a6473ba25bb8f92894 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 17:46:41 -0400
Subject: [PATCH 040/291] changed constexpr to enums

---
 src/common/event_api.h   |  2 +-
 src/common/event_args.h  | 10 +++---
 src/common/event_flags.h | 20 ++++++-----
 src/common/hltv.h        | 73 ++++++++++++++++++++++------------------
 4 files changed, 59 insertions(+), 46 deletions(-)

diff --git a/src/common/event_api.h b/src/common/event_api.h
index 2564d9e7..1bc0595b 100644
--- a/src/common/event_api.h
+++ b/src/common/event_api.h
@@ -18,7 +18,7 @@
 #pragma once
 #endif
 
-#define EVENT_API_VERSION 1
+constexpr int EVENT_API_VERSION = 1;
 
 typedef struct event_api_s
 {
diff --git a/src/common/event_args.h b/src/common/event_args.h
index e4d732d9..e58d0a74 100644
--- a/src/common/event_args.h
+++ b/src/common/event_args.h
@@ -18,11 +18,13 @@
 #pragma once
 #endif
 
-// Event was invoked with stated origin
-constexpr int FEVENT_ORIGIN = (1 << 0);
+enum {
+	// Event was invoked with stated origin
+	FEVENT_ORIGIN = (1 << 0),
 
-// Event was invoked with stated angles
-constexpr int FEVENT_ANGLES = (1 << 1);
+	// Event was invoked with stated angles
+	FEVENT_ANGLES = (1 << 1);
+};
 
 typedef struct event_args_s
 {
diff --git a/src/common/event_flags.h b/src/common/event_flags.h
index 7e6c4f7d..acf8fd93 100644
--- a/src/common/event_flags.h
+++ b/src/common/event_flags.h
@@ -18,30 +18,32 @@
 #pragma once
 #endif
 
-// Skip local host for event send.
-constexpr int FEV_NOTHOST = (1 << 0);
+
+enum {
+	// Skip local host for event send.
+	FEV_NOTHOST = (1 << 0),
 
 // Send the event reliably.  You must specify the origin and angles and use
 // PLAYBACK_EVENT_FULL for this to work correctly on the server for anything
 // that depends on the event origin/angles.  I.e., the origin/angles are not
 // taken from the invoking edict for reliable events.
-constexpr int FEV_RELIABLE = (1 << 1);
+	FEV_RELIABLE = (1 << 1),
 
 // Don't restrict to PAS/PVS, send this event to _everybody_ on the server ( useful for stopping CHAN_STATIC
 //  sounds started by client event when client is not in PVS anymore ( hwguy in TFC e.g. ).
-constexpr int FEV_GLOBAL = (1 << 2);
+	FEV_GLOBAL = (1 << 2),
 
 // If this client already has one of these events in its queue, just update the event instead of sending it as a duplicate
 //
-constexpr int FEV_UPDATE = (1 << 3);
+	FEV_UPDATE = (1 << 3),
 
 // Only send to entity specified as the invoker
-constexpr int FEV_HOSTONLY = (1 << 4);
+	FEV_HOSTONLY = (1 << 4),
 
 // Only send if the event was created on the server.
-constexpr int FEV_SERVER = (1 << 5);
+	FEV_SERVER = (1 << 5),
 
 // Only issue event client side ( from shared code )
-constexpr int FEV_CLIENT = (1 << 6);
-
+	FEV_CLIENT = (1 << 6)
+};
 #endif
diff --git a/src/common/hltv.h b/src/common/hltv.h
index 8dafe189..6ca800e4 100644
--- a/src/common/hltv.h
+++ b/src/common/hltv.h
@@ -10,42 +10,51 @@
 
 #ifndef HLTV_H
 #define HLTV_H
-
-constexpr int TYPE_CLIENT = 0;      // client is a normal HL client (default)
-constexpr int TYPE_PROXY = 1;       // client is another proxy
-constexpr int TYPE_COMMENTATOR = 3; // client is a commentator
-constexpr int TYPE_DEMO = 4;        // client is a demo file
+enum {
+	TYPE_CLIENT = 0,   // client is a normal HL client (default)
+	TYPE_PROXY = 1,       // client is another proxy
+	TYPE_COMMENTATOR = 3, // client is a commentator
+	TYPE_DEMO = 4       // client is a demo file
+};
 // sub commands of svc_hltv:
-constexpr int HLTV_ACTIVE = 0; // tells client that he's an spectator and will get director commands
-constexpr int HLTV_STATUS = 1; // send status infos about proxy
-constexpr int HLTV_LISTEN = 2; // tell client to listen to a multicast stream
-
+enum {
+	HLTV_ACTIVE = 0, // tells client that he's an spectator and will get director commands
+	HLTV_STATUS = 1, // send status infos about proxy
+	HLTV_LISTEN = 2  // tell client to listen to a multicast stream
+};
 // sub commands of svc_director:
-constexpr int DRC_CMD_NONE = 0;       // NULL director command
-constexpr int DRC_CMD_START = 1;      // start director mode
-constexpr int DRC_CMD_EVENT = 2;      // informs about director command
-constexpr int DRC_CMD_MODE = 3;       // switches camera modes
-constexpr int DRC_CMD_CAMERA = 4;     // sets camera registers
-constexpr int DRC_CMD_TIMESCALE = 5;  // sets time scale
-constexpr int DRC_CMD_MESSAGE = 6;    // send HUD centerprint
-constexpr int DRC_CMD_SOUND = 7;      // plays a particular sound
-constexpr int DRC_CMD_STATUS = 8;     // status info about broadcast
-constexpr int DRC_CMD_BANNER = 9;     // banner file name for HLTV gui
-constexpr int DRC_CMD_FADE = 10;      // send screen fade command
-constexpr int DRC_CMD_SHAKE = 11;     // send screen shake command
-constexpr int DRC_CMD_STUFFTEXT = 12; // like the normal svc_stufftext but as director command
-
-#define DRC_CMD_LAST 12
+
+enum {
+	DRC_CMD_NONE = 0,       // NULL director command
+	DRC_CMD_START = 1,      // start director mode
+	DRC_CMD_EVENT = 2,      // informs about director command
+	DRC_CMD_MODE = 3,       // switches camera modes
+	DRC_CMD_CAMERA = 4,     // sets camera registers
+	DRC_CMD_TIMESCALE = 5,  // sets time scale
+	DRC_CMD_MESSAGE = 6,    // send HUD centerprint
+	DRC_CMD_SOUND = 7,      // plays a particular sound
+	DRC_CMD_STATUS = 8,     // status info about broadcast
+	DRC_CMD_BANNER = 9,     // banner file name for HLTV gui
+	DRC_CMD_FADE = 10,      // send screen fade command
+	DRC_CMD_SHAKE = 11,     // send screen shake command
+	DRC_CMD_STUFFTEXT = 12, // like the normal svc_stufftext but as director command
+	DRC_CMD_LAST = 12
+};
+
 
 // HLTV_EVENT event flags
-constexpr int DRC_FLAG_PRIO_MASK = 0x0F;      // priorities between 0 and 15 (15 most important)
-constexpr int DRC_FLAG_SIDE = (1 << 4);       //
-constexpr int DRC_FLAG_DRAMATIC = (1 << 5);   // is a dramatic scene
-constexpr int DRC_FLAG_SLOWMOTION = (1 << 6); // would look good in SloMo
-constexpr int DRC_FLAG_FACEPLAYER = (1 << 7); // player is doning something (reload/defuse bomb etc)
-constexpr int DRC_FLAG_INTRO = (1 << 8);      // is a introduction scene
-constexpr int DRC_FLAG_FINAL = (1 << 9);      // is a final scene
-constexpr int DRC_FLAG_NO_RANDOM = (1 << 10); // don't randomize event data
+
+enum {
+	DRC_FLAG_PRIO_MASK = 0x0F,      // priorities between 0 and 15 (15 most important)
+	DRC_FLAG_SIDE = (1 << 4),       //
+	DRC_FLAG_DRAMATIC = (1 << 5),   // is a dramatic scene
+	DRC_FLAG_SLOWMOTION = (1 << 6), // would look good in SloMo
+	DRC_FLAG_FACEPLAYER = (1 << 7), // player is doning something (reload/defuse bomb etc)
+	DRC_FLAG_INTRO = (1 << 8),      // is a introduction scene
+	DRC_FLAG_FINAL = (1 << 9),      // is a final scene
+	DRC_FLAG_NO_RANDOM = (1 << 10)  // don't randomize event data
+};
+
 constexpr int MAX_DIRECTOR_CMD_PARAMETERS = 4;
 constexpr int MAX_DIRECTOR_CMD_STRING = 128;
 

From 894bf5f9296cdcc6241359c5a564d7944787adfb Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 17:53:01 -0400
Subject: [PATCH 041/291] fixed Vector passing to IS_NAN need const float * for
 x,y,z vars. Changed constexpr to enum

---
 src/common/event_args.h |  2 +-
 src/common/in_buttons.h | 35 ++++++++++++++++++-----------------
 src/common/mathlib.h    |  2 +-
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/common/event_args.h b/src/common/event_args.h
index e58d0a74..25d94bd6 100644
--- a/src/common/event_args.h
+++ b/src/common/event_args.h
@@ -23,7 +23,7 @@ enum {
 	FEVENT_ORIGIN = (1 << 0),
 
 	// Event was invoked with stated angles
-	FEVENT_ANGLES = (1 << 1);
+	FEVENT_ANGLES = (1 << 1)
 };
 
 typedef struct event_args_s
diff --git a/src/common/in_buttons.h b/src/common/in_buttons.h
index c16a2bc4..dc20d5f5 100644
--- a/src/common/in_buttons.h
+++ b/src/common/in_buttons.h
@@ -18,21 +18,22 @@
 #pragma once
 #endif
 
-constexpr int IN_ATTACK = (1 << 0);
-constexpr int IN_JUMP = (1 << 1);
-constexpr int IN_DUCK = (1 << 2);
-constexpr int IN_FORWARD = (1 << 3);
-constexpr int IN_BACK = (1 << 4);
-constexpr int IN_USE = (1 << 5);
-constexpr int IN_CANCEL = (1 << 6);
-constexpr int IN_LEFT = (1 << 7);
-constexpr int IN_RIGHT = (1 << 8);
-constexpr int IN_MOVELEFT = (1 << 9);
-constexpr int IN_MOVERIGHT = (1 << 10);
-constexpr int IN_ATTACK2 = (1 << 11);
-constexpr int IN_RUN = (1 << 12);
-constexpr int IN_RELOAD = (1 << 13);
-constexpr int IN_ALT1 = (1 << 14);
-constexpr int IN_SCORE = (1 << 15);// Used by client.dll for when scoreboard is held down
-
+enum {
+	IN_ATTACK = (1 << 0),
+	IN_JUMP = (1 << 1),
+	IN_DUCK = (1 << 2),
+	IN_FORWARD = (1 << 3),
+	IN_BACK = (1 << 4),
+	IN_USE = (1 << 5),
+	IN_CANCEL = (1 << 6),
+	IN_LEFT = (1 << 7),
+	IN_RIGHT = (1 << 8),
+	IN_MOVELEFT = (1 << 9),
+	IN_MOVERIGHT = (1 << 10),
+	IN_ATTACK2 = (1 << 11),
+	IN_RUN = (1 << 12),
+	IN_RELOAD = (1 << 13),
+	IN_ALT1 = (1 << 14),
+	IN_SCORE = (1 << 15)	// Used by client.dll for when scoreboard is held down
+};
 #endif // IN_BUTTONS_H
diff --git a/src/common/mathlib.h b/src/common/mathlib.h
index 7c64983f..4040e01d 100644
--- a/src/common/mathlib.h
+++ b/src/common/mathlib.h
@@ -37,7 +37,7 @@ struct mplane_s;
 extern Vector vec3_origin;
 constexpr int nanmask = 255 << 23;
 
-inline static bool IS_NAN(float x) {
+inline static bool IS_NAN(const float* x) {
 
 	if ((((*(int*)&x) & nanmask) == nanmask)) {
 		return true;

From e93b7e4e88ce9e90ee5c23f4ee4c4c4f034eabce Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 17:57:18 -0400
Subject: [PATCH 042/291] changed constexpr to enum

---
 src/common/net_api.h | 27 ++++++++++++++--------
 src/common/r_efx.h   | 54 ++++++++++++++++++++++++--------------------
 2 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/src/common/net_api.h b/src/common/net_api.h
index 980d92e9..38f15d11 100644
--- a/src/common/net_api.h
+++ b/src/common/net_api.h
@@ -15,22 +15,29 @@
 #include "netadr.h"
 #endif
 
-constexpr int NETAPI_REQUEST_SERVERLIST = 0; // Doesn't need a remote address
-constexpr int NETAPI_REQUEST_PING = 1;
-constexpr int NETAPI_REQUEST_RULES = 2;
-constexpr int NETAPI_REQUEST_PLAYERS = 3;
-constexpr int NETAPI_REQUEST_DETAILS = 4;
+
+enum {
+	NETAPI_REQUEST_SERVERLIST = 0, // Doesn't need a remote address
+	NETAPI_REQUEST_PING = 1,
+	NETAPI_REQUEST_RULES = 2,
+	NETAPI_REQUEST_PLAYERS = 3,
+	NETAPI_REQUEST_DETAILS = 4
+};
 
 // Set this flag for things like broadcast requests, etc. where the engine should not
 //  kill the request hook after receiving the first response
-constexpr int FNETAPI_MULTIPLE_RESPONSE = (1 << 0);
+enum {
+	FNETAPI_MULTIPLE_RESPONSE = (1 << 0);
+};
 
 typedef void (*net_api_response_func_t)(struct net_response_s *response);
 
-constexpr int NET_SUCCESS = 0;
-constexpr int NET_ERROR_TIMEOUT = 1 << 0;
-constexpr int NET_ERROR_PROTO_UNSUPPORTED = 1 << 1;
-constexpr int NET_ERROR_UNDEFINED = 1 << 2;
+enum {
+	NET_SUCCESS = 0,
+	NET_ERROR_TIMEOUT = 1 << 0,
+	NET_ERROR_PROTO_UNSUPPORTED = 1 << 1,
+	NET_ERROR_UNDEFINED = 1 << 2
+};
 
 typedef struct net_adrlist_s
 {
diff --git a/src/common/r_efx.h b/src/common/r_efx.h
index eb638cb2..ae34b02a 100644
--- a/src/common/r_efx.h
+++ b/src/common/r_efx.h
@@ -59,32 +59,38 @@ color24 gTracerColors[] =
 */
 
 // Temporary entity array
-constexpr int TENTPRIORITY_LOW = 0;
-constexpr int TENTPRIORITY_HIGH = 1;
+
+enum {
+	TENTPRIORITY_LOW = 0,
+	TENTPRIORITY_HIGH = 1
+};
 
 // TEMPENTITY flags
-constexpr int FTENT_NONE = 0x00000000;
-constexpr int FTENT_SINEWAVE = 0x00000001;
-constexpr int FTENT_GRAVITY = 0x00000002;
-constexpr int FTENT_ROTATE = 0x00000004;
-constexpr int FTENT_SLOWGRAVITY = 0x00000008;
-constexpr int FTENT_SMOKETRAIL = 0x00000010;
-constexpr int FTENT_COLLIDEWORLD = 0x00000020;
-constexpr int FTENT_FLICKER = 0x00000040;
-constexpr int FTENT_FADEOUT = 0x00000080;
-constexpr int FTENT_SPRANIMATE = 0x00000100;
-constexpr int FTENT_HITSOUND = 0x00000200;
-constexpr int FTENT_SPIRAL = 0x00000400;
-constexpr int FTENT_SPRCYCLE = 0x00000800;
-constexpr int FTENT_COLLIDEALL = 0x00001000;	// will collide with world and slideboxes
-constexpr int FTENT_PERSIST = 0x00002000;		// tent is not removed when unable to draw
-constexpr int FTENT_COLLIDEKILL = 0x00004000;	// tent is removed upon collision with anything
-constexpr int FTENT_PLYRATTACHMENT = 0x00008000; // tent is attached to a player (owner)
-constexpr int FTENT_SPRANIMATELOOP = 0x00010000; // animating sprite doesn't die when last frame is displayed
-constexpr int FTENT_SPARKSHOWER = 0x00020000;
-constexpr int FTENT_NOMODEL = 0x00040000;	  // Doesn't have a model, never try to draw ( it just triggers other things )
-constexpr int FTENT_CLIENTCUSTOM = 0x00080000; // Must specify callback.  Callback function is responsible for killing tempent and updating fields ( unless other flags specify how to do things )
-constexpr int FTENT_SKIPENT = 0x00100000;  // AUG2013_25 Thothie - Skip collision checks for stored ent index
+
+enum {
+	FTENT_NONE = 0x00000000,
+	FTENT_SINEWAVE = 0x00000001,
+	FTENT_GRAVITY = 0x00000002,
+	FTENT_ROTATE = 0x00000004,
+	FTENT_SLOWGRAVITY = 0x00000008,
+	FTENT_SMOKETRAIL = 0x00000010,
+	FTENT_COLLIDEWORLD = 0x00000020,
+	FTENT_FLICKER = 0x00000040,
+	FTENT_FADEOUT = 0x00000080,
+	FTENT_SPRANIMATE = 0x00000100,
+	FTENT_HITSOUND = 0x00000200,
+	FTENT_SPIRAL = 0x00000400,
+	FTENT_SPRCYCLE = 0x00000800,
+	FTENT_COLLIDEALL = 0x00001000,	// will collide with world and slideboxes
+	FTENT_PERSIST = 0x00002000,		// tent is not removed when unable to draw
+	FTENT_COLLIDEKILL = 0x00004000,	// tent is removed upon collision with anything
+	FTENT_PLYRATTACHMENT = 0x00008000, // tent is attached to a player (owner)
+	FTENT_SPRANIMATELOOP = 0x00010000, // animating sprite doesn't die when last frame is displayed
+	FTENT_SPARKSHOWER = 0x00020000,
+	FTENT_NOMODEL = 0x00040000,	  // Doesn't have a model, never try to draw ( it just triggers other things )
+	FTENT_CLIENTCUSTOM = 0x00080000, // Must specify callback.  Callback function is responsible for killing tempent and updating fields ( unless other flags specify how to do things )
+	FTENT_SKIPENT = 0x00100000  // AUG2013_25 Thothie - Skip collision checks for stored ent index
+};
 
 typedef struct tempent_s TEMPENTITY;
 typedef struct tempent_s

From a112db4b872cbc7c40a2aea12b5e9b71de446326 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 17:57:59 -0400
Subject: [PATCH 043/291] removed whitespace

---
 src/common/Sequence.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/common/Sequence.h b/src/common/Sequence.h
index 708c5c69..4b7bf978 100644
--- a/src/common/Sequence.h
+++ b/src/common/Sequence.h
@@ -73,7 +73,6 @@ enum sequenceCommandEnum_
 	SEQUENCE_COMMAND_MODIFIER,
 	SEQUENCE_COMMAND_POSTMODIFIER,
 	SEQUENCE_COMMAND_NOOP,
-
 	SEQUENCE_MODIFIER_EFFECT,
 	SEQUENCE_MODIFIER_POSITION,
 	SEQUENCE_MODIFIER_COLOR,

From a4ed474b60899397fb421bf2404cc5bfbfc565d7 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 17:59:11 -0400
Subject: [PATCH 044/291] changed constexpr to enum

---
 src/common/triangleapi.h | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/common/triangleapi.h b/src/common/triangleapi.h
index 3440f7c9..c498fb09 100644
--- a/src/common/triangleapi.h
+++ b/src/common/triangleapi.h
@@ -24,14 +24,18 @@ typedef enum
 	TRI_NONE = 1,
 } TRICULLSTYLE;
 
+
 constexpr int TRI_API_VERSION = 1;
-constexpr int TRI_TRIANGLES = 0;
-constexpr int TRI_TRIANGLE_FAN = 1;
-constexpr int TRI_QUADS = 2;
-constexpr int TRI_POLYGON = 3;
-constexpr int TRI_LINES = 4;
-constexpr int TRI_TRIANGLE_STRIP = 5;
-constexpr int TRI_QUAD_STRIP = 6;
+
+enum {
+	TRI_TRIANGLES = 0,
+	TRI_TRIANGLE_FAN = 1,
+	TRI_QUADS = 2,
+	TRI_POLYGON = 3,
+	TRI_LINES = 4,
+	TRI_TRIANGLE_STRIP = 5,
+	TRI_QUAD_STRIP = 6
+};
 
 typedef struct triangleapi_s
 {

From b5c3f01b8fd0d11f35cbaa5f112d01de9c57aad5 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 18:01:34 -0400
Subject: [PATCH 045/291] Fixed syntax. change pointer to reference.

---
 src/common/mathlib.h | 2 +-
 src/common/net_api.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/mathlib.h b/src/common/mathlib.h
index 4040e01d..b04b67cf 100644
--- a/src/common/mathlib.h
+++ b/src/common/mathlib.h
@@ -37,7 +37,7 @@ struct mplane_s;
 extern Vector vec3_origin;
 constexpr int nanmask = 255 << 23;
 
-inline static bool IS_NAN(const float* x) {
+inline static bool IS_NAN(const float &x) {
 
 	if ((((*(int*)&x) & nanmask) == nanmask)) {
 		return true;
diff --git a/src/common/net_api.h b/src/common/net_api.h
index 38f15d11..a2937c1b 100644
--- a/src/common/net_api.h
+++ b/src/common/net_api.h
@@ -27,7 +27,7 @@ enum {
 // Set this flag for things like broadcast requests, etc. where the engine should not
 //  kill the request hook after receiving the first response
 enum {
-	FNETAPI_MULTIPLE_RESPONSE = (1 << 0);
+	FNETAPI_MULTIPLE_RESPONSE = (1 << 0)
 };
 
 typedef void (*net_api_response_func_t)(struct net_response_s *response);

From 5d5208582ab16915d98b1491ee73ae52ec8fcbdf Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 18:02:12 -0400
Subject: [PATCH 046/291] Removed static keyword

---
 src/common/mathlib.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/mathlib.h b/src/common/mathlib.h
index b04b67cf..522e6d04 100644
--- a/src/common/mathlib.h
+++ b/src/common/mathlib.h
@@ -37,7 +37,7 @@ struct mplane_s;
 extern Vector vec3_origin;
 constexpr int nanmask = 255 << 23;
 
-inline static bool IS_NAN(const float &x) {
+inline bool IS_NAN(const float &x) {
 
 	if ((((*(int*)&x) & nanmask) == nanmask)) {
 		return true;

From a4c36d8fd565875bfba5310c67e9b14077dc00ee Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 18:18:37 -0400
Subject: [PATCH 047/291] Removed magic numbers in favor of defines for
 NULL/TRUE/FALSE

---
 src/game/client/hl/hl_baseentity.cpp | 105 ++++++++++++++-------------
 1 file changed, 53 insertions(+), 52 deletions(-)

diff --git a/src/game/client/hl/hl_baseentity.cpp b/src/game/client/hl/hl_baseentity.cpp
index db98d1f9..a44f5100 100644
--- a/src/game/client/hl/hl_baseentity.cpp
+++ b/src/game/client/hl/hl_baseentity.cpp
@@ -38,6 +38,7 @@ const Vector g_vecZero = Vector(0, 0, 0);
 int gmsgWeapPickup = 0;
 enginefuncs_t g_engfuncs;
 globalvars_t *gpGlobals;
+constexpr int NEG_REF = -1;
 
 //-----------
 
@@ -52,23 +53,23 @@ void EMIT_SOUND_DYN(edict_t *entity, int channel, const char *sample, float volu
 }
 
 // CBaseEntity Stubs
-int CBaseEntity ::TakeHealth(float flHealth, int bitsDamageType) { return 1; }
-int CBaseEntity ::TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType) { return 1; }
+int CBaseEntity ::TakeHealth(float flHealth, int bitsDamageType) { return NULL; }
+int CBaseEntity ::TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType) { return NULL; }
 CBaseEntity *CBaseEntity::GetNextTarget(void) { return NULL; }
-int CBaseEntity::Save(CSave &save) { return 1; }
-int CBaseEntity::Restore(CRestore &restore) { return 1; }
+int CBaseEntity::Save(CSave &save) { return NULL; }
+int CBaseEntity::Restore(CRestore &restore) { return NULL; }
 void CBaseEntity::SetObjectCollisionBox(void) {}
-int CBaseEntity ::Intersects(CBaseEntity *pOther) { return 0; }
+int CBaseEntity ::Intersects(CBaseEntity *pOther) { return NULL; }
 void CBaseEntity ::MakeDormant(void) {}
-int CBaseEntity ::IsDormant(void) { return 0; }
+int CBaseEntity ::IsDormant(void) { return NULL; }
 BOOL CBaseEntity ::IsInWorld(void) { return TRUE; }
-int CBaseEntity::ShouldToggle(USE_TYPE useType, BOOL currentState) { return 0; }
-int CBaseEntity ::DamageDecal(int bitsDamageType) { return -1; }
+int CBaseEntity::ShouldToggle(USE_TYPE useType, BOOL currentState) { return NULL; }
+int CBaseEntity ::DamageDecal(int bitsDamageType) { return NEG_REF; }
 CBaseEntity *CBaseEntity::Create(const char *szName, const Vector &vecOrigin, const Vector &vecAngles, edict_t *pentOwner) { return NULL; }
 void CBaseEntity::SUB_Remove(void)
 {
 	Deactivate();
-	MS_DEBUG("DELETE ITEM: %s (%i)", DisplayName(), IsMSItem() ? ((CBasePlayerItem*)this)->m_iId : 0);
+	MS_DEBUG("DELETE ITEM: %s (%i)", DisplayName(), IsMSItem() ? ((CBasePlayerItem*)this)->m_iId : NULL);
 	MSCLGlobals::RemoveEnt(this, true);
 }
 //void CBaseEntity::StruckSound( CBaseEntity *pInflicter, CBaseEntity *pAttacker, float flDamage, TraceResult *ptr, int bitsDamageType ) { }
@@ -76,13 +77,13 @@ void CBaseEntity::CounterEffect(CBaseEntity *pInflictor, int iEffect, void *pExt
 
 // CBaseDelay Stubs
 void CBaseDelay ::KeyValue(struct KeyValueData_s *) {}
-int CBaseDelay::Restore(class CRestore &) { return 1; }
-int CBaseDelay::Save(class CSave &) { return 1; }
+int CBaseDelay::Restore(class CRestore &) { return TRUE; }
+int CBaseDelay::Save(class CSave &) { return TRUE; }
 CBaseEntity *CBaseDelay::GetSelf() { return this; }
 
 // CBaseAnimating Stubs
-int CBaseAnimating::Restore(class CRestore &) { return 1; }
-int CBaseAnimating::Save(class CSave &) { return 1; }
+int CBaseAnimating::Restore(class CRestore &) { return TRUE; }
+int CBaseAnimating::Save(class CSave &) { return TRUE; }
 
 // DEBUG Stubs
 edict_t *DBG_EntOfVars(const entvars_t *pev) { return NULL; }
@@ -107,8 +108,8 @@ void ClientPrint(entvars_t *client, int msg_dest, const char *msg_name, const ch
 }
 
 // CBaseToggle Stubs
-int CBaseToggle::Restore(class CRestore &) { return 1; }
-int CBaseToggle::Save(class CSave &) { return 1; }
+int CBaseToggle::Restore(class CRestore &) { return TRUE; }
+int CBaseToggle::Save(class CSave &) { return TRUE; }
 void CBaseToggle ::KeyValue(struct KeyValueData_s *) {}
 
 // CGrenade Stubs
@@ -124,20 +125,20 @@ BOOL CBaseMonster ::FShouldEat(void) { return TRUE; }
 void CBaseMonster ::BarnacleVictimBitten(entvars_t *pevBarnacle) {}
 void CBaseMonster ::BarnacleVictimReleased(void) {}
 void CBaseMonster ::Listen(void) {}
-float CBaseMonster ::FLSoundVolume(CSound *pSound) { return 0.0; }
+float CBaseMonster::FLSoundVolume(CSound* pSound) { return NULL; }
 BOOL CBaseMonster ::FValidateHintType(short sHint) { return FALSE; }
 void CBaseMonster ::Look(int iDistance) {}
-int CBaseMonster ::ISoundMask(void) { return 0; }
+int CBaseMonster ::ISoundMask(void) { return NULL; }
 CSound *CBaseMonster ::PBestSound(void) { return NULL; }
 CSound *CBaseMonster ::PBestScent(void) { return NULL; }
-float CBaseAnimating ::StudioFrameAdvance(float flInterval) { return 0.0; }
+float CBaseAnimating ::StudioFrameAdvance(float flInterval) { return NULL; }
 void CBaseMonster ::MonsterThink(void) {}
 void CBaseMonster ::MonsterUse(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value) {}
-int CBaseMonster ::IgnoreConditions(void) { return 0; }
+int CBaseMonster ::IgnoreConditions(void) { return NULL; }
 void CBaseMonster ::RouteClear(void) {}
 void CBaseMonster ::RouteNew(void) {}
 BOOL CBaseMonster ::FRouteClear(void) { return FALSE; }
-BOOL CBaseMonster ::FRefreshRoute(void) { return 0; }
+BOOL CBaseMonster ::FRefreshRoute(void) { return FALSE; }
 BOOL CBaseMonster::MoveToEnemy(Activity movementAct, float waitTime) { return FALSE; }
 BOOL CBaseMonster::MoveToLocation(Activity movementAct, float waitTime, const Vector &goal) { return FALSE; }
 BOOL CBaseMonster::MoveToTarget(Activity movementAct, float waitTime) { return FALSE; }
@@ -151,15 +152,15 @@ BOOL CBaseMonster ::CheckMeleeAttack1(float flDot, float flDist) { return FALSE;
 BOOL CBaseMonster ::CheckMeleeAttack2(float flDot, float flDist) { return FALSE; }
 void CBaseMonster ::CheckAttacks(CBaseEntity *pTarget, float flDist) {}
 BOOL CBaseMonster ::FCanCheckAttacks(void) { return FALSE; }
-int CBaseMonster ::CheckEnemy(CBaseEntity *pEnemy) { return 0; }
+int CBaseMonster ::CheckEnemy(CBaseEntity *pEnemy) { return FALSE; }
 void CBaseMonster ::PushEnemy(CBaseEntity *pEnemy, Vector &vecLastKnownPos) {}
 BOOL CBaseMonster ::PopEnemy() { return FALSE; }
 void CBaseMonster ::SetActivity(Activity NewActivity) {}
 void CBaseMonster ::SetSequenceByName(char *szSequence) {}
-int CBaseMonster ::CheckLocalMove(const Vector &vecStart, const Vector &vecEnd, CBaseEntity *pTarget, float *pflDist) { return 0; }
-float CBaseMonster ::OpenDoorAndWait(entvars_t *pevDoor) { return 0.0; }
+int CBaseMonster ::CheckLocalMove(const Vector &vecStart, const Vector &vecEnd, CBaseEntity *pTarget, float *pflDist) { return NULL; }
+float CBaseMonster::OpenDoorAndWait(entvars_t* pevDoor) { return NULL; }
 void CBaseMonster ::AdvanceRoute(float distance) {}
-int CBaseMonster ::RouteClassify(int iMoveFlag) { return 0; }
+int CBaseMonster::RouteClassify(int iMoveFlag) { return NULL; }
 BOOL CBaseMonster ::BuildRoute(const Vector &vecGoal, int iMoveFlag, CBaseEntity *pTarget) { return FALSE; }
 void CBaseMonster ::InsertWaypoint(Vector vecLocation, int afMoveFlags) {}
 BOOL CBaseMonster ::FTriangulate(const Vector &vecStart, const Vector &vecEnd, float flDist, CBaseEntity *pTargetEnt, Vector *pApex) { return FALSE; }
@@ -170,8 +171,8 @@ void CBaseMonster ::MonsterInit(void) {}
 void CBaseMonster ::MonsterInitThink(void) {}
 void CBaseMonster ::StartMonster(void) {}
 void CBaseMonster ::MovementComplete(void) {}
-int CBaseMonster::TaskIsRunning(void) { return 0; }
-int CBaseMonster::IRelationship(CBaseEntity *pTarget) { return 0; }
+int CBaseMonster::TaskIsRunning(void) { return FALSE; }
+int CBaseMonster::IRelationship(CBaseEntity *pTarget) { return NULL; }
 BOOL CBaseMonster ::FindCover(Vector vecThreat, Vector vecViewOffset, float flMinDist, float flMaxDist) { return FALSE; }
 BOOL CBaseMonster ::BuildNearestRoute(Vector vecThreat, Vector vecViewOffset, float flMinDist, float flMaxDist) { return FALSE; }
 CBaseEntity *CBaseMonster ::BestVisibleEnemy(void) { return NULL; }
@@ -182,26 +183,26 @@ BOOL CBaseEntity ::FVisible(const Vector &vecOrigin) { return FALSE; }
 BOOL CBaseEntity ::FMVisible(CBaseEntity *pEntity) { return FALSE; }
 BOOL CBaseEntity ::FMVisible(const Vector &vecOrigin) { return FALSE; }
 void CBaseMonster ::MakeIdealYaw(Vector vecTarget) {}
-float CBaseMonster::FlYawDiff(void) { return 0.0; }
-float CBaseMonster::ChangeYaw(int yawSpeed) { return 0; }
-float CBaseMonster::VecToYaw(Vector vecDir) { return 0.0; }
-int CBaseAnimating ::LookupActivity(int activity) { return 0; }
-int CBaseAnimating ::LookupActivityHeaviest(int activity) { return 0; }
+float CBaseMonster::FlYawDiff(void) { return NULL; }
+float CBaseMonster::ChangeYaw(int yawSpeed) { return NULL; }
+float CBaseMonster::VecToYaw(Vector vecDir) { return NULL; }
+int CBaseAnimating ::LookupActivity(int activity) { return NULL; }
+int CBaseAnimating ::LookupActivityHeaviest(int activity) { return NULL; }
 void CBaseMonster ::SetEyePosition(void) {}
-int CBaseAnimating ::LookupSequence(const char *label) { return 0; }
+int CBaseAnimating ::LookupSequence(const char *label) { return NULL; }
 void CBaseAnimating ::ResetSequenceInfo() {}
 BOOL CBaseAnimating ::GetSequenceFlags() { return FALSE; }
 void CBaseAnimating ::DispatchAnimEvents(float flInterval) {}
 void CBaseMonster ::HandleAnimEvent(MonsterEvent_t *pEvent) {}
-float CBaseAnimating ::SetBoneController(int iController, float flValue) { return 0.0; }
+float CBaseAnimating::SetBoneController(int iController, float flValue) { return NULL; }
 void CBaseAnimating ::InitBoneControllers(void) {}
-float CBaseAnimating ::SetBlending(int iBlender, float flValue) { return 0; }
+float CBaseAnimating ::SetBlending(int iBlender, float flValue) { return NULL; }
 void CBaseAnimating ::GetBonePosition(int iBone, Vector &origin, Vector &angles) {}
 void CBaseAnimating ::GetAttachment(int iAttachment, Vector &origin, Vector &angles) {}
-int CBaseAnimating ::FindTransition(int iEndingSequence, int iGoalSequence, int *piDir) { return -1; }
+int CBaseAnimating ::FindTransition(int iEndingSequence, int iGoalSequence, int *piDir) { return NEG_REF; }
 void CBaseAnimating ::GetAutomovement(Vector &origin, Vector &angles, float flInterval) {}
 void CBaseAnimating ::SetBodygroup(int iGroup, int iValue) {}
-int CBaseAnimating ::GetBodygroup(int iGroup) { return 0; }
+int CBaseAnimating ::GetBodygroup(int iGroup) { return NULL; }
 Vector CBaseMonster ::GetGunPosition(void) { return g_vecZero; }
 void CBaseEntity::FireBullets(unsigned long cShots, Vector vecSrc, Vector vecDirShooting, Vector vecSpread, float flDistance, int iBulletType, int iTracerFreq, int iDamage, entvars_t *pevAttacker) {}
 void CBaseEntity ::TraceBleed(float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType) {}
@@ -242,25 +243,25 @@ Schedule_t *CBaseMonster::ScheduleFromName(const char *pName) { return NULL; }
 void CBaseMonster::BecomeDead(void) {}
 void CBaseMonster ::RunAI(void) {}
 void CBaseMonster ::Killed(entvars_t *pevAttacker, int iGib) {}
-int CBaseMonster ::TakeHealth(float flHealth, int bitsDamageType) { return 0; }
-int CBaseMonster ::TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType) { return 0; }
-int CBaseMonster::Restore(class CRestore &) { return 1; }
-int CBaseMonster::Save(class CSave &) { return 1; }
+int CBaseMonster ::TakeHealth(float flHealth, int bitsDamageType) { return NULL; }
+int CBaseMonster::TakeDamage(entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType) {return NULL;}
+int CBaseMonster::Restore(class CRestore &) { return TRUE; }
+int CBaseMonster::Save(class CSave &) { return TRUE; }
 
-int TrainSpeed(int iSpeed, int iMax) { return 0; }
+int TrainSpeed(int iSpeed, int iMax) { return NULL; }
 
 //Master Sword
 void CBasePlayer::PainSound() {}
 void CBasePlayer::TakeDamageEffect(CBaseEntity *pInflictor, CBaseEntity *pAttacker, float flDamage, int bitsDamageType) {}
-int CBasePlayer::IRelationship(CBaseEntity *pTarget) { return 0; }
+int CBasePlayer::IRelationship(CBaseEntity *pTarget) { return NULL; }
 
-int CBasePlayerWeapon::Restore(class CRestore &) { return 1; }
-int CBasePlayerWeapon::Save(class CSave &) { return 1; }
+int CBasePlayerWeapon::Restore(class CRestore &) { return TRUE; }
+int CBasePlayerWeapon::Save(class CSave &) { return TRUE; }
 
 void CBasePlayer::StruckSound(CBaseEntity *pInflicter, CBaseEntity *pAttacker, float flDamage, TraceResult *ptr, int bitsDamageType) {}
 void CBasePlayer::DeathSound(void) {}
-int CBasePlayer::TakeHealth(float flHealth, int bitsDamageType) { return 0; }
-int CBasePlayer::TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType) { return 0; }
+int CBasePlayer::TakeHealth(float flHealth, int bitsDamageType) { return NULL; }
+int CBasePlayer::TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType) { return NULL; }
 void CBasePlayer::PackDeadPlayerItems(void) {}
 void CBasePlayer::WaterMove() {}
 BOOL CBasePlayer::IsOnLadder(void) { return FALSE; }
@@ -270,7 +271,7 @@ void CBasePlayer::StartObserver(Vector vecPosition, Vector vecViewAngle) {}
 void CBasePlayer::PlayerUse(void) {}
 void CBasePlayer::Jump() {}
 void CBasePlayer::Duck() {}
-int CBasePlayer::Classify(void) { return 0; }
+int CBasePlayer::Classify(void) { return NULL; }
 //void CBasePlayer :: PlayStepSound(int step, float fvol) { }
 //void CBasePlayer :: UpdateStepSound( void ) { }
 void CBasePlayer::PreThink(void) {}
@@ -279,9 +280,9 @@ void CBasePlayer ::UpdateGeigerCounter(void) {}
 void CBasePlayer ::UpdatePlayerSound(void) {}
 void CBasePlayer::PostThink() {}
 void CBasePlayer ::Precache(void) {}
-int CBasePlayer::Save(CSave &save) { return 0; }
+int CBasePlayer::Save(CSave &save) { return NULL; }
 void CBasePlayer::RenewItems(void) {}
-int CBasePlayer::Restore(CRestore &restore) { return 0; }
+int CBasePlayer::Restore(CRestore &restore) { return NULL; }
 void CBasePlayer::SelectNextItem(int iItem) {}
 BOOL CBasePlayer::HasWeapons(void) { return FALSE; }
 void CBasePlayer::SelectPrevItem(int iItem) {}
@@ -294,19 +295,19 @@ void CBasePlayer::ImpulseCommands() {}
 void CBasePlayer::CheatImpulseCommands(int iImpulse) {}
 void CBasePlayer::ItemPreFrame() {}
 void CBasePlayer::ItemPostFrame() {}
-int CBasePlayer::AmmoInventory(int iAmmoIndex) { return -1; }
+int CBasePlayer::AmmoInventory(int iAmmoIndex) { return NEG_REF; }
 //Master Sword
 void CBasePlayer ::UpdateClientData(void) {}
 BOOL CBasePlayer ::FBecomeProne(void) { return TRUE; }
 void CBasePlayer ::BarnacleVictimBitten(entvars_t *pevBarnacle) {}
 void CBasePlayer ::BarnacleVictimReleased(void) {}
-int CBasePlayer ::Illumination(void) { return 0; }
+int CBasePlayer ::Illumination(void) { return NULL; }
 void CBasePlayer ::EnableControl(BOOL fControl) {}
 Vector CBasePlayer ::GetAutoaimVector(float flDelta) { return g_vecZero; }
 //Vector CBasePlayer :: AutoaimDeflection( Vector &vecSrc, float flDist, float flDelta  ) { return g_vecZero; }
 void CBasePlayer ::ResetAutoaim() {}
 void CBasePlayer ::SetCustomDecalFrames(int nFrames) {}
-int CBasePlayer ::GetCustomDecalFrames(void) { return -1; }
+int CBasePlayer ::GetCustomDecalFrames(void) { return NEG_REF; }
 Vector CBasePlayer ::GetGunPosition(void) { return g_vecZero; }
 //Master Sword
 void CBasePlayer::Trade() {}

From 6b2b930d92b15cbd696a9950ff145eacd32e898a Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 18:20:31 -0400
Subject: [PATCH 048/291] Removed massive comment block from 2011.

---
 src/game/client/ms/clglobal.cpp | 67 ---------------------------------
 1 file changed, 67 deletions(-)

diff --git a/src/game/client/ms/clglobal.cpp b/src/game/client/ms/clglobal.cpp
index bdf8f3a8..72657b75 100644
--- a/src/game/client/ms/clglobal.cpp
+++ b/src/game/client/ms/clglobal.cpp
@@ -69,74 +69,7 @@ void MSCLGlobals::Initialize()
 	// Set up pointer
 	// Fill in current time
 	gpGlobals->time = gEngfuncs.GetClientTime();
-
-	// //Client CVARs
-	// CVAR_CREATE("ms_status_icons", "1", FCVAR_CLIENTDLL); // Drigien MAY2008 - Shows/Hides The HUD Status Icons
-	// //JAN2010_11 - not optional - used to blind player sometimes
-	// //CVAR_CREATE( "ms_showhudimgs", "1", FCVAR_CLIENTDLL );		// Drigien MAY2008 - Shows/Hides The HUD Images
-	// CVAR_CREATE("hud_classautokill", "1", FCVAR_ARCHIVE);				// controls whether or not to suicide immediately on TF class switch
-	// CVAR_CREATE("hud_takesshots", "0", FCVAR_ARCHIVE);					// controls whether or not to automatically take screenshots at the end of a round
-	// CVAR_CREATE("ms_hidehud", "0", FCVAR_ARCHIVE);						// Hides the HUD and viewmodel completely
-	// CVAR_CREATE("ms_lildude", "1", FCVAR_ARCHIVE);						// Thothie MAR2007a - Hides the 3d Guy if set 0
-	// CVAR_CREATE("ms_clgender", "0", FCVAR_CLIENTDLL);					// Thothie FEB2011_22 - Adding a cvar to store client gender
-	// CVAR_CREATE("ms_xpdisplay", "0", FCVAR_ARCHIVE);					// Thothie AUG2007a - XP Display Options
-	// CVAR_CREATE("ms_developer", "0", FCVAR_CLIENTDLL);					// Thothie MAR2007b - Hides client side developer messages when set to 0
-	// CVAR_CREATE("ms_evthud_decaytime", "5", FCVAR_ARCHIVE);				// Time each line in the Event Console lasts before it shrinks
-	// CVAR_CREATE("ms_evthud_history", "10", FCVAR_ARCHIVE);				// Max number of text lines to keep in the Event Console history
-	// CVAR_CREATE("ms_evthud_size", "5", FCVAR_ARCHIVE);					// Max number of text lines shown at once
-	// CVAR_CREATE("ms_evthud_bgtrans", "0", FCVAR_CLIENTDLL);				// Transparency of the background
-	// CVAR_CREATE("ms_txthud_decaytime", "9", FCVAR_ARCHIVE);				// Time each line in the Event Console lasts before it shrinks
-	// CVAR_CREATE("ms_txthud_history", "50", FCVAR_ARCHIVE);				// Max number of text lines to keep in the Event Console history
-	// CVAR_CREATE("ms_txthud_size", "8", FCVAR_ARCHIVE);					// Max number of text lines shown at once
-	// CVAR_CREATE("ms_txthud_bgtrans", "0", FCVAR_ARCHIVE);				// Transparency of the background
-	// CVAR_CREATE("ms_txthud_width", "640", FCVAR_ARCHIVE);				// Width of console
-	// CVAR_CREATE(CVAR_HELPTIPS, "1", FCVAR_ARCHIVE /*|FCVAR_USERINFO*/); // Whether help tips are shown
-	// CVAR_CREATE("ms_reflect", "1", FCVAR_ARCHIVE);						// Allow reflective surfaces
-	// CVAR_CREATE("ms_reflect_dbg", "0", FCVAR_ARCHIVE);					// Debug reflective surfaces
-	// CVAR_CREATE("ms_bloom_darken", "-1", FCVAR_ARCHIVE);				// MiB DEC2010 - Darken bloom
-	// CVAR_CREATE("ms_bloom_level", "0", FCVAR_ARCHIVE);					// Thothie DEC2010_30 - Fix ms_bloom_level stickiness
-	// //CVAR_CREATE("ms_reconnect_delay", "5", FCVAR_ARCHIVE);				// Thothie AUG2017 - Make reconnect delay adjustable client side
-	// CVAR_CREATE(MSCVAR_QUICKSLOT_TIMEOUT, "2.5", FCVAR_ARCHIVE);		// Timeout for the quickslots
-	// CVAR_CREATE("ms_autocharge", "1", FCVAR_ARCHIVE);					// MiB MAR2012_05 - Let's you auto-charge your attack
-	// CVAR_CREATE("ms_doubletapdodge", "0", FCVAR_ARCHIVE);				// MiB MAR2012_05 -Enable/Disable double tapping to dodge
-	// CVAR_CREATE("ms_invtype", "1", FCVAR_ARCHIVE);						// MiB FEB2012_12 - Inventory types (added post-doc by Thothie)
-	// CVAR_CREATE("ms_showotherglow", "1", FCVAR_ARCHIVE);
-	// CVAR_CREATE("ms_chargebar_sound", "magic/chargebar_alt1.wav", FCVAR_ARCHIVE);
-	// CVAR_CREATE("ms_chargebar_volume", "15", FCVAR_ARCHIVE);
-	// CVAR_CREATE("ms_doubletap_delay", "0.45", FCVAR_ARCHIVE); // The higher the amount, the longer the player has to hit left/right/back for a second time
-	// CVAR_CREATE("ms_sprint_verbose", "2", FCVAR_ARCHIVE); // 0 for no messages , 1 for only warnings , 2 for everything
-	// CVAR_CREATE("ms_sprint_toggle", "1", FCVAR_ARCHIVE);
-	// CVAR_CREATE("ms_sprint_doubletap", "1", FCVAR_ARCHIVE);
-
-	//CVAR_CREATE("ms_alpha_inventory", "0", FCVAR_ARCHIVE); // MiB FEB2019_24 [ALPHABETICAL_INVENTORY]
-	//CVAR_CREATE("ms_hands_display", "2", FCVAR_ARCHIVE);
-	//CVAR_CREATE("ms_hands_display_y", "20", FCVAR_ARCHIVE);
-	//CVAR_CREATE("ms_scrollamount", "30", FCVAR_ARCHIVE);
-	//CVAR_CREATE("ms_doubleclicktime", "1", FCVAR_ARCHIVE);
-
-	/*msstring DefaultLANID = "this_must_be_unique";
-	gEngfuncs.pfnRegisterVariable( "ms_id", DefaultID, FCVAR_USERINFO|FCVAR_ARCHIVE );
-
-	if( DefaultLANID == (const char *)gEngfuncs.pfnGetCvarString("ms_id") )
-	{
-		//If I'm still using the default ID, generate a random one
-		char ID[8];
-		 for (int i = 0; i < 6; i++)
-		{
-			int CharType = RANDOM_LONG(0,2);
-			int Low, High;
-			switch( CharType ) {
-				case 0: Low = '0'; High = '9'; break;
-				case 1: Low = 'a'; High = 'z'; break;
-				case 2: Low = 'A'; High = 'Z'; break;
-			}
-			ID[i] = RANDOM_LONG( Low, High ); ID[i+1] = 0;
-		}
-		gEngfuncs.pfnClientCmd( msstring("ms_id ") + ID + "\n" );
-	}*/
-
 	InitializePlayer();
-
 	MSGlobalItemInit();
 }
 

From 60cd2fdf4bed6a03a658fc5cec96737c4cd23da7 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 19:20:39 -0400
Subject: [PATCH 049/291] Removed some comments. Addeec constexpr to defined
 constants. FIxed warning C5055 after enum changes.

---
 src/game/client/ms/health.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/game/client/ms/health.cpp b/src/game/client/ms/health.cpp
index aad8e4c0..3b94e44d 100644
--- a/src/game/client/ms/health.cpp
+++ b/src/game/client/ms/health.cpp
@@ -55,6 +55,7 @@ int giDmgFlags[NUM_DMG_TYPES] =
 		DMG_NERVEGAS,
 		DMG_RADIATION,
 		DMG_SHOCK,
+	
 		DMG_CALTROP,
 		DMG_TRANQ,
 		DMG_CONCUSS,

From bfa30bc1dcecd3bebaf19bb3974951cad94c96e0 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 19:20:50 -0400
Subject: [PATCH 050/291] Removed whitespace

---
 src/game/client/ms/health.cpp | 192 ++++------------------------------
 1 file changed, 20 insertions(+), 172 deletions(-)

diff --git a/src/game/client/ms/health.cpp b/src/game/client/ms/health.cpp
index 3b94e44d..f0f0abc7 100644
--- a/src/game/client/ms/health.cpp
+++ b/src/game/client/ms/health.cpp
@@ -39,27 +39,27 @@ MS_DECLARE_MESSAGE(m_Health, HP)
 MS_DECLARE_MESSAGE(m_Health, MP)
 MS_DECLARE_MESSAGE(m_Health, Damage)
 
-#define MOVE_INC 3
-#define PAIN_NAME "sprites/%d_pain.spr"
-#define DAMAGE_NAME "sprites/%d_dmg.spr"
+constexpr int MOVE_INC = 3;
+constexpr const char* PAIN_NAME = "sprites/%d_pain.spr";
+constexpr const char* DAMAGE_NAME = "sprites/%d_dmg.spr";
 
 int giDmgHeight, giDmgWidth;
 
 int giDmgFlags[NUM_DMG_TYPES] =
-	{
-		DMG_POISON,
-		DMG_ACID,
-		DMG_FREEZE | DMG_SLOWFREEZE,
-		DMG_DROWN,
-		DMG_BURN | DMG_SLOWBURN,
-		DMG_NERVEGAS,
-		DMG_RADIATION,
-		DMG_SHOCK,
-	
-		DMG_CALTROP,
-		DMG_TRANQ,
-		DMG_CONCUSS,
-		DMG_HALLUC};
+{
+	DMG_POISON,
+	DMG_ACID,
+	DMG_FREEZE | DMG_SLOWFREEZE,
+	DMG_DROWN,
+	DMG_BURN | DMG_SLOWBURN,
+	DMG_NERVEGAS,
+	DMG_RADIATION,
+	DMG_SHOCK,
+	DMG_CALTROP,
+	DMG_TRANQ,
+	DMG_CONCUSS,
+	DMG_HALLUC
+};
 
 int CHudHealth::Init(void)
 {
@@ -77,14 +77,6 @@ int CHudHealth::Init(void)
 	m_iTempHP = m_iTempMP = 0;
 
 	memset(m_dmg, 0, sizeof(DAMAGE_IMAGE) * NUM_DMG_TYPES);
-
-	/*	if( !CVAR_GET_FLOAT("gl_polyoffset") ) {
-		char a[64];
-		 _snprintf(a, sizeof(a),  "Software mode detected!  Disabling Health/Mana Flasks!.\n",  CVAR_GET_FLOAT("gl_polyoffset") ); 
-		ConsolePrint( a );
-		m_iFlags = 0;
-	}*/
-
 	gHUD.AddHudElem(this);
 	return 1;
 }
@@ -185,7 +177,7 @@ void CHudHealth::GetPainColor(int &r, int &g, int &b)
 		iHealth -= 25;
 	else if (iHealth < 0)
 		iHealth = 0;
-#if 0
+#if 0 
 	g = iHealth * 255 / 100;
 	r = 255 - g;
 	b = 0;
@@ -209,90 +201,6 @@ void CHudHealth::GetPainColor(int &r, int &g, int &b)
 int CHudHealth::Draw(float flTime)
 {	
 	return 1;
-	/*	int HPr, HPg, HPb;
-	int x, y;
-	int xFlask, yFlask;
-	int iHealth = player.m_HP,
-		iMaxHP = player.m_MaxHP,
-		iMana = player.m_MP,
-		iMaxMP = player.m_MaxMP;
-
-	if( player.m_HP < 1.0f && player.m_HP > 0 ) iHealth = 1;	//Cap integers at 1
-	if( player.m_MP < 1.0f && player.m_MP > 0 ) iMana = 1;
-
-	if ( gHUD.m_iHideHUDDisplay & (HIDEHUD_HEALTH|HIDEHUD_ALL) || !(m_iFlags&HUD_ACTIVE) )
-		return 1;
-
-	if ( !m_hSprite )
-		m_hSprite = LoadSprite(PAIN_NAME);
-	
-
-	// If health is getting low, make it bright red
-	//if (m_iHealth <= 15) ScaleColors(r, g, b, a );
-		
-	if( (gHUD.m_flTime-flChangeTime) >= .007) {
-		float inc = (100/MOVE_INC);
-		if( m_iTempHP > iHealth ) { m_iTempHP -= (iHealth/inc)+1; if(m_iTempHP<iHealth) m_iTempHP = iHealth; }
-		else if( m_iTempHP < iHealth ) { m_iTempHP += (iHealth/inc)+1; if(m_iTempHP>iHealth) m_iTempHP = iHealth; }
-		if( m_iTempMP > iMana ) { m_iTempMP -= (iMana/inc)+1; if(m_iTempMP<iMana) m_iTempMP = iMana; }
-		else if( m_iTempMP < iMana ) { m_iTempMP += (iMana/inc)+1; if(m_iTempMP>iMana) m_iTempMP = iMana; }
-		flChangeTime = gHUD.m_flTime;
-	}
-
-//	if( m_iTempHP < iHealth ) m_iTempHP = iHealth;
-//	if( m_iTempMP < iMana ) m_iTempMP = iMana;
-
-//	ScaleColors(r, g, b, a );
-
-	int iHealthFlask = gHUD.GetSpriteIndex("healthflask"),
-		iManaFlask = gHUD.GetSpriteIndex("manaflask"),
-		iframe;
-	int SMLNumWidth = gHUD.GetSpriteRect(gHUD.m_HUD_numberSML_0).right - gHUD.GetSpriteRect(gHUD.m_HUD_numberSML_0).left,
-		SMLSlashWidth = gHUD.GetSpriteRect(gHUD.m_HUD_char_slashSML).right - gHUD.GetSpriteRect(gHUD.m_HUD_char_slashSML).left,
-		HFlaskWidth = gHUD.GetSpriteRect(iHealthFlask).right - gHUD.GetSpriteRect(iHealthFlask).left,
-		MFlaskWidth = gHUD.GetSpriteRect(iManaFlask).right - gHUD.GetSpriteRect(iManaFlask).left;
-	int xStart, yStart;
-
-	//y = ScreenHeight - gHUD.m_iFontHeight - gHUD.m_iFontHeight / 2;
-	yFlask = ScreenHeight - 110; xFlask = XRES(15);
-
-	xStart = (xFlask+(HFlaskWidth/2))-(((numofdigits(m_iTempHP)*SMLNumWidth)+(numofdigits(iMaxHP)*SMLNumWidth)+SMLSlashWidth)/2); yStart = ScreenHeight - 40;
-
-	y = yStart; x = xStart;
-
-
-	float fltemp; int maxframes;
-	maxframes = (SPR_Frames(gHUD.GetSprite(iHealthFlask))-1);
-	fltemp = (float)((float)m_iTempHP/(float)iMaxHP) * maxframes;
-	iframe = min(fltemp,maxframes); //round up if not at integer
-	SPR_Set(gHUD.GetSprite(iHealthFlask), 128, 128, 128 );
-	SPR_DrawHoles( iframe, xFlask, yFlask, &gHUD.GetSpriteRect(iHealthFlask));
-
-	GetPainColor( HPr, HPg, HPb );
-	x = gHUD.DrawHudNumberSML(x, y, NULL, m_iTempHP, HPr, HPg, HPb);
-
-	x = gHUD.DrawHudStringSML( x, y, "/", 255, 255, 255 );
-	
-	x = gHUD.DrawHudNumberSML(x, y, NULL, iMaxHP, 255, 255, 255);
-
-	xFlask += (gHUD.GetSpriteRect(iHealthFlask).right - gHUD.GetSpriteRect(iHealthFlask).left) + XRES(10);
-	
-	maxframes = (SPR_Frames(gHUD.GetSprite(iManaFlask))-1);
-	fltemp = (float)((float)m_iTempMP/(float)iMaxMP) * maxframes;
-	iframe = min(fltemp,maxframes); //round up if not at integer
-	SPR_Set(gHUD.GetSprite(iManaFlask), 128, 128, 128 );
-	SPR_DrawHoles( iframe, xFlask, yFlask, &gHUD.GetSpriteRect(iManaFlask));
-
-	x = (xFlask+(MFlaskWidth/2))-(((numofdigits(m_iTempMP)*SMLNumWidth)+(numofdigits(iMaxMP)*SMLNumWidth)+SMLSlashWidth)/2); yStart = ScreenHeight - 40;
-	
-	x = gHUD.DrawHudNumberSML(x, y, NULL, m_iTempMP, 255, 255, 255);
-
-	x = gHUD.DrawHudStringSML( x, y, "/", 255, 255, 255 );
-	
-	x = gHUD.DrawHudNumberSML(x, y, NULL, iMaxMP, 255, 255, 255);
-
-	DrawDamage(flTime);
-	return DrawPain(flTime);*/
 }
 
 void CHudHealth::CalcDamageDirection(vec3_t vecFrom)
@@ -430,66 +338,6 @@ int CHudHealth::DrawPain(float flTime)
 	return 1;
 }
 
-/*int CHudHealth::DrawDamage(float flTime)
-{
-	int r, g, b, a;
-	DAMAGE_IMAGE *pdmg;
-
-	if (!m_bitsDamage)
-		return 1;
-
-	UnpackRGB(r,g,b, RGB_YELLOWISH);
-	
-	a = (int)( fabs(sin(flTime*2)) * 256.0);
-
-	ScaleColors(r, g, b, a);
-
-	// Draw all the items
-	for (int i = 0; i < NUM_DMG_TYPES; i++)
-	{
-		if (m_bitsDamage & giDmgFlags[i])
-		{
-			pdmg = &m_dmg[i];
-			SPR_Set(gHUD.GetSprite(m_HUD_dmg_bio + i), r, g, b );
-			SPR_DrawAdditive(0, pdmg->x, pdmg->y, &gHUD.GetSpriteRect(m_HUD_dmg_bio + i));
-		}
-	}
-
-
-	// check for bits that should be expired
-	for ( i = 0; i < NUM_DMG_TYPES; i++ )
-	{
-		DAMAGE_IMAGE *pdmg = &m_dmg[i];
-
-		if ( m_bitsDamage & giDmgFlags[i] )
-		{
-			pdmg->fExpire = min( flTime + DMG_IMAGE_LIFE, pdmg->fExpire );
-
-			if ( pdmg->fExpire <= flTime		// when the time has expired
-				&& a < 40 )						// and the flash is at the low point of the cycle
-			{
-				pdmg->fExpire = 0;
-
-				int y = pdmg->y;
-				pdmg->x = pdmg->y = 0;
-
-				// move everyone above down
-				for (int j = 0; j < NUM_DMG_TYPES; j++)
-				{
-					pdmg = &m_dmg[j];
-					if ((pdmg->y) && (pdmg->y < y))
-						pdmg->y += giDmgHeight;
-
-				}
-
-				m_bitsDamage &= ~giDmgFlags[i];  // clear the bits
-			}
-		}
-	}
-
-	return 1;
-}*/
-
 void CHudHealth::UpdateTiles(float flTime, long bitsDamage)
 {
 	DAMAGE_IMAGE *pdmg;
@@ -504,7 +352,7 @@ void CHudHealth::UpdateTiles(float flTime, long bitsDamage)
 		// Is this one already on?
 		if (m_bitsDamage & giDmgFlags[i])
 		{
-			pdmg->fExpire = flTime + DMG_IMAGE_LIFE; // extend the duration
+			pdmg->fExpire = flTime + static_cast<float>(DMG_IMAGE_LIFE); // extend the duration
 			if (!pdmg->fBaseline)
 				pdmg->fBaseline = flTime;
 		}
@@ -515,7 +363,7 @@ void CHudHealth::UpdateTiles(float flTime, long bitsDamage)
 			// put this one at the bottom
 			pdmg->x = giDmgWidth / 8;
 			pdmg->y = ScreenHeight - giDmgHeight * 2;
-			pdmg->fExpire = flTime + DMG_IMAGE_LIFE;
+			pdmg->fExpire = flTime + static_cast<float>(DMG_IMAGE_LIFE);
 
 			// move everyone else up
 			for (int j = 0; j < NUM_DMG_TYPES; j++)

From 15929402a7e659113fdf531184ddaca29eb2e55d Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 19:21:29 -0400
Subject: [PATCH 051/291] Removed multiple enum definitions, MS defines are in
 cbase.h

---
 src/game/client/ms/health.h | 85 ++++++++-----------------------------
 1 file changed, 18 insertions(+), 67 deletions(-)

diff --git a/src/game/client/ms/health.h b/src/game/client/ms/health.h
index 6fef6538..4442334e 100644
--- a/src/game/client/ms/health.h
+++ b/src/game/client/ms/health.h
@@ -13,75 +13,26 @@
 *
 ****/
 
-#define DMG_IMAGE_LIFE 2 // seconds that image is up
+enum {
 
-#define DMG_IMAGE_POISON 0
-#define DMG_IMAGE_ACID 1
-#define DMG_IMAGE_COLD 2
-#define DMG_IMAGE_DROWN 3
-#define DMG_IMAGE_BURN 4
-#define DMG_IMAGE_NERVE 5
-#define DMG_IMAGE_RAD 6
-#define DMG_IMAGE_SHOCK 7
-//tf defines
-#define DMG_IMAGE_CALTROP 8
-#define DMG_IMAGE_TRANQ 9
-#define DMG_IMAGE_CONCUSS 10
-#define DMG_IMAGE_HALLUC 11
-#define NUM_DMG_TYPES 12
-// instant damage
-
-#define DMG_GENERIC 0			 // generic damage was done
-#define DMG_CRUSH (1 << 0)		 // crushed by falling or moving object
-#define DMG_BULLET (1 << 1)		 // shot
-#define DMG_SLASH (1 << 2)		 // cut, clawed, stabbed
-#define DMG_BURN (1 << 3)		 // heat burned
-#define DMG_FREEZE (1 << 4)		 // frozen
-#define DMG_FALL (1 << 5)		 // fell too far
-#define DMG_BLAST (1 << 6)		 // explosive blast damage
-#define DMG_CLUB (1 << 7)		 // crowbar, punch, headbutt
-#define DMG_SHOCK (1 << 8)		 // electric shock
-#define DMG_SONIC (1 << 9)		 // sound pulse shockwave
-#define DMG_ENERGYBEAM (1 << 10) // laser or other high energy beam
-#define DMG_NEVERGIB (1 << 12)	 // with this bit OR'd in, no damage type will be able to gib victims upon death
-#define DMG_ALWAYSGIB (1 << 13)	 // with this bit OR'd in, any damage type can be made to gib victims upon death.
-
-// time-based damage
-//mask off TF-specific stuff too
-//#define DMG_TIMEBASED		(~(0xff003fff))	// mask for time-based damage
-
-#define DMG_DROWN (1 << 14) // Drowning
-#define DMG_FIRSTTIMEBASED DMG_DROWN
-
-#define DMG_PARALYZE (1 << 15)	   // slows affected creature down
-#define DMG_NERVEGAS (1 << 16)	   // nerve toxins, very bad
-#define DMG_POISON (1 << 17)	   // blood poisioning
-#define DMG_RADIATION (1 << 18)	   // radiation exposure
-#define DMG_DROWNRECOVER (1 << 19) // drowning recovery
-#define DMG_ACID (1 << 20)		   // toxic chemicals or acid burns
-#define DMG_SLOWBURN (1 << 21)	   // in an oven
-#define DMG_SLOWFREEZE (1 << 22)   // in a subzero freezer
-#define DMG_MORTAR (1 << 23)	   // Hit by air raid (done to distinguish grenade from mortar)
-
-//TF ADDITIONS
-#define DMG_IGNITE (1 << 24)	   // Players hit by this begin to burn
-#define DMG_RADIUS_MAX (1 << 25)   // Radius damage with this flag doesn't decrease over distance
-#define DMG_RADIUS_QUAKE (1 << 26) // Radius damage is done like Quake. 1/2 damage at 1/2 radius.
-#define DMG_IGNOREARMOR (1 << 27)  // Damage ignores target's armor
-#define DMG_AIMED (1 << 28)		   // Does Hit location damage
-#define DMG_WALLPIERCING (1 << 29) // Blast Damages ents through walls
-
-#define DMG_CALTROP (1 << 30)
-#define DMG_HALLUC (1 << 31)
-
-// TF Healing Additions for TakeHealth
-#define DMG_IGNORE_MAXHEALTH DMG_IGNITE
-// TF Redefines since we never use the originals
-#define DMG_NAIL DMG_SLASH
-#define DMG_NOT_SELF DMG_FREEZE
+	DMG_IMAGE_POISON = 0,
+	DMG_IMAGE_ACID = 1,
+	DMG_IMAGE_COLD = 2,
+	DMG_IMAGE_LIFE = 2,// seconds that image is up
+	DMG_IMAGE_DROWN = 3,
+	DMG_IMAGE_BURN = 4,
+	DMG_IMAGE_NERVE = 5,
+	DMG_IMAGE_RAD = 6,
+	DMG_IMAGE_SHOCK = 7,
+	//tf defines
+	DMG_IMAGE_CALTROP = 8,
+	DMG_IMAGE_TRANQ = 9,
+	DMG_IMAGE_CONCUSS = 10,
+	DMG_IMAGE_HALLUC = 11
+};
 
-#define DMG_TRANQ DMG_MORTAR
-#define DMG_CONCUSS DMG_SONIC
+constexpr int NUM_DMG_TYPES = 12;
+// instant damage
 
 typedef struct
 {

From 41d162368c8e910b1a785b79a17db0a8e85db4fd Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 19:22:02 -0400
Subject: [PATCH 052/291] Added missing enums in DMG types to to remove
 multiple declarations.

---
 src/game/server/hl/cbase.h | 187 +++++++++++++++++++------------------
 1 file changed, 94 insertions(+), 93 deletions(-)

diff --git a/src/game/server/hl/cbase.h b/src/game/server/hl/cbase.h
index ec3361e2..2534cd58 100644
--- a/src/game/server/hl/cbase.h
+++ b/src/game/server/hl/cbase.h
@@ -836,111 +836,112 @@ class CBaseToggle : public CBaseAnimating
 #define SetMoveDone(a) m_pfnCallWhenMoveDone = static_cast<void (CBaseToggle::*)(void)>(a)
 
 // people gib if their health is <= this at the time of death
-#define GIB_HEALTH_VALUE -30
-
-#define ROUTE_SIZE 8	  // how many waypoints a monster can store at one time
-#define MAX_OLD_ENEMIES 4 // how many old enemies to remember
-
-#define bits_CAP_DUCK (1 << 0)		 // crouch
-#define bits_CAP_JUMP (1 << 1)		 // jump/leap
-#define bits_CAP_STRAFE (1 << 2)	 // strafe ( walk/run sideways)
-#define bits_CAP_SQUAD (1 << 3)		 // can form squads
-#define bits_CAP_SWIM (1 << 4)		 // proficiently navigate in water
-#define bits_CAP_CLIMB (1 << 5)		 // climb ladders/ropes
-#define bits_CAP_USE (1 << 6)		 // open doors/push buttons/pull levers
-#define bits_CAP_HEAR (1 << 7)		 // can hear forced sounds
-#define bits_CAP_AUTO_DOORS (1 << 8) // can trigger auto doors
-#define bits_CAP_OPEN_DOORS (1 << 9) // can open manual doors
-#define bits_CAP_TURN_HEAD (1 << 10) // can turn head, always bone controller 0
-
-#define bits_CAP_RANGE_ATTACK1 (1 << 11) // can do a range attack 1
-#define bits_CAP_RANGE_ATTACK2 (1 << 12) // can do a range attack 2
-#define bits_CAP_MELEE_ATTACK1 (1 << 13) // can do a melee attack 1
-#define bits_CAP_MELEE_ATTACK2 (1 << 14) // can do a melee attack 2
-
-#define bits_CAP_FLY (1 << 15) // can fly, move all around
-
-#define bits_CAP_DOORS_GROUP (bits_CAP_USE | bits_CAP_AUTO_DOORS | bits_CAP_OPEN_DOORS)
-
+constexpr int GIB_HEALTH_VALUE = -30;
+constexpr int ROUTE_SIZE = 8;	  // how many waypoints a monster can store at one time
+constexpr int MAX_OLD_ENEMIES = 4; // how many old enemies to remember
+
+enum {
+	bits_CAP_DUCK = (1 << 0),		 // crouch
+	bits_CAP_JUMP = (1 << 1),		 // jump/leap
+	bits_CAP_STRAFE = (1 << 2),		// strafe ( walk/run sideways)
+	bits_CAP_SQUAD = (1 << 3),		 // can form squads
+	bits_CAP_SWIM = (1 << 4),		 // proficiently navigate in water
+	bits_CAP_CLIMB = (1 << 5),		 // climb ladders/ropes
+	bits_CAP_USE = (1 << 6),		 // open doors/push buttons/pull levers
+	bits_CAP_HEAR = (1 << 7),		 // can hear forced sounds
+	bits_CAP_AUTO_DOORS = (1 << 8), // can trigger auto doors
+	bits_CAP_OPEN_DOORS = (1 << 9), // can open manual doors
+	bits_CAP_TURN_HEAD = (1 << 10), // can turn head, always bone controller 0
+	bits_CAP_RANGE_ATTACK1 = (1 << 11), // can do a range attack 1
+	bits_CAP_RANGE_ATTACK2 = (1 << 12), // can do a range attack 2
+	bits_CAP_MELEE_ATTACK1 = (1 << 13), // can do a melee attack 1
+	bits_CAP_MELEE_ATTACK2 = (1 << 14), // can do a melee attack 2
+	bits_CAP_FLY = (1 << 15), // can fly, move all around
+	bits_CAP_DOORS_GROUP = (bits_CAP_USE | bits_CAP_AUTO_DOORS | bits_CAP_OPEN_DOORS)
+};
 // used by suit voice to indicate damage sustained and repaired type to player
 
 // instant damage
-
-#define DMG_GENERIC 0			 // generic damage was done
-#define DMG_CRUSH (1 << 0)		 // crushed by falling or moving object
-#define DMG_BULLET (1 << 1)		 // shot
-#define DMG_SLASH (1 << 2)		 // cut, clawed, stabbed
-#define DMG_BURN (1 << 3)		 // heat burned
-#define DMG_FREEZE (1 << 4)		 // frozen
-#define DMG_FALL (1 << 5)		 // fell too far
-#define DMG_BLAST (1 << 6)		 // explosive blast damage
-#define DMG_CLUB (1 << 7)		 // crowbar, punch, headbutt
-#define DMG_SHOCK (1 << 8)		 // electric shock
-#define DMG_SONIC (1 << 9)		 // sound pulse shockwave
-#define DMG_ENERGYBEAM (1 << 10) // laser or other high energy beam
-#define DMG_NEVERGIB (1 << 12)	 // with this bit OR'd in, no damage type will be able to gib victims upon death
-#define DMG_ALWAYSGIB (1 << 13)	 // with this bit OR'd in, any damage type can be made to gib victims upon death.
-#define DMG_DROWN (1 << 14)		 // Drowning
-// time-based damage
-#define DMG_TIMEBASED (~(0x3fff)) // mask for time-based damage
-
-#define DMG_PARALYZE (1 << 15)	   // slows affected creature down
-#define DMG_NERVEGAS (1 << 16)	   // nerve toxins, very bad
-#define DMG_POISON (1 << 17)	   // blood poisioning
-#define DMG_RADIATION (1 << 18)	   // radiation exposure
-#define DMG_DROWNRECOVER (1 << 19) // drowning recovery
-#define DMG_ACID (1 << 20)		   // toxic chemicals or acid burns
-#define DMG_SLOWBURN (1 << 21)	   // in an oven
-#define DMG_SLOWFREEZE (1 << 22)   // in a subzero freezer
-#define DMG_MORTAR (1 << 23)	   // Hit by air raid (done to distinguish grenade from mortar)
-//Master Sword --
-#define DMG_NOKILL (1 << 24)	  // (Dogg) This damage cannot kill you (fists reflective damage...)
-#define DMG_SIMPLEBBOX (1 << 25)  // (Dogg) Use a simple BBox for tracelines
-#define DMG_DIRECT (1 << 26)	  // (Dogg) Ignore the traceline and just do damage to the target
-#define DMG_REFLECTIVE (1 << 27)  // (Dogg) This damage can hurt you
-#define DMG_AOE (1 << 28)		  // (Dogg) Area of Effect Damage
-#define DMG_NONE (1 << 29)		  // (Dogg) Find a target, but don't damage it
-#define DMG_NOSKIN (1 << 30)	  // (Dogg) This damage won't skin creatures (arrows, fireball, etc.)
-#define DMG_MARTIALARTS (1 << 31) // (Dogg) Martial arts attack (punch, kick, jumpkick...)
-//---------------
-// these are the damage types that are allowed to gib corpses
-#define DMG_GIB_CORPSE (DMG_CRUSH | DMG_FALL | DMG_BLAST | DMG_SONIC | DMG_CLUB)
-
-// these are the damage types that have client hud art
-#define DMG_SHOWNHUD (DMG_POISON | DMG_ACID | DMG_FREEZE | DMG_SLOWFREEZE | DMG_DROWN | DMG_BURN | DMG_SLOWBURN | DMG_NERVEGAS | DMG_RADIATION | DMG_SHOCK)
-
+	
+enum {
+	DMG_GENERIC = (0 << 0),			 // generic damage was done
+	DMG_CRUSH = (1 << 0),		 // crushed by falling or moving object
+	DMG_BULLET = (1 << 1),		 // shot
+	DMG_SLASH = (1 << 2),		 // cut, clawed, stabbed
+	DMG_BURN = (1 << 3),		 // heat burned
+	DMG_FREEZE = (1 << 4),		 // frozen
+	DMG_FALL = (1 << 5),		 // fell too far
+	DMG_BLAST = (1 << 6),		 // explosive blast damage
+	DMG_CLUB = (1 << 7),		 // crowbar, punch, headbutt
+	DMG_SHOCK = (1 << 8),		 // electric shock
+	DMG_SONIC = (1 << 9),		 // sound pulse shockwave
+	DMG_ENERGYBEAM = (1 << 10), // laser or other high energy beam
+	DMG_NEVERGIB = (1 << 12),	 // with this bit OR'd in, no damage type will be able to gib victims upon death
+	DMG_ALWAYSGIB = (1 << 13),	 // with this bit OR'd in, any damage type can be made to gib victims upon death.
+	DMG_DROWN = (1 << 14),		 // Drowning
+	DMG_TIMEBASED = (~(0x3fff)), // mask for time-based damage
+	DMG_PARALYZE = (1 << 15),	   // slows affected creature down
+	DMG_NERVEGAS = (1 << 16),	   // nerve toxins, very bad
+	DMG_POISON = (1 << 17),	   // blood poisioning
+	DMG_RADIATION = (1 << 18),	   // radiation exposure
+	DMG_DROWNRECOVER = (1 << 19), // drowning recovery
+	DMG_ACID = (1 << 20),		   // toxic chemicals or acid burns
+	DMG_SLOWBURN = (1 << 21),	   // in an oven
+	DMG_SLOWFREEZE = (1 << 22),   // in a subzero freezer
+	DMG_MORTAR = (1 << 23),	   // Hit by air raid (done to distinguish grenade from mortar)
+	DMG_CALTROP = (1 << 30),
+	DMG_HALLUC = (1 << 31),
+	DMG_TRANQ = DMG_MORTAR,
+	DMG_CONCUSS = DMG_SONIC,
+	//Master Sword --
+	DMG_NOKILL = (1 << 24),	  // (Dogg) This damage cannot kill you (fists reflective damage...)
+	DMG_SIMPLEBBOX = (1 << 25),  // (Dogg) Use a simple BBox for tracelines
+	DMG_DIRECT = (1 << 26),	  // (Dogg) Ignore the traceline and just do damage to the target
+	DMG_REFLECTIVE = (1 << 27),  // (Dogg) This damage can hurt you
+	DMG_AOE = (1 << 28),		  // (Dogg) Area of Effect Damage
+	DMG_NONE = (1 << 29),		  // (Dogg) Find a target, but don't damage it
+	DMG_NOSKIN = (1 << 30),	  // (Dogg) This damage won't skin creatures (arrows, fireball, etc.)
+	DMG_MARTIALARTS = (1 << 31), // (Dogg) Martial arts attack (punch, kick, jumpkick...)
+	//---------------
+	// these are the damage types that are allowed to gib corpses
+	DMG_GIB_CORPSE = (DMG_CRUSH | DMG_FALL | DMG_BLAST | DMG_SONIC | DMG_CLUB),
+	// these are the damage types that have client hud art
+	DMG_SHOWNHUD = (DMG_POISON | DMG_ACID | DMG_FREEZE | DMG_SLOWFREEZE | DMG_DROWN | DMG_BURN | DMG_SLOWBURN | DMG_NERVEGAS | DMG_RADIATION | DMG_SHOCK)
+};
 // NOTE: tweak these values based on gameplay feedback:
 
-#define PARALYZE_DURATION 2 // number of 2 second intervals to take damage
-#define PARALYZE_DAMAGE 1.0 // damage to take each 2 second interval
+constexpr int   PARALYZE_DURATION = 2; // number of 2 second intervals to take damage
+constexpr float PARALYZE_DAMAGE = 1.0;// damage to take each 2 second interval
 
-#define NERVEGAS_DURATION 2
-#define NERVEGAS_DAMAGE 5.0
+constexpr int   NERVEGAS_DURATION = 2;
+constexpr float NERVEGAS_DAMAGE = 5.0;
 
-#define POISON_DURATION 5
-#define POISON_DAMAGE 2.0
+constexpr int   POISON_DURATION = 5;
+constexpr float POISON_DAMAGE = 2.0;
 
-#define RADIATION_DURATION 2
-#define RADIATION_DAMAGE 1.0
+constexpr int   RADIATION_DURATION = 2;
+constexpr float RADIATION_DAMAGE = 1.0;
 
-#define ACID_DURATION 2
-#define ACID_DAMAGE 5.0
+constexpr int   ACID_DURATION = 2;
+constexpr float ACID_DAMAGE = 5.0;
 
-#define SLOWBURN_DURATION 2
-#define SLOWBURN_DAMAGE 1.0
+constexpr int   SLOWBURN_DURATION = 2;
+constexpr float SLOWBURN_DAMAGE = 1.0;
 
-#define SLOWFREEZE_DURATION 2
-#define SLOWFREEZE_DAMAGE 1.0
+constexpr int   SLOWFREEZE_DURATION = 2;
+constexpr float SLOWFREEZE_DAMAGE = 1.0;
 
-#define itbd_Paralyze 0
-#define itbd_NerveGas 1
-#define itbd_Poison 2
-#define itbd_Radiation 3
-#define itbd_DrownRecover 4
-#define itbd_Acid 5
-#define itbd_SlowBurn 6
-#define itbd_SlowFreeze 7
-#define CDMG_TIMEBASED 8
+enum {
+	itbd_Paralyze = 0,
+	itbd_NerveGas = 1,
+	itbd_Poison = 2,
+	itbd_Radiation = 3,
+	itbd_DrownRecover = 4,
+	itbd_Acid = 5,
+	itbd_SlowBurn = 6,
+	itbd_SlowFreeze = 7,
+	CDMG_TIMEBASED = 8
+};
 
 // when calling KILLED(), a value that governs gib behavior is expected to be
 // one of these three values

From b18cd736c2efadce705e2224d5553862d392d48d Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 19:22:18 -0400
Subject: [PATCH 053/291] Changes defines to enums and constexpr where
 appropriate

---
 src/game/server/msitemdefs.h | 91 ++++++++++++++++++++----------------
 1 file changed, 52 insertions(+), 39 deletions(-)

diff --git a/src/game/server/msitemdefs.h b/src/game/server/msitemdefs.h
index f9b3d963..a1a3e736 100644
--- a/src/game/server/msitemdefs.h
+++ b/src/game/server/msitemdefs.h
@@ -7,7 +7,7 @@
 //#define DG_WEAPONBEAMS //Show weapon tracelines
 
 //Expiretime was 60, upped
-#define MSITEM_TIME_EXPIRE 120 //Time until an item on the ground disappears
+constexpr int MSITEM_TIME_EXPIRE = 120; //Time until an item on the ground disappears
 
 enum item_flags
 {
@@ -51,61 +51,74 @@ enum
 
 //MS-Specifiv client-side effects for studio-model-based entities, sent through pev->playerclass
 //Don't use for brush models because the engine uses playerclass on brushes to specify that it can be decaled
-#define ENT_EFFECT_FOLLOW_ROTATE (1 << 0)		//An entity that follows another on the client.  Rotates with the host entity.  pev->basevelocity.x specifies distance out from the host
-#define ENT_EFFECT_FOLLOW_ALIGN_BOTTOM (1 << 1) //The follow entity is aligned to the bottom of the host's bounding box (in players, the bottom is 36 units lower)
-//#define ENT_EFFECT_FOLLOW_FACE_HOST		(1<<2)		//The follow entity always faces the host (pitch ignored)
+enum {
+	ENT_EFFECT_FOLLOW_ROTATE = (1 << 0),		//An entity that follows another on the client.  Rotates with the host entity.  pev->basevelocity.x specifies distance out from the host
+	ENT_EFFECT_FOLLOW_ALIGN_BOTTOM = (1 << 1)//The follow entity is aligned to the bottom of the host's bounding box (in players, the bottom is 36 units lower)
+	//ENT_EFFECT_FOLLOW_FACE_HOST = (1<<2)		//The follow entity always faces the host (pitch ignored)
+};
 
 // ***** Player *****
-#define PLAYER_GIB_HEATH -40
+
+constexpr int PLAYER_GIB_HEATH = -40;
 
 //These are for CBasePlayer::MoreBTNSDown
-#define BTN_SPECIAL (IN_SCORE * 2)
-#define BTN_ATTACKLEFT (BTN_SPECIAL * 2)
-#define BTN_ATTACKRIGHT (BTN_ATTACKLEFT * 2)
+
+enum {
+	BTN_SPECIAL = (IN_SCORE * 2),
+	BTN_ATTACKLEFT = (BTN_SPECIAL * 2),
+	BTN_ATTACKRIGHT = (BTN_ATTACKLEFT * 2)
+};
 
 //These are for CBasePlayer::m_StatusFlags
-#define PLAYER_MOVE_RUNNING (1 << 0)
-#define PLAYER_MOVE_ATTACKING (1 << 1)
-#define PLAYER_MOVE_JUMPING (1 << 2)
-#define PLAYER_MOVE_SWIMMING (1 << 3) //Set by script.. really just an indicator for the client that it should rotate the model by pitch
-#define PLAYER_MOVE_NORUN (1 << 3)
-#define PLAYER_MOVE_NOJUMP (1 << 4)
-#define PLAYER_MOVE_NODUCK (1 << 5)
-#define PLAYER_MOVE_NOATTACK (1 << 6)
-#define PLAYER_MOVE_NOMOVE (1 << 7)
-#define PLAYER_MOVE_SITTING (1 << 8)  //JAN2010_09 Thothie - Attempting to allow inventory access while sittin again
-#define PLAYER_MOVE_STOPRUN (1 << 9)
 
+enum {
+	PLAYER_MOVE_RUNNING = (1 << 0),
+	PLAYER_MOVE_ATTACKING = (1 << 1),
+	PLAYER_MOVE_JUMPING = (1 << 2),
+	PLAYER_MOVE_SWIMMING = (1 << 3) ,//Set by script.. really just an indicator for the client that it should rotate the model by pitch
+	PLAYER_MOVE_NORUN = (1 << 3),
+	PLAYER_MOVE_NOJUMP = (1 << 4),
+	PLAYER_MOVE_NODUCK = (1 << 5),
+	PLAYER_MOVE_NOATTACK = (1 << 6),
+	PLAYER_MOVE_NOMOVE = (1 << 7),
+	PLAYER_MOVE_SITTING = (1 << 8), //JAN2010_09 Thothie - Attempting to allow inventory access while sittin again
+	PLAYER_MOVE_STOPRUN = (1 << 9)
+};
 
 //#define PLAYER_MOVE_SPECTATE		(1<<3)
 //#define PLAYER_MOVE_SPECTATE_MOVE	(1<<4)
-//#define PLAYER_MOVE_STUNNED			(1<<3)
+//#define PLAYER_MOVE_STUNNED		(1<<3)
 
 //***** Item properties *****
-#define ITEM_WEARABLE (1 << 0)
-#define ITEM_SHIELD (1 << 1)
-#define ITEM_ARMOR (1 << 2)
-#define ITEM_GENERIC (1 << 3)
-#define ITEM_GROUPABLE (1 << 4)
-#define ITEM_CONTAINER (1 << 5)
-#define ITEM_PROJECTILE (1 << 6)
-#define ITEM_DRINKABLE (1 << 7)
-#define ITEM_PERISHABLE (1 << 8)
-#define ITEM_SPELL (1 << 9)
-#define ITEM_NOPICKUP (1 << 15) //MIB FEB2010_13 [thothie: 1<<10 is taken below - switched to 1<<15]
+
+enum {
+	ITEM_WEARABLE = (1 << 0),
+	ITEM_SHIELD = (1 << 1),
+	ITEM_ARMOR = (1 << 2),
+	ITEM_GENERIC = (1 << 3),
+	ITEM_GROUPABLE = (1 << 4),
+	ITEM_CONTAINER = (1 << 5),
+	ITEM_PROJECTILE = (1 << 6),
+	ITEM_DRINKABLE = (1 << 7),
+	ITEM_PERISHABLE = (1 << 8),
+	ITEM_SPELL = (1 << 9),
+	ITEM_NOPICKUP = (1 << 15) //MIB FEB2010_13 [thothie: 1<<10 is taken below - switched to 1<<15]
+};
 
 //***** Others *****
-#define ENT_BODYPART (1 << 10)
-#define MS_NPC (1 << 11)
-#define MS_PLAYER (1 << 12)
-#define MS_CORPSE (1 << 13)
-#define MS_SHIELD (1 << 14)
+enum {
+	MS_BODYPART = (1 << 10),
+	MS_NPC = (1 << 11),
+	MS_PLAYER = (1 << 12),
+	MS_CORPSE = (1 << 13),
+	MS_SHIELD = (1 << 14)
+};
 
 //Shield Sounds
-#define SOUND_IRONSHIELD_HIT1 "weapons/cbar_hit1.wav" //global sounds
-#define SOUND_IRONSHIELD_HIT2 "weapons/cbar_hit2.wav"
+constexpr const char* SOUND_IRONSHIELD_HIT1 = "weapons/cbar_hit1.wav"; //global sounds
+constexpr const char* SOUND_IRONSHIELD_HIT2 = "weapons/cbar_hit2.wav";
 
 //Corpse
-#define CLASS_CORPSE "corpse"
+constexpr const char* CLASS_CORPSE = "corpse";
 
 #endif //MSITEMDEFS
\ No newline at end of file

From 12e30ae7a26ffea60fa9303fde97e90495ec81c2 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 19:27:16 -0400
Subject: [PATCH 054/291] Changes macro define to enum

---
 src/common/engine_launcher_api.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/common/engine_launcher_api.h b/src/common/engine_launcher_api.h
index 59bc7563..fa568d00 100644
--- a/src/common/engine_launcher_api.h
+++ b/src/common/engine_launcher_api.h
@@ -14,9 +14,12 @@
 
 //typedef void ( *xcommand_t ) ( void );
 
-constexpr int RENDERTYPE_UNDEFINED = 0;
-constexpr int RENDERTYPE_SOFTWARE = 1;
-constexpr int RENDERTYPE_HARDWARE = 2;
+enum {
+	RENDERTYPE_UNDEFINED = 0,
+	RENDERTYPE_SOFTWARE = 1,
+	RENDERTYPE_HARDWARE = 2
+};
+
 
 constexpr int ENGINE_LAUNCHER_API_VERSION = 1;
 

From e65d0435978d7ca09ae74065783bf5c5e1fea462 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 19:32:28 -0400
Subject: [PATCH 055/291] Changed macros to constexpr/enums

---
 src/game/client/hud.h | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/game/client/hud.h b/src/game/client/hud.h
index 225ef6c4..8b50ecee 100644
--- a/src/game/client/hud.h
+++ b/src/game/client/hud.h
@@ -73,12 +73,13 @@ typedef struct
 
 typedef struct cvar_s cvar_t;
 
-#define HUD_ACTIVE 1
-#define HUD_INTERMISSION 2
-
-#define MAX_PLAYER_NAME_LENGTH 32
+enum {
+	HUD_ACTIVE = 1,
+	HUD_INTERMISSION = 2
+};
 
-#define MAX_MOTD_LENGTH 1024
+constexpr int MAX_PLAYER_NAME_LENGTH = 32;
+constexpr int MAX_MOTD_LENGTH = 1024;
 
 //					Master Sword
 //-----------------------------------------------------
@@ -99,7 +100,7 @@ typedef int BOOL;
 #endif
 
 //Moved here from CHudStatusIcons
-#define MAX_SPRITE_NAME_LENGTH 24
+constexpr int MAX_SPRITE_NAME_LENGTH = 24;
 
 typedef struct
 {
@@ -150,7 +151,7 @@ class CHudAmmoSecondary : public CHudBase
 	float m_fFade;
 };
 
-#define FADE_TIME 100
+constexpr int FADE_TIME = 100;
 
 //
 //-----------------------------------------------------
@@ -255,7 +256,7 @@ class CHudSayText : public CHudBase
 //
 //-----------------------------------------------------
 //
-const int maxHUDMessages = 16;
+constexpr int maxHUDMessages = 16;
 struct message_parms_t
 {
 	client_textmessage_t *pMessage;

From 67d02992b1982cce62a4558913c1e37964633af3 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 19:34:03 -0400
Subject: [PATCH 056/291] Removed commented logic

---
 src/game/client/ms/hudmagic.cpp | 42 ++-------------------------------
 1 file changed, 2 insertions(+), 40 deletions(-)

diff --git a/src/game/client/ms/hudmagic.cpp b/src/game/client/ms/hudmagic.cpp
index c39a77f9..6220f49a 100644
--- a/src/game/client/ms/hudmagic.cpp
+++ b/src/game/client/ms/hudmagic.cpp
@@ -25,15 +25,13 @@
 void CHudMagic_SelectMenuItem(int menu_item, TCallbackMenu *pcbMenu);
 
 MS_DECLARE_MESSAGE(m_Magic, Spells);
-//MS_DECLARE_COMMAND( m_Magic, ListSpells );
+
 
 int CHudMagic::Init(void)
 {
 	gHUD.AddHudElem(this);
 
 	HOOK_MESSAGE(Spells);
-	//HOOK_COMMAND("listspells", ListSpells);
-
 	Reset();
 
 	return 1;
@@ -64,48 +62,12 @@ void CHudMagic::Think()
 int CHudMagic::MsgFunc_Spells(const char *pszName, int iSize, void *pbuf)
 {
 	BEGIN_READ(pbuf, iSize);
-
-	/*short Spells = READ_SHORT( );		//The number of spells have I memorized
-	short VerboseIdx = READ_SHORT( );	//If Verbose: Which spell was learned (incremented by 1 | 0 = Non-verbose)
-
-	bool Verbose = VerboseIdx ? true : false;
-	if( Verbose ) VerboseIdx--;		//The index is offset by 1, so that 0 == Non-verbose
-
-	player.m_SpellList.clear();
-	 for (int s = 0; s < Spells; s++) 
-		player.LearnSpell( READ_STRING(), (Verbose && (VerboseIdx == s)) ? true : false );		//Spell scriptname*/
-
-	bool Verbose = READ_BYTE() == 1;
+	bool Verbose = (READ_BYTE() == 1);
 	player.LearnSpell(READ_STRING(), Verbose);
 
 	return 1;
 }
-/*void CHudMagic::UserCmd_ListSpells(void)
-{
-	if( gHUD.m_Menu->HideMyMenu( MENU_LISTSPELLS ) )  return;
-
-	//Disallow choosing spells by unsetting HUD_ACTIVE
-	if( !FBitSet(m_iFlags,HUD_ACTIVE) )
-		return;
 
-	int iBitsValid = 0;
-	char MenuText[1024];
-	//Activate
-	if( !SpellsMemorized() ) return;
-	 strncpy(MenuText,  "Cast spell:\n\n", sizeof(MenuText) );
-	spellgroup_v &SpellList = player.m_SpellList;
-	 for (int n = 0; n < SpellList.size(); n++) 
-	{
-		CGenericItem *pItem = NewGenericItem( SpellList[n] );
-		if( pItem )
-			strcat( MenuText, UTIL_VarArgs("%i. %s\n", n+1, pItem->DisplayName() ) );
-		else
-			strcat( MenuText, UTIL_VarArgs("%i. %s\n", n+1, SpellList[n].c_str() ) );
-		iBitsValid += pow(2,n);
-		SpellMenuIndex[n] = n;
-	}
-	gHUD.m_Menu->ShowMenu( iBitsValid, MenuText, CHudMagic_SelectMenuItem, MENU_LISTSPELLS );
-}*/
 void CHudMagic_SelectMenuItem(int idx, TCallbackMenu *pcbMenu)
 {
 	if (!gHUD.m_Magic)

From 56dddf61c28ec601a78bc40f7212bcf9e9f5db34 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 20:12:06 -0400
Subject: [PATCH 057/291] Fixed warninng on sign mismatch. Fixed wasrning on
 unintialized variables. Templated clrmem() macro

---
 src/game/shared/ms/netcodeshared.cpp |  4 ++--
 src/game/shared/ms/stackstring.h     | 10 +++++++++-
 src/game/shared/stats/races.cpp      |  4 ++--
 src/game/shared/stats/stats.cpp      |  6 +++---
 src/game/shared/stats/stats.h        |  2 +-
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/game/shared/ms/netcodeshared.cpp b/src/game/shared/ms/netcodeshared.cpp
index cac8a58d..79cd4d1f 100644
--- a/src/game/shared/ms/netcodeshared.cpp
+++ b/src/game/shared/ms/netcodeshared.cpp
@@ -51,7 +51,7 @@ void CBasePlayer::SendChar(charinfo_base_t &CharBase)
 	WRITE_LONG(SendInfo.DataLen);
 	MESSAGE_END();
 
-	hudtextparms_t htp;
+	hudtextparms_t htp = {};
 	clrmem(htp);
 	htp.x = 0.02;
 	htp.y = 0.6;
@@ -143,7 +143,7 @@ void MSChar_Interface::Think_SendChar(CBasePlayer *pPlayer)
 		SendInfo.Status = CSS_DORMANT;
 
 #ifdef VALVE_DLL
-		hudtextparms_t htp;
+		hudtextparms_t htp = {};
 		clrmem(htp);
 		htp.x = 0.02;
 		htp.y = 0.6;
diff --git a/src/game/shared/ms/stackstring.h b/src/game/shared/ms/stackstring.h
index a9e5377f..c9c10ddd 100644
--- a/src/game/shared/ms/stackstring.h
+++ b/src/game/shared/ms/stackstring.h
@@ -27,7 +27,15 @@ extern "C" char *strlwr(char *str);
 
 #include "strhelper.h"
 
-#define clrmem(a) memset(&a, 0, sizeof(a));
+
+//what a mess
+
+//#define clrmem(a) memset(&a, 0, sizeof(a));
+
+template <typename T>
+void clrmem(T type) {
+	memset(&type, 0, sizeof(type));
+};
 
 //Deuplicated from msdebug.h
 #ifdef DEV_BUILD
diff --git a/src/game/shared/stats/races.cpp b/src/game/shared/stats/races.cpp
index ad6f0c75..623c814f 100644
--- a/src/game/shared/stats/races.cpp
+++ b/src/game/shared/stats/races.cpp
@@ -20,7 +20,7 @@ race_t *CRaceManager::GetRacePtr(const char* pszName)
 	if (!pszName || strlen(pszName) < 1) //Null or empty string
 		return NULL;
 
-	for (int r = 0; r < Races.size(); r++)
+	for (unsigned int r = 0; r < Races.size(); r++)
 	{
 		race_t &Race = Races[r];
 		if (!_stricmp(Race.Name, pszName))
@@ -30,7 +30,7 @@ race_t *CRaceManager::GetRacePtr(const char* pszName)
 }
 bool CRaceManager::RelationshipContains(msstringlist &RaceList, const char* pszTargetRace)
 {
-	for (int i = 0; i < RaceList.size(); i++)
+	for (unsigned int i = 0; i < RaceList.size(); i++)
 	{
 		const char* pszRaceName = RaceList[i];
 
diff --git a/src/game/shared/stats/stats.cpp b/src/game/shared/stats/stats.cpp
index 0bd13b6e..ef51710e 100644
--- a/src/game/shared/stats/stats.cpp
+++ b/src/game/shared/stats/stats.cpp
@@ -189,7 +189,7 @@ void CStat::Update() // Updates the stat to current - no updates sent
 {
 	bNeedsUpdate = false;
 
-	for (int i = 0; i < m_SubStats.size(); i++)
+	for (unsigned int i = 0; i < m_SubStats.size(); i++)
 	{
 		m_SubStats[i].OldValue = m_SubStats[i].Value;
 		m_SubStats[i].OldExp = m_SubStats[i].Exp;
@@ -202,7 +202,7 @@ bool CStat::Changed()
 		return true;
 
 	// If any values changed -> update.
-	for (int i = 0; i < m_SubStats.size(); i++)
+	for (unsigned int i = 0; i < m_SubStats.size(); i++)
 		if ((m_SubStats[i].Exp != m_SubStats[i].OldExp) || (m_SubStats[i].Value != m_SubStats[i].OldValue))
 			return true;
 
@@ -212,7 +212,7 @@ bool CStat::Changed()
 bool CStat::operator!=(const CStat& Other)
 {
 	// Just check the substats
-	for (int i = 0; i < m_SubStats.size(); i++)
+	for (unsigned int i = 0; i < m_SubStats.size(); i++)
 	{
 		if (i >= (signed)Other.m_SubStats.size())
 			break;
diff --git a/src/game/shared/stats/stats.h b/src/game/shared/stats/stats.h
index 2f5a2c4c..ca9d29ae 100644
--- a/src/game/shared/stats/stats.h
+++ b/src/game/shared/stats/stats.h
@@ -65,7 +65,7 @@ class CStat
 
 	CSubStat* GetSubStat(int index)
 	{
-		if ((index < 0) || (index >= m_SubStats.size()))
+		if ((index < 0) || (static_cast<unsigned int>(index) >= m_SubStats.size()))
 			return NULL;
 		return &m_SubStats[index];
 	}

From 9fa0a99ed7c8110ae84780c75196480564aae2c1 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 8 Mar 2026 21:47:34 -0400
Subject: [PATCH 058/291] Fixed pass by reference not in template

---
 src/game/shared/ms/stackstring.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/game/shared/ms/stackstring.h b/src/game/shared/ms/stackstring.h
index c9c10ddd..bae4f0f6 100644
--- a/src/game/shared/ms/stackstring.h
+++ b/src/game/shared/ms/stackstring.h
@@ -32,8 +32,9 @@ extern "C" char *strlwr(char *str);
 
 //#define clrmem(a) memset(&a, 0, sizeof(a));
 
+
 template <typename T>
-void clrmem(T type) {
+void clrmem(T& type) {
 	memset(&type, 0, sizeof(type));
 };
 

From 2aa27c7a5cd41892bd8066d7a16107c302e44861 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 9 Mar 2026 22:15:20 -0400
Subject: [PATCH 059/291] changed define to constexpr. moved include to top of
 file.

---
 src/game/client/ms/menu.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/game/client/ms/menu.h b/src/game/client/ms/menu.h
index 014a9ddb..f04263d2 100644
--- a/src/game/client/ms/menu.h
+++ b/src/game/client/ms/menu.h
@@ -1,5 +1,7 @@
 //Master Sword
-#define MAX_MENU_STRING 512
+#include "sharedmenu.h"
+
+constexpr int MAX_MENU_STRING = 512;
 
 enum MenuType
 { //menutypes
@@ -11,7 +13,7 @@ enum MenuType
 	MENU_DYNAMICNPC,
 };
 //------------
-#include "sharedmenu.h"
+
 class CHudMenu : public CHudBase
 {
 public:

From 580655e2bdfd38b98c58003eeba62016434e386c Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 9 Mar 2026 22:16:40 -0400
Subject: [PATCH 060/291] Changed enum to reference enum name.

---
 src/game/client/ms/menu.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/client/ms/menu.h b/src/game/client/ms/menu.h
index f04263d2..cc6bf7d2 100644
--- a/src/game/client/ms/menu.h
+++ b/src/game/client/ms/menu.h
@@ -35,7 +35,7 @@ class CHudMenu : public CHudBase
 	//Master Sword
 	TCallbackMenu m;
 
-	int ShowMenu(int bitsValidSlots, const char *pszMenuString, MenuCallback CallBack, MenuType mtMenuType = MENU_NORMAL, float ShutOffTime = 0);
+	int ShowMenu(int bitsValidSlots, const char *pszMenuString, MenuCallback CallBack, MenuType mtMenuType = MenuType::MENU_NORMAL, float ShutOffTime = 0);
 	bool HideMyMenu(int mtMenuType);
 	//------------
 };

From f7acd222dce05e4e3f3865c88938fe230c52917d Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 9 Mar 2026 22:18:31 -0400
Subject: [PATCH 061/291] removed unneded define with menu.h include.

---
 src/game/client/ms/menu.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/game/client/ms/menu.cpp b/src/game/client/ms/menu.cpp
index e0bfccd0..6231f2e6 100644
--- a/src/game/client/ms/menu.cpp
+++ b/src/game/client/ms/menu.cpp
@@ -35,7 +35,6 @@
 #include "action.h"
 #include "menu.h"
 
-#define MAX_MENU_STRING 512
 //char m.cMenuText[MAX_MENU_STRING];
 char g_szPrelocalisedMenuString[MAX_MENU_STRING];
 

From 0255cea265cea78e2b3e95182b74949cbc5f6117 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 9 Mar 2026 23:30:12 -0400
Subject: [PATCH 062/291] Converted macros to wrapper functions.

---
 src/game/client/ms/hudscript.cpp | 87 +++++++++++++++++++++++++++++---
 1 file changed, 81 insertions(+), 6 deletions(-)

diff --git a/src/game/client/ms/hudscript.cpp b/src/game/client/ms/hudscript.cpp
index cc667a5d..20e48f30 100644
--- a/src/game/client/ms/hudscript.cpp
+++ b/src/game/client/ms/hudscript.cpp
@@ -31,6 +31,81 @@
 
 extern physent_t *MSUTIL_EntityByIndex( int playerindex );
 
+
+static void SCRIPT_CONTROLVEC_POS(CScript* Script, const char* name, Vector& vec) {
+
+	const char* ofsX = "_ofs.x";
+	const char* ofsY = "_ofs.y";
+	const char* ofsZ = "_ofs.z";
+	const char* setX = "_set.x";
+	const char* setY = "_set.y";
+	const char* setZ = "_set.z";
+
+	std::string ScriptVarNameX = name;	ScriptVarNameX += ofsX;
+	std::string ScriptVarNameY = name;	ScriptVarNameY += ofsY;
+	std::string ScriptVarNameZ = name;	ScriptVarNameZ += ofsZ;
+
+	std::string ScriptVarSetNameX = {name};	ScriptVarSetNameX += setX;
+	std::string ScriptVarSetNameY = {name}; ScriptVarSetNameY += setY;
+	std::string ScriptVarSetNameZ = {name};	ScriptVarSetNameZ += setZ;
+
+	if (Script->VarExists(ScriptVarNameX.c_str())) vec.x += atof(Script->GetVar(ScriptVarNameX.c_str()));
+	if (Script->VarExists(ScriptVarNameY.c_str())) vec.y += atof(Script->GetVar(ScriptVarNameY.c_str()));
+	if (Script->VarExists(ScriptVarNameZ.c_str())) vec.z += atof(Script->GetVar(ScriptVarNameZ.c_str()));
+	if (Script->VarExists(ScriptVarSetNameX.c_str())) vec.x += atof(Script->GetVar(ScriptVarNameX.c_str()));
+	if (Script->VarExists(ScriptVarSetNameY.c_str())) vec.y += atof(Script->GetVar(ScriptVarNameY.c_str()));
+	if (Script->VarExists(ScriptVarSetNameZ.c_str())) vec.z += atof(Script->GetVar(ScriptVarNameZ.c_str()));
+
+
+};
+
+static void SCRIPT_CONTROLVEC_ANG(CScript* Script, const char* name, Vector& vec) {
+
+	const char* ofsPitch = "_ofs.pitch";
+	const char* ofsYaw = "_ofs.yaw";
+	const char* ofsRoll = "_ofs.roll";
+	const char* setPitch = "_set.pitch";
+	const char* setYaw = "_set.yaw";
+	const char* setRoll = "_set.roll";
+
+	std::string ScriptVarPitch = { name };	ScriptVarPitch += ofsPitch;
+	std::string ScriptVarYaw = {name};		ScriptVarYaw += ofsYaw;
+	std::string ScriptVarRoll = {name};		ScriptVarRoll += ofsRoll;
+
+	std::string ScriptVarSetPitch = {name};	ScriptVarSetPitch += setPitch;
+	std::string ScriptVarSetYaw = {name};	ScriptVarSetYaw += setYaw;
+	std::string ScriptVarSetRoll = {name};	ScriptVarSetRoll += setRoll;
+
+	if (Script->VarExists(ScriptVarPitch.c_str())) vec.x += atof(Script->GetVar(ScriptVarPitch.c_str()));
+	if (Script->VarExists(ScriptVarYaw.c_str()))   vec.y += atof(Script->GetVar(ScriptVarYaw.c_str()));
+	if (Script->VarExists(ScriptVarRoll.c_str()))  vec.z += atof(Script->GetVar(ScriptVarRoll.c_str()));
+	if (Script->VarExists(ScriptVarSetPitch.c_str())) vec.x = atof(Script->GetVar(ScriptVarSetPitch.c_str()));
+	if (Script->VarExists(ScriptVarSetYaw.c_str()))   vec.y = atof(Script->GetVar(ScriptVarSetYaw.c_str()));
+	if (Script->VarExists(ScriptVarSetRoll.c_str()))  vec.z = atof(Script->GetVar(ScriptVarSetRoll.c_str()));
+};
+
+static void SCRIPT_CONTROLVEC_POS_CUSTOM(CScript* Script, const char* name, Vector& vec, const char* xname, const char* yname, const char* zname) {
+	
+	const char* ofs = "_ofs.";
+	const char* set = "_set.";
+
+	std::string ScriptVarCustomXOffset{ name }; ScriptVarCustomXOffset += ofs; ScriptVarCustomXOffset += xname;
+	std::string ScriptVarCustomYOffset{ name }; ScriptVarCustomYOffset += ofs; ScriptVarCustomYOffset += yname;
+	std::string ScriptVarCustomZOffset{ name }; ScriptVarCustomZOffset += ofs; ScriptVarCustomZOffset += zname;
+
+	std::string ScriptVarCustomXSet{ name }; ScriptVarCustomXSet += set; ScriptVarCustomXSet += xname;
+	std::string ScriptVarCustomYSet{ name }; ScriptVarCustomYSet += set; ScriptVarCustomYSet += yname;
+	std::string ScriptVarCustomZSet{ name }; ScriptVarCustomZSet += set; ScriptVarCustomZSet += zname;
+
+	if (Script->VarExists(ScriptVarCustomXOffset.c_str())) vec.x += atof(Script->GetVar(ScriptVarCustomXOffset.c_str())); 
+	if (Script->VarExists(ScriptVarCustomYOffset.c_str())) vec.x += atof(Script->GetVar(ScriptVarCustomYOffset.c_str()));
+	if (Script->VarExists(ScriptVarCustomZOffset.c_str())) vec.x += atof(Script->GetVar(ScriptVarCustomZOffset.c_str()));
+	if (Script->VarExists(ScriptVarCustomXSet.c_str())) vec.x += atof(Script->GetVar(ScriptVarCustomXSet.c_str()));
+	if (Script->VarExists(ScriptVarCustomYSet.c_str())) vec.x += atof(Script->GetVar(ScriptVarCustomYSet.c_str()));
+	if (Script->VarExists(ScriptVarCustomZSet.c_str())) vec.x += atof(Script->GetVar(ScriptVarCustomZSet.c_str()));
+
+};
+/*
 #define SCRIPT_CONTROLVEC_POS( name, vec ) \
 		if( Script->VarExists( name "_ofs.x" ) ) vec.x += atof(Script->GetVar( name "_ofs.x" )); \
 		if( Script->VarExists( name "_ofs.y" ) ) vec.y += atof(Script->GetVar( name "_ofs.y" )); \
@@ -54,10 +129,10 @@ extern physent_t *MSUTIL_EntityByIndex( int playerindex );
 		if( Script->VarExists( name "_set." xname ) ) vec.x  = atof(Script->GetVar( name "_set." xname )); \
 		if( Script->VarExists( name "_set." yname ) ) vec.y  = atof(Script->GetVar( name "_set." yname )); \
 		if( Script->VarExists( name "_set." zname ) ) vec.z  = atof(Script->GetVar( name "_set." zname ));
-
+\
+*/
 //----------------
 
-#include "hudscript.h"
 
 int CHudScript::Init( void )
 {
@@ -213,10 +288,10 @@ void CHudScript::Effects_GetView( ref_params_s *pparams, cl_entity_t *ViewModel
 		Vector &ViewAng = *(Vector *)&pparams->viewangles;
 		Vector &ViewMdlOfs = *(Vector *)&ViewModel->origin;
 		Vector &ViewMdlAng = *(Vector *)&ViewModel->angles;
-		SCRIPT_CONTROLVEC_POS( "game.cleffect.view", ViewOfs );
-		SCRIPT_CONTROLVEC_ANG( "game.cleffect.view", ViewAng );
-		SCRIPT_CONTROLVEC_POS( "game.cleffect.viewmodel", ViewMdlOfs );
-		SCRIPT_CONTROLVEC_ANG( "game.cleffect.viewmodel", ViewMdlAng );
+		SCRIPT_CONTROLVEC_POS(Script, "game.cleffect.view", ViewOfs );
+		SCRIPT_CONTROLVEC_ANG(Script, "game.cleffect.view", ViewAng );
+		SCRIPT_CONTROLVEC_POS(Script, "game.cleffect.viewmodel", ViewMdlOfs );
+		SCRIPT_CONTROLVEC_ANG(Script, "game.cleffect.viewmodel", ViewMdlAng );
 	}
 }
 Vector CHudScript::Effects_GetMoveScale( )

From 4d4e42363ae309cb32a0722495df30cb563c7663 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 9 Mar 2026 23:30:33 -0400
Subject: [PATCH 063/291] templated clrmem macro into function.

---
 src/game/shared/ms/stackstring.h | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/game/shared/ms/stackstring.h b/src/game/shared/ms/stackstring.h
index bae4f0f6..11aa17f2 100644
--- a/src/game/shared/ms/stackstring.h
+++ b/src/game/shared/ms/stackstring.h
@@ -27,14 +27,10 @@ extern "C" char *strlwr(char *str);
 
 #include "strhelper.h"
 
-
-//what a mess
-
 //#define clrmem(a) memset(&a, 0, sizeof(a));
 
-
-template <typename T>
-void clrmem(T& type) {
+template <typename Type>
+inline void clrmem(Type& type) {
 	memset(&type, 0, sizeof(type));
 };
 

From 6d4d87e6add2025a3fdbc8aceb3cd2f4bdcb288a Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 9 Mar 2026 23:38:03 -0400
Subject: [PATCH 064/291] Reworked IS_NAN function. thanks copilot for type
 safety.

---
 src/common/mathlib.h | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/common/mathlib.h b/src/common/mathlib.h
index 522e6d04..1b6eae27 100644
--- a/src/common/mathlib.h
+++ b/src/common/mathlib.h
@@ -37,16 +37,12 @@ struct mplane_s;
 extern Vector vec3_origin;
 constexpr int nanmask = 255 << 23;
 
-inline bool IS_NAN(const float &x) {
+static inline bool IS_NAN(float flVelocity) {
 
-	if ((((*(int*)&x) & nanmask) == nanmask)) {
-		return true;
-	}
-	else {
-		return false;
-	}
-};
+	int i = *(int*)&flVelocity;
+	return (i & 0x7F800000) == 0x7F800000 && (i & 0x007FFFFF) != 0;
 
+};
 
 inline void VectorSubtract(const float* a, const float* b, float* c)
 {

From c65fd646eb53acaf23db875f173700a8746e2230 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 9 Mar 2026 23:47:19 -0400
Subject: [PATCH 065/291] Added nanmask to reworkedd IS_NAN

---
 src/common/mathlib.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/mathlib.h b/src/common/mathlib.h
index 1b6eae27..3e289b93 100644
--- a/src/common/mathlib.h
+++ b/src/common/mathlib.h
@@ -40,7 +40,7 @@ constexpr int nanmask = 255 << 23;
 static inline bool IS_NAN(float flVelocity) {
 
 	int i = *(int*)&flVelocity;
-	return (i & 0x7F800000) == 0x7F800000 && (i & 0x007FFFFF) != 0;
+	return (i & nanmask) == 0x7F800000 && (i & 0x007FFFFF) != 0;
 
 };
 

From ba0c4bb2f2ecb6f0b3521d903b6e20226dab64a7 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 9 Mar 2026 23:57:50 -0400
Subject: [PATCH 066/291] Changed defines to enums/constexpr

---
 src/game/client/render/clrender.h | 102 +++++++++++++++++-------------
 1 file changed, 57 insertions(+), 45 deletions(-)

diff --git a/src/game/client/render/clrender.h b/src/game/client/render/clrender.h
index d70001e2..c32a9094 100644
--- a/src/game/client/render/clrender.h
+++ b/src/game/client/render/clrender.h
@@ -1,37 +1,42 @@
 
 //curstate.oldbuttons
-#define MSRDR_VIEWMODEL (1 << 0) //Model is a view model (parent view model... never rendered fully)
-#define MSRDR_FLIPPED (1 << 1)	 //Model is flipped across the verical axis, changing it from the right to left hand
-#define MSRDR_SKIP (1 << 2)		 //Do all setup (for attachments later), but don't render
-#define MSRDR_NOREFLECT (1 << 3) //Don't render to mirrors
-#define MSRDR_FULLROT (1 << 4)	 //Use full rotation this frame (automatically unset in )
-
-//Separate flags from the above -- stored in curstate.colormap
-#define MSRDR_GLOW_GRN (1 << 0) //Green glow
-#define MSRDR_GLOW_RED (1 << 1) //Highlight slected weapons - Red Glow
-#define MSRDR_DARK (1 << 2)		//Dim lights on the inset player model
-#define MSRDR_LIGHT_DIM (1 << 3)
-#define MSRDR_LIGHT_NORMAL (1 << 4) //Give a moderate amount of artificial light
-#define MSRDR_LIGHT_BRIGHT (1 << 5) //Make it fullbright
-#define MSRDR_ANIM_ONCE (1 << 6)	//Only play the client-side anim once (no loop)
-#define MSRDR_ASPLAYER (1 << 7)		//Render as player
-#define MSRDR_COPYPLAYER (1 << 8)	//Copy the local player's anims
-#define MSRDR_HANDMODEL (1 << 9)	//This is one of the two hand models (coming off the viewmodel)
-
-//mouth.sndavg
-#define MSRDR_HASEXTRA (1 << 0) //The extra info is initialied
 
-//Specifics
-#define INSET_SCALE 0.026f //0.02f
-#define ANIM_RUN 11
-#define ANIM_CROUCH 0
-#define ANIM_CRAWL 1
-#define ANIM_SIT 19
-#define ANIM_ATTENTION 4
-#define ANIM_DEEPIDLE 5
-#define ANIM_JUMP 6
-#define ANIM_SIT 19
 
+enum {
+	MSRDR_VIEWMODEL = (1 << 0), //Model is a view model (parent view model... never rendered fully)
+	MSRDR_FLIPPED = (1 << 1),	 //Model is flipped across the verical axis, changing it from the right to left hand
+	MSRDR_SKIP = (1 << 2),		 //Do all setup (for attachments later), but don't render
+	MSRDR_NOREFLECT = (1 << 3), //Don't render to mirrors
+	MSRDR_FULLROT = (1 << 4),	 //Use full rotation this frame (automatically unset in )
+
+	//Separate flags from the above -- stored in curstate.colormap
+	MSRDR_GLOW_GRN = (1 << 0), //Green glow
+	MSRDR_GLOW_RED = (1 << 1), //Highlight slected weapons - Red Glow
+	MSRDR_DARK = (1 << 2),		//Dim lights on the inset player model
+	MSRDR_LIGHT_DIM = (1 << 3),
+	MSRDR_LIGHT_NORMAL = (1 << 4), //Give a moderate amount of artificial light
+	MSRDR_LIGHT_BRIGHT = (1 << 5), //Make it fullbright
+	MSRDR_ANIM_ONCE = (1 << 6),	//Only play the client-side anim once (no loop)
+	MSRDR_ASPLAYER = (1 << 7),		//Render as player
+	MSRDR_COPYPLAYER = (1 << 8),	//Copy the local player's anims
+	MSRDR_HANDMODEL = (1 << 9),	//This is one of the two hand models (coming off the viewmodel)
+
+	//mouth.sndavg
+	MSRDR_HASEXTRA (1 << 0) //The extra info is initialied
+}
+
+//Specifics
+constexpr float INSET_SCALE = 0.026f; //0.02f
+enum {
+	ANIM_RUN = 11,
+	ANIM_CROUCH = 0,
+	ANIM_CRAWL = 1,
+	ANIM_SIT = 19,
+	ANIM_ATTENTION = 4,
+	ANIM_DEEPIDLE = 5,
+	ANIM_JUMP = 6,
+	ANIM_SIT = 19
+};
 typedef struct msurface_s msurface_t;
 typedef struct decal_s decal_t;
 
@@ -199,14 +204,16 @@ class CSurface
 	Vector m_SurfaceNormal;
 };
 
-#define RDR_TEXTURE (1 << 0)
-#define RDR_PROJECTIVE (1 << 1)
-#define RDR_ALPHATEST (1 << 2)
-#define RDR_STENCIL (1 << 3)
-#define RDR_CLRSTENCIL (1 << 4)
-#define RDR_CHKSTENCIL (1 << 5)
-#define RDR_CLEARZ (1 << 6)
-#define RDR_CLRALPHA (1 << 7)
+enum {
+	RDR_TEXTURE = (1 << 0),
+	RDR_PROJECTIVE = (1 << 1),
+	RDR_ALPHATEST = (1 << 2),
+	RDR_STENCIL = (1 << 3),
+	RDR_CLRSTENCIL = (1 << 4),
+	RDR_CHKSTENCIL = (1 << 5),
+	RDR_CLEARZ = (1 << 6),
+	RDR_CLRALPHA = (1 << 7)
+};
 
 class CMirror
 {
@@ -307,13 +314,18 @@ class CMirrorMgr
 };
 void RenderModel(cl_entity_t *pEntity);
 
-#define SURF_PLANEBACK 2
-#define SURF_DRAWSKY 4
-#define SURF_DRAWSPRITE 8
-#define SURF_DRAWTURB 0x10
-#define SURF_DRAWTILED 0x20
-#define SURF_DRAWBACKGROUND 0x40
-#define SURF_UNDERWATER 0x80
+
+enum {
+
+	SURF_PLANEBACK = 2,
+	SURF_DRAWSKY = 4,
+	SURF_DRAWSPRITE = 8,
+	SURF_DRAWTURB = 0x10,
+	SURF_DRAWTILED = 0x20,
+	SURF_DRAWBACKGROUND = 0x40,
+	SURF_UNDERWATER = 0x80
+
+};
 
 #include <GL/gl.h>	  // Header File For The OpenGL32 Library
 #include <GL/glext.h>

From be897458acf901aba8f048204129fe6d79a4e27e Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 9 Mar 2026 23:58:32 -0400
Subject: [PATCH 067/291] Fixed missing semi colon.

---
 src/game/client/render/clrender.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/game/client/render/clrender.h b/src/game/client/render/clrender.h
index c32a9094..c79eaeed 100644
--- a/src/game/client/render/clrender.h
+++ b/src/game/client/render/clrender.h
@@ -22,8 +22,8 @@ enum {
 	MSRDR_HANDMODEL = (1 << 9),	//This is one of the two hand models (coming off the viewmodel)
 
 	//mouth.sndavg
-	MSRDR_HASEXTRA (1 << 0) //The extra info is initialied
-}
+	MSRDR_HASEXTRA(1 << 0) //The extra info is initialied
+};
 
 //Specifics
 constexpr float INSET_SCALE = 0.026f; //0.02f

From 5e44f6fcab7e9ed4b099baa3d43de8368873442e Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 9 Mar 2026 23:59:10 -0400
Subject: [PATCH 068/291] Fixed missing equals. Removed duplicate enum def.

---
 src/game/client/render/clrender.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/game/client/render/clrender.h b/src/game/client/render/clrender.h
index c79eaeed..a8b68645 100644
--- a/src/game/client/render/clrender.h
+++ b/src/game/client/render/clrender.h
@@ -22,7 +22,7 @@ enum {
 	MSRDR_HANDMODEL = (1 << 9),	//This is one of the two hand models (coming off the viewmodel)
 
 	//mouth.sndavg
-	MSRDR_HASEXTRA(1 << 0) //The extra info is initialied
+	MSRDR_HASEXTRA = (1 << 0) //The extra info is initialied
 };
 
 //Specifics
@@ -34,8 +34,7 @@ enum {
 	ANIM_SIT = 19,
 	ANIM_ATTENTION = 4,
 	ANIM_DEEPIDLE = 5,
-	ANIM_JUMP = 6,
-	ANIM_SIT = 19
+	ANIM_JUMP = 6
 };
 typedef struct msurface_s msurface_t;
 typedef struct decal_s decal_t;

From 2d9d0ea067063585f5c55e75821dbdbc190037da Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Tue, 10 Mar 2026 00:39:02 -0400
Subject: [PATCH 069/291] Changed vector.h class to allow for constexpr
 initialization. Changes macros to constexpr/enums in util.h

---
 src/game/server/hl/util.h   | 192 ++++++++++++++++++++----------------
 src/game/shared/hl/vector.h |  16 +--
 2 files changed, 115 insertions(+), 93 deletions(-)

diff --git a/src/game/server/hl/util.h b/src/game/server/hl/util.h
index 570ff87b..1b9260e4 100644
--- a/src/game/server/hl/util.h
+++ b/src/game/server/hl/util.h
@@ -178,16 +178,16 @@ inline BOOL FStringNull(int iString)
 #define cchMapNameMost 32
 
 // Dot products for view cone checking
-#define VIEW_FIELD_FULL (float)-1.0		   // +-180 degrees
-#define VIEW_FIELD_WIDE (float)-0.7		   // +-135 degrees 0.1 // +-85 degrees, used for full FOV checks
-#define VIEW_FIELD_NARROW (float)0.7	   // +-45 degrees, more narrow check used to set up ranged attacks
-#define VIEW_FIELD_ULTRA_NARROW (float)0.9 // +-25 degrees, more narrow check used to set up ranged attacks
+constexpr float VIEW_FIELD_FULL = -1.0f;		   // +-180 degrees
+constexpr float VIEW_FIELD_WIDE = -0.7f;		   // +-135 degrees 0.1 // +-85 degrees, used for full FOV checks
+constexpr float VIEW_FIELD_NARROW = 0.7f;	   // +-45 degrees, more narrow check used to set up ranged attacks
+constexpr float VIEW_FIELD_ULTRA_NARROW = 0.9f; // +-25 degrees, more narrow check used to set up ranged attacks
 
 // All monsters need this data
-#define DONT_BLEED -1
-#define BLOOD_COLOR_RED (byte)247
-#define BLOOD_COLOR_YELLOW (byte)195
-#define BLOOD_COLOR_GREEN BLOOD_COLOR_YELLOW
+constexpr int DONT_BLEED = -1;
+constexpr byte BLOOD_COLOR_RED = (byte)247;
+constexpr byte BLOOD_COLOR_YELLOW = (byte)195;
+constexpr byte BLOOD_COLOR_GREEN = BLOOD_COLOR_YELLOW;
 
 typedef enum
 {
@@ -424,99 +424,119 @@ extern DLL_GLOBAL const Vector g_vecZero;
 //
 // Un-comment only as needed
 //
-#define LANGUAGE_ENGLISH 0
-#define LANGUAGE_GERMAN 1
-#define LANGUAGE_FRENCH 2
-#define LANGUAGE_BRITISH 3
 
+enum {
+	LANGUAGE_ENGLISH = 0,
+	LANGUAGE_GERMAN = 1,
+	LANGUAGE_FRENCH = 2,
+	LANGUAGE_BRITISH = 3
+};
 extern DLL_GLOBAL int g_Language;
 
-#define AMBIENT_SOUND_STATIC 0 // medium radius attenuation
-#define AMBIENT_SOUND_EVERYWHERE 1
-#define AMBIENT_SOUND_SMALLRADIUS 2
-#define AMBIENT_SOUND_MEDIUMRADIUS 4
-#define AMBIENT_SOUND_LARGERADIUS 8
-#define AMBIENT_SOUND_START_SILENT 16
-#define AMBIENT_SOUND_NOT_LOOPING 32
-
-#define SPEAKER_START_SILENT 1 // wait for trigger 'on' to start announcements
-
-#define SND_SPAWNING (1 << 8)	  // duplicated in protocol.h we're spawing, used in some cases for ambients
-#define SND_STOP (1 << 5)		  // duplicated in protocol.h stop sound
-#define SND_CHANGE_VOL (1 << 6)	  // duplicated in protocol.h change sound vol
-#define SND_CHANGE_PITCH (1 << 7) // duplicated in protocol.h change sound pitch
-
-#define LFO_SQUARE 1
-#define LFO_TRIANGLE 2
-#define LFO_RANDOM 3
-
-// func_rotating
-#define SF_BRUSH_ROTATE_Y_AXIS 0
-#define SF_BRUSH_ROTATE_INSTANT 1
-#define SF_BRUSH_ROTATE_BACKWARDS 2
-#define SF_BRUSH_ROTATE_Z_AXIS 4
-#define SF_BRUSH_ROTATE_X_AXIS 8
-#define SF_PENDULUM_AUTO_RETURN 16
-#define SF_PENDULUM_PASSABLE 32
-
-#define SF_BRUSH_ROTATE_SMALLRADIUS 128
-#define SF_BRUSH_ROTATE_MEDIUMRADIUS 256
-#define SF_BRUSH_ROTATE_LARGERADIUS 512
-
-#define PUSH_BLOCK_ONLY_X 1
-#define PUSH_BLOCK_ONLY_Y 2
-
-#define VEC_HULL_MIN Vector(-16, -16, -36)
-#define VEC_HULL_MAX Vector(16, 16, 36)
-#define VEC_HUMAN_HULL_MIN Vector(-16, -16, 0)
-#define VEC_HUMAN_HULL_MAX Vector(16, 16, 72)
-#define VEC_HUMAN_HULL_DUCK Vector(16, 16, 36)
-
-#define VEC_VIEW Vector(0, 0, 28)
-
-#define VEC_DUCK_HULL_MIN Vector(-16, -16, -18)
-#define VEC_DUCK_HULL_MAX Vector(16, 16, 18)
-#define VEC_DUCK_VIEW Vector(0, 0, 12)
-
-#define SVC_TEMPENTITY 23
-#define SVC_INTERMISSION 30
-#define SVC_CDTRACK 32
-#define SVC_WEAPONANIM 35
-#define SVC_ROOMTYPE 37
-#define SVC_DIRECTOR 51
+enum {
+	AMBIENT_SOUND_STATIC = 0,// medium radius attenuation
+	AMBIENT_SOUND_EVERYWHERE = 1,
+	AMBIENT_SOUND_SMALLRADIUS = 2,
+	AMBIENT_SOUND_MEDIUMRADIUS = 4,
+	AMBIENT_SOUND_LARGERADIUS = 8,
+	AMBIENT_SOUND_START_SILENT = 16,
+	AMBIENT_SOUND_NOT_LOOPING = 32
+};
 
-// triggers
-#define SF_TRIGGER_ALLOWMONSTERS 1 // monsters allowed to fire this trigger
-#define SF_TRIGGER_NOCLIENTS 2	   // players not allowed to fire this trigger
-#define SF_TRIGGER_PUSHABLES 4	   // only pushables can fire this trigger
+enum {
+	SPEAKER_START_SILENT = 1 // wait for trigger 'on' to start announcements
+};
+
+enum {	 
+	SND_STOP = (1 << 5),		   // duplicated in protocol.h stop sound
+	SND_CHANGE_VOL = (1 << 6),	   // duplicated in protocol.h change sound vol
+	SND_CHANGE_PITCH = (1 << 7),    // duplicated in protocol.h change sound pitch
+	SND_SPAWNING = (1 << 8)			// duplicated in protocol.h we're spawing, used in some cases for ambients
+};
+
+enum {
+	LFO_SQUARE = 1,
+	LFO_TRIANGLE = 2,
+	LFO_RANDOM = 3
+};
+
+enum {
+	SF_BRUSH_ROTATE_Y_AXIS = 0,
+	SF_BRUSH_ROTATE_INSTANT = 1,
+	SF_BRUSH_ROTATE_BACKWARDS = 2,
+	SF_BRUSH_ROTATE_Z_AXIS = 4,
+	SF_BRUSH_ROTATE_X_AXIS = 8,
+	SF_PENDULUM_AUTO_RETURN = 16,
+	SF_PENDULUM_PASSABLE = 32,
+	SF_BRUSH_ROTATE_SMALLRADIUS = 128,
+	SF_BRUSH_ROTATE_MEDIUMRADIUS = 256,
+	SF_BRUSH_ROTATE_LARGERADIUS = 512
+};
 
-// func breakable
-#define SF_BREAK_TRIGGER_ONLY 1 // may only be broken by trigger
-#define SF_BREAK_TOUCH 2		// can be 'crashed through' by running player (plate glass)
-#define SF_BREAK_PRESSURE 4		// can be broken by a player standing on it
-#define SF_BREAK_CROWBAR 256	// instant break if hit with crowbar
 
-// func_pushable (it's also func_breakable, so don't collide with those flags)
-#define SF_PUSH_BREAKABLE 128
+enum {
+	PUSH_BLOCK_ONLY_X = 1,
+	PUSH_BLOCK_ONLY_Y = 2
+};
 
-#define SF_LIGHT_START_OFF 1
+constexpr Vector VEC_HULL_MIN = Vector(-16,-16,-36);
+constexpr Vector VEC_HULL_MAX = Vector(16, 16, 36);
+constexpr Vector VEC_HUMAN_HULL_MIN = Vector(-16, -16, 0);
+constexpr Vector VEC_HUMAN_HULL_MAX = Vector(16, 16, 72);
+constexpr Vector VEC_HUMAN_HULL_DUCK = Vector(16, 16, 36);
+constexpr Vector VEC_VIEW = Vector(0, 0, 28);
+constexpr Vector VEC_DUCK_HULL_MIN = Vector(-16, -16, -18);
+constexpr Vector VEC_DUCK_HULL_MAX = Vector(16, 16, 18);
+constexpr Vector VEC_DUCK_VIEW = Vector(0, 0, 12);
+
+enum {
+	SVC_TEMPENTITY = 23,
+	SVC_INTERMISSION = 30,
+	SVC_CDTRACK = 32,
+	SVC_WEAPONANIM = 35,
+	SVC_ROOMTYPE = 37,
+	SVC_DIRECTOR = 51
+};
 
-#define SPAWNFLAG_NOMESSAGE 1
-#define SPAWNFLAG_NOTOUCH 1
-#define SPAWNFLAG_DROIDONLY 4
+// triggers
 
-#define SPAWNFLAG_USEONLY 1 // can't be touched, must be used (buttons)
+enum {
+	SF_TRIG_PUSH_ONCE = 1,
+	SF_TRIGGER_ALLOWMONSTERS = 1, // monsters allowed to fire this trigger
+	SF_TRIGGER_NOCLIENTS = 2,	   // players not allowed to fire this trigger
+	SF_TRIGGER_PUSHABLES = 4	   // only pushables can fire this trigger
+};
 
-#define TELE_PLAYER_ONLY 1
-#define TELE_SILENT 2
+// func breakable
+enum {
+	SF_BREAK_TRIGGER_ONLY = 1, // may only be broken by trigger
+	SF_BREAK_TOUCH = 2,		// can be 'crashed through' by running player (plate glass)
+	SF_BREAK_PRESSURE = 4,		// can be broken by a player standing on it
+	SF_PUSH_BREAKABLE = 128, // func_pushable (it's also func_breakable, so don't collide with those flags)
+	SF_BREAK_CROWBAR = 256	// instant break if hit with crowbar
+};
 
-#define SF_TRIG_PUSH_ONCE 1
+enum {
+	SF_LIGHT_START_OFF = 1
+};
+
+enum {
+	SPAWNFLAG_NOMESSAGE = 1,
+	SPAWNFLAG_NOTOUCH = 1,
+	SPAWNFLAG_USEONLY = 1,
+	SPAWNFLAG_DROIDONLY = 4
+};
 
+enum {
+	TELE_PLAYER_ONLY = 1,
+	TELE_SILENT = 2
+};
 // Sound Utilities
 
+
 // sentence groups
-#define CBSENTENCENAME_MAX 16
-#define CVOXFILESENTENCEMAX 1536 // max number of sentences in game. NOTE: this must match CVOXFILESENTENCEMAX in engine\sound.h!!!
+constexpr int CBSENTENCENAME_MAX = 16;
+constexpr int CVOXFILESENTENCEMAX = 1536;// max number of sentences in game. NOTE: this must match CVOXFILESENTENCEMAX in engine\sound.h!!!
 
 extern char gszallsentencenames[CVOXFILESENTENCEMAX][CBSENTENCENAME_MAX];
 extern int gcallsentences;
diff --git a/src/game/shared/hl/vector.h b/src/game/shared/hl/vector.h
index 92a90a72..8ffbfe47 100644
--- a/src/game/shared/hl/vector.h
+++ b/src/game/shared/hl/vector.h
@@ -64,22 +64,22 @@ class Vector // same data-layout as engine's vec3_t,
 {			 //		which is a vec_t[3]
 public:
 	// Construction/destruction
-	inline Vector(void) {}
-	inline Vector(float X, float Y, float Z)
-	{
+	inline constexpr Vector(void) {}
+	inline constexpr Vector(float X, float Y, float Z) {
 		x = X;
 		y = Y;
-		z = Z;
+		x = Z;
 	}
+
 	//inline Vector(double X, double Y, double Z)		{ x = (float)X; y = (float)Y; z = (float)Z;	}
 	//inline Vector(int X, int Y, int Z)				{ x = (float)X; y = (float)Y; z = (float)Z;	}
-	inline Vector(const Vector &v)
+	inline constexpr Vector(const Vector &v)
 	{
 		x = v.x;
 		y = v.y;
 		z = v.z;
 	}
-	inline Vector(float rgfl[3])
+	inline constexpr Vector(float rgfl[3])
 	{
 		x = rgfl[0];
 		y = rgfl[1];
@@ -129,7 +129,9 @@ class Vector // same data-layout as engine's vec3_t,
 	inline float Length2D(void) const { return sqrt( (x * x) + (y * y) ); }
 
 	// Members
-	vec_t x, y, z; //just floats
+	vec_t x{};
+	vec_t y{};
+	vec_t z{}; //just floats
 };
 
 inline Vector operator*(float fl, const Vector& v) { return v * fl; }

From acf2e2cc28d89f2ee9348353076fe02e9edb8ba7 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Tue, 10 Mar 2026 00:43:28 -0400
Subject: [PATCH 070/291] fixed accidental change to var in init.

---
 src/game/shared/hl/vector.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/shared/hl/vector.h b/src/game/shared/hl/vector.h
index 8ffbfe47..c9752171 100644
--- a/src/game/shared/hl/vector.h
+++ b/src/game/shared/hl/vector.h
@@ -68,7 +68,7 @@ class Vector // same data-layout as engine's vec3_t,
 	inline constexpr Vector(float X, float Y, float Z) {
 		x = X;
 		y = Y;
-		x = Z;
+		z = Z;
 	}
 
 	//inline Vector(double X, double Y, double Z)		{ x = (float)X; y = (float)Y; z = (float)Z;	}

From aeb28bbe7686b77bee7edfea70ac46a1c9cc5523 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Tue, 10 Mar 2026 17:25:59 -0400
Subject: [PATCH 071/291] Reverted init change for member vars

---
 src/game/shared/hl/vector.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/game/shared/hl/vector.h b/src/game/shared/hl/vector.h
index c9752171..31cc3efc 100644
--- a/src/game/shared/hl/vector.h
+++ b/src/game/shared/hl/vector.h
@@ -129,9 +129,7 @@ class Vector // same data-layout as engine's vec3_t,
 	inline float Length2D(void) const { return sqrt( (x * x) + (y * y) ); }
 
 	// Members
-	vec_t x{};
-	vec_t y{};
-	vec_t z{}; //just floats
+	vec_t x, y, z; //just floats
 };
 
 inline Vector operator*(float fl, const Vector& v) { return v * fl; }

From 107934e2f3c5940fd6a49ec6dad1111bbfc9da9b Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Tue, 10 Mar 2026 17:51:03 -0400
Subject: [PATCH 072/291] templated fabs and DotProduct functions

---
 src/game/client/cl_util.h | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/game/client/cl_util.h b/src/game/client/cl_util.h
index e3bfefce..237111d8 100644
--- a/src/game/client/cl_util.h
+++ b/src/game/client/cl_util.h
@@ -150,20 +150,30 @@ inline void PlaySound(const char *szSound, float vol) { gEngfuncs.pfnPlaySoundBy
 inline void PlaySound(int iSound, float vol) { gEngfuncs.pfnPlaySoundByIndex(iSound, vol); }
 inline void PlayHUDSound(const char *Sound, float vol) { PlaySound((char *)Sound, vol); }
 
-#define fabs(x) ((x) > 0 ? (x) : 0 - (x))
+template <typename Type>
+Type fabs(Type x) {
+	if (x > 0) return x;
+	else return (0 - x);
+};
+
 
 void ScaleColors(int &r, int &g, int &b, int a);
 
-#define DotProduct(x, y) ((x)[0] * (y)[0] + (x)[1] * (y)[1] + (x)[2] * (y)[2])
+template <typename Type>
+float DotProduct(Type* x, Type* y) {
+	return (x[0] * y[0]) + (x[1] * y[1]) + (x[2] + y[2]);
+};
+
+//#define DotProduct(x, y) ((x)[0] * (y)[0] + (x)[1] * (y)[1] + (x)[2] * (y)[2])
 
 // ugh, some bits of the client code expect a float[3] while others expect a Vector, and there's a macro that pretends they're the same
 // handle the extern with the correct types in the places where it's required
 // extern vec3_t vec3_origin;
 
 // disable 'possible loss of data converting float to int' warning message
-#pragma warning(disable : 4244)
+//#pragma warning(disable : 4244)
 // disable 'truncation from 'const double' to 'float' warning message
-#pragma warning(disable : 4305)
+//#pragma warning(disable : 4305)
 
 inline void UnpackRGB(int &r, int &g, int &b, unsigned long ulRGB)
 {

From bf2e80e13f44cf1d0c96a2ec57c85feeba3d1b37 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Tue, 10 Mar 2026 18:09:57 -0400
Subject: [PATCH 073/291] Changed macros to templated functions. Fixed /
 changed unneeded assignment.

---
 src/game/client/entity.cpp              |  2 +-
 src/game/client/ms/clplayer.cpp         |  3 ++-
 src/game/server/hl/util.h               | 29 ++++++++++++++++++++-----
 src/game/shared/weapons/genericitem.cpp |  2 +-
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/game/client/entity.cpp b/src/game/client/entity.cpp
index 60b5a9ad..f42b1100 100644
--- a/src/game/client/entity.cpp
+++ b/src/game/client/entity.cpp
@@ -1725,7 +1725,7 @@ void SetClEntityProp(cl_entity_t &Ent, msstring &Cmd, mslist<msstring *> &Params
 	else if (Cmd == "frame")
 		Ent.curstate.frame = atof(Value);
 	else if (Cmd == "update")
-		Ent.curstate.iuser4 = atoi(Value) ? SetBits(Ent.curstate.iuser4, MSTEMPENT_CALLBACK) : ClearBits(Ent.curstate.iuser4, MSTEMPENT_CALLBACK);
+		atoi(Value) ? SetBits(Ent.curstate.iuser4, MSTEMPENT_CALLBACK) : ClearBits(Ent.curstate.iuser4, MSTEMPENT_CALLBACK);
 	else if (Cmd == "rendermode")
 	{
 		if (Value.find("normal") != msstring_error)
diff --git a/src/game/client/ms/clplayer.cpp b/src/game/client/ms/clplayer.cpp
index f49766a1..f62bbf53 100644
--- a/src/game/client/ms/clplayer.cpp
+++ b/src/game/client/ms/clplayer.cpp
@@ -595,7 +595,8 @@ void HUD_WeaponsPostThink(local_state_s* from, local_state_s* to, usercmd_t* cmd
 	static int PreserveMask = PLAYER_MOVE_RUNNING | PLAYER_MOVE_ATTACKING; //These are client-side bits to be saved
 	int PreserveBits = (player.m_StatusFlags & PreserveMask);			   //Save the client-side bits
 
-	player.m_StatusFlags = ClearBits(from->client.iuser3, PreserveMask); //Copy all the flags except the client-side ones
+	ClearBits(from->client.iuser3, PreserveMask); //clear flags execpt client side ones
+	player.m_StatusFlags = from->client.iuser3;  //Copy all the flags except the client-side ones
 	SetBits(player.m_StatusFlags, PreserveBits);						 //Copy the client-side bits back over
 
 	to->playerstate.iuser3 = from->playerstate.iuser3;
diff --git a/src/game/server/hl/util.h b/src/game/server/hl/util.h
index 1b9260e4..065ae53a 100644
--- a/src/game/server/hl/util.h
+++ b/src/game/server/hl/util.h
@@ -61,9 +61,26 @@ inline edict_t *FIND_ENTITY_BY_TARGET(edict_t *entStart, const char *pszName)
 	ENGINE_FPRINTF(pf, "\"%s\" \"%f %f %f\"\n", szKeyName, flX, flY, flZ)
 
 // Keeps clutter down a bit, when using a float as a bit-vector
-#define SetBits(flBitVector, bits) ((flBitVector) = (int)(flBitVector) | (bits))
-#define ClearBits(flBitVector, bits) ((flBitVector) = (int)(flBitVector) & ~(bits))
-#define FBitSet(flBitVector, bit) ((int)(flBitVector) & (bit))
+
+template <typename Type>
+void SetBits(Type& vector, const int bits) {
+	vector = (int)vector | bits;
+}
+
+template <typename Type>
+void ClearBits(Type& vector, const int bits) {
+	vector = (int)vector & ~bits;
+}
+
+template <typename Type>
+bool FBitSet(const Type& vector, const int bit) {
+	return (int)vector & bit;
+}
+
+
+//#define SetBits(flBitVector, bits) ((flBitVector) = (int)(flBitVector) | (bits))
+//#define ClearBits(flBitVector, bits) ((flBitVector) = (int)(flBitVector) & ~(bits))
+//#define FBitSet(flBitVector, bit) ((int)(flBitVector) & (bit))
 
 // Makes these more explicit, and easier to find
 #define FILE_GLOBAL static
@@ -160,7 +177,7 @@ inline void MESSAGE_BEGIN(int msg_dest, int msg_type, const float* pOrigin, entv
 }
 
 // Testing the three types of "entity" for nullity
-#define eoNullEntity 0
+constexpr int eoNullEntity = 0;
 inline BOOL FNullEnt(EOFFSET eoffset)
 {
 	return eoffset == 0;
@@ -169,13 +186,13 @@ inline BOOL FNullEnt(const edict_t *pent) { return pent == NULL || FNullEnt(OFFS
 inline BOOL FNullEnt(entvars_t *pev) { return pev == NULL || FNullEnt(OFFSET(pev)); }
 
 // Testing strings for nullity
-#define iStringNull 0
+constexpr int iStringNull = 0;
 inline BOOL FStringNull(int iString)
 {
 	return iString == iStringNull;
 }
 
-#define cchMapNameMost 32
+constexpr int cchMapNameMost = 32;
 
 // Dot products for view cone checking
 constexpr float VIEW_FIELD_FULL = -1.0f;		   // +-180 degrees
diff --git a/src/game/shared/weapons/genericitem.cpp b/src/game/shared/weapons/genericitem.cpp
index 005ca938..4dab5ee7 100644
--- a/src/game/shared/weapons/genericitem.cpp
+++ b/src/game/shared/weapons/genericitem.cpp
@@ -598,7 +598,7 @@ float CGenericItem::Weight()
 	float MyVolume = CBaseEntity::m_Weight;
 	if (FBitSet(MSProperties(), ITEM_CONTAINER))
 		MyVolume += Container_Weight();
-	else if FBitSet(MSProperties(), ITEM_GROUPABLE)
+	else if (FBitSet(MSProperties(), ITEM_GROUPABLE))
 		MyVolume *= iQuantity;
 	return MyVolume;
 }

From a0c0671924d358edb3f0a53cc2edd6128bb373d8 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Tue, 10 Mar 2026 18:31:26 -0400
Subject: [PATCH 074/291] templated FDotProduct function

---
 src/game/client/cl_util.h            | 2 +-
 src/game/client/render/studio_util.h | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/game/client/cl_util.h b/src/game/client/cl_util.h
index 237111d8..a890bbea 100644
--- a/src/game/client/cl_util.h
+++ b/src/game/client/cl_util.h
@@ -152,7 +152,7 @@ inline void PlayHUDSound(const char *Sound, float vol) { PlaySound((char *)Sound
 
 template <typename Type>
 Type fabs(Type x) {
-	if (x > 0) return x;
+	if (x >= 0) return x;
 	else return (0 - x);
 };
 
diff --git a/src/game/client/render/studio_util.h b/src/game/client/render/studio_util.h
index aa784528..a69eba5d 100644
--- a/src/game/client/render/studio_util.h
+++ b/src/game/client/render/studio_util.h
@@ -17,7 +17,10 @@ constexpr int YAW = 1;
 constexpr int ROLL = 2;
 #endif
 
-#define FDotProduct(a, b) (fabs((a[0]) * (b[0])) + fabs((a[1]) * (b[1])) + fabs((a[2]) * (b[2])))
+template <typename Type>
+float FDotProduct(Type* a, Type* b) {
+	return fabs(a[0] * b[0]) + fabs(a[1] * b[1]) + fabs(a[2] * b[2]);
+}
 
 void AngleMatrix(const float *angles, float (*matrix)[4]);
 bool VectorCompare (const float *v1, const float *v2);

From 2a5f233411266a938ba3aad38c7a16df33f6f6d9 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Tue, 10 Mar 2026 18:31:39 -0400
Subject: [PATCH 075/291] consted var pass in

---
 src/game/client/render/studio_util.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/client/render/studio_util.h b/src/game/client/render/studio_util.h
index a69eba5d..c630d0dc 100644
--- a/src/game/client/render/studio_util.h
+++ b/src/game/client/render/studio_util.h
@@ -18,7 +18,7 @@ constexpr int ROLL = 2;
 #endif
 
 template <typename Type>
-float FDotProduct(Type* a, Type* b) {
+Type FDotProduct(const Type a, const Type b) {
 	return fabs(a[0] * b[0]) + fabs(a[1] * b[1]) + fabs(a[2] * b[2]);
 }
 

From 47e72d403a6027d97e333c1ba142305e4efe27b3 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Tue, 10 Mar 2026 20:47:39 -0400
Subject: [PATCH 076/291] changes header functions to be specified as inline

---
 src/common/Platform.h                |  4 ++--
 src/game/client/cl_util.h            | 16 +++++++++++++---
 src/game/client/render/studio_util.h |  2 +-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/common/Platform.h b/src/common/Platform.h
index 6089b66c..7ea5474e 100644
--- a/src/common/Platform.h
+++ b/src/common/Platform.h
@@ -44,12 +44,12 @@ using word = unsigned short;
 
 
 template <typename T1, typename T2>
-auto V_min(const T1& a, const T2& b) {
+inline auto V_min(const T1& a, const T2& b) {
 	return (a < b) ? a : b;
 };
 
 template <typename T1, typename T2>
-auto V_max(const T1& a, const T2& b) {
+inline auto V_max(const T1& a, const T2& b) {
 	return (a > b) ? a : b;
 };
 
diff --git a/src/game/client/cl_util.h b/src/game/client/cl_util.h
index a890bbea..90ed772d 100644
--- a/src/game/client/cl_util.h
+++ b/src/game/client/cl_util.h
@@ -15,6 +15,7 @@
 //
 // cl_util.h
 //
+
 #include "sharedutil.h"
 #include "msdebug.h"
 
@@ -25,6 +26,7 @@
 #define FALSE 0
 #endif
 
+//these must stay macros, or we need to make a msg function for every command.
 // Macros to hook function calls into the HUD object
 #define HOOK_MESSAGE(x) gEngfuncs.pfnHookUserMsg(#x, __MsgFunc_##x);
 
@@ -57,7 +59,7 @@
 		gHUD.y->UserCmd_##x();   \
 	}
 //------------------------------------------
-
+//end required macros
 //Master Sword
 #undef CVAR_GET_FLOAT
 #undef CVAR_GET_STRING
@@ -66,6 +68,15 @@ inline float CVAR_GET_FLOAT(const char *x) { return gEngfuncs.pfnGetCvarFloat(x)
 inline const char *CVAR_GET_STRING(const char *x) { return gEngfuncs.pfnGetCvarString(x); }
 inline struct cvar_s *CVAR_CREATE(const char *cv, const char *val, const int flags) { return gEngfuncs.pfnRegisterVariable(cv, val, flags); }
 
+//HLSPRITE SPR_Load(const char* sprName) {
+//return gEngfuncs.pfnSPR_Load(sprName);
+//}
+
+
+//void SPR_Set(HLSPRITE& hPic, const int r, const int g, const int b ) {
+//	gEngfuncs.pfnSPR_Set(&hPic, r, g, b);
+//}
+
 #define SPR_Load (*gEngfuncs.pfnSPR_Load)
 #define SPR_Set (*gEngfuncs.pfnSPR_Set)
 #define SPR_Frames (*gEngfuncs.pfnSPR_Frames)
@@ -150,8 +161,7 @@ inline void PlaySound(const char *szSound, float vol) { gEngfuncs.pfnPlaySoundBy
 inline void PlaySound(int iSound, float vol) { gEngfuncs.pfnPlaySoundByIndex(iSound, vol); }
 inline void PlayHUDSound(const char *Sound, float vol) { PlaySound((char *)Sound, vol); }
 
-template <typename Type>
-Type fabs(Type x) {
+inline float fabs(float x) {
 	if (x >= 0) return x;
 	else return (0 - x);
 };
diff --git a/src/game/client/render/studio_util.h b/src/game/client/render/studio_util.h
index c630d0dc..76c628ff 100644
--- a/src/game/client/render/studio_util.h
+++ b/src/game/client/render/studio_util.h
@@ -18,7 +18,7 @@ constexpr int ROLL = 2;
 #endif
 
 template <typename Type>
-Type FDotProduct(const Type a, const Type b) {
+inline Type FDotProduct(const Type a, const Type b) {
 	return fabs(a[0] * b[0]) + fabs(a[1] * b[1]) + fabs(a[2] * b[2]);
 }
 

From 803fe461224e8f2892a3b43f409fe243b9af148a Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Tue, 10 Mar 2026 20:50:30 -0400
Subject: [PATCH 077/291] removed fabs unneeded redefinition

---
 src/game/client/cl_util.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/game/client/cl_util.h b/src/game/client/cl_util.h
index 90ed772d..39684dd7 100644
--- a/src/game/client/cl_util.h
+++ b/src/game/client/cl_util.h
@@ -161,12 +161,6 @@ inline void PlaySound(const char *szSound, float vol) { gEngfuncs.pfnPlaySoundBy
 inline void PlaySound(int iSound, float vol) { gEngfuncs.pfnPlaySoundByIndex(iSound, vol); }
 inline void PlayHUDSound(const char *Sound, float vol) { PlaySound((char *)Sound, vol); }
 
-inline float fabs(float x) {
-	if (x >= 0) return x;
-	else return (0 - x);
-};
-
-
 void ScaleColors(int &r, int &g, int &b, int a);
 
 template <typename Type>

From fb753344c000e11cda822f5539d5c4321c8a9a8e Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Tue, 10 Mar 2026 20:51:33 -0400
Subject: [PATCH 078/291] Moved VecMutiply definition to inline header
 function. Converted from macro.

---
 src/game/shared/ms/script.cpp     | 1 -
 src/game/shared/ms/script.h       | 4 ++++
 src/game/shared/ms/scriptcmds.cpp | 1 -
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/game/shared/ms/script.cpp b/src/game/shared/ms/script.cpp
index d9610df2..47903c2e 100644
--- a/src/game/shared/ms/script.cpp
+++ b/src/game/shared/ms/script.cpp
@@ -35,7 +35,6 @@ bool GetModelBounds(CBaseEntity* pEntity, Vector Bounds[2]);
 //#include <unordered_map>
 
 #undef SCRIPTVAR
-#define VecMultiply( a, b ) Vector( a[0] * b[0], a[1] * b[1], a[2] * b[2] )		//Thothie APR2016_25 - seems we need this here too
 #define SCRIPTVAR GetVar								//A script-wide or global variable
 #define SCRIPTCONST( a ) SCRIPTVAR(GetConst(a))			//A const, script-wide, or global variable - loadtime only
 #define GETCONST_COMPATIBLE( a ) ( a.c_str()[0] == '$' ? GetConst(a) : SCRIPTCONST(a) )			//Loadtime - Only parse it as a var if it's not a $parser
diff --git a/src/game/shared/ms/script.h b/src/game/shared/ms/script.h
index 4f47b911..d4ee10e1 100644
--- a/src/game/shared/ms/script.h
+++ b/src/game/shared/ms/script.h
@@ -6,6 +6,10 @@
 #include <ctime>
 #include <vector>
 
+inline Vector VecMultiply(Vector a, Vector b) {
+	return Vector(a[0] * b[0], a[1] * b[1], a[2] * b[2]);
+};
+
 class CEventList : public mslist<SCRIPT_EVENT *> //This class was created so I can store Events as pointers, but still access them as
 {															//dereferenced objects
 public:
diff --git a/src/game/shared/ms/scriptcmds.cpp b/src/game/shared/ms/scriptcmds.cpp
index 695dec33..3acd0cef 100644
--- a/src/game/shared/ms/scriptcmds.cpp
+++ b/src/game/shared/ms/scriptcmds.cpp
@@ -34,7 +34,6 @@
 #undef SCRIPTVAR
 #define SCRIPTVAR GetVar								//A script-wide or global variable
 #define ERROR_MISSING_PARMS MS_ERROR("ExecuteScriptCmd: Script: %s, %s - not enough parameters!", m.ScriptFile.c_str(), Cmd.Name().c_str())
-#define VecMultiply( a, b ) Vector( a[0] * b[0], a[1] * b[1], a[2] * b[2] )
 void Player_UseStamina(float flAddAmt);
 extern "C" playermove_t *pmove;
 

From 28f1f34248406b9c8e5623799afd04bcb042b92d Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Tue, 10 Mar 2026 23:25:22 -0400
Subject: [PATCH 079/291] changes two defines to constexpr

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

diff --git a/src/common/com_model.h b/src/common/com_model.h
index c8466505..92fc4ce9 100644
--- a/src/common/com_model.h
+++ b/src/common/com_model.h
@@ -493,8 +493,8 @@ typedef struct auxvert_s
 //
 #include "custom.h"
 
-#define MAX_INFO_STRING 256
-#define MAX_SCOREBOARDNAME 32
+constexpr int  MAX_INFO_STRING = 256;
+constexpr int  MAX_SCOREBOARDNAME = 32;
 typedef struct player_info_s
 {
     // User id on server

From 44f03a21a524f73bb8e578718999b4eb1a741d4c Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Tue, 10 Mar 2026 23:27:24 -0400
Subject: [PATCH 080/291] fixed ifndef syntax

---
 src/common/engine_launcher_api.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/engine_launcher_api.h b/src/common/engine_launcher_api.h
index fa568d00..92c3be7b 100644
--- a/src/common/engine_launcher_api.h
+++ b/src/common/engine_launcher_api.h
@@ -6,7 +6,7 @@
 //=============================================================================
 
 // engine/launcher interface
-#if !defined(ENGINE_LAUNCHER_APIH)
+#ifndef ENGINE_LAUNCHER_APIH
 #define ENGINE_LAUNCHER_APIH
 #ifdef _WIN32
 #pragma once

From 16b7088f165aaa2a1a00d8c8f0a1b0673b0b1cd0 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Tue, 10 Mar 2026 23:30:52 -0400
Subject: [PATCH 081/291] Revferted syntax change

---
 src/common/engine_launcher_api.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/engine_launcher_api.h b/src/common/engine_launcher_api.h
index 92c3be7b..fa568d00 100644
--- a/src/common/engine_launcher_api.h
+++ b/src/common/engine_launcher_api.h
@@ -6,7 +6,7 @@
 //=============================================================================
 
 // engine/launcher interface
-#ifndef ENGINE_LAUNCHER_APIH
+#if !defined(ENGINE_LAUNCHER_APIH)
 #define ENGINE_LAUNCHER_APIH
 #ifdef _WIN32
 #pragma once

From 6a61dec8b9d04257d3751cc9063c2db9741d81d2 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Tue, 10 Mar 2026 23:35:39 -0400
Subject: [PATCH 082/291] Removed macro

---
 src/common/mathlib.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/common/mathlib.h b/src/common/mathlib.h
index 3e289b93..dab9927e 100644
--- a/src/common/mathlib.h
+++ b/src/common/mathlib.h
@@ -91,7 +91,6 @@ int GreatestCommonDivisor(int i1, int i2);
 
 void AngleVectors(const Vector& angles, Vector* forward, Vector* right, Vector* up);
 void AngleVectorsTranspose(const Vector& angles, Vector* forward, Vector* right, Vector* up);
-#define AngleIVectors AngleVectorsTranspose
 
 void AngleMatrix(const float* angles, float (*matrix)[4]);
 void AngleIMatrix(const Vector& angles, float (*matrix)[4]);

From ceefc46992c5fb6d80ff88db7c602b5b92bc1190 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Wed, 11 Mar 2026 02:25:25 -0400
Subject: [PATCH 083/291] Fixed warning 4018 signed/unsigned mismatches

---
 lib/include/vgui/VGUI_Dar.h                   |   2 +-
 lib/include/vgui/VGUI_String.h                |   2 +-
 src/common/Platform.h                         |   6 +-
 src/common/cl_entity.h                        |   2 +-
 src/common/com_model.h                        |   6 +-
 src/common/entity_state.h                     |   4 +-
 src/common/ref_params.h                       |   2 +-
 src/game/client/ammo_secondary.cpp            |   4 +-
 src/game/client/ammohistory.cpp               |   2 +-
 src/game/client/ammohistory.h                 |   2 +-
 src/game/client/death.cpp                     |   2 +-
 src/game/client/entity.cpp                    |  24 +--
 src/game/client/hud.cpp                       |   2 +-
 src/game/client/hud_msg.cpp                   |   4 +-
 src/game/client/hud_spectator.cpp             |   6 +-
 src/game/client/inputw32.cpp                  |   5 +-
 src/game/client/ms/action.cpp                 |   6 +-
 src/game/client/ms/clglobal.cpp               |  12 +-
 src/game/client/ms/clplayer.cpp               |  12 +-
 src/game/client/ms/health.cpp                 |   6 +-
 src/game/client/ms/hudid.cpp                  |   4 +-
 src/game/client/ms/hudmisc.cpp                |   4 +-
 src/game/client/ms/hudscript.cpp              |  43 +++--
 src/game/client/ms/menu.cpp                   |   2 +-
 src/game/client/render/clrender.cpp           |  24 ++-
 src/game/client/render/clrender.h             |   2 +-
 src/game/client/render/clrenderent.cpp        |  24 +--
 src/game/client/render/clrendermirror.cpp     |  49 +++--
 .../client/render/studiomodelrenderer.cpp     |   2 +-
 src/game/client/status_icons.cpp              |   4 +-
 src/game/client/statusbar.cpp                 |   6 +-
 .../client/ui/ms/vgui_choosecharacter.cpp     |  42 ++---
 src/game/client/ui/ms/vgui_choosecharacter.h  |   4 +-
 src/game/client/ui/ms/vgui_container.cpp      |  28 +--
 src/game/client/ui/ms/vgui_container.h        |   8 +-
 src/game/client/ui/ms/vgui_containerlist.cpp  |   8 +-
 src/game/client/ui/ms/vgui_eventconsole.h     |  22 +--
 src/game/client/ui/ms/vgui_health.h           |  10 +-
 src/game/client/ui/ms/vgui_healthretro.h      |  10 +-
 src/game/client/ui/ms/vgui_hud.cpp            |  18 +-
 src/game/client/ui/ms/vgui_id.h               |  10 +-
 src/game/client/ui/ms/vgui_infowin.h          |   4 +-
 src/game/client/ui/ms/vgui_localizedpanel.cpp |   8 +-
 src/game/client/ui/ms/vgui_localizedpanel.h   |   4 +-
 src/game/client/ui/ms/vgui_menu_interact.h    |   6 +-
 src/game/client/ui/ms/vgui_menu_main.h        |   4 +-
 src/game/client/ui/ms/vgui_menubase.cpp       |   4 +-
 src/game/client/ui/ms/vgui_moveitempanel.cpp  |   6 +-
 src/game/client/ui/ms/vgui_mscontrols.cpp     |  24 +--
 src/game/client/ui/ms/vgui_mscontrols.h       |  12 +-
 src/game/client/ui/ms/vgui_options.cpp        |  16 +-
 src/game/client/ui/ms/vgui_stats.cpp          |  10 +-
 src/game/client/ui/ms/vgui_storage.cpp        |  14 +-
 src/game/client/ui/ms/vgui_store.cpp          |   6 +-
 src/game/client/ui/ms/vgui_storebuy.cpp       |   4 +-
 src/game/client/ui/ms/vgui_storesell.cpp      |  12 +-
 src/game/client/ui/vgui_global.cpp            |   2 +-
 src/game/client/ui/vgui_loadtga.cpp           |   2 +-
 src/game/client/ui/vgui_schememanager.cpp     |   6 +-
 src/game/client/ui/vgui_schememanager.h       |   4 +-
 src/game/client/ui/vgui_scorepanel.cpp        |   6 +-
 src/game/client/ui/vgui_scrollbar2.cpp        |   4 +-
 src/game/client/ui/vgui_slider2.cpp           |   2 +-
 src/game/client/ui/vgui_status.h              |   8 +-
 .../client/ui/vgui_teamfortressviewport.cpp   |  24 +--
 .../client/ui/vgui_teamfortressviewport.h     |   8 +-
 src/game/client/view.cpp                      |   8 +-
 .../server/angelscript/ASServerEngineImpl.cpp |   8 +-
 src/game/server/client.cpp                    |  15 +-
 src/game/server/effects/mseffects.cpp         |  16 +-
 src/game/server/enginecallback.h              |   2 +-
 src/game/server/fn/FNSharedDefs.cpp           |   2 +-
 src/game/server/func_break.cpp                |  10 +-
 .../server/gamerules/multiplay_gamerules.cpp  |  35 ++--
 src/game/server/gamerules/team.cpp            |  16 +-
 src/game/server/ggrenade.cpp                  |   4 +-
 src/game/server/hl/animating.cpp              |   2 +-
 src/game/server/hl/animation.cpp              |  16 +-
 src/game/server/hl/animation.h                |   2 +-
 src/game/server/hl/explode.cpp                |   4 +-
 src/game/server/hl/monsters.cpp               |  10 +-
 src/game/server/hl/nodes.cpp                  |  89 ++++-----
 src/game/server/hl/nodes.h                    |  18 +-
 src/game/server/hl/saverestore.h              |   2 +-
 src/game/server/hl/sound.cpp                  |   4 +-
 src/game/server/hl/soundent.cpp               |   4 +-
 src/game/server/hl/subs.cpp                   |   2 +-
 src/game/server/hl/util.cpp                   |  40 ++---
 src/game/server/hl/util.h                     |   2 +-
 .../server/monsters/bodyparts/bodyparts.cpp   |  14 +-
 .../monsters/bodyparts/bodyparts_human.cpp    |   4 +-
 src/game/server/monsters/corpse.cpp           |   4 +-
 src/game/server/monsters/msmonster.h          |   4 +-
 src/game/server/monsters/msmonsterserver.cpp  |  46 ++---
 src/game/server/monsters/npcglobal.cpp        |   2 +-
 src/game/server/monsters/npcscript.cpp        |  36 ++--
 src/game/server/msmapents.cpp                 |  39 ++--
 src/game/server/player/player.cpp             | 115 ++++++------
 src/game/server/player/player.h               |   2 +-
 src/game/server/player/playershared.cpp       |  70 ++++----
 src/game/server/player/playerstats.cpp        |   4 +-
 src/game/server/shield.cpp                    |   2 +-
 src/game/server/shurispritedefs.h             |   2 +-
 src/game/server/store.cpp                     |   8 +-
 src/game/server/store.h                       |   2 +-
 src/game/server/sv_character.cpp              |  56 +++---
 src/game/server/svglobals.cpp                 |  20 +--
 src/game/server/triggers.cpp                  |  22 +--
 src/game/server/world.cpp                     |   2 +-
 src/game/shared/movement/pm_shared.cpp        |   2 +-
 src/game/shared/ms/angelscript/ASBindings.cpp |  18 +-
 .../ms/angelscript/ASBuiltinFunctions.cpp     |  31 ++--
 src/game/shared/ms/angelscript/ASDebugger.cpp |  12 +-
 .../ms/angelscript/ASEngineEventManager.cpp   |   2 +-
 .../ms/angelscript/ASEntityBindings.cpp       |  22 +--
 .../shared/ms/angelscript/ASModuleSystem.cpp  |   6 +-
 .../shared/ms/angelscript/CAngelScript.cpp    |   4 +-
 .../ms/angelscript/CAngelScriptManager.cpp    |   4 +-
 .../shared/ms/angelscript/IAngelScript.cpp    |   4 +-
 src/game/shared/ms/findentities.cpp           |   4 +-
 src/game/shared/ms/global.cpp                 |  14 +-
 src/game/shared/ms/globalmem.cpp              |   4 +-
 src/game/shared/ms/groupfile.cpp              |   4 +-
 src/game/shared/ms/mscharacter.cpp            |   6 +-
 src/game/shared/ms/mscharacter.h              |   4 +-
 src/game/shared/ms/msfileio.cpp               |   2 +-
 src/game/shared/ms/msfileio.h                 |   2 +
 src/game/shared/ms/mslogger.cpp               |   2 +-
 src/game/shared/ms/msmonstershared.cpp        |  46 ++---
 src/game/shared/ms/netcodeshared.cpp          |  18 +-
 src/game/shared/ms/script.cpp                 | 164 ++++++++---------
 src/game/shared/ms/script.h                   |   2 +-
 src/game/shared/ms/scriptcmds.cpp             | 170 +++++++++---------
 src/game/shared/ms/scriptedeffects.cpp        |   4 +-
 src/game/shared/ms/stackstring.cpp            |   4 +-
 src/game/shared/stats/statdefs.h              |   2 +-
 src/game/shared/stats/stats.cpp               |  14 +-
 src/game/shared/voice_banmgr.cpp              |  14 +-
 src/game/shared/voice_gamemgr.cpp             |   2 +-
 src/game/shared/voice_status.cpp              |  18 +-
 src/game/shared/weapons/genericitem.cpp       |  40 ++---
 src/game/shared/weapons/genericitem.h         |   8 +-
 src/game/shared/weapons/giarmor.cpp           |   2 +-
 src/game/shared/weapons/giattack.cpp          |  18 +-
 src/game/shared/weapons/gipack.cpp            |  25 +--
 src/game/shared/weapons/weapons.cpp           |   2 +-
 src/game/shared/weapons/weapons.h             |   2 +-
 src/public/engine/eiface.h                    |   2 +-
 src/public/engine/progdefs.h                  |   6 +-
 src/public/engine/studio.h                    |   4 +-
 thirdparty/tartan/textureloader.cpp           |   2 +-
 151 files changed, 1066 insertions(+), 1050 deletions(-)

diff --git a/lib/include/vgui/VGUI_Dar.h b/lib/include/vgui/VGUI_Dar.h
index 6f8eb513..2d5c6496 100644
--- a/lib/include/vgui/VGUI_Dar.h
+++ b/lib/include/vgui/VGUI_Dar.h
@@ -66,7 +66,7 @@ template<class ELEMTYPE> class VGUIAPI Dar
 		}
 		_count=count;
 	}
-	int getCount()
+	unsigned int getCount()
 	{
 		return _count;
 	}
diff --git a/lib/include/vgui/VGUI_String.h b/lib/include/vgui/VGUI_String.h
index 9cdebadf..289e1af7 100644
--- a/lib/include/vgui/VGUI_String.h
+++ b/lib/include/vgui/VGUI_String.h
@@ -37,7 +37,7 @@ class VGUIAPI String
 
 public:
 
-	int    getCount();
+	unsigned int    getCount();
 	String operator+(String text);
 	String operator+(const char* text);
 	bool   operator==(String text);
diff --git a/src/common/Platform.h b/src/common/Platform.h
index 7ea5474e..12b18f5b 100644
--- a/src/common/Platform.h
+++ b/src/common/Platform.h
@@ -12,7 +12,7 @@ constexpr int DEBUG = 1
 #pragma warning(disable : 4201)	 // nameless struct/union
 #pragma warning(disable : 4514)	 // unreferenced inline function removed
 #pragma warning(disable : 4100)	 // unreferenced formal parameter
-#pragma warning(disable : 4018) // signed/unsigned mismatch, this this probably isn't a good idea...
+//#pragma warning(disable : 4018) // signed/unsigned mismatch, this this probably isn't a good idea...
 #pragma warning(disable : 26495) // Variable is uninitialized
 #pragma warning(disable : 26451) // Arithmetic overflow
 #pragma warning(disable : 26812) // The enum type is unscoped
@@ -45,12 +45,12 @@ using word = unsigned short;
 
 template <typename T1, typename T2>
 inline auto V_min(const T1& a, const T2& b) {
-	return (a < b) ? a : b;
+	return (a <= b) ? a : b;
 };
 
 template <typename T1, typename T2>
 inline auto V_max(const T1& a, const T2& b) {
-	return (a > b) ? a : b;
+	return (a >= b) ? a : b;
 };
 
 #endif
\ No newline at end of file
diff --git a/src/common/cl_entity.h b/src/common/cl_entity.h
index c6b2f646..dbdbca62 100644
--- a/src/common/cl_entity.h
+++ b/src/common/cl_entity.h
@@ -42,7 +42,7 @@ typedef struct
 	vec3_t prevorigin;
 	vec3_t prevangles;
 
-	int prevsequence;
+	unsigned int prevsequence;
 	float prevframe;
 
 	byte prevcontroller[4];
diff --git a/src/common/com_model.h b/src/common/com_model.h
index 92fc4ce9..d3be02e6 100644
--- a/src/common/com_model.h
+++ b/src/common/com_model.h
@@ -280,7 +280,7 @@ typedef struct mleaf_s
     struct efrag_s *efrags;
 
     msurface_t **firstmarksurface;
-    int nummarksurfaces;
+    unsigned int nummarksurfaces;
     int key; // BSP sequence number for leaf's contents
     byte ambient_sound_level[NUM_AMBIENTS];
 } mleaf_t;
@@ -420,7 +420,7 @@ typedef struct model_s
     //
     // brush model
     //
-    int firstmodelsurface, nummodelsurfaces; // +0x070, +0x074
+    unsigned int firstmodelsurface, nummodelsurfaces; // +0x070, +0x074
 
     int numsubmodels;    // +0x078
     dmodel_t *submodels; // +0x07C
@@ -521,7 +521,7 @@ typedef struct player_info_s
     int renderframe;
 
     // Gait frame estimation
-    int gaitsequence;
+    unsigned int gaitsequence;
     float gaitframe;
     float gaityaw;
     vec3_t prevgaitorigin;
diff --git a/src/common/entity_state.h b/src/common/entity_state.h
index 3c6b0a94..3d8120ab 100644
--- a/src/common/entity_state.h
+++ b/src/common/entity_state.h
@@ -44,7 +44,7 @@ struct entity_state_s
 	vec3_t angles;
 
 	int modelindex;
-	int sequence;
+	unsigned int sequence;
 	float frame;
 	int colormap;
 	short skin;
@@ -87,7 +87,7 @@ struct entity_state_s
 	int health;
 	qboolean spectator;
 	int weaponmodel;
-	int gaitsequence;
+	unsigned int gaitsequence;
 	// If standing on conveyor, e.g.
 	vec3_t basevelocity;
 	// Use the crouched hull, or the regular player hull.
diff --git a/src/common/ref_params.h b/src/common/ref_params.h
index f8a8d361..084166b1 100644
--- a/src/common/ref_params.h
+++ b/src/common/ref_params.h
@@ -60,7 +60,7 @@ typedef struct ref_params_s
 	int maxclients;
 	int viewentity;
 	int playernum;
-	int max_entities;
+	unsigned int max_entities;
 	int demoplayback;
 	int hardware;
 
diff --git a/src/game/client/ammo_secondary.cpp b/src/game/client/ammo_secondary.cpp
index 7b374912..2f14d1a3 100644
--- a/src/game/client/ammo_secondary.cpp
+++ b/src/game/client/ammo_secondary.cpp
@@ -35,7 +35,7 @@ int CHudAmmoSecondary ::Init(void)
 	gHUD.AddHudElem(this);
 	m_HUD_ammoicon = 0;
 
-	for (int i = 0; i < MAX_SEC_AMMO_VALUES; i++)
+	for (unsigned int i = 0; i < MAX_SEC_AMMO_VALUES; i++)
 		m_iAmmoAmounts[i] = -1; // -1 means don't draw this value
 
 	Reset();
@@ -139,7 +139,7 @@ int CHudAmmoSecondary ::MsgFunc_SecAmmoVal(const char *pszName, int iSize, void
 
 	// check to see if there is anything left to draw
 	int count = 0;
-	for (int i = 0; i < MAX_SEC_AMMO_VALUES; i++)
+	for (unsigned int i = 0; i < MAX_SEC_AMMO_VALUES; i++)
 	{
 		count += V_max(0, m_iAmmoAmounts[i]);
 	}
diff --git a/src/game/client/ammohistory.cpp b/src/game/client/ammohistory.cpp
index 40aa30c7..b9403817 100644
--- a/src/game/client/ammohistory.cpp
+++ b/src/game/client/ammohistory.cpp
@@ -91,7 +91,7 @@ void HistoryResource ::AddToHistory(int iType, const char *szName, int iCount)
 
 void HistoryResource ::CheckClearHistory(void)
 {
-	for (int i = 0; i < MAX_HISTORY; i++)
+	for (unsigned int i = 0; i < MAX_HISTORY; i++)
 	{
 		if (rgAmmoHistory[i].type)
 			return;
diff --git a/src/game/client/ammohistory.h b/src/game/client/ammohistory.h
index 9d4d6870..f2e1f46a 100644
--- a/src/game/client/ammohistory.h
+++ b/src/game/client/ammohistory.h
@@ -65,7 +65,7 @@ class WeaponsResource
 
 	void DropAllWeapons(void)
 	{
-		for (int i = 0; i < MAX_WEAPONS; i++)
+		for (unsigned int i = 0; i < MAX_WEAPONS; i++)
 		{
 			if (rgWeapons[i].iId)
 				DropWeapon(&rgWeapons[i]);
diff --git a/src/game/client/death.cpp b/src/game/client/death.cpp
index 18dd983a..98e45ae1 100644
--- a/src/game/client/death.cpp
+++ b/src/game/client/death.cpp
@@ -91,7 +91,7 @@ int CHudDeathNotice ::Draw(float flTime)
 {
 	int x, y, r, g, b;
 
-	for (int i = 0; i < MAX_DEATHNOTICES; i++)
+	for (unsigned int i = 0; i < MAX_DEATHNOTICES; i++)
 	{
 		if (rgDeathNoticeList[i].iId == 0)
 			break; // we've gone through them all
diff --git a/src/game/client/entity.cpp b/src/game/client/entity.cpp
index f42b1100..a837a885 100644
--- a/src/game/client/entity.cpp
+++ b/src/game/client/entity.cpp
@@ -588,7 +588,7 @@ void CHudScript::Effects_UpdateTempEnt(const char* EventName, msstringlist *Para
 {
 	//Update tempents
 	TEMPENTITY *pTempEnt = g_CurrentTempEnt; //Save a copy, because this could get set to NULL during RunScriptEventByName
-	for (int i = 0; i < m_Scripts.size(); i++)
+	for (unsigned int i = 0; i < m_Scripts.size(); i++)
 	{
 		CScript *Script = m_Scripts[i];
 		if (pTempEnt->entity.curstate.iuser2 != (int)Script)
@@ -649,7 +649,7 @@ const char* CScript::CLGetBeamProp(int beamid, msstringlist &Params)
 	BEAM *pBeam = found_beam ? m_Beams[beamid] : NULL;
 	/*
 	bool found_beam = false;
-	 for (int i = 0; i < m_Beams.size(); i++) 
+	 for (unsigned int i = 0; i < m_Beams.size(); i++) 
 	{
 		Print("DEBUG: $get_clbeam checking %i for %i\n",i,beamid);
 		if ( m_Beams[i]->id == beamid )
@@ -963,7 +963,7 @@ void CScript::CLScriptedEffect(msstringlist &Params)
 			p->die += 1.0;
 
 			int Spot = 0;
-			for (int i = 0; i < MAX_TEMPENT_EXTRA; i++)
+			for (unsigned int i = 0; i < MAX_TEMPENT_EXTRA; i++)
 				if (!g_TempEntExtra[i].Active)
 				{
 					Spot = i;
@@ -1115,7 +1115,7 @@ void CScript::CLScriptedEffect(msstringlist &Params)
 				static mslist<msstring *> ValueParams;
 				ValueParams.clearitems();
 
-				for (int i = 0; i < Params.size() - 3; i++)
+				for (unsigned int i = 0; i < Params.size() - 3; i++)
 					ValueParams.add(&(Params[i + 3]));
 
 				SetClEntityProp(p->entity, Cmd, ValueParams);
@@ -1181,7 +1181,7 @@ void CScript::CLScriptedEffect(msstringlist &Params)
 			static mslist<msstring *> ValueParams;
 			ValueParams.clearitems();
 
-			for (int i = 0; i < Params.size() - 3; i++)
+			for (unsigned int i = 0; i < Params.size() - 3; i++)
 				ValueParams.add(&Params[i + 3]);
 
 			SetClEntityProp(*g_CurrentEnt, Cmd, ValueParams);
@@ -1207,7 +1207,7 @@ void CScript::CLScriptedEffect(msstringlist &Params)
 			static mslist<msstring *> ValueParams;
 			ValueParams.clearitems();
 
-			for (int i = 0; i < Params.size() - 3; i++)
+			for (unsigned int i = 0; i < Params.size() - 3; i++)
 				ValueParams.add(&Params[i + 3]);
 
 			SetClEntityProp(*pEnt, Cmd, ValueParams);
@@ -1222,7 +1222,7 @@ void CScript::CLScriptedEffect(msstringlist &Params)
 		dlight_t NewLight;
 		clrmem(NewLight);
 		bool EntityLight = false;
-		int NextParm = 2;
+		unsigned int NextParm = 2;
 
 		NewLight.origin = StringToVec(Params[NextParm++]);
 		NewLight.radius = atof(Params[NextParm++]);
@@ -1385,7 +1385,7 @@ void CScript::CLScriptedEffect(msstringlist &Params)
 			if ( m_Beams.size() > 0 )
 			{
 				float gcltime = gEngfuncs.GetClientTime();
-				 for (int i = 0; i < m_Beams.size(); i++) 
+				 for (unsigned int i = 0; i < m_Beams.size(); i++) 
 					if ( m_Beams[i]->die > 0 && m_Beams[i]->die < gcltime )
 						m_Beams.erase(i);
 			}
@@ -1418,7 +1418,7 @@ void CScript::CLScriptedEffect(msstringlist &Params)
 		if (Params.size() >= 2 && Params[1] == "removeall")
 		{
 			size_t size = m_Beams.size();
-			for (int i = 0; i < size; i++)
+			for (unsigned int i = 0; i < size; i++)
 			{
 				BEAM* pBeam = m_Beams[i];
 				if ( pBeam ) pBeam->die = 0;
@@ -1433,7 +1433,7 @@ void CScript::CLScriptedEffect(msstringlist &Params)
 
 			/*
 			bool found_beam =false;
-			 for (int i = 0; i < m_Beams.size(); i++) 
+			 for (unsigned int i = 0; i < m_Beams.size(); i++) 
 			{
 				Print("DEBUG: beam_update checking %i for %i\n",i,beamid);
 				if ( m_Beams[i]->id == beamid )
@@ -1530,7 +1530,7 @@ void CScript::CLScriptedEffect(msstringlist &Params)
 			/*if(Params[2].contains("clmsg"))
 			{
 				msstring sTemp = "ce";
-				for (int i = 0; i < Params.size(); i++) //Thothie SEP2019_03 - fix need for "x" param (was Params.size()-1 )
+				for (unsigned int i = 0; i < Params.size(); i++) //Thothie SEP2019_03 - fix need for "x" param (was Params.size()-1 )
 				{
 					if (i > 0)
 					{
@@ -1897,7 +1897,7 @@ void DLLEXPORT HUD_TempEntUpdate(
 	{
 		if (g_TempEntNewLevel)
 		{
-			for (int i = 0; i < MAX_TEMPENT_EXTRA; i++) //On level change, this is called.  Clear all tempent extra data from last level
+			for (unsigned int i = 0; i < MAX_TEMPENT_EXTRA; i++) //On level change, this is called.  Clear all tempent extra data from last level
 				clrmem(g_TempEntExtra[i]);
 
 			g_TempEntNewLevel = false;
diff --git a/src/game/client/hud.cpp b/src/game/client/hud.cpp
index 211952e9..2e216d46 100644
--- a/src/game/client/hud.cpp
+++ b/src/game/client/hud.cpp
@@ -383,7 +383,7 @@ void CHud::Shutdown()
 int CHud::GetSpriteIndex(const char *SpriteName)
 {
 	// look through the loaded sprite name list for SpriteName
-	for (int i = 0; i < m_Sprites.size() - 1; ++i)
+	for (unsigned int i = 0; i < m_Sprites.size() - 1; ++i)
 	{
 		if (m_Sprites[i].Name == SpriteName)
 			return static_cast<int>(i);
diff --git a/src/game/client/hud_msg.cpp b/src/game/client/hud_msg.cpp
index f7d37d35..c1e97b3f 100644
--- a/src/game/client/hud_msg.cpp
+++ b/src/game/client/hud_msg.cpp
@@ -65,7 +65,7 @@ void CHud ::MsgFunc_InitHUD(const char *pszName, int iSize, void *pbuf)
 	//g_NetCode.m.HostIP = READ_STRING();
 
 	MS_INFO("[MsgFunc_InitHUD: CLEnt Readin]");
-	for (int i = 0; i < CLPERMENT_TOTALK; i++)
+	for (unsigned int i = 0; i < CLPERMENT_TOTALK; i++)
 		MSGlobals::ClEntities[i] = READ_SHORT();
 	int flags = READ_BYTE();
 
@@ -86,7 +86,7 @@ void CHud ::MsgFunc_InitHUD(const char *pszName, int iSize, void *pbuf)
 
 	MS_INFO("[MsgFunc_InitHUD: Clearvotes]");
 	vote_t::VotesTypesAllowed.clearitems();
-	for (int i = 0; i < vote_t::VotesTypes.size(); i++)
+	for (unsigned int i = 0; i < vote_t::VotesTypes.size(); i++)
 		if (FBitSet(VotesAllowed, (1 << i)))
 			vote_t::VotesTypesAllowed.add(vote_t::VotesTypes[i]);
 
diff --git a/src/game/client/hud_spectator.cpp b/src/game/client/hud_spectator.cpp
index 0f330464..c6f07553 100644
--- a/src/game/client/hud_spectator.cpp
+++ b/src/game/client/hud_spectator.cpp
@@ -426,7 +426,7 @@ int CHudSpectator::Draw(float flTime)
 	gViewPort->GetAllPlayersInfo();
 
 	// loop through all the players and draw additional infos to their sprites on the map
-	for (int i = 0; i < MAX_PLAYERS; i++)
+	for (unsigned int i = 0; i < MAX_PLAYERS; i++)
 	{
 
 		if (m_vPlayerPos[i][2] < 0) // marked as invisible ?
@@ -1385,7 +1385,7 @@ void CHudSpectator::CheckOverviewEntities()
 	double time = gEngfuncs.GetClientTime();
 
 	// removes old entities from list
-	for (int i = 0; i < MAX_OVERVIEW_ENTITIES; i++)
+	for (unsigned int i = 0; i < MAX_OVERVIEW_ENTITIES; i++)
 	{
 		// remove entity from list if it is too old
 		if (m_OverviewEntities[i].killTime < time)
@@ -1445,7 +1445,7 @@ void CHudSpectator::DeathMessage(int victim)
 
 bool CHudSpectator::AddOverviewEntityToList(HLSPRITE sprite, cl_entity_t *ent, double killTime)
 {
-	for (int i = 0; i < MAX_OVERVIEW_ENTITIES; i++)
+	for (unsigned int i = 0; i < MAX_OVERVIEW_ENTITIES; i++)
 	{
 		// find empty entity slot
 		if (m_OverviewEntities[i].entity == NULL)
diff --git a/src/game/client/inputw32.cpp b/src/game/client/inputw32.cpp
index 8c76655c..47c05641 100644
--- a/src/game/client/inputw32.cpp
+++ b/src/game/client/inputw32.cpp
@@ -655,10 +655,11 @@ void IN_StartupJoystick(void)
 	// assume no joystick
 	joy_avail = 0;
 
-	int nJoysticks = SDL_NumJoysticks();
+	unsigned int nJoysticks = SDL_NumJoysticks();
+
 	if (nJoysticks > 0)
 	{
-		for (int i = 0; i < nJoysticks; i++)
+		for (unsigned int i = 0; i < nJoysticks; i++)
 		{
 			if (SDL_IsGameController(i))
 			{
diff --git a/src/game/client/ms/action.cpp b/src/game/client/ms/action.cpp
index 04de0345..c5b1c8ec 100644
--- a/src/game/client/ms/action.cpp
+++ b/src/game/client/ms/action.cpp
@@ -49,7 +49,7 @@ int CHudAction::MsgFunc_Action(const char *pszName, int iSize, void *pbuf)
 		NewAction.Name = READ_STRING();
 		NewAction.ID = ID;
 
-		for (int i = 0; i < PlayerActions.size(); i++)
+		for (unsigned int i = 0; i < PlayerActions.size(); i++)
 			if (PlayerActions[i].ID == NewAction.ID)
 			{
 				PlayerActions[i] = NewAction;
@@ -60,7 +60,7 @@ int CHudAction::MsgFunc_Action(const char *pszName, int iSize, void *pbuf)
 	}
 	else //Remove
 	{
-		for (int i = 0; i < PlayerActions.size(); i++)
+		for (unsigned int i = 0; i < PlayerActions.size(); i++)
 			if (PlayerActions[i].ID == ID)
 			{
 				PlayerActions.erase(i);
@@ -90,7 +90,7 @@ void CHudAction::UserCmd_Action(void)
 
 	int iBitsValid = 0;
 	msstring MenuText(msstring(Localized("#ACTION_QUERY")) + "\n\n");
-	for (int i = 0; i < PlayerActions.size(); i++)
+	for (unsigned int i = 0; i < PlayerActions.size(); i++)
 	{
 		//Print("DEBUG: UserCmd_Action: loop: %i %s %s\n",i,PlayerActions[i].Name.c_str(),PlayerActions[i].ID.c_str());
 		MenuText += (i + 1);
diff --git a/src/game/client/ms/clglobal.cpp b/src/game/client/ms/clglobal.cpp
index 72657b75..b1ba96d3 100644
--- a/src/game/client/ms/clglobal.cpp
+++ b/src/game/client/ms/clglobal.cpp
@@ -46,7 +46,7 @@ void MSCLGlobals::AddEnt(CBaseEntity *pEntity)
 }
 void MSCLGlobals::RemoveEnt(CBaseEntity *pEntity, bool fDelete)
 {
-	for (int e = 0; e < m_ClEntites.size(); e++)
+	for (unsigned int e = 0; e < m_ClEntites.size(); e++)
 		if (m_ClEntites[e] == pEntity)
 		{
 			m_ClEntites.erase(e);
@@ -92,7 +92,7 @@ void MSCLGlobals::InitializePlayer()
 	player.m_SprintDelay = gpGlobals->time;
 	player.m_Initialized = false;
 
-	for (int i = 0; i < MAX_PLAYER_HANDITEMS; i++)
+	for (unsigned int i = 0; i < MAX_PLAYER_HANDITEMS; i++)
 	{
 		MSCLGlobals::CLViewEntities[i].index = MSGlobals::ClEntities[(i != 2) ? CLPERMENT_LEFTVIEW + i : CLPERMENT_LEFTVIEW];
 		MSCLGlobals::CLViewEntities[i].curstate.number = MSGlobals::ClEntities[(i != 2) ? CLPERMENT_LEFTVIEW + i : CLPERMENT_LEFTVIEW];
@@ -115,7 +115,7 @@ void MSCLGlobals::Think()
 			RemoveEnt(m_ClEntites[e], m_ClEntites[e] != &player);
 
 	//Call entity Think() functions
-	for (int e = 0; e < m_ClEntites.size(); e++)
+	for (unsigned int e = 0; e < m_ClEntites.size(); e++)
 		if (flLastThinkTime <= m_ClEntites[e]->pev->nextthink && m_ClEntites[e]->pev->nextthink < gpGlobals->time)
 			m_ClEntites[e]->Think();
 
@@ -130,7 +130,7 @@ void MSCLGlobals::PrintAllEntites()
 	Print("Global Items...\n");
 
 	int items = 0;
-	for (int e = 0; e < m_ClEntites.size(); e++)
+	for (unsigned int e = 0; e < m_ClEntites.size(); e++)
 		Print("Item %i: %s", items++, m_ClEntites[e]->DisplayName());
 }
 
@@ -148,7 +148,7 @@ void MSCLGlobals::RemoveAllEntities()
 	//deleted beforehand
 	//(presumably within RemoveAllItems() somewhere)
 	int killed = 0;
-	for (int e = 0; e < m_ClEntites.size(); e++)
+	for (unsigned int e = 0; e < m_ClEntites.size(); e++)
 	{
 		CBaseEntity *pEntity = m_ClEntites[e];
 		if (!pEntity) continue;
@@ -235,7 +235,7 @@ string_t MSCLGlobals::AllocString(const char *pszString)
 		return 0;
 
 	size_t size = m_Strings.size();
-	for (int s = 0; s < size; s++)
+	for (unsigned int s = 0; s < size; s++)
 	{
 		if (FStrEq(m_Strings[s].c_str(), pszString))
 			return m_Strings[s].c_str() - gpGlobals->pStringBase;
diff --git a/src/game/client/ms/clplayer.cpp b/src/game/client/ms/clplayer.cpp
index f62bbf53..b7362327 100644
--- a/src/game/client/ms/clplayer.cpp
+++ b/src/game/client/ms/clplayer.cpp
@@ -1029,11 +1029,11 @@ int __MsgFunc_Item(const char* pszName, int iSize, void* pbuf)
 		CGenericItem* pItem = MSUtil_GetItemByID(lID);
 
 		msstring Event = READ_STRING();
-		int numParams = READ_BYTE();
+		unsigned int numParams = READ_BYTE();
 
 		msstringlist Params;
 		Params.clear();
-		for (int i = 0; i < numParams; i++)
+		for (unsigned int i = 0; i < numParams; i++)
 			Params.add(READ_STRING());
 
 		if (pItem)
@@ -1094,7 +1094,7 @@ int __MsgFunc_SetProp(const char* pszName, int iSize, void* pbuf)
 			//Memory dellocation errors when using '.erase()', so I'm now using this loop
 			int idx = READ_BYTE();
 			msstringlist newSpells;
-			for (int i = 0; i < player.m_SpellList.size(); i++)
+			for (unsigned int i = 0; i < player.m_SpellList.size(); i++)
 				if (i != idx)
 					newSpells.add(player.m_SpellList[i]); //Add all spells to the new list except the one to erase
 			player.m_SpellList = newSpells;				  //Overwrite the player spells with the new list
@@ -1128,7 +1128,7 @@ void Player_ToggleInventory()
 	}
 
 	CGenericItem* pWearable = NULL; //Fallback, in case a pack isn't found
-	for (int i = 0; i < player.Gear.size(); i++)
+	for (unsigned int i = 0; i < player.Gear.size(); i++)
 	{
 		CGenericItem* pPack = player.Gear[i];
 		if (FBitSet(pPack->MSProperties(), ITEM_CONTAINER) && pPack->m_Location > ITEMPOS_HANDS)
@@ -1232,7 +1232,7 @@ void __CmdFunc_DynamicNPC(void)
 	}
 
 	int iBitsValid = 0;
-	for (int i = 0; i < NPCList.size(); i++)
+	for (unsigned int i = 0; i < NPCList.size(); i++)
 	{
 		const char* arg = UTIL_VarArgs("%i. %s\n", i + 1, NPCList[i].c_str());
 		strncat(MenuText, arg, strlen(arg));
@@ -1500,7 +1500,7 @@ int __MsgFunc_CLDllFunc(const char* pszName, int iSize, void* pbuf)
 
 	case 21: //Retrieve all quickslots (Sent at spawn)
 	{
-		for (int i = 0; i < MAX_QUICKSLOTS; i++)
+		for (unsigned int i = 0; i < MAX_QUICKSLOTS; i++)
 		{
 			quickslot_t& QuickSlot = player.m_QuickSlots[i];
 			QuickSlot.Active = READ_BYTE() ? true : false;
diff --git a/src/game/client/ms/health.cpp b/src/game/client/ms/health.cpp
index f0f0abc7..48c4cc5f 100644
--- a/src/game/client/ms/health.cpp
+++ b/src/game/client/ms/health.cpp
@@ -88,7 +88,7 @@ void CHudHealth::Reset(void)
 
 	// force all the flashing damage icons to expire
 	m_bitsDamage = 0;
-	for (int i = 0; i < NUM_DMG_TYPES; i++)
+	for (unsigned int i = 0; i < NUM_DMG_TYPES; i++)
 	{
 		m_dmg[i].fExpire = 0;
 	}
@@ -155,7 +155,7 @@ int CHudHealth::MsgFunc_Damage(const char *pszName, int iSize, void *pbuf)
 
 	vec3_t vecFrom;
 
-	for (int i = 0; i < 3; i++)
+	for (unsigned int i = 0; i < 3; i++)
 		vecFrom[i] = READ_COORD();
 
 	UpdateTiles(gHUD.m_flTime, bitsDamage);
@@ -345,7 +345,7 @@ void CHudHealth::UpdateTiles(float flTime, long bitsDamage)
 	// Which types are new?
 	long bitsOn = ~m_bitsDamage & bitsDamage;
 
-	for (int i = 0; i < NUM_DMG_TYPES; i++)
+	for (unsigned int i = 0; i < NUM_DMG_TYPES; i++)
 	{
 		pdmg = &m_dmg[i];
 
diff --git a/src/game/client/ms/hudid.cpp b/src/game/client/ms/hudid.cpp
index 47dc589a..b760180b 100644
--- a/src/game/client/ms/hudid.cpp
+++ b/src/game/client/ms/hudid.cpp
@@ -148,7 +148,7 @@ int CHudID::MsgFunc_EntInfo(const char *pszName, int iSize, void *pbuf)
 	EntData.Type = (EntType)READ_BYTE();
 
 	//Search for a current entry with this info
-	for (int i = 0; i < player.m_EntInfo.size(); i++)
+	for (unsigned int i = 0; i < player.m_EntInfo.size(); i++)
 		if (player.m_EntInfo[i].entindex == EntData.entindex)
 		{
 			player.m_EntInfo[i] = EntData;
@@ -190,7 +190,7 @@ entinfo_t *CHudID::GetEntInFrontOfMe(float Range)
 	if (tr.fraction < 1.0 && tr.ent)
 	{
 		physent_t *pe = gEngfuncs.pEventAPI->EV_GetPhysent(tr.ent);
-		for (int i = 0; i < player.m_EntInfo.size(); i++)
+		for (unsigned int i = 0; i < player.m_EntInfo.size(); i++)
 			if (player.m_EntInfo[i].entindex == pe->info)
 				return &player.m_EntInfo[i];
 	}
diff --git a/src/game/client/ms/hudmisc.cpp b/src/game/client/ms/hudmisc.cpp
index 3c6665b7..2095a559 100644
--- a/src/game/client/ms/hudmisc.cpp
+++ b/src/game/client/ms/hudmisc.cpp
@@ -202,7 +202,7 @@ void CHudMisc ::UserCmd_RemovePack(void)
 	 strncpy(MenuText,  "Remove item:\n\n", sizeof(MenuText) );
 
 	m_RemoveList.clear();
-	for (int i = 0; i < player.Gear.size(); i++)
+	for (unsigned int i = 0; i < player.Gear.size(); i++)
 	{
 		CGenericItem *pGearItem = player.Gear[i];
 		if (!FBitSet(pGearItem->MSProperties(), ITEM_WEARABLE) || pGearItem->m_Location == ITEMPOS_HANDS)
@@ -315,7 +315,7 @@ void CHudMisc ::UserCmd_Offer(void)
 	}
 
 	int r = 0;
-	for (int i = 0; i < MAX_PLAYER_HANDS; i++)
+	for (unsigned int i = 0; i < MAX_PLAYER_HANDS; i++)
 	{
 		if (!player.Hand(i))
 			continue;
diff --git a/src/game/client/ms/hudscript.cpp b/src/game/client/ms/hudscript.cpp
index 20e48f30..8100f70d 100644
--- a/src/game/client/ms/hudscript.cpp
+++ b/src/game/client/ms/hudscript.cpp
@@ -155,8 +155,7 @@ void CHudScript::Reset( void )
 }
 void CHudScript::InitHUDData( void )
 {
-	int scriptnum = m_Scripts.size();
-	 for (int i = 0; i < scriptnum; i++) 
+	 for (unsigned int i = 0; i < m_Scripts.size(); i++)
 		Script_Remove( 0 );
 }
 
@@ -176,31 +175,31 @@ int CHudScript::MsgFunc_ClientScript( const char *pszName, int iSize, void *pbuf
 	if( !Action )	//Add Script
 	{	
 		msstring ScriptName = READ_STRING( );
-		int iParameters = READ_BYTE( );
-		for (int i = 0; i < iParameters; i++) Parameters.add(READ_STRING());
+		unsigned int iParameters = READ_BYTE( );
+		for (unsigned int i = 0; i < iParameters; i++) Parameters.add(READ_STRING());
 		CScript *Script = CreateScript( ScriptName, Parameters, true, ID );
 	}
 	else if( Action == 1 )	//Send Msg to Script
 	{
-		int iParameters = READ_BYTE( );
+		unsigned int iParameters = READ_BYTE( );
 		msstring EventName = READ_STRING( );	//First parameter is the eventname
-		for (int i = 0; i < (iParameters - 1); i++) Parameters.add(READ_STRING());
+		for (unsigned int i = 0; i < (iParameters - 1); i++) Parameters.add(READ_STRING());
 
-		 for (int i = 0; i < m_Scripts.size(); i++) 
+		 for (unsigned int i = 0; i < m_Scripts.size(); i++) 
 		{
 			CScript *Script = m_Scripts[i];
 			if( Script->m.UniqueID != ID )
 				continue;
 
-			 for (int p = 0; p < Parameters.size(); p++) 
-				Script->SetVar( msstring("PARAM") + (p+1), Parameters[p].c_str() );
+			 for (unsigned int p = 0; p < Parameters.size(); p++) 
+				Script->SetVar( msstring("PARAM") + ((int)p+1), Parameters[p].c_str() );
 			Script->RunScriptEventByName( EventName, Parameters.size() ? &Parameters : NULL );
 			break;
 		}
 	}
 	else	//Remove script
 	{
-		 for (int i = 0; i < m_Scripts.size(); i++) 
+		 for (unsigned int i = 0; i < m_Scripts.size(); i++) 
 		{
 			if( m_Scripts[i]->m.UniqueID != ID )
 				continue;
@@ -218,8 +217,8 @@ CScript *CHudScript::CreateScript(const char* ScriptName, msstringlist &Paramete
 	//If I don't allow dupes, try to find a prev copy of this script
 	if( !AllowDupe )
 	{
-		int events = m_Scripts.size();
-		 for (int i = 0; i < events; i++) 
+		unsigned int events = m_Scripts.size();
+		 for (unsigned int i = 0; i < events; i++) 
 			if( strstr( m_Scripts[i]->m.ScriptFile.c_str(), ScriptName ) )
 			{
 				UniqueID = m_Scripts[i]->m.UniqueID;
@@ -255,8 +254,8 @@ void CHudScript::HandleAnimEvent(const char* Options, const cl_entity_s *clEntit
 	//Latch onto an existing script
 	if( Type == HAE_EITHER || Type == HAE_ATTACH )
 	{
-		int events = m_Scripts.size( );
-		 for (int i = 0; i < events; i++) 
+		unsigned int events = m_Scripts.size( );
+		 for (unsigned int i = 0; i < events; i++) 
 			if( strstr( m_Scripts[i]->m.ScriptFile.c_str(), ScriptName ) )
 				{ Script = m_Scripts[i]; break; }
 	}
@@ -273,7 +272,7 @@ void CHudScript::HandleAnimEvent(const char* Options, const cl_entity_s *clEntit
 
 	static msstringlist Params;
 	Params.clearitems( );
-	 for (int i = 0; i < ParsedOptions.size()-2; i++) 
+	 for (unsigned int i = 0; i < ParsedOptions.size()-2; i++) 
 		Params.add( ParsedOptions[i+2] );
 
 	Script->RunScriptEventByName( EventName, &Params );
@@ -281,7 +280,7 @@ void CHudScript::HandleAnimEvent(const char* Options, const cl_entity_s *clEntit
 
 void CHudScript::Effects_GetView( ref_params_s *pparams, cl_entity_t *ViewModel )
 {
-	 for (int i = 0; i < m_Scripts.size(); i++) 
+	 for (unsigned int i = 0; i < m_Scripts.size(); i++) 
 	{
 		CScript *Script = m_Scripts[i];
 		Vector &ViewOfs = *(Vector *)&pparams->vieworg;
@@ -297,7 +296,7 @@ void CHudScript::Effects_GetView( ref_params_s *pparams, cl_entity_t *ViewModel
 Vector CHudScript::Effects_GetMoveScale( )
 {
 	Vector NewScale( 1.0f, 1.0f, 1.0f );
-	 for (int i = 0; i < m_Scripts.size(); i++) 
+	 for (unsigned int i = 0; i < m_Scripts.size(); i++) 
 	{
 		CScript *Script = m_Scripts[i];
 		if( Script->VarExists( "game.cleffect.move_scale.forward" ) ) NewScale.x *= atof(Script->GetVar( "game.cleffect.move_scale.forward" ));
@@ -310,7 +309,7 @@ Vector CHudScript::Effects_GetMoveScale( )
 Vector CHudScript::Effects_GetMove( Vector &OriginalMove )
 {
 	Vector NewMove = OriginalMove;
-	 for (int i = 0; i < m_Scripts.size(); i++) 
+	 for (unsigned int i = 0; i < m_Scripts.size(); i++) 
 	{
 		CScript *Script = m_Scripts[i];
 		NewMove.x += atof(Script->GetVar( "game.cleffect.move_ofs.forward" ));
@@ -325,7 +324,7 @@ void CHudScript::Effects_GetFade( screenfade_t &ScreenFade )
 {
 	float OldScreenAlpha = ScreenFade.fadealpha;
 	ScreenFade.fadeFlags = 0;
-	 for (int i = 0; i < m_Scripts.size(); i++) 
+	 for (unsigned int i = 0; i < m_Scripts.size(); i++) 
 	{
 		CScript *Script = m_Scripts[i];
 		if( !atoi(Script->GetVar( "game.cleffect.screenfade.newfade" )) )
@@ -356,14 +355,14 @@ void CHudScript::Effects_GetFade( screenfade_t &ScreenFade )
 }
 void CHudScript::Effects_PreRender( )
 {
-	 for (int i = 0; i < m_Scripts.size(); i++) 
+	 for (unsigned int i = 0; i < m_Scripts.size(); i++) 
 		if( m_Scripts[i]->m.m_HandleRender )
 			m_Scripts[i]->RunScriptEventByName( "game_prerender" );
 }
 
 void CHudScript::Effects_Render( cl_entity_t &Ent, bool InMirror )
 {
-	 for (int i = 0; i < m_Scripts.size(); i++) 
+	 for (unsigned int i = 0; i < m_Scripts.size(); i++) 
 		if( m_Scripts[i]->m.m_HandleRender )
 		{
 			static msstringlist Params;
@@ -376,7 +375,7 @@ void CHudScript::Effects_Render( cl_entity_t &Ent, bool InMirror )
 
 void CHudScript::Effects_DrawTransPararentTriangles( )
 {
-	 for (int i = 0; i < m_Scripts.size(); i++) 
+	 for (unsigned int i = 0; i < m_Scripts.size(); i++) 
 		if( m_Scripts[i]->m.m_HandleRender )
 			m_Scripts[i]->RunScriptEventByName( "game_render_transparent" );
 }
diff --git a/src/game/client/ms/menu.cpp b/src/game/client/ms/menu.cpp
index 6231f2e6..c70aa768 100644
--- a/src/game/client/ms/menu.cpp
+++ b/src/game/client/ms/menu.cpp
@@ -94,7 +94,7 @@ int CHudMenu ::Draw(float flTime)
 
 	// count the number of newlines
 	int nlc = 0;
-	for (int i = 0; i < MAX_MENU_STRING && m.cMenuText[i] != '\0'; i++)
+	for (unsigned int i = 0; i < MAX_MENU_STRING && m.cMenuText[i] != '\0'; i++)
 	{
 		if (m.cMenuText[i] == '\n')
 			nlc++;
diff --git a/src/game/client/render/clrender.cpp b/src/game/client/render/clrender.cpp
index fa2e0162..e9c0997e 100644
--- a/src/game/client/render/clrender.cpp
+++ b/src/game/client/render/clrender.cpp
@@ -14,10 +14,9 @@
 #include "entity_state.h"
 #include "cl_entity.h"
 #include "triangleapi.h"
-#include "const.h"
+
 #include "com_model.h"
 #include "studio.h"
-#include "entity_state.h"
 #include "studio_util.h"
 #include "r_studioint.h"
 #include "ref_params.h"
@@ -44,7 +43,6 @@ extern "C"
 };
 
 //TWHL Project - Thothie JUN2010_22
-#include "r_studioint.h"
 
 extern engine_studio_api_t IEngineStudio;
 
@@ -214,7 +212,7 @@ class CSkyBox
 		m_uiNextTexIdx = 1;
 		m_SkyName = "g_morning";
 
-		for (int i = 0; i < 6; i++)
+		for (unsigned int i = 0; i < 6; i++)
 		{
 			Faces.add(skyface_t());
 
@@ -227,7 +225,7 @@ class CSkyBox
 	//Called once each level load
 	void Setup() //Be sure to call after EngineFunc stuff is valid
 	{
-		for (int i = 0; i < Faces.size(); i++)
+		for (unsigned int i = 0; i < Faces.size(); i++)
 		{
 			CParticle &Face = Faces[i].Face;
 			Face.SetAngles(g_SkyBoxInfo[i].Dir);
@@ -248,7 +246,7 @@ class CSkyBox
 	void ChangeTexture(const char* NewTexture)
 	{
 		m_SkyName = NewTexture;
-		for (int i = 0; i < Faces.size(); i++)
+		for (unsigned int i = 0; i < Faces.size(); i++)
 		{
 			msstring FileName = /*msstring(EngineFunc::GetGameDir()) + "/" +*/ msstring(SKYFILENAME_PREFIX) + NewTexture + g_SkyBoxInfo[i].FileNameSuffix + ".tga";
 			Faces[i].Face.m_GLTex = 0;
@@ -261,7 +259,7 @@ class CSkyBox
 		//if( MSGlobals::GameScript )
 		//	MSGlobals::GameScript->CallScriptEvent( "game_render_sky" );
 
-		for (int i = 0; i < Faces.size(); i++)
+		for (unsigned int i = 0; i < Faces.size(); i++)
 		{
 			CParticle &Face = Faces[i].Face;
 			Face.m_Width = v_ViewDist - 1;
@@ -322,12 +320,12 @@ void TraverseAllNodes(mnode_t *pNode, void *Func)
 	{
 		//Call Function on Leaf
 		mleaf_t &Leaf = *(mleaf_t *)&Node;
-		for (int s = 0; s < Leaf.nummarksurfaces; s++)
+		for (unsigned int s = 0; s < Leaf.nummarksurfaces; s++)
 			(*(ParseAllSurfacesFunc *)Func)(Leaf.firstmarksurface[s]);
 		return;
 	}
 
-	for (int i = 0; i < 2; i++)
+	for (unsigned int i = 0; i < 2; i++)
 		TraverseAllNodes(Node.children[i], Func);
 }
 
@@ -557,7 +555,7 @@ mslist<VGUI_Image3D *> g_VGUIImages;
 void VGUIImages_NewLevel()
 {
 	//Reload the TGA textures for the 3D VGUI Images
-	for (int i = 0; i < g_VGUIImages.size(); i++)
+	for (unsigned int i = 0; i < g_VGUIImages.size(); i++)
 	{
 		if (g_VGUIImages[i]->m_TGAorSprite)
 		{
@@ -647,7 +645,7 @@ void VGUI_Image3D::paintBackground()
 
 VGUI_Image3D::~VGUI_Image3D()
 {
-	for (int i = 0; i < g_VGUIImages.size(); i++)
+	for (unsigned int i = 0; i < g_VGUIImages.size(); i++)
 		if (g_VGUIImages[i] == this)
 		{
 			g_VGUIImages.erase(i);
@@ -667,7 +665,7 @@ bool LoadGLTexture(const char *FileName, loadtex_t &LoadTex)
 {
 	bool Loaded = false;
 
-	for (int i = 0; i < g_TextureList.size(); i++)
+	for (unsigned int i = 0; i < g_TextureList.size(); i++)
 	{
 		if (g_TextureList[i].Name == FileName)
 		{
@@ -706,7 +704,7 @@ bool LoadGLTexture(const char *FileName, uint &TextureID)
 
 void DeleteGLTextures()
 {
-	for (int i = 0; i < g_TextureList.size(); i++)
+	for (unsigned int i = 0; i < g_TextureList.size(); i++)
 		glDeleteTextures(1, &g_TextureList[i].GLTexureID);
 	g_TextureList.clear();
 }
diff --git a/src/game/client/render/clrender.h b/src/game/client/render/clrender.h
index a8b68645..60162660 100644
--- a/src/game/client/render/clrender.h
+++ b/src/game/client/render/clrender.h
@@ -140,7 +140,7 @@ class Plane
 	bool BBoxIsInFront(Vector Bounds[2])
 	{
 		Vector Point;
-		for (int i = 0; i < 6; i++)
+		for (unsigned int i = 0; i < 6; i++)
 		{
 			switch (i)
 			{
diff --git a/src/game/client/render/clrenderent.cpp b/src/game/client/render/clrenderent.cpp
index 9ef48685..5d74afe0 100644
--- a/src/game/client/render/clrenderent.cpp
+++ b/src/game/client/render/clrenderent.cpp
@@ -35,7 +35,7 @@ void Game_AddObjects(void)
 {
 	g_FirstRender = true;
 
-	for (int i = 0; i < MSCLGlobals::m_ClModels.size(); i++)
+	for (unsigned int i = 0; i < MSCLGlobals::m_ClModels.size(); i++)
 	{
 		cl_entity_t &Entity = MSCLGlobals::m_ClModels[i];
 		CLFrameShowModel(Entity);
@@ -108,7 +108,7 @@ bool cl_entity_s::PlayAnim(const char* Anim)
 
 	pseqdesc = (mstudioseqdesc_t *)((byte *)pstudiohdr + pstudiohdr->seqindex);
 
-	for (int i = 0; i < pstudiohdr->numseq; i++)
+	for (unsigned int i = 0; i < pstudiohdr->numseq; i++)
 	{
 		if (_stricmp(pseqdesc[i].label, Anim) != 0)
 			continue;
@@ -206,7 +206,7 @@ void CBasePlayer::BeginRender()
 
 void CBasePlayer::Render()
 {
-	for (int i = 0; i < g_RenderEnts.size(); i++)
+	for (unsigned int i = 0; i < g_RenderEnts.size(); i++)
 		g_RenderEnts[i]->Render();
 }
 void CBasePlayer::RenderCleanup()
@@ -214,8 +214,8 @@ void CBasePlayer::RenderCleanup()
 	mslist<CRenderEntity *> RenderEntListCopy;
 	RenderEntListCopy = g_RenderEnts;
 
-	int size = RenderEntListCopy.size();
-	for (int i = 0; i < size; i++)
+	unsigned int size = RenderEntListCopy.size();
+	for (unsigned int i = 0; i < size; i++)
 	{
 		CRenderEntity *pRdrEnt = RenderEntListCopy[i];
 		if (pRdrEnt->IsPermanent())
@@ -236,7 +236,7 @@ void CRenderEntity::Render()
 }
 void CRenderEntity::UnRegister()
 {
-	for (int i = 0; i < g_RenderEnts.size(); i++)
+	for (unsigned int i = 0; i < g_RenderEnts.size(); i++)
 		if (g_RenderEnts[i] == this)
 		{
 			g_RenderEnts.erase(i--);
@@ -261,7 +261,7 @@ void CRenderPlayer::Render()
 	//m_Ent.origin and m_Ent.angles are calulated in V_CalcRefdef for precise accuracy.
 	cl_entity_t &Ent = GetEntity();
 
-	/* for (int i = 0; i < HUMAN_BODYPARTS; i++) 
+	/* for (unsigned int i = 0; i < HUMAN_BODYPARTS; i++) 
 	{
 		cl_entity_t &BPEnt = m_BodyParts[i];
 		BPEnt.SetModel( ModelList[i][m_Gender] );
@@ -282,10 +282,10 @@ void CRenderPlayer::Render()
 	CRenderEntity::Render();
 
 	CItemList &Gear = GetGear();
-	for (int i = 0; i < Gear.size(); i++)
+	for (unsigned int i = 0; i < Gear.size(); i++)
 		RenderGearItem(*Gear[i]);
 
-	/* for (int i = 0; i < HUMAN_BODYPARTS; i++) 
+	/* for (unsigned int i = 0; i < HUMAN_BODYPARTS; i++) 
 	{
 		cl_entity_t &BPEnt = m_BodyParts[i];
 		if( BPEnt.curstate.number != 0 ) CLFrameShowModel( BPEnt );
@@ -312,7 +312,7 @@ void CRenderPlayer::RenderGearItem(CGenericItem &Item)
 	//		foreach( i, Item.m_WearModelPositions.size( ) )
 	//			Ent.SetBody( Item.m_WearModelPositions[i], 1 );
 
-	/* for (int i = 0; i < HUMAN_BODYPARTS; i++) 
+	/* for (unsigned int i = 0; i < HUMAN_BODYPARTS; i++) 
 		{
 			cl_entity_t &BPEnt = m_BodyParts[i];
 			int PlayerBody = Item.Armor_GetBody( i );
@@ -375,11 +375,11 @@ void CRenderPlayerInset::Render()
 	//m_Ent.index = clplayer->index;
 	//m_Ent.curstate.number = clplayer->index;
 
-	/* for (int i = 0; i < 4; i++) 
+	/* for (unsigned int i = 0; i < 4; i++) 
 		m_Ent.latched.prevcontroller[i] = m_Ent.curstate.controller[i] = 127;
  	m_Ent.curstate.gaitsequence = 0;
 	m_Ent.curstate.framerate = 1;
-	 for (int i = 0; i < 4; i++) 
+	 for (unsigned int i = 0; i < 4; i++) 
 		m_Ent.attachment[i] = clplayer->attachment[i];
 
 	ClearBits( m_Ent.curstate.colormap, MSRDR_ANIM_ONCE );
diff --git a/src/game/client/render/clrendermirror.cpp b/src/game/client/render/clrendermirror.cpp
index 02aa8397..6bc258db 100644
--- a/src/game/client/render/clrendermirror.cpp
+++ b/src/game/client/render/clrendermirror.cpp
@@ -9,7 +9,6 @@
 #include "cl_entity.h"
 #include "dlight.h"
 #include "triangleapi.h"
-#include "com_model.h"
 #include "studio_util.h"
 #include "../r_studioint.h"
 #include "studiomodelrenderer.h"
@@ -70,7 +69,7 @@ class CFrustum
 		float FOV = gHUD.m_iFOV ? ((float)gHUD.m_iFOV / 2.0f) : 45;
 		float RightPlaneYaw = FOV;
 		float UpPlanePitch = FOV;
-		for (int i = 0; i < 6; i++)
+		for (unsigned int i = 0; i < 6; i++)
 		{
 			Plane &plane = Planes[i];
 			switch (i)
@@ -128,7 +127,7 @@ class CFrustum
 
 	bool IsBBoxVisible(Vector Bounds[2])
 	{
-		for (int i = 0; i < 6; i++)
+		for (unsigned int i = 0; i < 6; i++)
 		{
 			Plane &plane = Planes[i];
 			if (!plane.BBoxIsInFront(Bounds))
@@ -147,7 +146,7 @@ bool CheckBBox(Vector Bounds[2])
 void CMirrorMgr::Cleanup()
 {
 	//Clear out old mirror data
-	for (int m = 0; m < CMirrorMgr::m_MirrorTextures.size(); m++)
+	for (unsigned int m = 0; m < CMirrorMgr::m_MirrorTextures.size(); m++)
 	{
 		//CMirror &Mirror = CMirrorMgr::m_LevelMirrors[m];
 		glDeleteTextures(1, &m_MirrorTextures[m]);
@@ -182,7 +181,7 @@ bool CheckSurface(TraverseInfo_t &Info, msurface_t *pSurface)
 		return false;*/
 
 	mstexture_t *pCustomTexture = NULL;
-	for (int t = 0; t < MSCLGlobals::Textures.size(); t++)
+	for (unsigned int t = 0; t < MSCLGlobals::Textures.size(); t++)
 	{
 		mstexture_t &MSTexture = MSCLGlobals::Textures[t];
 
@@ -204,7 +203,7 @@ bool CheckSurface(TraverseInfo_t &Info, msurface_t *pSurface)
 	{
 		CMirror *pUseMirror = NULL;
 
-		for (int m = 0; m < CMirrorMgr::m_Mirrors.size(); m++)
+		for (unsigned int m = 0; m < CMirrorMgr::m_Mirrors.size(); m++)
 		{
 			CMirror &Mirror = CMirrorMgr::m_Mirrors[m];
 			if (Mirror.Normal == SurfaceNormal &&
@@ -223,7 +222,7 @@ bool CheckSurface(TraverseInfo_t &Info, msurface_t *pSurface)
 		for (int t = 0; t < Surface.polys->numverts; t++, Vertex += VERTEXSIZE)
 		{
 			Vector Vert = Vector(Vertex);
-			for (int i = 0; i < 3; i++)
+			for (unsigned int i = 0; i < 3; i++)
 			{
 				if (Vert[i] < Bounds[0][i])
 					Bounds[0][i] = Vert[i];
@@ -357,7 +356,7 @@ void CMirrorMgr::MarkCustomTextures()
 	if (!m_pStartLeaf || m_pStartLeaf->contents == CONTENTS_SOLID)
 		return;
 
-	for (int e = 0; e < ViewMgr.Params->max_entities; e++) //MAX_MAP_MODELS
+	for (unsigned int e = 0; e < ViewMgr.Params->max_entities; e++) //MAX_MAP_MODELS
 	{
 		cl_entity_t *pEntity = gEngfuncs.GetEntityByIndex(e);
 		if (!pEntity || !pEntity->model)
@@ -382,7 +381,7 @@ void CMirrorMgr::MarkCustomTextures()
 				//This is being called on a frame basis.  Don't search the world, just check cached level mirrors
 
 				//Find any cached mirrors with at least one surface close enough to the camera
-				for (int wm = 0; wm < m_WorldMirrors.size(); wm++)
+				for (unsigned int wm = 0; wm < m_WorldMirrors.size(); wm++)
 				{
 					CMirror &Mirror = m_WorldMirrors[wm];
 
@@ -416,17 +415,17 @@ void CMirrorMgr::MarkCustomTextures()
 				continue;
 
 			//Success = false;
-			for (int s = 0; s < Model.nummodelsurfaces; s++)
+			for (unsigned int s = 0; s < Model.nummodelsurfaces; s++)
 				CheckSurface(Info, &Model.surfaces[Model.firstmodelsurface + s]);
 		}
 	}
 
 	//Store a lookup table.
 	//Surface --> mirror, So I can find child mirrors by the surface
-	for (int i = 0; i < m_Mirrors.size(); i++)
+	for (unsigned int i = 0; i < m_Mirrors.size(); i++)
 	{
 		CMirror &Mirror = m_Mirrors[i];
-		for (int s = 0; s < Mirror.m_Surfaces.size(); s++)
+		for (unsigned int s = 0; s < Mirror.m_Surfaces.size(); s++)
 		{
 			rendersurface_t RendSurface;
 			RendSurface.Mirror = &m_Mirrors[i];
@@ -469,7 +468,7 @@ void CMirrorMgr::Render_SetupViewReflection()
 		{
 			// cl_entity_t &WorldEntity = *gEngfuncs.GetEntityByIndex( 0 );
 
-			for (int i = 0; i < m_Mirrors.size(); i++)
+			for (unsigned int i = 0; i < m_Mirrors.size(); i++)
 			{
 				CMirror &Mirror = m_Mirrors[i];
 
@@ -639,7 +638,7 @@ void CMirrorMgr::HUD_DrawTransparentTriangles()
 	{
 		CRender::SyncOffScreenSurface();
 
-		for (int i = 0; i < CMirrorMgr::m_RdrMirrors.size(); i++)
+		for (unsigned int i = 0; i < CMirrorMgr::m_RdrMirrors.size(); i++)
 		{
 			CMirrorMgr::SetupMirrorView(i);
 			CMirrorMgr::m_RdrMirrors[i]->RenderMirroredWorld(0);
@@ -712,7 +711,7 @@ bool CMirror::Vis_Eye() //Check if the camera is facing the mirror and not behin
 }
 bool CMirror::Vis_Surface() //Check if the camera is close enough to the mirror
 {
-	for (int s = 0; s < m_Surfaces.size(); s++)
+	for (unsigned int s = 0; s < m_Surfaces.size(); s++)
 	{
 		CSurface &Surface = m_Surfaces[s];
 
@@ -808,7 +807,7 @@ void CMirror::RenderMirroredWorld(int RecurseCall)
 
 		gEngfuncs.pTriAPI->CullFace(TRI_NONE);
 
-		for (int i = 0; i < CMirrorMgr::m_BrushEnts.size(); i++)
+		for (unsigned int i = 0; i < CMirrorMgr::m_BrushEnts.size(); i++)
 		{
 			cl_entity_t *pEntity = CMirrorMgr::m_BrushEnts[i];
 			if (!pEntity || !pEntity->model)
@@ -851,7 +850,7 @@ void CMirror::RenderMirroredWorld(int RecurseCall)
 						glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 					}
 
-					for (int s = 0; s < Model.nummodelsurfaces; s++)
+					for (unsigned int s = 0; s < Model.nummodelsurfaces; s++)
 						Mirror_DrawSurface(Info, &Model.surfaces[Model.firstmodelsurface + s]);
 				}
 
@@ -876,7 +875,7 @@ void CMirror::RenderMirroredWorld(int RecurseCall)
 	//Warning: Drawing entites causes half-life to kill the culling order, so restore it afterwards
 
 	if (!Mirror.m_Texture->Mirror.NoEnts)
-		for (int i = 0; i < CMirrorMgr::m_FrameEnts.size(); i++)
+		for (unsigned int i = 0; i < CMirrorMgr::m_FrameEnts.size(); i++)
 			RenderModel(CMirrorMgr::m_FrameEnts[i]);
 
 	gEngfuncs.pTriAPI->CullFace(TRI_NONE); //Warning: This must be reset after calling RenderModel.  HL changes the mode
@@ -897,7 +896,7 @@ void CMirror::RenderMirroredWorld(int RecurseCall)
 
 	int ChildMirrors = 0;
 	if (!m_Parent && !m_Texture->Mirror.NoWorld)
-		for (int m = 0; m < m_ChildMirrors.size(); m++)
+		for (unsigned int m = 0; m < m_ChildMirrors.size(); m++)
 		{
 			CMirror &ChildMirror = *m_ChildMirrors[m];
 			if (m_ChildMirrors[m] == this)
@@ -963,7 +962,7 @@ mleaf_t *FindLeaf(Vector &Origin, mnode_t *pNode)
 
 	int Side = (Dist >= 0) ? 0 : 1;
 
-	for (int i = 0; i < 2; i++)
+	for (unsigned int i = 0; i < 2; i++)
 	{
 		mleaf_t *pLeaf = FindLeaf(Origin, Node.children[(i == 0) ? Side : !Side]);
 		if (pLeaf)
@@ -983,7 +982,7 @@ inline bool ParseLeaf(TraverseInfo_t &Info, mleaf_t &Leaf)
 		CallFunc = Info.ClipPlane.BBoxIsInFront(Bounds);
 
 	if (CallFunc)
-		for (int s = 0; s < Leaf.nummarksurfaces; s++)
+		for (unsigned int s = 0; s < Leaf.nummarksurfaces; s++)
 			if ((*(ParseSurfaceFunc *)Info.Func)(Info, Leaf.firstmarksurface[s]))
 				Success = true;
 
@@ -1043,7 +1042,7 @@ bool IsLeafVisible(cl_entity_t *pEntity, mnode_t *pNode, mleaf_t *pSearchLeaf)
 	}
 
 	//Search child nodes
-	for (int i = 0; i < 2; i++)
+	for (unsigned int i = 0; i < 2; i++)
 	{
 		bool Found = IsLeafVisible(pEntity, Node.children[i], pSearchLeaf);
 		if (Found)
@@ -1151,14 +1150,14 @@ bool Mirror_DrawSurface(TraverseInfo_t &Info, msurface_t *pSurface)
 		glStencilOp(GL_REPLACE, GL_KEEP, GL_REPLACE);
 		IsMirrorSurface = true;
 
-		for (int r = 0; r < CMirrorMgr::m_RenderSurfaces.size(); r++)
+		for (unsigned int r = 0; r < CMirrorMgr::m_RenderSurfaces.size(); r++)
 		{
 			rendersurface_t &Rend = CMirrorMgr::m_RenderSurfaces[r];
 			if (Rend.Surface != pSurface || Rend.Mirror == Info.Mirror)
 				continue;
 
 			bool MirrorAlreadyFound = false;
-			for (int m = 0; m < Mirror.m_ChildMirrors.size(); m++)
+			for (unsigned int m = 0; m < Mirror.m_ChildMirrors.size(); m++)
 				if (Mirror.m_ChildMirrors[m] == Rend.Mirror)
 				{
 					MirrorAlreadyFound = true;
@@ -1492,7 +1491,7 @@ void CMirror::Draw(int Flags)
 		glMultMatrixf((float *)m_Parent->MirrorMatrix);
 	}
 
-	for (int s = 0; s < m_Surfaces.size(); s++)
+	for (unsigned int s = 0; s < m_Surfaces.size(); s++)
 	{
 		//if( !Mirror.Surfaces[s]->visframe )//!= Mirror.Entity->model->nodes[0].visframe )
 		//	continue;
diff --git a/src/game/client/render/studiomodelrenderer.cpp b/src/game/client/render/studiomodelrenderer.cpp
index df3f2400..bc39d678 100644
--- a/src/game/client/render/studiomodelrenderer.cpp
+++ b/src/game/client/render/studiomodelrenderer.cpp
@@ -977,7 +977,7 @@ void CStudioModelRenderer::StudioSetupBones(void)
 	if (m_fDoInterp &&
 		Ent.latched.sequencetime &&
 		(Ent.latched.sequencetime + 0.2 > m_clTime) &&
-		(Ent.latched.prevsequence < m_pStudioHeader->numseq))
+		(Ent.latched.prevsequence < (float)m_pStudioHeader->numseq))
 	{
 		// blend from last sequence
 		static float pos1b[MAXSTUDIOBONES][3];
diff --git a/src/game/client/status_icons.cpp b/src/game/client/status_icons.cpp
index 28141280..81338703 100644
--- a/src/game/client/status_icons.cpp
+++ b/src/game/client/status_icons.cpp
@@ -57,7 +57,7 @@ int CHudStatusIcons::Draw(float flTime)
 	int y = ScreenHeight / 2;
 
 	// loop through icon list, and draw any valid icons drawing up from the middle of screen
-	for (int i = 0; i < MAX_ICONSPRITES; i++)
+	for (unsigned int i = 0; i < MAX_ICONSPRITES; i++)
 	{
 		if (m_IconList[i].spr)
 		{
@@ -149,7 +149,7 @@ void CHudStatusIcons::EnableIcon(const char *pszIconName, unsigned char red, uns
 void CHudStatusIcons::DisableIcon(const char *pszIconName)
 {
 	// find the sprite is in the current list
-	for (int i = 0; i < MAX_ICONSPRITES; i++)
+	for (unsigned int i = 0; i < MAX_ICONSPRITES; i++)
 	{
 		if (!_stricmp(m_IconList[i].szSpriteName, pszIconName))
 		{
diff --git a/src/game/client/statusbar.cpp b/src/game/client/statusbar.cpp
index e766c529..00c15125 100644
--- a/src/game/client/statusbar.cpp
+++ b/src/game/client/statusbar.cpp
@@ -56,7 +56,7 @@ int CHudStatusBar ::VidInit(void)
 void CHudStatusBar ::Reset(void)
 {
 	m_iFlags &= ~HUD_ACTIVE; // start out inactive
-	for (int i = 0; i < MAX_STATUSBAR_LINES; i++)
+	for (unsigned int i = 0; i < MAX_STATUSBAR_LINES; i++)
 		m_szStatusText[i][0] = 0;
 	memset(m_iStatusValues, 0, sizeof m_iStatusValues);
 
@@ -166,13 +166,13 @@ int CHudStatusBar ::Draw(float fTime)
 {
 	if (m_bReparseString)
 	{
-		for (int i = 0; i < MAX_STATUSBAR_LINES; i++)
+		for (unsigned int i = 0; i < MAX_STATUSBAR_LINES; i++)
 			ParseStatusString(i);
 		m_bReparseString = FALSE;
 	}
 
 	// Draw the status bar lines
-	for (int i = 0; i < MAX_STATUSBAR_LINES; i++)
+	for (unsigned int i = 0; i < MAX_STATUSBAR_LINES; i++)
 	{
 		int TextHeight, TextWidth;
 		GetConsoleStringSize(m_szStatusBar[i], &TextWidth, &TextHeight);
diff --git a/src/game/client/ui/ms/vgui_choosecharacter.cpp b/src/game/client/ui/ms/vgui_choosecharacter.cpp
index f74e2e31..679ffb8b 100644
--- a/src/game/client/ui/ms/vgui_choosecharacter.cpp
+++ b/src/game/client/ui/ms/vgui_choosecharacter.cpp
@@ -73,7 +73,7 @@
 #include "mslogger.h"
 
 extern engine_studio_api_t IEngineStudio;
-int			ChooseChar_Interface::ServerCharNum = 0;
+unsigned int			ChooseChar_Interface::ServerCharNum = 0;
 bool		ChooseChar_Interface::CentralServer;
 
 const char *GenderPanel_MainBtnText[] =
@@ -96,7 +96,7 @@ class CAction_SelectOption : public ActionSignal
 {
 //protected:
 	CNewCharacterPanel *m_pPanel;
-	int m_Option, m_Value;
+	unsigned int m_Option, m_Value;
 	static createchar_t m_NewChar;
 public:
 	CAction_SelectOption( CNewCharacterPanel *pPanel, int iOption, int iValue )
@@ -141,7 +141,7 @@ class CAction_SelectOption : public ActionSignal
 				}
 				else
 				{
-					msstring CharCmd = msstring("char ") + m_Value + "\n";
+					msstring CharCmd = msstring("char ") + (int)m_Value + "\n";
 					ServerCmd( CharCmd );
 				}
 				return;
@@ -558,7 +558,7 @@ CNewCharacterPanel::CNewCharacterPanel( int iTrans, int iRemoveMe, int x, int y,
 	Gender_GenderLabel->addInputSignal( new GenderInput_ChangeName( this, 1 ) );
 
 	StartX = GetCenteredItemX( m_ChoosePanel->getWide(), CHOOSE_BTNWIDTH, 2, XRES(32) );
-	for (int i = 0; i < GENDERPANEL_MAINBTNS; i++) 
+	for (unsigned int i = 0; i < GENDERPANEL_MAINBTNS; i++) 
 	{
 		int ix = StartX + i * CHOOSE_BTNWIDTH + i * CHOOSE_BTNSPACERX, iy = CHOOSE_BTNY + CHOOSE_CHARHANDLING_H;
 		//int ix = StartX + i * CHOOSE_BTNWIDTH + i * CHOOSE_BTNSPACERX, iy = GENDER_BTNY;
@@ -585,7 +585,7 @@ CNewCharacterPanel::CNewCharacterPanel( int iTrans, int iRemoveMe, int x, int y,
 
 	StartX = GetCenteredItemX( m_ChoosePanel->getWide(), WEAPON_BTN_SIZEX, 3, CHOOSE_BTNSPACERX );
 	int WeaponPanelSizeY = m_WeaponPanel->getTall( );
-	for (int i = 0; i < WEAPONPANEL_MAINBTNS; i++) 
+	for (unsigned int i = 0; i < WEAPONPANEL_MAINBTNS; i++) 
 	{
 		if( i >= WEAPONPANEL_MAINBTNMAX )
 			break;							//Max of 9 starting weapon choices
@@ -693,7 +693,7 @@ void CNewCharacterPanel::Update()
 		m_ChoosePanel->setVisible( true );
 		iButtons = CHOOSEPANEL_MAINBTNS;
 
-		for (int i = 0; i < iButtons; i++) 
+		for (unsigned int i = 0; i < iButtons; i++) 
 		{
 			//Only certain fields can be assumed valid in this savedata
 			//If client-side characters - all savedata_t info is valid;
@@ -812,7 +812,7 @@ void CNewCharacterPanel::Update()
 		iButtons = GENDERPANEL_MAINBTNS;
 		break;
 	case STG_CHOOSEWEAPON:
-		 for (int i = 0; i < WEAPONPANEL_MAINBTNS; i++) 
+		 for (unsigned int i = 0; i < WEAPONPANEL_MAINBTNS; i++) 
 			Weapon_MainBtnImg[i]->LoadImg( );
 		m_WeaponPanel->setVisible( true );
 		m_BackBtn->setVisible( true );
@@ -849,7 +849,7 @@ void CNewCharacterPanel::Gender_SelectItem( int Btn )
 	Gender_CharEnts[0].m_Gender = GENDER_MALE; //Thothie FEB2011_02 gender bender fixes
 	Gender_CharEnts[1].m_Gender = GENDER_FEMALE; //Thothie FEB2011_02 gender bender fixes
 
-	 for (int i = 0; i < GENDERPANEL_MAINBTNS; i++) 
+	 for (unsigned int i = 0; i < GENDERPANEL_MAINBTNS; i++) 
 	{
 		Gender_CharEnts[i].SetActive( Btn == 1 ? true : false );
 		Gender_MainBtn[i]->setEnabled( Btn == 1 ? true : false );
@@ -905,13 +905,13 @@ void CNewCharacterPanel::Close( void )
 		return;
 	}*/
 
-	 for (int i = 0; i < CHOOSEPANEL_MAINBTNS; i++) 
+	 for (unsigned int i = 0; i < CHOOSEPANEL_MAINBTNS; i++) 
 	{
 		CRenderChar &CharEnt = m_CharEnts[i];
 		CharEnt.UnRegister( );
 	}
 
-	 for (int i = 0; i < GENDERPANEL_MAINBTNS; i++) 
+	 for (unsigned int i = 0; i < GENDERPANEL_MAINBTNS; i++) 
 	{
 		CRenderChar &CharEnt = Gender_CharEnts[i];
 		CharEnt.UnRegister( );
@@ -958,7 +958,7 @@ void CNewCharacterPanel::Close( void )
 	//gViewPort->HideTopMenu( );
 
 	//Remove from menu list
-	 for (int i = 0; i < gViewPort->m_Menus.size(); i++) 
+	 for (unsigned int i = 0; i < gViewPort->m_Menus.size(); i++) 
 		if( gViewPort->m_Menus[i] == this ) 
 			{ gViewPort->m_Menus.erase( i ); break; }
 
@@ -966,7 +966,7 @@ void CNewCharacterPanel::Close( void )
 }
 //======================================
 // Key inputs for the Class Menu
-bool CNewCharacterPanel::SlotInput( int iSlot )
+bool CNewCharacterPanel::SlotInput( unsigned int iSlot )
 {
 	//Convert iSlot to be zero-based
 	iSlot--;
@@ -1013,7 +1013,7 @@ void CNewCharacterPanel::Open( void )
 
 	CMenuPanel::Open();
 
-	 for (int i = 0; i < CHOOSEPANEL_MAINBTNS; i++) 
+	 for (unsigned int i = 0; i < CHOOSEPANEL_MAINBTNS; i++) 
 	{
 		CRenderChar &CharEnt = m_CharEnts[i];
 		CharEnt.m_Stage = STG_CHOOSECHAR;
@@ -1021,7 +1021,7 @@ void CNewCharacterPanel::Open( void )
 		CharEnt.Init( i );
 	}
 
-	 for (int i = 0; i < GENDERPANEL_MAINBTNS; i++) 
+	 for (unsigned int i = 0; i < GENDERPANEL_MAINBTNS; i++) 
 	{
 		CRenderChar &CharEnt = Gender_CharEnts[i];
 		CharEnt.m_Stage = STG_CHOOSEGENDER;
@@ -1088,8 +1088,8 @@ int __MsgFunc_CharInfo(const char* pszName, int iSize, void* pbuf)
 
 	if (CharMsgType == CHAR_TYPE_ITEMS)
 	{
-		int GearItems = READ_BYTE();
-		for (int i = 0; i < GearItems; i++)
+		unsigned int GearItems = READ_BYTE();
+		for (unsigned int i = 0; i < GearItems; i++)
 		{
 			gearinfo_t GearInfo;
 			GearInfo.Flags = READ_BYTE();
@@ -1183,7 +1183,7 @@ void CRenderChar::Init( int Idx, msstring model )
 	
 	m_Gender = GENDER_MALE;
 
-	for (int i = 0; i < 4; i++) 
+	for (unsigned int i = 0; i < 4; i++) 
 		m_Ent.latched.prevcontroller[i] = m_Ent.curstate.controller[i] = 127;
 		
  	m_Ent.curstate.gaitsequence = 0;
@@ -1225,7 +1225,7 @@ void CRenderChar::Render( )
 		m_Gear.clear();
 		uint BodyParts[HUMAN_BODYPARTS] = { 0 };
 		
-		for (int i = 0; i < player.m_CharInfo[m_Idx].GearInfo.size(); i++) 
+		for (unsigned int i = 0; i < player.m_CharInfo[m_Idx].GearInfo.size(); i++) 
 		{
 			gearinfo_t &GearInfo = player.m_CharInfo[m_Idx].GearInfo[i];
 			CGenericItem pItem = CGenericItem();
@@ -1241,7 +1241,7 @@ void CRenderChar::Render( )
 			ItemEnt.curstate.skin = GearInfo.Skin;
 			ItemEnt.PlayAnim( GearInfo.Anim );
 
-			for (int i = 0; i < HUMAN_BODYPARTS; i++)
+			for (unsigned int i = 0; i < HUMAN_BODYPARTS; i++)
 			{
 				if( FBitSet( GearInfo.Flags, (1<<i) ) )
 					BodyParts[i] = 1;
@@ -1269,7 +1269,7 @@ void CRenderChar::Render( )
 			pItem.Deactivate();
 
 		}
-		for (int i = 0; i < m_GearItems.size(); i++) 
+		for (unsigned int i = 0; i < m_GearItems.size(); i++) 
 			m_Gear.push_back( &m_GearItems[i] );
 	}
 
@@ -1333,7 +1333,7 @@ void CRenderChar::PlayAttnAnim( )
 	m_ItemInHand = false;
 
 	if( m_Stage == STG_CHOOSECHAR )
-		 for (int i = 0; i < player.m_CharInfo[m_Idx].GearInfo.size(); i++) 
+		 for (unsigned int i = 0; i < player.m_CharInfo[m_Idx].GearInfo.size(); i++) 
 			if( !FBitSet( player.m_CharInfo[m_Idx].GearInfo[i].Flags,GEARFL_WEARING ) ) { m_ItemInHand = true; break; }
 
 
diff --git a/src/game/client/ui/ms/vgui_choosecharacter.h b/src/game/client/ui/ms/vgui_choosecharacter.h
index 0228ff79..0a7ba380 100644
--- a/src/game/client/ui/ms/vgui_choosecharacter.h
+++ b/src/game/client/ui/ms/vgui_choosecharacter.h
@@ -115,7 +115,7 @@ class CNewCharacterPanel : public CMenuPanel
 	ActionSignal *Weapon_MainActionSig[WEAPONPANEL_MAINBTNMAX];
 	Label *Weapon_BtnLabel[WEAPONPANEL_MAINBTNMAX];
 
-	int iButtons;
+	unsigned int iButtons;
 	bool fClosingMenu;
 
 	CRenderChar m_CharEnts[3];
@@ -125,7 +125,7 @@ class CNewCharacterPanel : public CMenuPanel
 	CNewCharacterPanel(int iTrans, int iRemoveMe, int x, int y, int wide, int tall);
 	~CNewCharacterPanel();
 
-	virtual bool SlotInput(int iSlot);
+	virtual bool SlotInput(unsigned int iSlot);
 	virtual void Open(void);
 	virtual void Close(void);
 	virtual void Update(void);
diff --git a/src/game/client/ui/ms/vgui_container.cpp b/src/game/client/ui/ms/vgui_container.cpp
index 67924979..841155f0 100644
--- a/src/game/client/ui/ms/vgui_container.cpp
+++ b/src/game/client/ui/ms/vgui_container.cpp
@@ -207,17 +207,17 @@ VGUI_Inv_GearItem *VGUI_InventoryPanel::AddGearItem(gearitem_t &GearItem)
 void VGUI_InventoryPanel::Reset()
 {
 	//Delete the old
-	for (int i = 0; i < GearItemButtonTotal; i++)
+	for (unsigned int i = 0; i < GearItemButtonTotal; i++)
 		GearItemButtons[i]->Reset();
 	GearItemButtonTotal = 0;
 }
 
-void VGUI_InventoryPanel::Select(int Idx)
+void VGUI_InventoryPanel::Select(unsigned int Idx)
 {
 	if (Idx < 0 || Idx >= GearItemButtonTotal)
 		return;
 
-	for (int i = 0; i < GearItemButtonTotal; i++)
+	for (unsigned int i = 0; i < GearItemButtonTotal; i++)
 		GearItemButtons[i]->DeSelect();
 
 	m_Selected = Idx;
@@ -246,7 +246,7 @@ CTFScrollPanel* VGUI_InventoryPanel::GetScrollForStepInput()
 {
 	if ( mbScrollHighlighted ) return m_Scroll;
 
-	for (int i = 0; i < GearItemButtons.size(); i++)
+	for (unsigned int i = 0; i < GearItemButtons.size(); i++)
 	{
 		if (GearItemButtons[i]->IsMouseOver())
 		{
@@ -412,7 +412,7 @@ void VGUI_ContainerPanel::Update()
 void VGUI_ContainerPanel::AddInventoryItems()
 {
 	gearitem_t GearItem;
-	const int gearSize = player.Gear.size();
+	const unsigned int gearSize = player.Gear.size();
 	std::vector<CGenericItem*> sortedItems;
 	std::vector<CGenericItem*> sortedOther;
 	sortedItems.reserve(gearSize);
@@ -422,7 +422,7 @@ void VGUI_ContainerPanel::AddInventoryItems()
 	GearItem.ID = 0;
 	GearItem.IsContainer = true;
 	VGUI_Inv_GearItem *pGearItemButton = m_GearPanel->AddGearItem(GearItem);
-	for (int i = 0; i < MAX_PLAYER_HANDS; i++)
+	for (unsigned int i = 0; i < MAX_PLAYER_HANDS; i++)
 	{
 		if (player.Hand(i))
 		{
@@ -431,7 +431,7 @@ void VGUI_ContainerPanel::AddInventoryItems()
 		}
 	}
 
-	for (int i = 0; i < gearSize; i++)
+	for (unsigned int i = 0; i < gearSize; i++)
 	{
 		CGenericItem *pGearItem = player.Gear[i];
 		const auto props = pGearItem->MSProperties(); // cache property lookup
@@ -530,7 +530,7 @@ VGUI_InvTypePanel::VGUI_InvTypePanel(Panel *pParent, VGUI_Container *pCallback)
 	pAlphaCheckBox->SetHandler(new AlphabetizeCheckBoxHandler(pCallback));
 	addChild(pAlphaCheckBox);
 
-	for (int i = 0; i < INVTYPE_BUTTONS_TOTAL; i++)
+	for (unsigned int i = 0; i < INVTYPE_BUTTONS_TOTAL; i++)
 	{
 		int x = 0, y;
 
@@ -569,7 +569,7 @@ void VGUI_ContainerPanel::Close(void)
 	m_AllowUpdate = false;
 }
 
-bool VGUI_ContainerPanel::SlotInput(int iSlot)
+bool VGUI_ContainerPanel::SlotInput(unsigned int iSlot)
 {
 	iSlot--;
 
@@ -601,10 +601,10 @@ void VGUI_ContainerPanel::ItemHighlighted(void *pData)
 
 bool VGUI_ContainerPanel::HasSelectedItems()
 {
-	for(int i = 0; i < m_GearPanel->GearItemButtonTotal; i++)
+	for(unsigned int i = 0; i < m_GearPanel->GearItemButtonTotal; i++)
 	{
 		VGUI_Inv_GearItem &GearItem = *m_GearPanel->GearItemButtons[i];
-		for(int g = 0; g < GearItem.m_ItemContainer->m_ItemButtonTotal; g++)
+		for(unsigned int g = 0; g < GearItem.m_ItemContainer->m_ItemButtonTotal; g++)
 		{
 			VGUI_ItemButton &ItemButton = *GearItem.m_ItemContainer->m_ItemButtons[g];
 			if(ItemButton.m_Selected) 
@@ -619,10 +619,10 @@ void VGUI_ContainerPanel::GetSelectedItems(mslist<VGUI_ItemButton *> &SelectedIt
 {
 	SelectedItems.clear();
 
-	for (int g = 0; g < m_GearPanel->GearItemButtonTotal; g++)
+	for (unsigned int g = 0; g < m_GearPanel->GearItemButtonTotal; g++)
 	{
 		VGUI_Inv_GearItem &GearItem = *m_GearPanel->GearItemButtons[g];
-		for (int i = 0; i < GearItem.m_ItemContainer->m_ItemButtonTotal; i++)
+		for (unsigned int i = 0; i < GearItem.m_ItemContainer->m_ItemButtonTotal; i++)
 		{
 			VGUI_ItemButton &ItemButton = *GearItem.m_ItemContainer->m_ItemButtons[i];
 			if (!ItemButton.m_Selected)
@@ -636,6 +636,6 @@ void VGUI_ContainerPanel::UnSelectAllItems()
 {
 	mslist<VGUI_ItemButton *> SelectedItems;
 	GetSelectedItems(SelectedItems);
-	for (int i = 0; i < SelectedItems.size(); i++)
+	for (unsigned int i = 0; i < SelectedItems.size(); i++)
 		SelectedItems[i]->Select(false);
 }
\ No newline at end of file
diff --git a/src/game/client/ui/ms/vgui_container.h b/src/game/client/ui/ms/vgui_container.h
index a98c378a..ac639e9d 100644
--- a/src/game/client/ui/ms/vgui_container.h
+++ b/src/game/client/ui/ms/vgui_container.h
@@ -61,9 +61,9 @@ class VGUI_InventoryPanel : public CTransparentPanel, public VGUI_ItemCallbackPa
 {
 public:
 	mslist<VGUI_Inv_GearItem*> GearItemButtons;
-	int GearItemButtonTotal;
+	unsigned int GearItemButtonTotal;
 	int m_Selected;
-	int m_InitializedItemButtons;
+	unsigned int m_InitializedItemButtons;
 	VGUI_ItemCallbackPanel *m_pCallbackPanel;
 	CTFScrollPanel *m_Scroll;
 	bool mbScrollHighlighted;
@@ -71,7 +71,7 @@ class VGUI_InventoryPanel : public CTransparentPanel, public VGUI_ItemCallbackPa
 	VGUI_InventoryPanel(VGUI_ItemCallbackPanel *pCallbackPanel, Panel *pParent);
 
 	virtual VGUI_Inv_GearItem *AddGearItem(gearitem_t &GearItem);
-	virtual void Select(int Idx);
+	virtual void Select(unsigned int Idx);
 	virtual void Reset();
 
 	//Callbacks
@@ -118,7 +118,7 @@ class VGUI_ContainerPanel : public CMenuPanel, public VGUI_ItemCallbackPanel
 	virtual void Close(void);
 	virtual void Update(void);
 	virtual void Initialize(void);
-	virtual bool SlotInput(int iSlot);
+	virtual bool SlotInput(unsigned int iSlot);
 
 	//Callbacks
 	virtual void ItemHighlighted(void* pData);
diff --git a/src/game/client/ui/ms/vgui_containerlist.cpp b/src/game/client/ui/ms/vgui_containerlist.cpp
index 929217ad..1892b5e1 100644
--- a/src/game/client/ui/ms/vgui_containerlist.cpp
+++ b/src/game/client/ui/ms/vgui_containerlist.cpp
@@ -169,7 +169,7 @@ void CContainerPanel::DropAllSelected()
 {
 	mslist<VGUI_ItemButton *> vSelectedItems;
 	GetSelectedItems( vSelectedItems );
-	for(int i = 0; i < vSelectedItems.size(); i++)
+	for(unsigned int i = 0; i < vSelectedItems.size(); i++)
 	{
 		ServerCmd( msstring("drop ") + (int)vSelectedItems[i]->m_Data.ID + "\n" );
 	}
@@ -293,13 +293,13 @@ bool CContainerPanel::GearItemClicked(ulong ID)
 	//Extract the IDs of the selected items.  I can't keep the list of selected items because the itembuttons get
 	//modified when I start moving items around
 	/*mslist<ulong> SelectedIDs;
-	 for (int i = 0; i < SelectedItems.size(); i++) 
+	 for (unsigned int i = 0; i < SelectedItems.size(); i++) 
 	{
 		SelectedIDs.push_back( SelectedItems[i]->m_Data.ID );
 		SelectedItems[i]->Select( false );
 	}*/
 
-	for (int i = 0; i < SelectedItems.size(); i++)
+	for (unsigned int i = 0; i < SelectedItems.size(); i++)
 	{
 		CGenericItem *pItem = MSUtil_GetItemByID(SelectedItems[i]->m_Data.ID, &player);
 		if (!pItem)
@@ -358,7 +358,7 @@ void CContainerPanel::Open(void)
 	VGUI_ContainerPanel::Open();
 
 	//Select the open pack
-	for (int i = 0; i < m_GearPanel->GearItemButtonTotal; i++)
+	for (unsigned int i = 0; i < m_GearPanel->GearItemButtonTotal; i++)
 	{
 		if (player.HasConditions(MONSTER_OPENCONTAINER))
 		{
diff --git a/src/game/client/ui/ms/vgui_eventconsole.h b/src/game/client/ui/ms/vgui_eventconsole.h
index b8214231..2ce308ef 100644
--- a/src/game/client/ui/ms/vgui_eventconsole.h
+++ b/src/game/client/ui/ms/vgui_eventconsole.h
@@ -89,7 +89,7 @@ class VGUI_EventConsole : public Panel
 		m_ScrollBarWidth = m_ScrollPanel->getVerticalScrollBar()->getWide();
 		int ScrollClientWidth = m_ScrollPanel->getWide() - m_ScrollBarWidth;
 
-		for (int i = 0; i < EVENTCON_PREF_MAXLINES; i++) 
+		for (unsigned int i = 0; i < EVENTCON_PREF_MAXLINES; i++) 
 		{
 			m_Line[i] = new EventConsoleText( 0, 0, ScrollClientWidth, EVENTCON_LINE_SIZE_Y, NULL );
 			if( TextFont ) 
@@ -109,7 +109,7 @@ class VGUI_EventConsole : public Panel
 		if (!Text || !Text[0])
 			return;
 
-		int MaxLines = V_min(EVENTCON_PREF_MAXLINES, EVENTCON_MAXLINES);
+		unsigned int MaxLines = V_min(EVENTCON_PREF_MAXLINES, EVENTCON_MAXLINES);
 
 		if( m_TotalLines >= MaxLines )
 		{
@@ -121,7 +121,7 @@ class VGUI_EventConsole : public Panel
 		}
 
 		// The newest line is always at logical index (m_TotalLines - 1)
-		int iNewLine = m_TotalLines - 1;
+		unsigned int iNewLine = m_TotalLines - 1;
 
 		// If the active line was tracking the bottom, keep it there
 		if( m_ActiveLine >= (iNewLine - 1) )
@@ -129,7 +129,7 @@ class VGUI_EventConsole : public Panel
 
 		// Reposition all active lines in the scroll panel
 		// (VGUI needs the panels laid out top-to-bottom by logical order)
-		for( int i = 0; i < m_TotalLines; i++ )
+		for (unsigned int i = 0; i < m_TotalLines; i++)
 		{
 			EventConsoleText *line = GetLine(i);
 			line->setParent( m_ScrollPanel->getClient() );
@@ -150,11 +150,11 @@ class VGUI_EventConsole : public Panel
 		char ctemp[512] = "";
 
 		int w, h;
-		int MaxWidth = NewLine.getWide();
-		int MaxHeight = EVENTCON_LINE_SIZE_Y;
+		unsigned int MaxWidth = NewLine.getWide();
+		unsigned int MaxHeight = EVENTCON_LINE_SIZE_Y;
 		NewLine.getTextImage()->getFont()->getTextSize( ThisLineText, w, h );
 
-		if( w > MaxWidth || h > MaxHeight )
+		if( (unsigned int)w > MaxWidth || (unsigned int)h > MaxHeight )
 		{
 			int TextLen = (int)strlen(Text);
 			int WrapPos = -1;
@@ -170,7 +170,7 @@ class VGUI_EventConsole : public Panel
 				ctemp[mid + 1] = 0;
 				int testw, testh;
 				NewLine.getTextImage()->getFont()->getTextSize( ctemp, testw, testh );
-				if( testw > MaxWidth || testh > MaxHeight )
+				if( (unsigned int)testw > MaxWidth || (unsigned int)testh > MaxHeight )
 					hi = mid;
 				else
 					lo = mid + 1;
@@ -258,7 +258,7 @@ class VGUI_EventConsole : public Panel
 		if( m_DynamicWidth )
 		{
 			w = 0;
- 			for (int i = 0; i < m_VisibleLines; i++) 
+ 			for (unsigned int i = 0; i < m_VisibleLines; i++) 
 			{
 				int logIdx = m_ActiveLine - i;
 				EventConsoleText *line = GetLine(logIdx);
@@ -303,7 +303,7 @@ class VGUI_EventConsole : public Panel
 			m_VisibleLines--;
 			Resize( );
 
-			int TopLine = V_max( m_ActiveLine - (m_VisibleLines - 1), 0 );
+			int TopLine = V_max( m_ActiveLine - (m_VisibleLines - 1), (unsigned int)0 );
 			EventConsoleText *topLine = GetLine(TopLine);
 
 			if (topLine != nullptr && !topLine->m_SpansFromPrevLine)
@@ -337,7 +337,7 @@ class VGUI_EventConsole : public Panel
 	CTFScrollPanel *m_ScrollPanel;
 	EventConsoleText *m_Line[EVENTCON_MAXLINES];
 	int m_Head;	// index of the oldest (logical 0) line
-	int m_VisibleLines,
+	unsigned int m_VisibleLines,
 		m_TotalLines,
 		m_ActiveLine,
 	    m_StartY,
diff --git a/src/game/client/ui/ms/vgui_health.h b/src/game/client/ui/ms/vgui_health.h
index 48afdd25..87636034 100644
--- a/src/game/client/ui/ms/vgui_health.h
+++ b/src/game/client/ui/ms/vgui_health.h
@@ -179,7 +179,7 @@ namespace PrimaryHUD
 			m_HUDImage.setPos(coords[0] + BAR_W, coords[1] - (7 * BAR_SCALE));
 
 			//Charge system
-			for (int i = 0; i < 2; i++)
+			for (unsigned int i = 0; i < 2; i++)
 			{
 				int Multiplier = (i == 0) ? -1 : 1;
 				float OffsetW = CHARGE_SPACER_W + (i == 0) ? CHARGE_W : 0;
@@ -196,14 +196,14 @@ namespace PrimaryHUD
 		void Update()
 		{
 			//Update flasks
-			for (int i = 0; i < 4; i++)
+			for (unsigned int i = 0; i < 4; i++)
 				m_Bar[i]->Update();
 
 			bool bShowHealth = ShowHealth();
 
 			m_HUDImage.setVisible(bShowHealth);
 
-			for (int i = 0; i < 2; i++)
+			for (unsigned int i = 0; i < 2; i++)
 			{
 				m_Charge[i]->setVisible(false);
 				m_ChargeLbl[i]->setVisible(false);
@@ -213,7 +213,7 @@ namespace PrimaryHUD
 			std::vector<CGenericItem*> *vHandsItems = new std::vector<CGenericItem*>;
 
 			//get all hands items
-			for (int i = 0; i < player.Gear.size(); i++)
+			for (unsigned int i = 0; i < player.Gear.size(); i++)
 			{
 				CGenericItem* Item = player.Gear[i];
 				if (Item->m_Location != ITEMPOS_HANDS)
@@ -222,7 +222,7 @@ namespace PrimaryHUD
 				vHandsItems->push_back(Item);
 			}
 
-			for (int i = 0; i < vHandsItems->size(); i++)
+			for (unsigned int i = 0; i < vHandsItems->size(); i++)
 			{
 				CGenericItem* Item = vHandsItems->at(i);
 
diff --git a/src/game/client/ui/ms/vgui_healthretro.h b/src/game/client/ui/ms/vgui_healthretro.h
index ec9d5c43..c705a561 100644
--- a/src/game/client/ui/ms/vgui_healthretro.h
+++ b/src/game/client/ui/ms/vgui_healthretro.h
@@ -191,7 +191,7 @@ namespace RetroHUD
 			pLabel->SetFGColorRGB(Color_Text_White);
 
 			//Charge system
-			for (int i = 0; i < 2; i++)
+			for (unsigned int i = 0; i < 2; i++)
 			{
 				int Multiplier = (i == 0) ? -1 : 1;
 				float OffsetW = CHARGE_SPACER_W + (i == 0) ? CHARGE_W : 0;
@@ -208,7 +208,7 @@ namespace RetroHUD
 		void Update()
 		{
 			//Update Health & Mana flasks
-			for (int i = 0; i < 2; i++)
+			for (unsigned int i = 0; i < 2; i++)
 				m_Flask[i]->Update();
 
 			bool bShowHealth = ShowHealth();
@@ -229,7 +229,7 @@ namespace RetroHUD
 
 			m_pWeight->Set(player.Weight(), player.Volume());
 
-			for (int i = 0; i < 2; i++)
+			for (unsigned int i = 0; i < 2; i++)
 			{
 				m_Charge[i]->setVisible(false);
 				m_ChargeLbl[i]->setVisible(false);
@@ -239,7 +239,7 @@ namespace RetroHUD
 			std::vector<CGenericItem*> *vHandsItems = new std::vector<CGenericItem*>;
 
 			//get all hands items
-			for (int i = 0; i < player.Gear.size(); i++)
+			for (unsigned int i = 0; i < player.Gear.size(); i++)
 			{
 				CGenericItem* Item = player.Gear[i];
 				if (Item->m_Location != ITEMPOS_HANDS)
@@ -248,7 +248,7 @@ namespace RetroHUD
 				vHandsItems->push_back(Item);
 			}
 
-			for (int i = 0; i < vHandsItems->size(); i++)
+			for (unsigned int i = 0; i < vHandsItems->size(); i++)
 			{
 				CGenericItem* Item = vHandsItems->at(i);
 
diff --git a/src/game/client/ui/ms/vgui_hud.cpp b/src/game/client/ui/ms/vgui_hud.cpp
index cd0a655a..400884f7 100644
--- a/src/game/client/ui/ms/vgui_hud.cpp
+++ b/src/game/client/ui/ms/vgui_hud.cpp
@@ -211,12 +211,12 @@ CHUDPanel::~CHUDPanel()
 	delete m_StartSayText;
 	delete m_DebugText;
 
-	for(int i = 0; i < m_HUDElements.size(); i++)
+	for(unsigned int i = 0; i < m_HUDElements.size(); i++)
 	{
 		delete m_HUDElements[i];
 	}
 
-	for(int i = 0; i < m_Consoles.size(); i++)
+	for(unsigned int i = 0; i < m_Consoles.size(); i++)
 	{
 		delete m_Consoles[i];
 	}
@@ -241,12 +241,12 @@ void CHUDPanel::Cleanup()
 	delete m_StartSayText;
 	delete m_DebugText;
 
-	for(int i = 0; i < m_HUDElements.size(); i++)
+	for(unsigned int i = 0; i < m_HUDElements.size(); i++)
 	{
 		delete m_HUDElements[i];
 	}
 
-	for(int i = 0; i < m_Consoles.size(); i++)
+	for(unsigned int i = 0; i < m_Consoles.size(); i++)
 	{
 		delete m_Consoles[i];
 	}
@@ -283,8 +283,8 @@ void CHUDPanel::AddHelpWin(const char* Title, const char* Text)
 		return;
 
 	//Replaces '|' with '\n'
-	int size = strlen(Text);
-	for (int i = 0; i < size; i++)
+	unsigned int size = strlen(Text);
+	for (unsigned int i = 0; i < size; i++)
 	{
 		if (Text[i] == '|')
 			((char*)Text)[i] = '\n';
@@ -325,7 +325,7 @@ void CHUDPanel::Think()
 	m_ID->Update();
 
 	//Update HUD Elements
-	for (int i = 0; i < m_HUDElements.size(); i++)
+	for (unsigned int i = 0; i < m_HUDElements.size(); i++)
 	{
 		msstring d = "HUD Elements loop: ";
 		d += i;
@@ -347,7 +347,7 @@ void CHUDPanel::Think()
 	UpdateInfoWindows(m_HelpWindows); //Update Help windows
 
 	//Update Text Consoles
-	for (int i = 0; i < m_Consoles.size(); i++)
+	for (unsigned int i = 0; i < m_Consoles.size(); i++)
 	{
 		msstring d = "Text Consoles: ";
 		d += i;
@@ -464,7 +464,7 @@ int __MsgFunc_HUDInfoMsg(const char* pszName, int iSize, void* pbuf)
 		msstring sTitle = READ_STRING();
 
 		std::string buffer = "";
-		for (int i = 0; i < HelpParts.size(); i++)
+		for (unsigned int i = 0; i < HelpParts.size(); i++)
 			buffer += static_cast<const char*>(HelpParts[i]);
 
 		HUD_ShowHelpWin(sTitle, buffer.c_str());
diff --git a/src/game/client/ui/ms/vgui_id.h b/src/game/client/ui/ms/vgui_id.h
index b1b32eaf..00f86927 100644
--- a/src/game/client/ui/ms/vgui_id.h
+++ b/src/game/client/ui/ms/vgui_id.h
@@ -26,7 +26,7 @@ class VGUI_ID : public Panel
 		setParent(pParent);
 		setBgColor(0, 0, 0, 255);
 
-		for (int i = 0; i < 3; i++)
+		for (unsigned int i = 0; i < 3; i++)
 		{
 			m_Label[i] = new VGUI_FadeText(this, 0.2, "", 0, i * g_FontID->getTall(), MSLabel::a_center);
 			m_Label[i]->setFont(g_FontID);
@@ -155,7 +155,7 @@ class VGUI_ID : public Panel
 		}
 		else
 		{
-			for (int i = 0; i < 3; i++)
+			for (unsigned int i = 0; i < 3; i++)
 			{
 				float PrevDelta = gpGlobals->time - m_Label[i]->m_StartTime;
 				PrevDelta = V_min(PrevDelta, m_Label[i]->m_FadeDuration);
@@ -167,12 +167,12 @@ class VGUI_ID : public Panel
 		m_LastID = pEntInfo;
 		m_pClientEnt = (pEntInfo ? gEngfuncs.GetEntityByIndex(pEntInfo->entindex) : NULL);
 		SetStatus();
-		for (int i = 0; i < 3; i++)
+		for (unsigned int i = 0; i < 3; i++)
 			m_Label[i]->Update();
 	}
 	void Update()
 	{
-		for (int i = 0; i < 3; i++)
+		for (unsigned int i = 0; i < 3; i++)
 			m_Label[i]->Update();
 
 		//get our wanted position
@@ -248,7 +248,7 @@ class VGUI_ID : public Panel
 	void NewLevel()
 	{
 		m_LastID = NULL;
-		for (int i = 0; i < 3; i++)
+		for (unsigned int i = 0; i < 3; i++)
 		{
 			m_Label[i]->m_StartTime = -1000; //Ensure ID doesn't show up after a level change
 			m_Label[i]->setText("");
diff --git a/src/game/client/ui/ms/vgui_infowin.h b/src/game/client/ui/ms/vgui_infowin.h
index 06df4828..9c6628ef 100644
--- a/src/game/client/ui/ms/vgui_infowin.h
+++ b/src/game/client/ui/ms/vgui_infowin.h
@@ -85,7 +85,7 @@ class CInfoWindow : public CTransparentPanel
 		setSize(x, y);
 	}
 
-	void Update(std::vector<CInfoWindow*> &Windows, int idx)
+	void Update(std::vector<CInfoWindow*> &Windows, unsigned int idx)
 	{
 		float elapsedtime = gpGlobals->time - m_TimeDisplayed;
 
@@ -108,7 +108,7 @@ class CInfoWindow : public CTransparentPanel
 		m_iTransparency = 255 - ((255 - INFOWIN_BKTRANS) * fadeamt);
 
 		int yPos = m_StartY;
-		for (int i = 0; i < idx; i++)
+		for (unsigned int i = 0; i < idx; i++)
 			yPos += Windows[i]->getTall() + INFOWIN_DISPLAY_SPACER_Y;
 
 		if (idx > 0)
diff --git a/src/game/client/ui/ms/vgui_localizedpanel.cpp b/src/game/client/ui/ms/vgui_localizedpanel.cpp
index 9e9325ed..1075e4bf 100644
--- a/src/game/client/ui/ms/vgui_localizedpanel.cpp
+++ b/src/game/client/ui/ms/vgui_localizedpanel.cpp
@@ -120,7 +120,7 @@ void CLocalizedPanel::Hide(void)
 
 void CLocalizedPanel::Close(void)
 {
-	for (int i = 0; i < m_iButtonTotal; i++)
+	for (unsigned int i = 0; i < m_iButtonTotal; i++)
 		m_ButtonList[i]->setArmed(false);
 	m_pCloseButton->setArmed(false);
 	setVisible(false);
@@ -196,7 +196,7 @@ void CLocalizedPanel::AddButton(msstring sText, bool bEnabled, bool bCloseOnClic
 void CLocalizedPanel::PositionButtons(void)
 {
 	int x = GetCenteredItem(m_pMainPanel->getWide(), LOCAL_BUTTON_WIDTH, m_iButtonTotal, LOCAL_BUTTON_SPACE);
-	for (int i = 0; i < m_iButtonTotal; i++)
+	for (unsigned int i = 0; i < m_iButtonTotal; i++)
 	{
 		m_ButtonList[i]->setPos(x + i * (LOCAL_BUTTON_WIDTH + LOCAL_BUTTON_SPACE), LOCAL_BUTTON_Y);
 	}
@@ -204,7 +204,7 @@ void CLocalizedPanel::PositionButtons(void)
 
 void CLocalizedPanel::ClearButtons(void)
 {
-	for (int i = 0; i < m_iButtonTotal; i++)
+	for (unsigned int i = 0; i < m_iButtonTotal; i++)
 	{
 		m_ButtonList[i]->setVisible(false);
 		m_pMainPanel->removeChild(m_ButtonList[i]);
@@ -284,7 +284,7 @@ void CLocalizedPanel::AddSubPanel( Panel *pPanel )
 
 void CLocalizedPanel::ClearSubPanels( void )
 {
-	for(int i = 0; i < m_iSubPanelTotal; i++)
+	for(unsigned int i = 0; i < m_iSubPanelTotal; i++)
 	{
 		m_pTextPanel->removeChild( m_SubPanelList[i] );
 		delete m_SubPanelList[i];
diff --git a/src/game/client/ui/ms/vgui_localizedpanel.h b/src/game/client/ui/ms/vgui_localizedpanel.h
index be1774ed..50180df7 100644
--- a/src/game/client/ui/ms/vgui_localizedpanel.h
+++ b/src/game/client/ui/ms/vgui_localizedpanel.h
@@ -14,10 +14,10 @@ class CLocalizedPanel : public CMenuPanel
 	TextPanel *m_pTitle; // Title label
 
 	mslist<ClassButton *> m_ButtonList; // List of all dynamic buttons
-	int m_iButtonTotal;					// Total number of buttons allocated
+	unsigned int m_iButtonTotal;					// Total number of buttons allocated
 
 	mslist<Panel *>	m_SubPanelList; // List of all dynamic sub-panels
-	int	m_iSubPanelTotal;		// Total number of sub-panels
+	unsigned int	m_iSubPanelTotal;		// Total number of sub-panels
 
 	CTFScrollPanel *m_pScroll; // Scrolling window
 	Panel *m_pTextPanel;	   // Panel inside scrolling window
diff --git a/src/game/client/ui/ms/vgui_menu_interact.h b/src/game/client/ui/ms/vgui_menu_interact.h
index 81378a98..d362d005 100644
--- a/src/game/client/ui/ms/vgui_menu_interact.h
+++ b/src/game/client/ui/ms/vgui_menu_interact.h
@@ -46,8 +46,8 @@ class VGUI_MenuInteract : public VGUI_MenuBase
 
 		m_ButtonY = BTN_START_Y;
 
-		for (int i = 0; i < INTERACT_MAX_BUTTONS; i++) //Create all the buttons now.  Fill them in later
-			AddButton("", 0, i);
+		for (unsigned int i = 0; i < INTERACT_MAX_BUTTONS; i++) //Create all the buttons now.  Fill them in later
+			AddButton("", 0, (int)i);
 
 		// MiB NOV2014_25, center the title and separator NpcInteractMenus.rft
 		m_AllowKeys = true; // MiB 25NOV_2014 - Disable key-input
@@ -63,7 +63,7 @@ class VGUI_MenuInteract : public VGUI_MenuBase
 		m_EntIdx = -1;
 		m_Options.clearitems();
 
-		for (int i = 0; i < m_Buttons.size(); i++) //Reset all buttons except cance
+		for (unsigned int i = 0; i < m_Buttons.size(); i++) //Reset all buttons except cance
 		{
 			m_Buttons[i]->setVisible(false);
 			m_Buttons[i]->setEnabled(true);
diff --git a/src/game/client/ui/ms/vgui_menu_main.h b/src/game/client/ui/ms/vgui_menu_main.h
index c36bf9a0..2a7aaa04 100644
--- a/src/game/client/ui/ms/vgui_menu_main.h
+++ b/src/game/client/ui/ms/vgui_menu_main.h
@@ -41,7 +41,7 @@ class VGUI_MenuMain : public VGUI_MenuBase
 				"#CANCEL", XRES(33), 0};
 
 		m_ButtonY = BTN_START_Y;
-		for (int i = 0; i < std::size(g_ButtonNames); i++)
+		for (unsigned int i = 0; i < std::size(g_ButtonNames); i++)
 			MSButton *pButton = AddButton(Localized(g_ButtonNames[i].Name), g_ButtonNames[i].Width, msvariant(g_ButtonNames[i].OptionScreen));
 
 		m_OptionsPanel = new CPanel_Options(this);
@@ -53,7 +53,7 @@ class VGUI_MenuMain : public VGUI_MenuBase
 	{
 		m_Buttons[OPT_VOTEKICK]->setEnabled(false);
 		m_Buttons[OPT_VOTETIME]->setEnabled(false);
-		for (int i = 0; i < vote_t::VotesTypesAllowed.size(); i++)
+		for (unsigned int i = 0; i < vote_t::VotesTypesAllowed.size(); i++)
 		{
 			if (vote_t::VotesTypesAllowed[i] == "kick")
 				m_Buttons[OPT_VOTEKICK]->setEnabled(true);
diff --git a/src/game/client/ui/ms/vgui_menubase.cpp b/src/game/client/ui/ms/vgui_menubase.cpp
index 3dc2a08d..38401ddd 100644
--- a/src/game/client/ui/ms/vgui_menubase.cpp
+++ b/src/game/client/ui/ms/vgui_menubase.cpp
@@ -176,7 +176,7 @@ bool VGUI_MenuBase::SlotInput(int iSlot)
 // Update the menu before opening it
 void VGUI_MenuBase::Open(void)
 {
-	for (int i = 0; i < m_Buttons.size(); i++)
+	for (unsigned int i = 0; i < m_Buttons.size(); i++)
 		m_Buttons[i]->setArmed(false);
 
 	Reset();
@@ -208,7 +208,7 @@ void VGUI_MenuBase::UpdateFade(void)
 	//m_pMainPanel->setBorder( NULL );
 	//m_pMainPanel->setBorder( m_Border );
 
-	for (int i = 0; i < m_Buttons.size(); i++)
+	for (unsigned int i = 0; i < m_Buttons.size(); i++)
 	{
 		m_Buttons[i]->m_ArmedColor.a = InveserdFade;
 		m_Buttons[i]->m_UnArmedColor.a = InveserdFade;
diff --git a/src/game/client/ui/ms/vgui_moveitempanel.cpp b/src/game/client/ui/ms/vgui_moveitempanel.cpp
index ee417289..8155a03d 100644
--- a/src/game/client/ui/ms/vgui_moveitempanel.cpp
+++ b/src/game/client/ui/ms/vgui_moveitempanel.cpp
@@ -12,7 +12,7 @@ VGUI_MoveItemPanel::VGUI_MoveItemPanel(CContainerPanel *pParent) : CTransparentP
 	int y = 0;
 	int w = 0;
 
-	for(int i = 0; i < gNumMoveNumbers + 1; i++)
+	for(unsigned int i = 0; i < gNumMoveNumbers + 1; i++)
 	{
 		int vNumMove;
 		msstring vsText;
@@ -57,7 +57,7 @@ void VGUI_MoveItemPanel::ShowForButton(VGUI_ItemButton *pButton)
 	pButton->getAbsExtents(x, y, w, h);
 	setPos(x,y);
 
-	for(int i = 0; i < gNumMoveNumbers; i++)
+	for(unsigned int i = 0; i < gNumMoveNumbers; i++)
 	{
 		mButtons[i]->setEnabled(pButton->m_Data.Quantity >= gMoveNumbers[i]);
 	}
@@ -76,7 +76,7 @@ void VGUI_MoveItemPanel::Move(int vNumMove)
 void VGUI_MoveItemPanel::setVisible(bool bVisible)
 {
 	CTransparentPanel::setVisible(bVisible);
-	for(int i = 0; i < gNumMoveNumbers + 1; i++)
+	for(unsigned int i = 0; i < gNumMoveNumbers + 1; i++)
 	{
 		mButtons[i]->setArmed(false);
 	}
diff --git a/src/game/client/ui/ms/vgui_mscontrols.cpp b/src/game/client/ui/ms/vgui_mscontrols.cpp
index c3f07711..3e91f226 100644
--- a/src/game/client/ui/ms/vgui_mscontrols.cpp
+++ b/src/game/client/ui/ms/vgui_mscontrols.cpp
@@ -30,7 +30,7 @@ BitmapTGA *MSBitmap::GetTGA(const char *pszImageName)
 	if( !pszImageName )
 		return NULL;
 
-	for (int i = 0; i < g_Bitmaps.size(); i++) 
+	for (unsigned int i = 0; i < g_Bitmaps.size(); i++) 
 	{
 		if( g_Bitmaps[i].m_TGAorSprite && !strcmp(g_Bitmaps[i].sImageName, pszImageName) )
 			return g_Bitmaps[i].m_TGA; //Return existing TGA
@@ -55,7 +55,7 @@ HLSPRITE MSBitmap::GetSprite(const char *pszImageName)
 	if( !pszImageName )
 		return NULL;
 
-	 for (int i = 0; i < g_Bitmaps.size(); i++) 
+	 for (unsigned int i = 0; i < g_Bitmaps.size(); i++) 
 		if( !g_Bitmaps[i].m_TGAorSprite && !strcmp(g_Bitmaps[i].sImageName, pszImageName) )
 			return g_Bitmaps[i].m_Sprite;						//Return existing Sprite
 
@@ -82,7 +82,7 @@ HLSPRITE MSBitmap::LoadSprite(const char *pszImageName)
 void MSBitmap::ReloadSprites()
 {
 	//Reload sprites after a video or level change
-	 for (int i = 0; i < g_Bitmaps.size(); i++) 
+	 for (unsigned int i = 0; i < g_Bitmaps.size(); i++) 
 		if( !g_Bitmaps[i].m_TGAorSprite )
 			g_Bitmaps[i].m_Sprite = LoadSprite( g_Bitmaps[i].sImageName );
 }
@@ -363,7 +363,7 @@ VGUI_ItemButton::VGUI_ItemButton( int x, int y, VGUI_ItemCallbackPanel *pCallbac
 	m_Image.setParent( this );
 
 	//Set the label
-	 for (int i = 0; i < ITEMBTN_LABELS_MAX; i++) 
+	 for (unsigned int i = 0; i < ITEMBTN_LABELS_MAX; i++) 
 		m_Labels[i] = new MSLabel( this, "Item", 0, 0, 1, 1, MSLabel::a_center );
 
 	m_Description = new TextPanel( "", 0, 0, 1, 1 );
@@ -385,7 +385,7 @@ VGUI_ItemButton::VGUI_ItemButton( int x, int y, VGUI_ItemCallbackPanel *pCallbac
 	m_Button->removeInputSignal( m_Signal );
 	removeChild( m_Button );
 
-	 for (int i = 0; i < ITEMBTN_LABELS; i++) 
+	 for (unsigned int i = 0; i < ITEMBTN_LABELS; i++) 
 	{
 		removeChild( Labels[i] );
 		delete Labels[i];
@@ -435,7 +435,7 @@ void VGUI_ItemButton::Update( )
 		int lblx, lbly;
 		int w, h;
 
-		 for (int i = 0; i < ITEMBTN_LABELS_MAX; i++) 
+		 for (unsigned int i = 0; i < ITEMBTN_LABELS_MAX; i++) 
 		{
 			switch( i )
 			{
@@ -567,7 +567,7 @@ void VGUI_ItemButton::paint( )
 	}
 
 	m_Image.SetFGColorRGB( ImageColor );
-	for (int i = 0; i < ITEMBTN_LABELS_MAX; i++) 
+	for (unsigned int i = 0; i < ITEMBTN_LABELS_MAX; i++) 
 		m_Labels[i]->SetFGColorRGB( LabelColor );
 	m_Description->SetFGColorRGB( LabelColor );
 }
@@ -654,7 +654,7 @@ VGUI_ItemButton *VGUI_Container::AddItem(containeritem_t &Item)
 	VGUI_ItemButton &NewItemButton = *m_ItemButtons[m_ItemButtonTotal];
 	NewItemButton.SetItem(Item);
 
-	int iAlphaLoc = m_ItemButtonTotal;
+	unsigned int iAlphaLoc = m_ItemButtonTotal;
 
 	if (m_ItemButtonTotal > 0)
 	{
@@ -672,7 +672,7 @@ VGUI_ItemButton *VGUI_Container::AddItem(containeritem_t &Item)
 		}
 		iAlphaLoc = lo;
 
-		for (int i = m_ItemButtonTotal; i > iAlphaLoc; --i)
+		for (unsigned int i = m_ItemButtonTotal; i > iAlphaLoc; --i)
 			m_AlphabetizedItemButtons[i] = m_AlphabetizedItemButtons[i - 1];
 	}
 
@@ -684,7 +684,7 @@ VGUI_ItemButton *VGUI_Container::AddItem(containeritem_t &Item)
 	const int invType = atoi(gEngfuncs.pfnGetCvarString("ms_invtype"));
 	if (IsAlphabetical())
 	{
-		for (int i = iAlphaLoc; i < m_ItemButtonTotal; ++i)
+		for (unsigned int i = iAlphaLoc; i < m_ItemButtonTotal; ++i)
 			UpdatePosition(i, invType);
 	}
 	else
@@ -700,7 +700,7 @@ void VGUI_Container::Update( )
 {
 	bool bIsAlpha = IsAlphabetical();
 	const int invType = atoi(gEngfuncs.pfnGetCvarString("ms_invtype"));
-	for (int i = 0; i < m_ItemButtonTotal; i++) 
+	for (unsigned int i = 0; i < m_ItemButtonTotal; i++) 
 	{
 		// MiB FEB2019_24 [ALPHABETICAL_INVENTORY]
 		if ( bIsAlpha )
@@ -749,7 +749,7 @@ void VGUI_Container::UpdatePosition(int idx, int invType)
 void VGUI_Container::PurgeButtons( )
 {
 	//Reset the old buttons
-	 for (int i = 0; i < m_ItemButtonTotal; i++) 
+	 for (unsigned int i = 0; i < m_ItemButtonTotal; i++) 
 		m_ItemButtons[i]->Reset( );
 
 	m_ItemButtonTotal = 0;
diff --git a/src/game/client/ui/ms/vgui_mscontrols.h b/src/game/client/ui/ms/vgui_mscontrols.h
index 205766de..c6726a8b 100644
--- a/src/game/client/ui/ms/vgui_mscontrols.h
+++ b/src/game/client/ui/ms/vgui_mscontrols.h
@@ -460,8 +460,8 @@ class VGUI_Container : public CTransparentPanel
 public:
 	std::vector<VGUI_ItemButton *> m_ItemButtons;
 	std::vector<VGUI_ItemButton *> m_AlphabetizedItemButtons; // MiB FEB2019_24 [ALPHABETICAL_INVENTORY]
-	int m_ItemButtonTotal;
-	int m_InitializedItemButtons;
+	unsigned int m_ItemButtonTotal;
+	unsigned int m_InitializedItemButtons;
 	CTFScrollPanel *m_pScrollPanel;
 	VGUI_ItemCallbackPanel *m_CallbackPanel;
 	MSLabel	*m_NoItems;
@@ -619,7 +619,7 @@ class VGUI_TextPanel : public CTransparentPanel
 		int w, h;
 		m_MessageLabel->getTextSize( w, h );
 		x += w + 1;
-		for (int i = 0; i < m_FadeLabels.size(); i++) { m_FadeLabels[i]->getTextSize(w, h); x += w; }
+		for (unsigned int i = 0; i < m_FadeLabels.size(); i++) { m_FadeLabels[i]->getTextSize(w, h); x += w; }
 		m_FadeLabels.add( new VGUI_FadeText( this, 0, Letter, x, y, XRES(16), m_MessageLabel->getTall() ) );
 		m_Message += Letter;
 
@@ -636,8 +636,8 @@ class VGUI_TextPanel : public CTransparentPanel
 	{
 		m_VisibleMsg = m_Message;
 		m_MessageLabel->setText( m_Message );
-		int sz =  m_FadeLabels.size();
-		for (int i = 0; i < sz; i++) 
+		unsigned int sz =  m_FadeLabels.size();
+		for (unsigned int i = 0; i < sz; i++) 
 		{
 			m_FadeLabels[0]->setParent( NULL );
 			delete m_FadeLabels[0];
@@ -654,7 +654,7 @@ class VGUI_TextPanel : public CTransparentPanel
 
 	void Update( )
 	{
-		for (int i = 0; i < m_FadeLabels.size(); i++) 
+		for (unsigned int i = 0; i < m_FadeLabels.size(); i++) 
 		{
 			VGUI_FadeText *pFadeText = m_FadeLabels[i];
 			pFadeText->Update( );
diff --git a/src/game/client/ui/ms/vgui_options.cpp b/src/game/client/ui/ms/vgui_options.cpp
index f33a63d1..d424c799 100644
--- a/src/game/client/ui/ms/vgui_options.cpp
+++ b/src/game/client/ui/ms/vgui_options.cpp
@@ -202,7 +202,7 @@ class VGUI_Options : public CTransparentPanel
 		//m_pScrollPanel->setBorder( new LineBorder( Color(255,255,255,0) ) );
 
 		int yPos = PLAYERBTN_START_Y;
-		for (int i = 0; i < MAX_VOTE_PLAYERS; i++)
+		for (unsigned int i = 0; i < MAX_VOTE_PLAYERS; i++)
 		{
 			ListButton *pButton = m_pListButton[i] = new ListButton(this, i, PLAYERBTN_X, yPos, PLAYERBTN_SIZE_X, PLAYERBTN_SIZE_Y);
 			pButton->setFont(pSchemes->getFont(hClassWindowText));
@@ -225,7 +225,7 @@ class VGUI_Options : public CTransparentPanel
 	{
 		m_Target = -1;
 		setVisible(true);
-		for (int i = 0; i < MAX_VOTE_PLAYERS; i++)
+		for (unsigned int i = 0; i < MAX_VOTE_PLAYERS; i++)
 		{
 			m_pListButton[i]->setArmed(false);
 			m_pListButton[i]->SetBGColorRGB(Color_Transparent);
@@ -251,7 +251,7 @@ class VGUI_Options : public CTransparentPanel
 	virtual void ButtonClicked(int idx)
 	{
 		m_Target = idx;
-		for (int i = 0; i < MAX_VOTE_PLAYERS; i++)
+		for (unsigned int i = 0; i < MAX_VOTE_PLAYERS; i++)
 			m_pListButton[i]->SetBgColor(Color_Transparent);
 		m_pListButton[m_Target]->SetBgColor(Color_BG_NameHightlight);
 		m_pBegin->setEnabled(true);
@@ -290,7 +290,7 @@ class CInitVotePanel : public VGUI_Options
 
 		if (m_VoteType == "kick")
 		{
-			for (int i = 0; i < MAX_VOTE_PLAYERS; i++)
+			for (unsigned int i = 0; i < MAX_VOTE_PLAYERS; i++)
 				if (g_PlayerInfoList[i].name &&
 					i != MSCLGlobals::GetLocalPlayerIndex())
 				{
@@ -303,10 +303,10 @@ class CInitVotePanel : public VGUI_Options
 		}
 		else if (m_VoteType == "advtime")
 		{
-			for (int i = 0; i < 3; i++)
+			for (unsigned int i = 0; i < 3; i++)
 			{
 				m_pListButton[i]->setParent(m_pScrollPanel->getClient());
-				m_pListButton[i]->setText(Localized(msstring("#VOTE_ADVTIME_OPT") + i));
+				m_pListButton[i]->setText(Localized(msstring("#VOTE_ADVTIME_OPT") + (int)i));
 				UsedBtns++;
 			}
 		}
@@ -329,7 +329,7 @@ class CInitVotePanel : public VGUI_Options
 	virtual void ButtonClicked(int idx)
 	{
 		m_Target = idx;
-		for (int i = 0; i < MAX_VOTE_PLAYERS; i++)
+		for (unsigned int i = 0; i < MAX_VOTE_PLAYERS; i++)
 			m_pListButton[i]->SetBgColor(Color_Transparent);
 		m_pListButton[m_Target]->SetBgColor(Color_BG_NameHightlight);
 		m_pBegin->setEnabled(true);
@@ -435,7 +435,7 @@ class CPartyPanel : public VGUI_Options
 	void Update()
 	{
 		int r = 0;
-		for (int i = 0; i < MAX_VOTE_PLAYERS; i++)
+		for (unsigned int i = 0; i < MAX_VOTE_PLAYERS; i++)
 			if (g_PlayerExtraInfo[i].teamname[0] /*&&
 				i != GetLocalPlayerIndex()*/
 			)
diff --git a/src/game/client/ui/ms/vgui_stats.cpp b/src/game/client/ui/ms/vgui_stats.cpp
index 29304499..1e90fd71 100644
--- a/src/game/client/ui/ms/vgui_stats.cpp
+++ b/src/game/client/ui/ms/vgui_stats.cpp
@@ -145,7 +145,7 @@ CStatPanel::CStatPanel(Panel *pParent) : CMenuPanel(0, false, 0, 0, ScreenWidth,
 	pLabel->getPos(ix, iy);
 	offset = iy + pLabel->getTall();
 
-	for (int i = 0; i < SKILL_MAX_STATS + 1; i++)
+	for (unsigned int i = 0; i < SKILL_MAX_STATS + 1; i++)
 	{
 		TextPanel *pTextbox = Skill_StatLabel[i] =
 			new TextPanel("", TITLE_SKILLS_X, offset + i * MAINBUTTON_SIZE_Y, MAINBUTTON_SIZE_X, MAINBUTTON_SIZE_Y);
@@ -267,7 +267,7 @@ void CStatPanel::Update()
 	}
 
 	bool FOUND_PARRY = false;
-	for (int i = 0; i < SKILL_MAX_STATS; i++)
+	for (unsigned int i = 0; i < SKILL_MAX_STATS; i++)
 	{
 		FOUND_PARRY = FOUND_PARRY || msstring(SkillStatList[i].Name) == "Parry";
 		bool blank = i == SKILL_MAX_STATS - 1;
@@ -306,9 +306,9 @@ void CStatPanel::Update()
 	{
 		int Height = SKILLINFOPANEL_TITLE_Y + SKILLINFOPANEL_TITLE_H + SKILLINFOPANEL_BTM_BORDERSPACER_H;
 		int UnusedSlots = 0;
-		for (int i = 0; i < STAT_MAGIC_TOTAL; i++)
+		for (unsigned int i = 0; i < STAT_MAGIC_TOTAL; i++)
 		{
-			int iSubStats = pStat->m_SubStats.size();
+			unsigned int iSubStats = pStat->m_SubStats.size();
 			if (i >= iSubStats)
 			{
 				m_StatTypeLabel[i]->setVisible(false);
@@ -467,7 +467,7 @@ int __MsgFunc_SetStat(const char *pszName, int iSize, void *pbuf)
 		if (iStat < (signed)player.m_Stats.size())
 		{
 			CStat &Stat = player.m_Stats[iStat];
-			for (int i = 0; i < Stat.m_SubStats.size(); i++)
+			for (unsigned int i = 0; i < Stat.m_SubStats.size(); i++)
 			{
 				Stat.m_SubStats[i].Value = READ_BYTE();
 				if (Stat.m_Type == CStat::STAT_SKILL)
diff --git a/src/game/client/ui/ms/vgui_storage.cpp b/src/game/client/ui/ms/vgui_storage.cpp
index f2d1b594..ebb13c9d 100644
--- a/src/game/client/ui/ms/vgui_storage.cpp
+++ b/src/game/client/ui/ms/vgui_storage.cpp
@@ -76,7 +76,7 @@ void CStoragePanel::AddInventoryItems()
 {
 	//Find the storage on the player
 	storage_t *pStorage = NULL;
-	for (int s = 0; s < player.m_Storages.size(); s++)
+	for (unsigned int s = 0; s < player.m_Storages.size(); s++)
 		if (player.m_Storages[s].Name == player.m_CurrentStorage.StorageName)
 		{
 			pStorage = &player.m_Storages[s];
@@ -100,7 +100,7 @@ void CStoragePanel::AddInventoryItems()
 
 	//Add the storage items
 	storage_t &Storage = *pStorage;
-	for (int i = 0; i < Storage.Items.size(); i++)
+	for (unsigned int i = 0; i < Storage.Items.size(); i++)
 	{
 		containeritem_t vNewItem = containeritem_t(Storage.Items[i]);
 		pGearItemButton->m_ItemContainer->AddItem(vNewItem);
@@ -166,7 +166,7 @@ bool CStoragePanel::GearItemClicked(ulong ID)
 
 	bool leftAnItemOff = false;
 
-	for (int i = 0; i < m_SelectedItems.size(); i++)
+	for (unsigned int i = 0; i < m_SelectedItems.size(); i++)
 	{
 		if (checkValid(m_SelectedItems[i])) //Check it against the bank mask (MiB Feb2008a)
 		{
@@ -246,10 +246,10 @@ void CStoragePanel::ItemSelectChanged(ulong ID, bool fSelected)
 
 	int Valuetotal = 0;
 
-	for (int g = 0; g < m_GearPanel->GearItemButtonTotal; g++)
+	for (unsigned int g = 0; g < m_GearPanel->GearItemButtonTotal; g++)
 	{
 		VGUI_Inv_GearItem &GearItem = *m_GearPanel->GearItemButtons[g];
-		for (int i = 0; i < GearItem.m_ItemContainer->m_ItemButtonTotal; i++)
+		for (unsigned int i = 0; i < GearItem.m_ItemContainer->m_ItemButtonTotal; i++)
 		{
 			VGUI_ItemButton &ItemButton = *GearItem.m_ItemContainer->m_ItemButtons[i];
 			if (!ItemButton.m_Selected)
@@ -282,7 +282,7 @@ void CStoragePanel::ItemSelectChanged(ulong ID, bool fSelected)
 	if( m_SelectedItems.size() > 0 )
 	{
 		CommandString = "trade sell";
-		 for (int i = 0; i < m_SelectedItems.size(); i++) 
+		 for (unsigned int i = 0; i < m_SelectedItems.size(); i++) 
 		{
 			CommandString += " ";
 			CommandString += (int)m_SelectedItems[i].ID;
@@ -320,7 +320,7 @@ void Storage_ItemMsg()
 	msstring StorageName = READ_STRING();
 	storage_t *pStorage = NULL;
 
-	for (int s = 0; s < player.m_Storages.size(); s++)
+	for (unsigned int s = 0; s < player.m_Storages.size(); s++)
 		if (player.m_Storages[s].Name == StorageName)
 		{
 			pStorage = &player.m_Storages[s];
diff --git a/src/game/client/ui/ms/vgui_store.cpp b/src/game/client/ui/ms/vgui_store.cpp
index 9004d166..1538011b 100644
--- a/src/game/client/ui/ms/vgui_store.cpp
+++ b/src/game/client/ui/ms/vgui_store.cpp
@@ -145,7 +145,7 @@ CStoreMenuPanel::CStoreMenuPanel(int iTrans, int iRemoveMe, int x,int y,int wide
 	m_pScrollPanel->validate();
 
 	// Create the Store buttons
-	for (int i = 0; i < STORE_BUTTONS; i++)
+	for (unsigned int i = 0; i < STORE_BUTTONS; i++)
 	{
 		int iYPos = STORE_SIDEBUTTON_TOPLEFT_Y + ( (STORE_SIDEBUTTON_SIZE_Y + STORE_SIDEBUTTON_SPACER_Y) * i );
 
@@ -205,7 +205,7 @@ void CStoreMenuPanel::Update()
 	char sz[256];
 	int width, height;
 	pTitleLabel->setText( "%s's Shop", CStorePanel::StoreVendorName.c_str() );
-	 for (int i = 0; i < STORE_BUTTONS; i++) 
+	 for (unsigned int i = 0; i < STORE_BUTTONS; i++) 
 	{
 		//Don't show buttons if not activated
 		m_pButtons[i]->setVisible( false );
@@ -256,7 +256,7 @@ void CStoreMenuPanel::Initialize( void )
 void CStoreMenuPanel::SetActiveInfo( int iInput )
 {
 	// Remove all the Info panels and bring up the specified one
-	for (int i = 0; i < STORE_BUTTONS; i++)
+	for (unsigned int i = 0; i < STORE_BUTTONS; i++)
 	{
 		m_pButtons[i]->setArmed( false );
 		m_pClassInfoPanel[i]->setVisible( false );
diff --git a/src/game/client/ui/ms/vgui_storebuy.cpp b/src/game/client/ui/ms/vgui_storebuy.cpp
index 53835f01..f3c84976 100644
--- a/src/game/client/ui/ms/vgui_storebuy.cpp
+++ b/src/game/client/ui/ms/vgui_storebuy.cpp
@@ -41,7 +41,7 @@ void CStoreBuyPanel::AddInventoryItems()
 	pGearItemButton->setVisible(false);
 
 	//Add store items with at least 1 in inventory to the container
-	for (int i = 0; i < StoreItems.size(); i++)
+	for (unsigned int i = 0; i < StoreItems.size(); i++)
 		if (StoreItems[i].Quantity > 0)
 			pGearItemButton->m_ItemContainer->AddItem(StoreItems[i]);
 
@@ -91,7 +91,7 @@ void CStoreBuyPanel::ItemHighlighted(void *pData)
 			m_InfoPanel->m_SaleText->setText("Price");
 
 			containeritem_t &Item = ItemButton.m_Data;
-			for (int s = 0; s < CStorePanel::StoreItems.size(); s++)
+			for (unsigned int s = 0; s < CStorePanel::StoreItems.size(); s++)
 			{
 				storeitem_t &StoreItem = CStorePanel::StoreItems[s];
 				if (Item.Name != StoreItem.Name)
diff --git a/src/game/client/ui/ms/vgui_storesell.cpp b/src/game/client/ui/ms/vgui_storesell.cpp
index c31154ab..bb1305bf 100644
--- a/src/game/client/ui/ms/vgui_storesell.cpp
+++ b/src/game/client/ui/ms/vgui_storesell.cpp
@@ -79,7 +79,7 @@ CStoreSellPanel::CStoreSellPanel(Panel *pParent) : CStorePanel()
 
 bool CStoreSellPanel::InterestedInItem(const char* pszItemName)
 {
-	for (int i = 0; i < CStorePanel::StoreItems.size(); i++)
+	for (unsigned int i = 0; i < CStorePanel::StoreItems.size(); i++)
 		if (CStorePanel::StoreItems[i].Name == pszItemName)
 			return true;
 
@@ -104,7 +104,7 @@ void CStoreSellPanel::ItemHighlighted(void *pData)
 		m_InfoPanel->m_SaleText->setText("Worthless");
 
 		containeritem_t &Item = ItemButton.m_Data;
-		for (int s = 0; s < CStorePanel::StoreItems.size(); s++)
+		for (unsigned int s = 0; s < CStorePanel::StoreItems.size(); s++)
 		{
 			storeitem_t &StoreItem = CStorePanel::StoreItems[s];
 			if (Item.Name != StoreItem.Name)
@@ -126,17 +126,17 @@ void CStoreSellPanel::ItemSelectChanged(ulong ID, bool fSelected)
 
 	int Valuetotal = 0;
 
-	for (int g = 0; g < m_GearPanel->GearItemButtonTotal; g++)
+	for (unsigned int g = 0; g < m_GearPanel->GearItemButtonTotal; g++)
 	{
 		VGUI_Inv_GearItem &GearItem = *m_GearPanel->GearItemButtons[g];
-		for (int i = 0; i < GearItem.m_ItemContainer->m_ItemButtonTotal; i++)
+		for (unsigned int i = 0; i < GearItem.m_ItemContainer->m_ItemButtonTotal; i++)
 		{
 			VGUI_ItemButton &ItemButton = *GearItem.m_ItemContainer->m_ItemButtons[i];
 			if (!ItemButton.m_Selected)
 				continue;
 
 			containeritem_t &Item = ItemButton.m_Data;
-			for (int s = 0; s < CStorePanel::StoreItems.size(); s++)
+			for (unsigned int s = 0; s < CStorePanel::StoreItems.size(); s++)
 			{
 				storeitem_t &StoreItem = CStorePanel::StoreItems[s];
 				if (Item.Name != StoreItem.Name)
@@ -159,7 +159,7 @@ void CStoreSellPanel::SellAll()
 	if (m_SelectedItems.size() > 0)
 	{
 		CommandString = "trade sell";
-		for (int i = 0; i < m_SelectedItems.size(); i++)
+		for (unsigned int i = 0; i < m_SelectedItems.size(); i++)
 		{
 			CommandString += " ";
 			CommandString += (int)m_SelectedItems[i].ID;
diff --git a/src/game/client/ui/vgui_global.cpp b/src/game/client/ui/vgui_global.cpp
index a011837e..d8875863 100644
--- a/src/game/client/ui/vgui_global.cpp
+++ b/src/game/client/ui/vgui_global.cpp
@@ -75,7 +75,7 @@ bool VGUI::HideMenu(VGUI_MainPanel *pPanel)
 
 VGUI_MainPanel *VGUI::FindPanel(const char* Name)
 {
-	for (int i = 0; i < gViewPort->m_Menus.size(); i++)
+	for (unsigned int i = 0; i < gViewPort->m_Menus.size(); i++)
 	{
 		VGUI_MainPanel *pPanel = gViewPort->m_Menus[i];
 		if (pPanel->m_Name == Name)
diff --git a/src/game/client/ui/vgui_loadtga.cpp b/src/game/client/ui/vgui_loadtga.cpp
index 25016180..771bcbad 100644
--- a/src/game/client/ui/vgui_loadtga.cpp
+++ b/src/game/client/ui/vgui_loadtga.cpp
@@ -64,7 +64,7 @@ class MemoryInputStream : public vgui::InputStream
 
 	void readUChar(uchar* buf, int count, bool& success) override
 	{
-		for (int i = 0; i < count; i++)
+		for (unsigned int i = 0; i < (unsigned int)count; i++)
 			buf[i] = readUChar(success);
 	}
 
diff --git a/src/game/client/ui/vgui_schememanager.cpp b/src/game/client/ui/vgui_schememanager.cpp
index ebc127cc..faae8fff 100644
--- a/src/game/client/ui/vgui_schememanager.cpp
+++ b/src/game/client/ui/vgui_schememanager.cpp
@@ -379,12 +379,12 @@ CSchemeManager::CSchemeManager(int xRes, int yRes)
 	memcpy(m_pSchemeList, tmpSchemes, sizeof(CScheme) * m_iNumSchemes);
 
 	// create the fonts
-	for (int i = 0; i < m_iNumSchemes; i++)
+	for (unsigned int i = 0; i < m_iNumSchemes; i++)
 	{
 		m_pSchemeList[i].font = NULL;
 
 		// see if the current font values exist in a previously loaded font
-		for (int j = 0; j < i; j++)
+		for (unsigned int j = 0; j < i; j++)
 		{
 			// check if the font name, size, and weight are the same
 			if (
@@ -483,7 +483,7 @@ CSchemeManager::~CSchemeManager()
 SchemeHandle_t CSchemeManager::getSchemeHandle(const char *schemeName)
 {
 	// iterate through the list
-	for (int i = 0; i < m_iNumSchemes; i++)
+	for (unsigned int i = 0; i < m_iNumSchemes; i++)
 	{
 		if (!_stricmp(schemeName, m_pSchemeList[i].schemeName))
 			return i;
diff --git a/src/game/client/ui/vgui_schememanager.h b/src/game/client/ui/vgui_schememanager.h
index f0befbbf..38913d8b 100644
--- a/src/game/client/ui/vgui_schememanager.h
+++ b/src/game/client/ui/vgui_schememanager.h
@@ -1,7 +1,7 @@
 #include <VGUI_Font.h>
 
 // handle to an individual scheme
-typedef int SchemeHandle_t;
+typedef unsigned int SchemeHandle_t;
 
 // Register console variables, etc..
 void Scheme_Init();
@@ -33,7 +33,7 @@ class CSchemeManager
 private:
 	class CScheme;
 	CScheme *m_pSchemeList;
-	int m_iNumSchemes;
+	unsigned int m_iNumSchemes;
 
 	// Resolution we were initted at.
 	int m_xRes;
diff --git a/src/game/client/ui/vgui_scorepanel.cpp b/src/game/client/ui/vgui_scorepanel.cpp
index 41b2f082..1337f29f 100644
--- a/src/game/client/ui/vgui_scorepanel.cpp
+++ b/src/game/client/ui/vgui_scorepanel.cpp
@@ -87,7 +87,7 @@ SBColumnInfo g_ColumnInfo[NUM_COLUMNS] =
 
 void ScorePanel::HitTestPanel::internalMousePressed(MouseCode code)
 {
-	for (int i = 0; i < _inputSignalDar.getCount(); i++)
+	for (unsigned int i = 0; i < _inputSignalDar.getCount(); i++)
 	{
 		_inputSignalDar[i]->mousePressed(code, this);
 	}
@@ -133,7 +133,7 @@ ScorePanel::ScorePanel(int x, int y, int wide, int tall) : Panel(x, y, wide, tal
 	m_HeaderGrid.SetDimensions(NUM_COLUMNS, 1);
 	m_HeaderGrid.SetSpacing(0, 0);
 
-	for (int i = 0; i < NUM_COLUMNS; i++)
+	for (unsigned int i = 0; i < NUM_COLUMNS; i++)
 	{
 		if (g_ColumnInfo[i].m_pTitle && g_ColumnInfo[i].m_pTitle[0] == '#')
 			m_HeaderLabels[i].setText(CHudTextMessage::BufferedLocaliseTextString(g_ColumnInfo[i].m_pTitle));
@@ -900,7 +900,7 @@ void ScorePanel::cursorMoved(int x, int y, Panel *panel)
 	if (GetClientVoiceMgr()->IsInSquelchMode())
 	{
 		// look for which cell the mouse is currently over
-		for (int i = 0; i < NUM_ROWS; i++)
+		for (unsigned int i = 0; i < NUM_ROWS; i++)
 		{
 			int row, col;
 			if (m_PlayerGrids[i].getCellAtPoint(x, y, row, col))
diff --git a/src/game/client/ui/vgui_scrollbar2.cpp b/src/game/client/ui/vgui_scrollbar2.cpp
index e07bf708..c19b42cc 100644
--- a/src/game/client/ui/vgui_scrollbar2.cpp
+++ b/src/game/client/ui/vgui_scrollbar2.cpp
@@ -189,7 +189,7 @@ void ScrollBar2::setRange(int min, int max)
 
 void ScrollBar2::fireIntChangeSignal()
 {
-	for (int i = 0; i < _intChangeSignalDar.getCount(); i++)
+	for (unsigned int i = 0; i < _intChangeSignalDar.getCount(); i++)
 	{
 		_intChangeSignalDar[i]->intChanged(_slider->getValue(), this);
 	}
@@ -280,7 +280,7 @@ void ScrollBar2::validate()
 	{
 		int buttonOffset = 0;
 
-		for (int i = 0; i < 2; i++)
+		for (unsigned int i = 0; i < 2; i++)
 		{
 			if (_button[i] != null)
 			{
diff --git a/src/game/client/ui/vgui_slider2.cpp b/src/game/client/ui/vgui_slider2.cpp
index a06345ba..4d3031a2 100644
--- a/src/game/client/ui/vgui_slider2.cpp
+++ b/src/game/client/ui/vgui_slider2.cpp
@@ -254,7 +254,7 @@ void Slider2::addIntChangeSignal(IntChangeSignal* s)
 
 void Slider2::fireIntChangeSignal()
 {	
-	for(int i=0;i<_intChangeSignalDar.getCount();i++)
+	for(unsigned int i=0;i<_intChangeSignalDar.getCount();i++)
 	{
 		_intChangeSignalDar[i]->intChanged(getValue(),this);
 	}
diff --git a/src/game/client/ui/vgui_status.h b/src/game/client/ui/vgui_status.h
index 15737c07..c5265d68 100644
--- a/src/game/client/ui/vgui_status.h
+++ b/src/game/client/ui/vgui_status.h
@@ -259,7 +259,7 @@ static void SetFN(bool Up)
 static void AddStatus(const char* Icon, const char* Name, float Dur, bool bSprite = false)
 {
 	// MiB FEB2019_22 - When sent a duplicate name, reset the duration
-	for (int i = 0; i < StatusIcons->m_Status.size(); i++)
+	for (unsigned int i = 0; i < StatusIcons->m_Status.size(); i++)
 	{
 		VGUI_StatusIcon* pIcon = StatusIcons->m_Status[i];
 		if (pIcon == NULL) continue;
@@ -276,7 +276,7 @@ static void AddImg(const char *Img, const char *Name,
 				   int x, int y, int w, int h, float Dur = -1.0)
 {
 	bool found = false;
-	for (int i = 0; i < StatusIcons->m_Img.size(); i++)
+	for (unsigned int i = 0; i < StatusIcons->m_Img.size(); i++)
 		//Check for ID conflictions
 		if (!strcmp(Name, StatusIcons->m_Img[i]->m_Name))
 		{
@@ -304,7 +304,7 @@ static void AddImg(const char *Img, const char *Name,
 
 void KillStatus(const char *Name)
 {
-	for (int i = 0; i < StatusIcons->m_Status.size(); i++)
+	for (unsigned int i = 0; i < StatusIcons->m_Status.size(); i++)
 	{
 		if (!strcmp(StatusIcons->m_Status[i]->m_Name, Name))
 		{
@@ -316,7 +316,7 @@ void KillStatus(const char *Name)
 }
 void KillImg(const char *Name)
 {
-	for (int i = 0; i < StatusIcons->m_Img.size(); i++)
+	for (unsigned int i = 0; i < StatusIcons->m_Img.size(); i++)
 	{
 		if (!strcmp(StatusIcons->m_Img[i]->m_Name, Name))
 		{
diff --git a/src/game/client/ui/vgui_teamfortressviewport.cpp b/src/game/client/ui/vgui_teamfortressviewport.cpp
index 40a0a250..b46e30d9 100644
--- a/src/game/client/ui/vgui_teamfortressviewport.cpp
+++ b/src/game/client/ui/vgui_teamfortressviewport.cpp
@@ -98,7 +98,7 @@ void VGUI_Think()
 	if (!gViewPort)
 		return;
 
-	for (int i = 0; i < gViewPort->m_Menus.size(); i++)
+	for (unsigned int i = 0; i < gViewPort->m_Menus.size(); i++)
 	{
 		gViewPort->m_Menus[i]->Think();
 	}
@@ -224,7 +224,7 @@ void CCommandMenu::AddButton(CommandButton *pButton)
 bool CCommandMenu::KeyInput(int keyNum)
 {
 	// loop through all our buttons looking for one bound to keyNum
-	for (int i = 0; i < m_iButtons; i++)
+	for (unsigned int i = 0; i < m_iButtons; i++)
 	{
 		if (!m_aButtons[i]->IsNotValid())
 		{
@@ -256,7 +256,7 @@ bool CCommandMenu::KeyInput(int keyNum)
 //-----------------------------------------------------------------------------
 void CCommandMenu::ClearButtonsOfArmedState(void)
 {
-	for (int i = 0; i < GetNumButtons(); i++)
+	for (unsigned int i = 0; i < GetNumButtons(); i++)
 	{
 		m_aButtons[i]->setArmed(false);
 
@@ -274,7 +274,7 @@ void CCommandMenu::ClearButtonsOfArmedState(void)
 //-----------------------------------------------------------------------------
 CommandButton *CCommandMenu::FindButtonWithSubmenu(CCommandMenu *pSubMenu)
 {
-	for (int i = 0; i < GetNumButtons(); i++)
+	for (unsigned int i = 0; i < GetNumButtons(); i++)
 	{
 		if (m_aButtons[i]->GetSubMenu() == pSubMenu)
 			return m_aButtons[i];
@@ -294,7 +294,7 @@ bool CCommandMenu::RecalculateVisibles(int iNewYPos, bool bHideAll)
 		setPos(_pos[0], iNewYPos);
 
 	// Cycle through all the buttons in this menu, and see which will be visible
-	for (int i = 0; i < m_iButtons; i++)
+	for (unsigned int i = 0; i < m_iButtons; i++)
 	{
 		int iClass = m_aButtons[i]->GetPlayerClass();
 		if ((iClass && iClass != g_iPlayerClass) || (m_aButtons[i]->IsNotValid()) || bHideAll)
@@ -362,7 +362,7 @@ void CCommandMenu::RecalculatePositions(int iYOffset)
 
 	// We need to force all menus below this one to update their positions now, because they
 	// might have submenus riding off buttons in this menu that have just shifted.
-	for (int i = 0; i < m_iButtons; i++)
+	for (unsigned int i = 0; i < m_iButtons; i++)
 		m_aButtons[i]->UpdateSubMenus(iAdjust);
 
 	setPos(_pos[0], iNewYPos);
@@ -373,7 +373,7 @@ void CCommandMenu::MakeVisible(CCommandMenu *pChildMenu)
 {
 	/*
 	// Push down the button leading to the child menu
-	for (int i = 0; i < m_iButtons; i++)
+	for (unsigned int i = 0; i < m_iButtons; i++)
 	{
 		if ( (pChildMenu != NULL) && (m_aButtons[i]->GetSubMenu() == pChildMenu) )
 		{
@@ -643,7 +643,7 @@ void TeamFortressViewport::Initialize(void)
 
 	 strncpy(m_sMapName,  "", sizeof(m_sMapName) );
 	 strncpy(m_szServerName,  "", sizeof(m_szServerName) );
-	for (int i = 0; i < 5; i++)
+	for (unsigned int i = 0; i < 5; i++)
 	{
 		m_iValidClasses[i] = 0;
 		strncpy(m_sTeamNames[i], "", MAX_TEAMNAME_SIZE);
@@ -1003,7 +1003,7 @@ void TeamFortressViewport::HideScoreBoard(void)
 // Set the submenu of the Command Menu
 void TeamFortressViewport::SetCurrentCommandMenu(CCommandMenu *pNewMenu)
 {
-	for (int i = 0; i < m_iNumMenus; i++)
+	for (unsigned int i = 0; i < m_iNumMenus; i++)
 		m_pCommandMenus[i]->setVisible(false);
 
 	m_pCurrentCommandMenu = pNewMenu;
@@ -1586,7 +1586,7 @@ void TeamFortressViewport::CreateVGUIMenus()
 	m_Menus.add(CreateHUD_MenuInteract(this)); //Create Interact menu
 	m_Menus.add(m_pLocalizedMenu = new CLocalizedPanel(this)); // MiB MAR2015_01 [LOCAL_PANEL] - Add local panel to list and set pointer
 
-	for (int i = 0; i < m_Menus.size(); i++)
+	for (unsigned int i = 0; i < m_Menus.size(); i++)
 		m_Menus[i]->setVisible(false);
 
 	m_pHUDPanel->setVisible(true);
@@ -1912,7 +1912,7 @@ int TeamFortressViewport::MsgFunc_ValClass(const char *pszName, int iSize, void
 {
 	BEGIN_READ(pbuf, iSize);
 
-	for (int i = 0; i < 5; i++)
+	for (unsigned int i = 0; i < 5; i++)
 		m_iValidClasses[i] = READ_SHORT();
 
 	// Force the menu to update
@@ -1927,7 +1927,7 @@ int TeamFortressViewport::MsgFunc_TeamNames(const char *pszName, int iSize, void
 
 	m_iNumberOfTeams = READ_BYTE();
 
-	for (int i = 0; i < m_iNumberOfTeams; i++)
+	for (unsigned int i = 0; i < m_iNumberOfTeams; i++)
 	{
 		int teamNum = i + 1;
 
diff --git a/src/game/client/ui/vgui_teamfortressviewport.h b/src/game/client/ui/vgui_teamfortressviewport.h
index c6d74ad7..9070fe1d 100644
--- a/src/game/client/ui/vgui_teamfortressviewport.h
+++ b/src/game/client/ui/vgui_teamfortressviewport.h
@@ -243,7 +243,7 @@ class CCommandMenu : public Panel
 
 	// Buttons in this menu
 	CommandButton *m_aButtons[MAX_BUTTONS];
-	int m_iButtons;
+	unsigned int m_iButtons;
 
 public:
 	CCommandMenu(CCommandMenu *pParentMenu, int x, int y, int wide, int tall) : Panel(x, y, wide, tall)
@@ -264,7 +264,7 @@ class CCommandMenu : public Panel
 	CCommandMenu *GetParentMenu() { return m_pParentMenu; };
 	int GetXOffset() { return m_iXOffset; };
 	int GetYOffset() { return m_iYOffset; };
-	int GetNumButtons() { return m_iButtons; };
+	unsigned int GetNumButtons() { return m_iButtons; };
 	CommandButton *FindButtonWithSubmenu(CCommandMenu *pSubMenu);
 
 	void ClearButtonsOfArmedState(void);
@@ -290,7 +290,7 @@ class TeamFortressViewport : public Panel
 	float m_flMenuOpenTime;
 	float m_flScoreBoardLastUpdated;
 	float m_flSpectatorPanelLastUpdated;
-	int m_iNumMenus;
+	unsigned int m_iNumMenus;
 	int m_iCurrentTeamNumber;
 	int m_iCurrentPlayerClass;
 	int m_iUser1;
@@ -333,7 +333,7 @@ class TeamFortressViewport : public Panel
 	int m_iValidClasses[5];
 	int m_iIsFeigning;
 	int m_iIsSettingDetpack;
-	int m_iNumberOfTeams;
+	unsigned int m_iNumberOfTeams;
 	int m_iBuildState;
 	int m_iRandomPC;
 	char m_sTeamNames[5][MAX_TEAMNAME_SIZE];
diff --git a/src/game/client/view.cpp b/src/game/client/view.cpp
index 26ae18f4..1d7dc7af 100644
--- a/src/game/client/view.cpp
+++ b/src/game/client/view.cpp
@@ -513,7 +513,7 @@ V_CalcRefdef
 void V_CalcNormalRefdef(struct ref_params_s *pparams)
 {
 	cl_entity_t *ent;
-	int i;
+	unsigned int i;
 	vec3_t angles;
 	float bob, waterOffset;
 	static viewinterp_t ViewInterp;
@@ -572,7 +572,7 @@ void V_CalcNormalRefdef(struct ref_params_s *pparams)
 		if (pparams->hardware)
 		{
 			waterEntity = gEngfuncs.PM_WaterEntity(pparams->simorg);
-			if (waterEntity >= 0 && waterEntity < pparams->max_entities)
+			if (waterEntity >= 0 && (unsigned int)waterEntity < pparams->max_entities)
 			{
 				pwater = gEngfuncs.GetEntityByIndex(waterEntity);
 				if (pwater && (pwater->model != NULL))
@@ -890,7 +890,7 @@ void V_SmoothInterpolateAngles(float *startAngle, float *endAngle, float *finalA
 	NormalizeAngles(startAngle);
 	NormalizeAngles(endAngle);
 
-	for (int i = 0; i < 3; i++)
+	for (unsigned int i = 0; i < 3; i++)
 	{
 		d = endAngle[i] - startAngle[i];
 
@@ -1119,7 +1119,7 @@ float MaxAngleBetweenAngles(float *a1, float *a2)
 	NormalizeAngles(a1);
 	NormalizeAngles(a2);
 
-	for (int i = 0; i < 3; i++)
+	for (unsigned int i = 0; i < 3; i++)
 	{
 		d = a2[i] - a1[i];
 		if (d > 180)
diff --git a/src/game/server/angelscript/ASServerEngineImpl.cpp b/src/game/server/angelscript/ASServerEngineImpl.cpp
index b2749bf0..22c2b768 100644
--- a/src/game/server/angelscript/ASServerEngineImpl.cpp
+++ b/src/game/server/angelscript/ASServerEngineImpl.cpp
@@ -244,7 +244,7 @@ bool ASServerEngine::IsValidPlayerImpl(void* player) const
     MinimalEntity* pEntity = (MinimalEntity*)player;
     if (pEntity && pEntity->edict_ptr) {
         int index = g_engfuncs.pfnIndexOfEdict(pEntity->edict_ptr);
-        return (index > 0 && index <= gpGlobals->maxClients);
+        return (index > 0 && (unsigned int)index <= gpGlobals->maxClients);
     }
     return false;
 }
@@ -317,7 +317,7 @@ void* ASServerEngine::GetEdict(void* entity) const
 int ASServerEngine::GetPlayerCountImpl() const
 {
     int count = 0;
-    for (int i = 1; i <= gpGlobals->maxClients; i++)
+    for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
     {
         CBasePlayer* pPlayer = static_cast<CBasePlayer*>(UTIL_PlayerByIndex(i));
         if (pPlayer && IsValidPlayerImpl(pPlayer))
@@ -546,7 +546,7 @@ void* ASServerEngine::FindPlayerBySteamID(const std::string& steamID) const
 {
     if (steamID.empty()) return nullptr;
     
-    for (int i = 1; i <= gpGlobals->maxClients; i++)
+    for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
     {
         CBasePlayer* pPlayer = static_cast<CBasePlayer*>(UTIL_PlayerByIndex(i));
         if (!pPlayer || !IsValidPlayerImpl(pPlayer)) continue;
@@ -567,7 +567,7 @@ void* ASServerEngine::FindPlayerByName(const std::string& playerName) const
 {
     if (playerName.empty()) return nullptr;
     
-    for (int i = 1; i <= gpGlobals->maxClients; i++)
+    for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
     {
         CBasePlayer* pPlayer = static_cast<CBasePlayer*>(UTIL_PlayerByIndex(i));
         if (!pPlayer || !IsValidPlayerImpl(pPlayer)) continue;
diff --git a/src/game/server/client.cpp b/src/game/server/client.cpp
index b35faa01..8aff1767 100644
--- a/src/game/server/client.cpp
+++ b/src/game/server/client.cpp
@@ -186,7 +186,8 @@ void ClientDisconnect(edict_t *pEntity)
 		
 		// Try to get Steam ID from client info
 		int iPlayerIndex = ENTINDEX(pEntity) - 1;
-		if (iPlayerIndex >= 0 && iPlayerIndex < gpGlobals->maxClients)
+
+		if (iPlayerIndex >= 0 && (unsigned int)iPlayerIndex < gpGlobals->maxClients)
 		{
 			clientaddr_t &ClientInfo = g_NewClients[iPlayerIndex];
 			if (ClientInfo.Addr[0])
@@ -624,7 +625,7 @@ void ClientCommand2(edict_t *pEntity)
 				ALERT(at_console, "[AS_RELOAD_SCRIPTS] Script hot-reload completed successfully\n");
 				
 				// Send notification to all players
-				for (int i = 1; i <= gpGlobals->maxClients; i++)
+				for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
 				{
 					CBasePlayer* pOtherPlayer = (CBasePlayer*)UTIL_PlayerByIndex(i);
 					if (pOtherPlayer && pOtherPlayer != pPlayer && pOtherPlayer->m_Initialized)
@@ -754,7 +755,7 @@ void ClientCommand2(edict_t *pEntity)
 
 					//Validate default weapon spawn
 					bool validItem = false;
-					for (int i = 0; i < MSGlobals::DefaultWeapons.size(); i++)
+					for (unsigned int i = 0; i < MSGlobals::DefaultWeapons.size(); i++)
 					{
 						if (MSGlobals::DefaultWeapons[i] == NewChar.Weapon)
 						{
@@ -968,7 +969,7 @@ void ClientCommand2(edict_t *pEntity)
 						for (unsigned int ID = 0; ID < SHRT_MAX; ID++)
 						{
 							bool Duplicate = false;
-							for (int i = 0; i < pStorage->Items.size(); i++)
+							for (unsigned int i = 0; i < pStorage->Items.size(); i++)
 								if (pStorage->Items[i].ID == ID)
 								{
 									Duplicate = true;
@@ -1385,7 +1386,7 @@ void ClientCommand2(edict_t *pEntity)
 		else if (FStrEq(CMD_ARGV(1), "open"))
 		{
 			//Thothie MAR2011_18 - moved item stacker here to prevent overflow
-			for (int i = 0; i < pPlayer->Gear.size(); i++)
+			for (unsigned int i = 0; i < pPlayer->Gear.size(); i++)
 			{
 				CGenericItem *pItem = pPlayer->Gear[i];
 				if (pItem)
@@ -1473,7 +1474,7 @@ void ClientCommand2(edict_t *pEntity)
 	else if (FStrEq(pcmd, "entcount"))
 	{
 		int e = 0;
-		for (int i = 0; i < gpGlobals->maxEntities; i++)
+		for (unsigned int i = 0; i < gpGlobals->maxEntities; i++)
 		{
 			edict_t *pEdict = g_engfuncs.pfnPEntityOfEntIndex(i);
 			if (!pEdict)
@@ -2535,7 +2536,7 @@ int AddToFullPack(struct entity_state_s *state, int e, edict_t *ent, edict_t *ho
 	state->owner = 0;
 	if (ent->v.owner)
 	{
-		int owner = ENTINDEX(ent->v.owner);
+		unsigned int owner = ENTINDEX(ent->v.owner);
 
 		// Only care if owned by a player or using special follow
 		if ((owner >= 1 && owner <= gpGlobals->maxClients))
diff --git a/src/game/server/effects/mseffects.cpp b/src/game/server/effects/mseffects.cpp
index a0432398..289f0b9d 100644
--- a/src/game/server/effects/mseffects.cpp
+++ b/src/game/server/effects/mseffects.cpp
@@ -114,7 +114,7 @@ void CTorchLight ::Create(float flDuration, edict_t *peOwner)
 }
 void CTorchLight ::Spawn()
 {
-	for (int i = 0; i < TORCH_LIGHTS; i++)
+	for (unsigned int i = 0; i < TORCH_LIGHTS; i++)
 	{
 		pLight[i] = GetClassPtr((CBaseEntity *)NULL);
 		SET_MODEL(pLight[i]->edict(), "models/null.mdl");
@@ -144,13 +144,13 @@ void CTorchLight ::Think()
 
 	if (FBitSet(pTorchTouse->pev->effects, EF_NODRAW) ||
 		pTorchTouse->pev->waterlevel > 2)
-		for (int i = 0; i < TORCH_LIGHTS; i++)
+		for (unsigned int i = 0; i < TORCH_LIGHTS; i++)
 			SetBits(pLight[i]->pev->effects, EF_NODRAW);
 	else
-		for (int i = 0; i < TORCH_LIGHTS; i++)
+		for (unsigned int i = 0; i < TORCH_LIGHTS; i++)
 			ClearBits(pLight[i]->pev->effects, EF_NODRAW);
 
-	for (int i = 0; i < TORCH_LIGHTS; i++)
+	for (unsigned int i = 0; i < TORCH_LIGHTS; i++)
 	{
 		if (pLight[i])
 		{
@@ -166,7 +166,7 @@ void CTorchLight ::Think()
 }
 void CTorchLight ::SUB_Remove()
 {
-	for (int i = 0; i < TORCH_LIGHTS; i++)
+	for (unsigned int i = 0; i < TORCH_LIGHTS; i++)
 		pLight[i]->SUB_Remove();
 	CBaseEntity ::SUB_Remove();
 }
@@ -231,7 +231,7 @@ void CChangePlayerSpeed ::Spawn(void)
 void CChangePlayerSpeed ::Think(void)
 {
 
-	for (int i = 0; i < 256; i++)
+	for (unsigned int i = 0; i < 256; i++)
 	{
 		playerinfo_t *pInfo = &m_PlayerInfo[i];
 		if (!pInfo->pePlayer)
@@ -267,7 +267,7 @@ void CChangePlayerSpeed ::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE
 		return;
 
 	playerinfo_t *pInfo = NULL;
-	for (int i = 0; i < 256; i++)
+	for (unsigned int i = 0; i < 256; i++)
 	{
 		if (!m_PlayerInfo[i].pePlayer)
 		{
@@ -398,7 +398,7 @@ class CMSChangeLevel : public CBaseEntity
 	string_t sDestMap, sDestTrans;
 	void Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value)
 	{
-		for (int i = 1; i <= gpGlobals->maxClients; i++)
+		for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
 		{
 			CBasePlayer *pPlayer = (CBasePlayer *)UTIL_PlayerByIndex(i);
 			if (!pPlayer)
diff --git a/src/game/server/enginecallback.h b/src/game/server/enginecallback.h
index 24aaf5a7..b070b102 100644
--- a/src/game/server/enginecallback.h
+++ b/src/game/server/enginecallback.h
@@ -163,7 +163,7 @@ inline void WRITE_STRING(const char* sz)
 #define WRITE_STRING_MAX 180 // Upper limit for a usermessage is around 192 bytes, keep this in mind!
 extern char g_pTempStringLimit[WRITE_STRING_MAX];
 // Use this to ensure that we only write this many bytes, ensure null terminated string, prevent overflows.
-#define WRITE_STRING_LIMIT(src, len) memset(g_pTempStringLimit, 0, WRITE_STRING_MAX); strncpy(g_pTempStringLimit, src, WRITE_STRING_MAX); g_pTempStringLimit[V_min(WRITE_STRING_MAX-1, len)] = 0; WRITE_STRING(g_pTempStringLimit)
+#define WRITE_STRING_LIMIT(src, len) memset(g_pTempStringLimit, 0, WRITE_STRING_MAX); strncpy(g_pTempStringLimit, src, WRITE_STRING_MAX); g_pTempStringLimit[V_min((unsigned int)WRITE_STRING_MAX-1, (unsigned int)len)] = 0; WRITE_STRING(g_pTempStringLimit)
 #endif
 
 #define CVAR_REGISTER (*g_engfuncs.pfnCVarRegister)
diff --git a/src/game/server/fn/FNSharedDefs.cpp b/src/game/server/fn/FNSharedDefs.cpp
index bb94b51f..084900c6 100644
--- a/src/game/server/fn/FNSharedDefs.cpp
+++ b/src/game/server/fn/FNSharedDefs.cpp
@@ -150,7 +150,7 @@ void FNShared::LoadCharacter(CBasePlayer* pPlayer)
 	if ((pPlayer == NULL) || (pPlayer->steamID64 == 0ULL))
 		return;
 
-	for (int i = 0; i < MAX_CHARSLOTS; i++)
+	for (unsigned int i = 0; i < MAX_CHARSLOTS; i++)
 	{
 		if (pPlayer->m_CharInfo[i].Status == CDS_LOADING)
 			continue;
diff --git a/src/game/server/func_break.cpp b/src/game/server/func_break.cpp
index 7acac0ee..2b2a5b70 100644
--- a/src/game/server/func_break.cpp
+++ b/src/game/server/func_break.cpp
@@ -597,7 +597,7 @@ int CBreakable ::TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, flo
 
 						if (Tokens.size() > 1)
 						{
-							for (int i = 0; i < Tokens.size(); i++)
+							for (unsigned int i = 0; i < Tokens.size(); i++)
 							{
 								if (i > 0)
 									Params.add(Tokens[i].c_str());
@@ -623,7 +623,7 @@ int CBreakable ::TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, flo
 						Params.clearitems();
 						if (Tokens.size() > 1)
 						{
-							for (int i = 0; i < Tokens.size(); i++)
+							for (unsigned int i = 0; i < Tokens.size(); i++)
 							{
 								if (i > 0)
 									Params.add(Tokens[i].c_str());
@@ -802,10 +802,10 @@ void CBreakable::Die(void)
 
 	// BUGBUG -- can only find 256 entities on a breakable -- should be enough
 	CBaseEntity *pList[256];
-	int count = UTIL_EntitiesInBox(pList, 256, mins, maxs, FL_ONGROUND);
+	unsigned int count = UTIL_EntitiesInBox(pList, 256, mins, maxs, FL_ONGROUND);
 	if (count)
 	{
-		for (int i = 0; i < count; i++)
+		for (unsigned int i = 0; i < count; i++)
 		{
 			ClearBits(pList[i]->pev->flags, FL_ONGROUND);
 			pList[i]->pev->groundentity = NULL;
@@ -915,7 +915,7 @@ void CPushable ::Spawn(void)
 
 void CPushable ::Precache(void)
 {
-	for (int i = 0; i < 3; i++)
+	for (unsigned int i = 0; i < 3; i++)
 		PRECACHE_SOUND(m_soundNames[i]);
 
 	if (pev->spawnflags & SF_PUSH_BREAKABLE)
diff --git a/src/game/server/gamerules/multiplay_gamerules.cpp b/src/game/server/gamerules/multiplay_gamerules.cpp
index 677f3eca..3bbb95a6 100644
--- a/src/game/server/gamerules/multiplay_gamerules.cpp
+++ b/src/game/server/gamerules/multiplay_gamerules.cpp
@@ -136,7 +136,7 @@ CHalfLifeMultiplay::CHalfLifeMultiplay()
 	SERVER_EXECUTE( );
 	m_CurrentVote.fActive = false;
 
-	for (int i = 0; i < CLPERMENT_TOTAL; i++) 
+	for (unsigned int i = 0; i < CLPERMENT_TOTAL; i++) 
 	{
 		CBaseEntity *pInvEntity = GetClassPtr( (CBaseEntity *)NULL );
 		SetBits( pInvEntity->pev->flags, FL_DORMANT );
@@ -238,7 +238,7 @@ void CHalfLifeMultiplay::Think( void )
 
 bool CHalfLifeMultiplay::IsAnyPlayerAllowedInMap()
 {
-	for (int i = 1; i <= gpGlobals->maxClients; i++)
+	for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
 	{
 		CBasePlayer* pPlayer = (CBasePlayer*)UTIL_PlayerByIndex(i);
 		if (!pPlayer) continue;
@@ -364,7 +364,7 @@ void CHalfLifeMultiplay::InitHUD( CBasePlayer *pPlayer )
 	//Notify all the entities with scripts
 	CBaseEntity *pEntity = NULL;
 	edict_t		*pEdict = NULL;
-	for( int i = 1; i < gpGlobals->maxEntities; i++ )
+	for( unsigned int i = 1; i < gpGlobals->maxEntities; i++ )
 	{
 		pEdict = g_engfuncs.pfnPEntityOfEntIndex( i );
 
@@ -394,7 +394,7 @@ void CHalfLifeMultiplay::InitHUD( CBasePlayer *pPlayer )
 	//SendMOTDToClient( pl->edict() );
 
 	// loop through all active players and send their score info to the new client
-	for ( int i = 1; i <= gpGlobals->maxClients; i++ )
+	for (unsigned int i = 1; i <= gpGlobals->maxClients; i++ )
 	{
 		CBasePlayer *pOtherPlayer = (CBasePlayer *)UTIL_PlayerByIndex( i );
 		if( !pOtherPlayer ) continue;
@@ -783,7 +783,7 @@ float CHalfLifeMultiplay::FlWeaponTryRespawn( CBasePlayerItem *pWeapon )
 {
 	if ( pWeapon && pWeapon->m_iId && (pWeapon->iFlags() & ITEM_FLAG_LIMITINWORLD) )
 	{
-		if ( NUMBER_OF_ENTITIES() < (gpGlobals->maxEntities - ENTITY_INTOLERANCE) )
+		if ( (unsigned int)NUMBER_OF_ENTITIES() < (gpGlobals->maxEntities - ENTITY_INTOLERANCE) )
 			return 0;
 
 		// we're past the entity tolerance level,  so delay the respawn
@@ -1018,7 +1018,7 @@ typedef struct mapcycle_item_s
 	struct mapcycle_item_s *next;
 
 	char mapname[ 32 ];
-	int  minplayers, maxplayers;
+	unsigned int minplayers, maxplayers;
 	char rulebuffer[ MAX_RULE_BUFFER ];
 } mapcycle_item_t;
 
@@ -1214,6 +1214,7 @@ int ReloadMapCycleFile( char *filename, mapcycle_t *cycle )
 
 				item->minplayers = 0;
 				item->maxplayers = 0;
+				unsigned int Minimum = 0;
 
 				memset( item->rulebuffer, 0, MAX_RULE_BUFFER );
 
@@ -1223,14 +1224,14 @@ int ReloadMapCycleFile( char *filename, mapcycle_t *cycle )
 					if ( s && s[0] )
 					{
 						item->minplayers = atoi( s );
-						item->minplayers = V_max( item->minplayers, 0 );
+						item->minplayers = V_max( item->minplayers, Minimum);
 						item->minplayers = V_min( item->minplayers, gpGlobals->maxClients );
 					}
 					s = g_engfuncs.pfnInfoKeyValue( szBuffer, "maxplayers" );
 					if ( s && s[0] )
 					{
 						item->maxplayers = atoi( s );
-						item->maxplayers = V_max( item->maxplayers, 0 );
+						item->maxplayers = V_max( item->maxplayers, Minimum);
 						item->maxplayers = V_min( item->maxplayers, gpGlobals->maxClients );
 					}
 
@@ -1336,7 +1337,7 @@ bool CheckBanned(const char* SteamID )
 {
 	if( g_BanList.size() <= 0 ) return false;
 
-	 for (int b = 0; b < g_BanList.size(); b++) 
+	 for (unsigned int b = 0; b < g_BanList.size(); b++) 
 		if( g_BanList[b] == (const char *)SteamID )
 			return true;
 
@@ -1417,7 +1418,7 @@ void CHalfLifeMultiplay :: ChangeLevel( void )
 	int minplayers = 0, maxplayers = 0;
 	strncpy(szFirstMapInList, "edana", sizeof(szFirstMapInList));  // the absolute default level is edana
 
-	int	curplayers;
+	unsigned int curplayers;
 	BOOL do_cycle = TRUE;
 
 	// find the map to change to
@@ -1697,7 +1698,7 @@ BOOL CHalfLifeMultiplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd
 			pPlayer->SendInfoMsg( "You leave the %s party\n", pTeam->TeamName() );
 			int iTeamPlayers = pTeam->MemberList.size();
 			if( iTeamPlayers )
-				 for (int i = 0; i < pTeam->MemberList.size(); i++) 
+				 for (unsigned int i = 0; i < pTeam->MemberList.size(); i++) 
 				{
 					CBasePlayer *pOtherPlayer = pTeam->GetPlayer( i );
 					//Send to all other players, but not myself
@@ -1754,7 +1755,7 @@ BOOL CHalfLifeMultiplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd
 		if( pPlayer->m_pTeam && pPlayer->m_pTeam->GetPlayer( 0 ) == pPlayer )
 		{
 			CBasePlayer *pCheckPlayer = NULL;
-			for( int n = 1; n <= gpGlobals->maxClients; n++ )
+			for(unsigned int n = 1; n <= gpGlobals->maxClients; n++ )
 			{
 				pCheckPlayer = (CBasePlayer *)UTIL_PlayerByIndex( n );
 				if( pCheckPlayer && pCheckPlayer->m_pJoinTeam == pPlayer->m_pTeam ) 
@@ -1771,7 +1772,7 @@ BOOL CHalfLifeMultiplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd
 
 				msstring JoinMsg = msstring(pCheckPlayer->DisplayName()) + " joins your party";
 				pTeam->ValidateUnits( );
-				 for (int i = 0; i < pTeam->MemberList.size(); i++) 
+				 for (unsigned int i = 0; i < pTeam->MemberList.size(); i++) 
 				{
 					CBasePlayer *pOtherPlayer = pTeam->GetPlayer( i );
 					//if( pOtherPlayer ) pOtherPlayer->SendInfoMsg( "%s joins your party\n", STRING(pCheckPlayer->DisplayName) );
@@ -1840,7 +1841,7 @@ BOOL CHalfLifeMultiplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd
 				ALERT(at_console, "as_reload_scripts: Script hot-reload completed successfully\n");
 				
 				// Send notification to all players
-				for( int i = 1; i <= gpGlobals->maxClients; i++ )
+				for(unsigned int i = 1; i <= gpGlobals->maxClients; i++ )
 				{
 					CBasePlayer* pOtherPlayer = (CBasePlayer*)UTIL_PlayerByIndex( i );
 					if( pOtherPlayer && pOtherPlayer != pPlayer )
@@ -2164,7 +2165,7 @@ void CHalfLifeMultiplay::ClientUserInfoChanged( CBasePlayer *pPlayer, const char
 void CHalfLifeMultiplay::EndMultiplayerGame( void )
 {
 	//Delete all the teams
-	 for (int i = 0; i < CTeam::Teams.size(); i++) 
+	 for (unsigned int i = 0; i < CTeam::Teams.size(); i++) 
 		delete CTeam::Teams[0];
 	CTeam::Teams.clear();
 	
@@ -2272,7 +2273,7 @@ void CHalfLifeMultiplay	:: UpdateVote( )
 	
 	//Count SPAWNED players (Connecting players don't count)
 	int	iTotalPlayers = 0;
-	for ( int i = 1; i <= gpGlobals->maxClients; i++ )
+	for (unsigned int i = 1; i <= gpGlobals->maxClients; i++ )
 	{
 		CBasePlayer *pPlayer = (CBasePlayer *)UTIL_PlayerByIndex( i );
 		if( pPlayer && pPlayer->m_fGameHUDInitialized )
@@ -2285,7 +2286,7 @@ void CHalfLifeMultiplay	:: UpdateVote( )
 
 	//Count votes
 	int iYesVotes = 0;
-	for(int i = 0; i < gpGlobals->maxClients; i++ )
+	for(unsigned int i = 0; i < gpGlobals->maxClients; i++ )
 	{
 		if( FBitSet( m_CurrentVote.VoteTally,(1<<i) ) )
 			iYesVotes++;
diff --git a/src/game/server/gamerules/team.cpp b/src/game/server/gamerules/team.cpp
index cbf25b27..a96f1f67 100644
--- a/src/game/server/gamerules/team.cpp
+++ b/src/game/server/gamerules/team.cpp
@@ -33,7 +33,7 @@ CTeam *CTeam::GetTeam(const char *pszName)
 {
 	if (!pszName || !pszName[0])
 		return NULL;
-	for (int i = 0; i < Teams.size(); i++)
+	for (unsigned int i = 0; i < Teams.size(); i++)
 		if (FStrEq(Teams[i]->TeamName(), pszName))
 			return Teams[i];
 
@@ -41,7 +41,7 @@ CTeam *CTeam::GetTeam(const char *pszName)
 }
 CTeam *CTeam::GetTeam(ulong ID)
 {
-	for (int i = 0; i < Teams.size(); i++)
+	for (unsigned int i = 0; i < Teams.size(); i++)
 		if (Teams[i]->m_ID == ID)
 			return Teams[i];
 
@@ -50,7 +50,7 @@ CTeam *CTeam::GetTeam(ulong ID)
 
 void CTeam ::ValidateUnits()
 {
-	for (int i = 0; i < MemberList.size(); i++)
+	for (unsigned int i = 0; i < MemberList.size(); i++)
 	{
 		teamunit_t &Unit = MemberList[i];
 		if ((ulong)UTIL_PlayerByIndex(Unit.idx) != Unit.ID)
@@ -84,7 +84,7 @@ void CTeam ::AddToTeam(CBasePlayer *pPlayer)
 	MemberList.add(Unit);
 
 	//Update everyone
-	for (int n = 1; n <= gpGlobals->maxClients; n++)
+	for (unsigned int n = 1; n <= gpGlobals->maxClients; n++)
 	{
 		CBasePlayer *pSendPlayer = (CBasePlayer *)UTIL_PlayerByIndex(n);
 		if (!pSendPlayer)
@@ -98,7 +98,7 @@ void CTeam ::RemoveFromTeam(CBasePlayer *pPlayer)
 	if (!pPlayer || !ExistsInList(pPlayer))
 		return;
 
-	for (int i = 0; i < MemberList.size(); i++)
+	for (unsigned int i = 0; i < MemberList.size(); i++)
 		if (GetPlayer(i) == pPlayer)
 		{
 			MemberList.erase(i);
@@ -106,7 +106,7 @@ void CTeam ::RemoveFromTeam(CBasePlayer *pPlayer)
 		}
 
 	//Update everyone
-	for (int n = 1; n <= gpGlobals->maxClients; n++)
+	for (unsigned int n = 1; n <= gpGlobals->maxClients; n++)
 	{
 		CBasePlayer *pSendPlayer = (CBasePlayer *)UTIL_PlayerByIndex(n);
 		if (!pSendPlayer)
@@ -123,7 +123,7 @@ BOOL CTeam ::ExistsInList(CBasePlayer *pPlayer)
 	if (!pPlayer)
 		return FALSE;
 	ValidateUnits();
-	for (int i = 0; i < MemberList.size(); i++)
+	for (unsigned int i = 0; i < MemberList.size(); i++)
 		if (MemberList[i].idx == pPlayer->entindex() && MemberList[i].ID == (ulong)pPlayer)
 			return TRUE;
 	return FALSE;
@@ -131,7 +131,7 @@ BOOL CTeam ::ExistsInList(CBasePlayer *pPlayer)
 CTeam::~CTeam()
 {
 	ValidateUnits();
-	for (int i = 0; i < MemberList.size(); i++)
+	for (unsigned int i = 0; i < MemberList.size(); i++)
 	{
 		CBasePlayer *pPlayer = (CBasePlayer *)UTIL_PlayerByIndex(MemberList[i].idx);
 		if (!pPlayer || (ulong)pPlayer != MemberList[i].ID)
diff --git a/src/game/server/ggrenade.cpp b/src/game/server/ggrenade.cpp
index 25f0e7cf..2d30d306 100644
--- a/src/game/server/ggrenade.cpp
+++ b/src/game/server/ggrenade.cpp
@@ -121,8 +121,8 @@ void CGrenade::Explode(TraceResult *pTrace, int bitsDamageType)
 
 	if (iContents != CONTENTS_WATER)
 	{
-		int sparkCount = RANDOM_LONG(0, 3);
-		for (int i = 0; i < sparkCount; i++)
+		unsigned int sparkCount = RANDOM_LONG(0, 3);
+		for (unsigned int i = 0; i < sparkCount; i++)
 			Create("spark_shower", pev->origin, pTrace->vecPlaneNormal, NULL);
 	}
 }
diff --git a/src/game/server/hl/animating.cpp b/src/game/server/hl/animating.cpp
index c801872c..4b904cfa 100644
--- a/src/game/server/hl/animating.cpp
+++ b/src/game/server/hl/animating.cpp
@@ -279,7 +279,7 @@ void CBaseAnimating ::SetSequenceBox(void)
 		Vector rmax(-9999, -9999, -9999);
 		Vector base, transformed;
 
-		for (int i = 0; i <= 1; i++)
+		for (unsigned int i = 0; i <= 1; i++)
 		{
 			base.x = bounds[i].x;
 			for (int j = 0; j <= 1; j++)
diff --git a/src/game/server/hl/animation.cpp b/src/game/server/hl/animation.cpp
index ab8ce426..36db1bad 100644
--- a/src/game/server/hl/animation.cpp
+++ b/src/game/server/hl/animation.cpp
@@ -92,7 +92,7 @@ int LookupActivity(void *pmodel, entvars_t *pev, int activity)
 
 	int weighttotal = 0;
 	int seq = ACTIVITY_NOT_AVAILABLE;
-	for (int i = 0; i < pstudiohdr->numseq; i++)
+	for (unsigned int i = 0; i < pstudiohdr->numseq; i++)
 	{
 		if (pseqdesc[i].activity == activity)
 		{
@@ -119,7 +119,7 @@ int LookupActivityHeaviest(void *pmodel, entvars_t *pev, int activity)
 
 	int weight = 0;
 	int seq = ACTIVITY_NOT_AVAILABLE;
-	for (int i = 0; i < pstudiohdr->numseq; i++)
+	for (unsigned int i = 0; i < pstudiohdr->numseq; i++)
 	{
 		if (pseqdesc[i].activity == activity)
 		{
@@ -162,7 +162,7 @@ int LookupSequence(void* pmodel, const char* label)
 
 	pseqdesc = (mstudioseqdesc_t*)((byte*)pstudiohdr + pstudiohdr->seqindex);
 
-	for (int i = 0; i < pstudiohdr->numseq; i++)
+	for (unsigned int i = 0; i < pstudiohdr->numseq; i++)
 	{
 		if (_stricmp(pseqdesc[i].label, label) == 0)
 			return i;
@@ -202,7 +202,7 @@ int IsSoundEvent(int eventNumber)
 
 void SequencePrecache(void *pmodel, const char *pSequenceName)
 {
-	int index = LookupSequence(pmodel, pSequenceName);
+	unsigned int index = LookupSequence(pmodel, pSequenceName);
 	if (index >= 0)
 	{
 		studiohdr_t *pstudiohdr;
@@ -217,7 +217,7 @@ void SequencePrecache(void *pmodel, const char *pSequenceName)
 		pseqdesc = (mstudioseqdesc_t *)((byte *)pstudiohdr + pstudiohdr->seqindex) + index;
 		pevent = (mstudioevent_t *)((byte *)pstudiohdr + pseqdesc->eventindex);
 
-		for (int i = 0; i < pseqdesc->numevents; i++)
+		for (unsigned int i = 0; i < pseqdesc->numevents; i++)
 		{
 			// Don't send client-side events to the server AI
 			if (pevent[i].event >= EVENT_CLIENT)
@@ -287,7 +287,7 @@ int GetSequenceFlags(void *pmodel, entvars_t *pev)
 	return pseqdesc->flags;
 }
 
-int GetAnimationEvent(void* pmodel, entvars_t* pev, MonsterEvent_t* pMonsterEvent, float flStart, float flEnd, int index)
+int GetAnimationEvent(void* pmodel, entvars_t* pev, MonsterEvent_t* pMonsterEvent, float flStart, float flEnd, unsigned int index)
 {
 	studiohdr_t* pstudiohdr;
 
@@ -317,7 +317,7 @@ int GetAnimationEvent(void* pmodel, entvars_t* pev, MonsterEvent_t* pMonsterEven
 		flEnd = 1.0;
 	}
 
-	for (; index < pseqdesc->numevents; index++)
+	for (index; index < pseqdesc->numevents; index++)
 	{
 		// Don't send client-side events to the server AI
 		if (pevent[index].event >= EVENT_CLIENT)
@@ -477,7 +477,7 @@ int FindTransition(void *pmodel, int iEndingAnim, int iGoalAnim, int *piDir)
 	if (iInternNode == 0)
 		return iGoalAnim;
 
-	int i;
+	unsigned int i;
 
 	// look for someone going
 	for (i = 0; i < pstudiohdr->numseq; i++)
diff --git a/src/game/server/hl/animation.h b/src/game/server/hl/animation.h
index 21a64bc9..591cff15 100644
--- a/src/game/server/hl/animation.h
+++ b/src/game/server/hl/animation.h
@@ -38,7 +38,7 @@ int FindTransition(void *pmodel, int iEndingAnim, int iGoalAnim, int *piDir);
 void SetBodygroup(void *pmodel, entvars_t *pev, int iGroup, int iValue);
 int GetBodygroup(void *pmodel, entvars_t *pev, int iGroup);
 
-int GetAnimationEvent(void *pmodel, entvars_t *pev, MonsterEvent_t *pMonsterEvent, float flStart, float flEnd, int index);
+int GetAnimationEvent(void *pmodel, entvars_t *pev, MonsterEvent_t *pMonsterEvent, float flStart, float flEnd, unsigned int index);
 int ExtractBbox(void *pmodel, int sequence, float *mins, float *maxs);
 
 // From /engine/studio.h
diff --git a/src/game/server/hl/explode.cpp b/src/game/server/hl/explode.cpp
index 667285e9..a7195bfb 100644
--- a/src/game/server/hl/explode.cpp
+++ b/src/game/server/hl/explode.cpp
@@ -232,9 +232,9 @@ void CEnvExplosion::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE
 	// draw sparks
 	if (!(pev->spawnflags & SF_ENVEXPLOSION_NOSPARKS))
 	{
-		int sparkCount = RANDOM_LONG(0, 3);
+		unsigned int sparkCount = RANDOM_LONG(0, 3);
 
-		for (int i = 0; i < sparkCount; i++)
+		for (unsigned int i = 0; i < sparkCount; i++)
 		{
 			Create("spark_shower", pev->origin, tr.vecPlaneNormal, NULL);
 		}
diff --git a/src/game/server/hl/monsters.cpp b/src/game/server/hl/monsters.cpp
index c470bdb0..a6034588 100644
--- a/src/game/server/hl/monsters.cpp
+++ b/src/game/server/hl/monsters.cpp
@@ -321,8 +321,8 @@ void CBaseMonster ::Look(int iDistance)
 
 		// Find only monsters/clients in box, NOT limited to PVS
 		//dbg("Entities in box");
-		int count = UTIL_EntitiesInBox(pList, 100, pev->origin - delta, pev->origin + delta, FL_CLIENT | FL_MONSTER);
-		for (int i = 0; i < count; i++)
+		unsigned int count = UTIL_EntitiesInBox(pList, 100, pev->origin - delta, pev->origin + delta, FL_CLIENT | FL_MONSTER);
+		for (unsigned int i = 0; i < count; i++)
 		{
 			//dbg("Assign ent Pre");
 			if (!pList[i])
@@ -2230,7 +2230,7 @@ int CBaseMonster::IRelationship(CBaseEntity *pTarget)
 
 BOOL CBaseMonster ::FindCover(Vector vecThreat, Vector vecViewOffset, float flMinDist, float flMaxDist)
 {
-	int i;
+	unsigned int i;
 	int iMyHullIndex;
 	int iMyNode;
 	int iThreatNode;
@@ -2335,7 +2335,7 @@ BOOL CBaseMonster ::FindCover(Vector vecThreat, Vector vecViewOffset, float flMi
 //=========================================================
 BOOL CBaseMonster ::BuildNearestRoute(Vector vecThreat, Vector vecViewOffset, float flMinDist, float flMaxDist)
 {
-	int i;
+	unsigned int i;
 	int iMyHullIndex;
 	int iMyNode;
 	float flDist;
@@ -2822,7 +2822,7 @@ BOOL CBaseMonster ::FGetNodeRoute(Vector vecDest)
 //=========================================================
 int CBaseMonster ::FindHintNode(void)
 {
-	int i;
+	unsigned int i;
 	TraceResult tr;
 
 	if (!WorldGraph.m_fGraphPresent)
diff --git a/src/game/server/hl/nodes.cpp b/src/game/server/hl/nodes.cpp
index 8c4eb71f..91becd8a 100644
--- a/src/game/server/hl/nodes.cpp
+++ b/src/game/server/hl/nodes.cpp
@@ -507,15 +507,15 @@ float CGraph::PathLength(int iStart, int iDest, int iHull, int afCapMask)
 // Parse the routing table at iCurrentNode for the next node on the shortest path to iDest
 int CGraph::NextNodeInRoute(int iCurrentNode, int iDest, int iHull, int iCap)
 {
-	int iNext = iCurrentNode;
-	int nCount = iDest + 1;
+	unsigned int iNext = iCurrentNode;
+	unsigned int nCount = iDest + 1;
 	char *pRoute = m_pRouteInfo + m_pNodes[iCurrentNode].m_pNextBestNode[iHull][iCap];
 
 	// Until we decode the next best node
 	//
 	while (nCount > 0)
 	{
-		char ch = *pRoute++;
+		unsigned char ch = *pRoute++;
 		//ALERT(at_aiconsole, "C(%d)", ch);
 		if (ch < 0)
 		{
@@ -540,7 +540,7 @@ int CGraph::NextNodeInRoute(int iCurrentNode, int iDest, int iHull, int iCap)
 
 			// Repeat phrase
 			//
-			if (nCount <= ch + 1)
+			if (nCount <= unsigned char(ch + 1))
 			{
 				iNext = iCurrentNode + *pRoute;
 				if (iNext >= m_cNodes)
@@ -582,7 +582,7 @@ int CGraph ::FindShortestPath(int *piPath, int iStart, int iDest, int iHull, int
 		return FALSE;
 	}
 
-	if (iStart < 0 || iStart > m_cNodes)
+	if (iStart < 0 || (unsigned int)iStart > m_cNodes)
 	{ // The start node is bad?
 		ALERT(at_aiconsole, "Can't build a path, iStart is %d!\n", iStart);
 		return FALSE;
@@ -651,7 +651,7 @@ int CGraph ::FindShortestPath(int *piPath, int iStart, int iDest, int iHull, int
 
 		// Mark all the nodes as unvisited.
 		//
-		int i;
+		unsigned int i;
 		for (i = 0; i < m_cNodes; i++)
 		{
 			m_pNodes[i].m_flClosestSoFar = -1.0;
@@ -892,7 +892,7 @@ int CGraph ::FindNearestNode(const Vector &vecOrigin, int afNodeTypes)
 	m_CheckedCounter++;
 	if (m_CheckedCounter == 0)
 	{
-		for (int i = 0; i < m_cNodes; i++)
+		for (unsigned int i = 0; i < m_cNodes; i++)
 		{
 			m_di[i].m_CheckedEvent = 0;
 		}
@@ -934,7 +934,7 @@ int CGraph ::FindNearestNode(const Vector &vecOrigin, int afNodeTypes)
 	int halfY = (m_minY + m_maxY) / 2;
 	int halfZ = (m_minZ + m_maxZ) / 2;
 
-	int j;
+	unsigned int j;
 
 	for (i = halfX; i >= m_minX; i--)
 	{
@@ -1134,7 +1134,7 @@ void CGraph ::ShowNodeConnections(int iNode)
 	Vector vecSpot;
 	CNode *pNode;
 	CNode *pLinkNode;
-	int i;
+	unsigned int i;
 
 	if (!m_fGraphPresent || !m_fGraphPointersSet)
 	{ // protect us in the case that the node graph isn't available or built
@@ -1190,9 +1190,9 @@ void CGraph ::ShowNodeConnections(int iNode)
 //=========================================================
 int CGraph ::LinkVisibleNodes(CLink *pLinkPool, CFile &file, int *piBadNode)
 {
-	int i, j, z;
+	unsigned int i, j, z;
 	edict_t *pTraceEnt;
-	int cTotalLinks, cLinksThisNode, cMaxInitialLinks;
+	unsigned int cTotalLinks, cLinksThisNode, cMaxInitialLinks;
 	TraceResult tr;
 
 	// !!!BUGBUG - this function returns 0 if there is a problem in the middle of connecting the graph
@@ -1385,7 +1385,7 @@ int CGraph ::LinkVisibleNodes(CLink *pLinkPool, CFile &file, int *piBadNode)
 //=========================================================
 int CGraph ::RejectInlineLinks(CLink *pLinkPool, CFile &file)
 {
-	int i, j, k;
+	unsigned int i, j, k;
 
 	int cRejectedLinks;
 
@@ -1655,11 +1655,11 @@ void CTestHull ::BuildNodeGraph(void)
 	BOOL fSkipRemainingHulls; //if smallest hull can't fit, don't check any others
 	BOOL fPairsValid;		  // are all links in the graph evenly paired?
 
-	int i, j, hull;
+	unsigned int i, j, hull;
 
 	int iBadNode; // this is the node that caused graph generation to fail
 
-	int iPoolIndex = 0;
+	unsigned int iPoolIndex = 0;
 	int cPoolLinks; // number of links in the pool.
 
 	Vector vecDirToCheckNode;
@@ -2435,7 +2435,7 @@ int CGraph ::FLoadGraph(const char *szMapName)
 		return false;
 	}
 	m_CheckedCounter = 0;
-	for (int i = 0; i < m_cNodes; i++)
+	for (unsigned int i = 0; i < m_cNodes; i++)
 	{
 		m_di[i].m_CheckedEvent = 0;
 	}
@@ -2545,7 +2545,7 @@ if (0 == m_fGraphPresent || 0 == m_fGraphPointersSet)
 //=========================================================
 int CGraph ::FSetGraphPointers(void)
 {
-	int i;
+	unsigned int i;
 	edict_t *pentLinkEnt;
 
 	for (i = 0; i < m_cLinks; i++)
@@ -2650,7 +2650,7 @@ void CGraph::HashInsert(int iSrcNode, int iDestNode, int iKey)
 	dwHash = CRC32_FINAL(dwHash);
 
 	int di = m_HashPrimes[dwHash & 15];
-	int i = (dwHash >> 4) % m_nHashLinks;
+	unsigned int i = (dwHash >> 4) % m_nHashLinks;
 	while (m_pHashLinks[i] != ENTRY_STATE_EMPTY)
 	{
 		i += di;
@@ -2672,7 +2672,7 @@ void CGraph::HashSearch(int iSrcNode, int iDestNode, int &iKey)
 	dwHash = CRC32_FINAL(dwHash);
 
 	int di = m_HashPrimes[dwHash & 15];
-	int i = (dwHash >> 4) % m_nHashLinks;
+	unsigned int i = (dwHash >> 4) % m_nHashLinks;
 	while (m_pHashLinks[i] != ENTRY_STATE_EMPTY)
 	{
 		CLink &link = Link(m_pHashLinks[i]);
@@ -2776,7 +2776,7 @@ void CGraph::SortNodes(void)
 	// After assigning new node numbers to everything, we move
 	// things and patchup the links.
 	//
-	int i, iNodeCnt = 0;
+	unsigned int i, iNodeCnt = 0;
 	m_pNodes[0].m_iPreviousNode = iNodeCnt++;
 	for (i = 1; i < m_cNodes; i++)
 	{
@@ -2787,7 +2787,7 @@ void CGraph::SortNodes(void)
 	{
 		// Run through all of this node's neighbors
 		//
-		for (int j = 0; j < m_pNodes[i].m_cNumLinks; j++)
+		for (unsigned int j = 0; j < m_pNodes[i].m_cNumLinks; j++)
 		{
 			int iDestNode = INodeLink(i, j);
 			if (m_pNodes[iDestNode].m_iPreviousNode == UNNUMBERED_NODE)
@@ -2834,7 +2834,7 @@ void CGraph::SortNodes(void)
 
 void CGraph::BuildLinkLookups(void)
 {
-	int i;
+	unsigned int i;
 	m_nHashLinks = 3 * m_cLinks / 2 + 3;
 
 	HashChoosePrimes(m_nHashLinks);
@@ -2885,7 +2885,7 @@ void CGraph::BuildRegionTables(void)
 	// Calculate regions for all the nodes.
 	//
 	//
-	int i;
+	unsigned int i;
 	for (i = 0; i < 3; i++)
 	{
 		m_RegionMin[i] = 999999999.0;  // just a big number out there;
@@ -2916,7 +2916,7 @@ void CGraph::BuildRegionTables(void)
 
 	for (i = 0; i < 3; i++)
 	{
-		int j;
+		unsigned int j;
 		for (j = 0; j < NUM_RANGES; j++)
 		{
 			m_RangeStart[i][j] = 255;
@@ -2947,7 +2947,7 @@ void CGraph::BuildRegionTables(void)
 				break;
 			}
 
-			for (int k = j + 1; k < m_cNodes; k++)
+			for (unsigned int k = j + 1; k < m_cNodes; k++)
 			{
 				int kNode = m_di[k].m_SortedBy[i];
 				int kCodeX = m_pNodes[kNode].m_Region[0];
@@ -3049,10 +3049,10 @@ void CGraph ::ComputeStaticRoutingTables(void)
 
 				// Initialize Routing table to uncalculated.
 				//
-				int iFrom, iTo;
+				unsigned int iFrom, iTo;
 				for (iFrom = 0; iFrom < m_cNodes; iFrom++)
 				{
-					for (int iTo = 0; iTo < m_cNodes; iTo++)
+					for (unsigned int iTo = 0; iTo < m_cNodes; iTo++)
 					{
 						Routes[FROM_TO(iFrom, iTo)] = -1;
 					}
@@ -3109,19 +3109,19 @@ void CGraph ::ComputeStaticRoutingTables(void)
 
 				for (iFrom = 0; iFrom < m_cNodes; iFrom++)
 				{
-					for (int iTo = 0; iTo < m_cNodes; iTo++)
+					for (unsigned int iTo = 0; iTo < m_cNodes; iTo++)
 					{
 						BestNextNodes[iTo] = Routes[FROM_TO(iFrom, iTo)];
 					}
 
 					// Compress this node's routing table.
 					//
-					int iLastNode = 9999999; // just really big.
+					unsigned int iLastNode = 9999999; // just really big.
 					int cSequence = 0;
 					int cRepeats = 0;
 					int CompressedSize = 0;
 					char *p = pRoute;
-					int i;
+					unsigned int i;
 					for (i = 0; i < m_cNodes; i++)
 					{
 						BOOL CanRepeat = ((BestNextNodes[i] == iLastNode) && cRepeats < 127);
@@ -3265,7 +3265,7 @@ void CGraph ::ComputeStaticRoutingTables(void)
 
 					// Go find a place to store this thing and point to it.
 					//
-					int nRoute = p - pRoute;
+					unsigned int nRoute = p - pRoute;
 					if (m_pRouteInfo)
 					{
 						for (i = 0; i < m_nRouteInfo - nRoute; i++)
@@ -3295,6 +3295,7 @@ void CGraph ::ComputeStaticRoutingTables(void)
 					{
 						m_nRouteInfo = nRoute;
 						m_pRouteInfo = (char *)calloc(sizeof(char), nRoute);
+
 						memcpy(m_pRouteInfo, pRoute, nRoute);
 						m_pNodes[iFrom].m_pNextBestNode[iHull][iCap] = 0;
 						nTotalCompressedSize += CompressedSize;
@@ -3331,9 +3332,9 @@ void CGraph ::TestRoutingTables(void)
 	int *pMyPath2 = new int[m_cNodes];
 	if (pMyPath && pMyPath2)
 	{
-		for (int iHull = 0; iHull < MAX_NODE_HULLS; iHull++)
+		for (unsigned int iHull = 0; iHull < MAX_NODE_HULLS; iHull++)
 		{
-			for (int iCap = 0; iCap < 2; iCap++)
+			for (unsigned int iCap = 0; iCap < 2; iCap++)
 			{
 				int iCapMask;
 				switch (iCap)
@@ -3347,14 +3348,14 @@ void CGraph ::TestRoutingTables(void)
 					break;
 				}
 
-				for (int iFrom = 0; iFrom < m_cNodes; iFrom++)
+				for (unsigned int iFrom = 0; iFrom < m_cNodes; iFrom++)
 				{
-					for (int iTo = 0; iTo < m_cNodes; iTo++)
+					for (unsigned int iTo = 0; iTo < m_cNodes; iTo++)
 					{
 						m_fRoutingComplete = FALSE;
-						int cPathSize1 = FindShortestPath(pMyPath, iFrom, iTo, iHull, iCapMask);
+						unsigned int cPathSize1 = FindShortestPath(pMyPath, iFrom, iTo, iHull, iCapMask);
 						m_fRoutingComplete = TRUE;
-						int cPathSize2 = FindShortestPath(pMyPath2, iFrom, iTo, iHull, iCapMask);
+						unsigned int cPathSize2 = FindShortestPath(pMyPath2, iFrom, iTo, iHull, iCapMask);
 
 						// Unless we can look at the entire path, we can verify that it's correct.
 						//
@@ -3365,14 +3366,14 @@ void CGraph ::TestRoutingTables(void)
 							//
 #if 1
 						float flDistance1 = 0.0;
-						int i;
+						unsigned int i;
 						for (i = 0; i < cPathSize1 - 1; i++)
 						{
 							// Find the link from pMyPath[i] to pMyPath[i+1]
 							//
 							if (pMyPath[i] == pMyPath[i + 1])
 								continue;
-							int iVisitNode, iLink;
+							unsigned int iVisitNode, iLink;
 							BOOL bFound = FALSE;
 							for (iLink = 0; iLink < m_pNodes[pMyPath[i]].m_cNumLinks; iLink++)
 							{
@@ -3399,7 +3400,7 @@ void CGraph ::TestRoutingTables(void)
 								continue;
 							int iVisitNode;
 							BOOL bFound = FALSE;
-							for (int iLink = 0; iLink < m_pNodes[pMyPath2[i]].m_cNumLinks; iLink++)
+							for (unsigned int iLink = 0; iLink < m_pNodes[pMyPath2[i]].m_cNumLinks; iLink++)
 							{
 								iVisitNode = INodeLink(pMyPath2[i], iLink);
 								if (iVisitNode == pMyPath2[i + 1])
@@ -3466,7 +3467,7 @@ class CNodeViewer : public CBaseEntity
 
 	int m_iBaseNode;
 	int m_iDraw;
-	int m_nVisited;
+	unsigned int m_nVisited;
 	int m_aFrom[128];
 	int m_aTo[128];
 	int m_iHull;
@@ -3524,7 +3525,7 @@ void CNodeViewer::Spawn()
 
 	if (WorldGraph.m_cNodes < 128)
 	{
-		for (int i = 0; i < WorldGraph.m_cNodes; i++)
+		for (unsigned int i = 0; i < WorldGraph.m_cNodes; i++)
 		{
 			AddNode(i, WorldGraph.NextNodeInRoute(i, m_iBaseNode, m_iHull, 0));
 		}
@@ -3558,7 +3559,7 @@ void CNodeViewer::Spawn()
 void CNodeViewer ::FindNodeConnections(int iNode)
 {
 	AddNode(iNode, WorldGraph.NextNodeInRoute(iNode, m_iBaseNode, m_iHull, 0));
-	for (int i = 0; i < WorldGraph.m_pNodes[iNode].m_cNumLinks; i++)
+	for (unsigned int i = 0; i < WorldGraph.m_pNodes[iNode].m_cNumLinks; i++)
 	{
 		CLink *pToLink = &WorldGraph.NodeLink(iNode, i);
 		AddNode(pToLink->m_iDestNode, WorldGraph.NextNodeInRoute(pToLink->m_iDestNode, m_iBaseNode, m_iHull, 0));
@@ -3576,7 +3577,7 @@ void CNodeViewer::AddNode(int iFrom, int iTo)
 		if (iFrom == iTo)
 			return;
 
-		for (int i = 0; i < m_nVisited; i++)
+		for (unsigned int i = 0; i < m_nVisited; i++)
 		{
 			if (m_aFrom[i] == iFrom && m_aTo[i] == iTo)
 				return;
@@ -3593,7 +3594,7 @@ void CNodeViewer ::DrawThink(void)
 {
 	/*pev->nextthink = gpGlobals->time;
 
-	for (int i = 0; i < 10; i++)
+	for (unsigned int i = 0; i < 10; i++)
 	{
 		if (m_iDraw == m_nVisited)
 		{
diff --git a/src/game/server/hl/nodes.h b/src/game/server/hl/nodes.h
index a6233e60..27738047 100644
--- a/src/game/server/hl/nodes.h
+++ b/src/game/server/hl/nodes.h
@@ -44,8 +44,8 @@ class CNode
 	byte m_Region[3];		// Which of 256 regions do each of the coordinate belong?
 	int m_afNodeInfo;		// bits that tell us more about this location
 
-	int m_cNumLinks;  // how many links this node has
-	int m_iFirstLink; // index of this node's first link in the link pool.
+	unsigned int m_cNumLinks;  // how many links this node has
+	unsigned int m_iFirstLink; // index of this node's first link in the link pool.
 
 	// Where to start looking in the compressed routing table (offset into m_pRouteInfo).
 	// (4 hull sizes -- smallest to largest + fly/swim), and secondly, door capability.
@@ -121,9 +121,9 @@ class CGraph
 	CLink *m_pLinkPool; // big list of all node connections
 	char *m_pRouteInfo; // compressed routing information the nodes use.
 
-	int m_cNodes;	  // total number of nodes
-	int m_cLinks;	  // total number of links
-	int m_nRouteInfo; // size of m_pRouteInfo in bytes.
+	unsigned int m_cNodes;	  // total number of nodes
+	unsigned int m_cLinks;	  // total number of links
+	unsigned int m_nRouteInfo; // size of m_pRouteInfo in bytes.
 
 	// Tables for making nearest node lookup faster. SortedBy provided nodes in a
 	// order of a particular coordinate. Instead of doing a binary search, RangeStart
@@ -137,8 +137,8 @@ class CGraph
 #define CACHE_SIZE 128
 #define NUM_RANGES 256
 	DIST_INFO *m_di; // This is m_cNodes long, but the entries don't correspond to CNode entries.
-	int m_RangeStart[3][NUM_RANGES];
-	int m_RangeEnd[3][NUM_RANGES];
+	unsigned int m_RangeStart[3][NUM_RANGES];
+	unsigned int m_RangeEnd[3][NUM_RANGES];
 	float m_flShortest;
 	int m_iNearest;
 	int m_minX, m_minY, m_minZ, m_maxX, m_maxY, m_maxZ;
@@ -149,12 +149,12 @@ class CGraph
 
 	int m_HashPrimes[16];
 	short *m_pHashLinks;
-	int m_nHashLinks;
+	unsigned int m_nHashLinks;
 
 	// kinda sleazy. In order to allow variety in active idles for monster groups in a room with more than one node,
 	// we keep track of the last node we searched from and store it here. Subsequent searches by other monsters will pick
 	// up where the last search stopped.
-	int m_iLastActiveIdleSearch;
+	unsigned int m_iLastActiveIdleSearch;
 
 	// another such system used to track the search for cover nodes, helps greatly with two monsters trying to get to the same node.
 	int m_iLastCoverSearch;
diff --git a/src/game/server/hl/saverestore.h b/src/game/server/hl/saverestore.h
index 644bb44b..53e61678 100644
--- a/src/game/server/hl/saverestore.h
+++ b/src/game/server/hl/saverestore.h
@@ -65,7 +65,7 @@ class CSave : public CSaveRestoreBuffer
 	int WriteFields(const char *pname, void *pBaseData, TYPEDESCRIPTION *pFields, int fieldCount);
 
 private:
-	int DataEmpty(const char *pdata, int size);
+	int DataEmpty(const char *pdata, unsigned int size);
 	void BufferField(const char *pname, int size, const char *pdata);
 	void BufferString(char *pdata, int len);
 	void BufferData(const char *pdata, int size);
diff --git a/src/game/server/hl/sound.cpp b/src/game/server/hl/sound.cpp
index 5b7ac96e..e5fd1732 100644
--- a/src/game/server/hl/sound.cpp
+++ b/src/game/server/hl/sound.cpp
@@ -1530,7 +1530,7 @@ void EMIT_GROUPNAME_SUIT(edict_t *entity, const char *groupname)
 // on material type.
 #define CTEXTURESMAX 512 // max number of textures loaded
 
-int gcTextures = 0;
+unsigned int gcTextures = 0;
 char grgszTextureName[CTEXTURESMAX][CBTEXTURENAMEMAX]; // texture names
 char grgchTextureType[CTEXTURESMAX];				   // parallel array of texture types
 
@@ -1544,7 +1544,7 @@ char TEXTURETYPE_Find(char *name)
 {
 	// CONSIDER: pre-sort texture names and perform faster binary search here
 
-	for (int i = 0; i < gcTextures; i++)
+	for (unsigned int i = 0; i < gcTextures; i++)
 	{
 		if (!_strnicmp(name, &(grgszTextureName[i][0]), CBTEXTURENAMEMAX - 1))
 			return (grgchTextureType[i]);
diff --git a/src/game/server/hl/soundent.cpp b/src/game/server/hl/soundent.cpp
index 4ec6aa2b..e0b32ce8 100644
--- a/src/game/server/hl/soundent.cpp
+++ b/src/game/server/hl/soundent.cpp
@@ -240,7 +240,7 @@ int CSoundEnt :: InsertSound ( int iType, const Vector &vecOrigin, int iVolume,
 //=========================================================
 void CSoundEnt :: Initialize ( void )
 {
-  	int i;
+  	unsigned int i;
 	int iSound;
 
 	m_cLastActiveSounds;
@@ -286,7 +286,7 @@ void CSoundEnt :: Initialize ( void )
 //=========================================================
 int CSoundEnt :: ISoundsInList ( int iListType )
 {
-	int i;
+	unsigned int i;
 	int iThisSound;
 
 	if ( iListType == SOUNDLISTTYPE_FREE )
diff --git a/src/game/server/hl/subs.cpp b/src/game/server/hl/subs.cpp
index 4e4ba514..c8c1125d 100644
--- a/src/game/server/hl/subs.cpp
+++ b/src/game/server/hl/subs.cpp
@@ -102,7 +102,7 @@ void CBaseEntity::UpdateOnRemove(void)
 		{
 			// this entity was a LinkEnt in the world node graph, so we must remove it from
 			// the graph since we are removing it from the world.
-			for (int i = 0; i < WorldGraph.m_cLinks; i++)
+			for (unsigned int i = 0; i < WorldGraph.m_cLinks; i++)
 			{
 				if (WorldGraph.m_pLinkPool[i].m_pLinkEnt == pev)
 				{
diff --git a/src/game/server/hl/util.cpp b/src/game/server/hl/util.cpp
index 0ffc2c03..719fd630 100644
--- a/src/game/server/hl/util.cpp
+++ b/src/game/server/hl/util.cpp
@@ -407,7 +407,7 @@ void UTIL_MoveToOrigin(edict_t *pent, const Vector &vecGoal, float flDist, int i
 
 int UTIL_EntitiesInBox(CBaseEntity **pList, int listMax, const Vector &mins, const Vector &maxs, int flagMask, int startIndex)
 {
-	if (startIndex >= gpGlobals->maxEntities) //End recursion if you have no more entities to search (shouldn't happen anyway) MiB Feb2008a
+	if ((unsigned int)startIndex >= gpGlobals->maxEntities) //End recursion if you have no more entities to search (shouldn't happen anyway) MiB Feb2008a
 		return 0;
 
 	edict_t *pEdict = g_engfuncs.pfnPEntityOfEntIndex(startIndex);
@@ -423,7 +423,7 @@ int UTIL_EntitiesInBox(CBaseEntity **pList, int listMax, const Vector &mins, con
 		//return count;
 	}
 
-	for (int i = startIndex + 1; i < gpGlobals->maxEntities; i++, pEdict++) //MAR2008b - zapping neo-chatbug
+	for (unsigned int i = startIndex + 1; i < gpGlobals->maxEntities; i++, pEdict++) //MAR2008b - zapping neo-chatbug
 	{
 		if (pEdict->free || !pEdict->pvPrivateData) //MAR2008b - zapping neo-chatbug
 			continue;
@@ -455,7 +455,7 @@ int UTIL_EntitiesInBox(CBaseEntity **pList, int listMax, const Vector &mins, con
 
 int UTIL_MonstersInSphere(CBaseEntity **pList, int listMax, const Vector &center, float radius, int startIndex)
 {
-	if (startIndex >= gpGlobals->maxEntities) //End recursion if you have no more entities to search (shouldn't happen anyway) MiB Feb2008a
+	if ((unsigned int)startIndex >= gpGlobals->maxEntities) //End recursion if you have no more entities to search (shouldn't happen anyway) MiB Feb2008a
 		return 0;
 
 	edict_t *pEdict = g_engfuncs.pfnPEntityOfEntIndex(startIndex);
@@ -474,7 +474,7 @@ int UTIL_MonstersInSphere(CBaseEntity **pList, int listMax, const Vector &center
 		//return count;
 	}
 
-	for (int i = startIndex + 1; i < gpGlobals->maxEntities; i++, pEdict++) //MAR2008b - zapping neo-chatbug
+	for (unsigned int i = startIndex + 1; i < gpGlobals->maxEntities; i++, pEdict++) //MAR2008b - zapping neo-chatbug
 	{
 		if (pEdict->free || !pEdict->pvPrivateData) //MAR2008b - zapping neo-chatbug
 			continue;
@@ -588,7 +588,7 @@ CBaseEntity *UTIL_PlayerByIndex(int playerIndex)
 {
 	CBaseEntity *pPlayer = NULL;
 
-	if (playerIndex > 0 && playerIndex <= gpGlobals->maxClients)
+	if (playerIndex > 0 && (unsigned int)playerIndex <= gpGlobals->maxClients)
 	{
 		edict_t *pPlayerEdict = INDEXENT(playerIndex);
 		if (pPlayerEdict && !pPlayerEdict->free)
@@ -602,7 +602,7 @@ CBaseEntity *UTIL_PlayerByIndex(int playerIndex)
 
 CBasePlayer* UTIL_PlayerBySteamID(ID64 steamID64)
 {
-	for (int i = 1; i <= gpGlobals->maxClients; i++)
+	for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
 	{
 		CBaseEntity* pEntity = UTIL_PlayerByIndex(i);
 		CBasePlayer* pPlayer = (pEntity ? (CBasePlayer*)pEntity : NULL);
@@ -683,7 +683,7 @@ void UTIL_DoTokenScriptEvent(const char *tokenevents, CBaseEntity *pTarget)
 			TokenizeString(m_scriptevent.c_str(), Tokens);
 			if (Tokens.size() > 1)
 			{
-				for (int i = 0; i < Tokens.size(); i++)
+				for (unsigned int i = 0; i < Tokens.size(); i++)
 				{
 					if (i > 0)
 						Params.add(Tokens[i].c_str());
@@ -711,7 +711,7 @@ void UTIL_DoTokenScriptEvent(const char *tokenevents, CBaseEntity *pTarget)
 			Params.clearitems();
 			if (Tokens.size() > 1)
 			{
-				for (int i = 0; i < Tokens.size(); i++)
+				for (unsigned int i = 0; i < Tokens.size(); i++)
 				{
 					if (i > 0)
 						Params.add(Tokens[i].c_str());
@@ -845,7 +845,7 @@ void Util_ScriptArray(CBaseEntity *pEntity, const char *array_operation, const c
 int UTIL_NumPlayers()
 {
 	int total_valid_players = 0;
-	for (int i = 1; i <= gpGlobals->maxClients; i++)
+	for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
 	{
 		CBaseEntity *pEntity = UTIL_PlayerByIndex(i);
 		CBasePlayer *pPlayer = pEntity ? (CBasePlayer *)pEntity : NULL;
@@ -869,7 +869,7 @@ int UTIL_NumActivePlayers()
 {
 	int total_valid_players = 0;
 	bool flagged_invalid = false;
-	for (int i = 1; i <= gpGlobals->maxClients; i++)
+	for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
 	{
 		CBaseEntity *pEntity = UTIL_PlayerByIndex(i);
 		CBasePlayer *pPlayer = pEntity ? (CBasePlayer *)pEntity : NULL;
@@ -905,7 +905,7 @@ float UTIL_TotalHP()
 	int total_valid_players = 0;
 	bool flagged_invalid = false;
 	float total_hp = 0;
-	for (int i = 1; i <= gpGlobals->maxClients; i++)
+	for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
 	{
 		CBaseEntity *pEntity = UTIL_PlayerByIndex(i);
 		CBasePlayer *pPlayer = pEntity ? (CBasePlayer *)pEntity : NULL;
@@ -942,7 +942,7 @@ float UTIL_AvgHP()
 	int total_valid_players = 0;
 	bool flagged_invalid = false;
 	float total_hp = 0;
-	for (int i = 1; i <= gpGlobals->maxClients; i++)
+	for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
 	{
 		CBaseEntity *pEntity = UTIL_PlayerByIndex(i);
 		CBasePlayer *pPlayer = pEntity ? (CBasePlayer *)pEntity : NULL;
@@ -1056,7 +1056,7 @@ static short FixedSigned16(float value, float scale)
 // UNDONE: Affect user controls?
 void UTIL_ScreenShake(const Vector &center, float amplitude, float frequency, float duration, float radius)
 {
-	int i;
+	unsigned int i;
 	float localAmplitude;
 	ScreenShake shake;
 
@@ -1154,7 +1154,7 @@ void UTIL_ScreenFadeWrite(const ScreenFade &fade, CBaseEntity *pEntity)
 
 void UTIL_ScreenFadeAll(const Vector &color, float fadeTime, float fadeHold, int alpha, int flags)
 {
-	int i;
+	unsigned int i;
 	ScreenFade fade;
 
 	UTIL_ScreenFadeBuild(fade, color, fadeTime, fadeHold, alpha, flags);
@@ -1211,7 +1211,7 @@ void UTIL_HudMessage(CBaseEntity *pEntity, const hudtextparms_t &textparms, cons
 
 void UTIL_HudMessageAll(const hudtextparms_t &textparms, const char *pMessage)
 {
-	int i = 0;
+	unsigned int i = 0;
 	//UTIL_ClientPrintAll( HUD_PRINTNOTIFY, "Game_text reached UTIL_HudMessageAll","test");
 	for (i = 1; i <= gpGlobals->maxClients; i++)
 	{
@@ -1319,7 +1319,7 @@ void UTIL_ShowMessage(const char *pString, CBaseEntity *pEntity)
 
 void UTIL_ShowMessageAll(const char *pString)
 {
-	int i;
+	unsigned int i;
 
 	// loop through all players
 
@@ -2176,7 +2176,7 @@ unsigned short CSaveRestoreBuffer ::TokenHash(const char *pszToken)
 		ALERT(at_error, "No token table array in TokenHash()!");
 #endif
 
-	for (int i = 0; i < m_pdata->tokenCount; i++)
+	for (unsigned int i = 0; i < m_pdata->tokenCount; i++)
 	{
 #if _DEBUG
 		static qboolean beentheredonethat = FALSE;
@@ -2187,7 +2187,7 @@ unsigned short CSaveRestoreBuffer ::TokenHash(const char *pszToken)
 		}
 #endif
 
-		int index = hash + i;
+		unsigned int index = hash + i;
 		if (index >= m_pdata->tokenCount)
 			index -= m_pdata->tokenCount;
 
@@ -2503,9 +2503,9 @@ void CSave ::BufferString(char *pdata, int len)
 	BufferData(&c, 1);		// Write a null terminator
 }
 
-int CSave ::DataEmpty(const char *pdata, int size)
+int CSave ::DataEmpty(const char *pdata, unsigned int size)
 {
-	for (int i = 0; i < size; i++)
+	for (unsigned int i = 0; i < size; i++)
 	{
 		if (pdata[i])
 			return 0;
diff --git a/src/game/server/hl/util.h b/src/game/server/hl/util.h
index 065ae53a..9600f275 100644
--- a/src/game/server/hl/util.h
+++ b/src/game/server/hl/util.h
@@ -631,7 +631,7 @@ void EMIT_GROUPNAME_SUIT(edict_t *entity, const char *groupname);
 
 #define PRECACHE_SOUND_ARRAY(a)                \
 	{                                          \
-		for (int i = 0; i < std::size(a); i++) \
+		for (unsigned int i = 0; i < std::size(a); i++) \
 			PRECACHE_SOUND((char *)a[i]);      \
 	}
 
diff --git a/src/game/server/monsters/bodyparts/bodyparts.cpp b/src/game/server/monsters/bodyparts/bodyparts.cpp
index 251258c6..43c1201c 100644
--- a/src/game/server/monsters/bodyparts/bodyparts.cpp
+++ b/src/game/server/monsters/bodyparts/bodyparts.cpp
@@ -47,7 +47,7 @@ CBodypart *CBodypart::Duplicate(CBodypart *pExistingBodypart)
 	CMSMonster *pOwner = (CMSMonster *)MSInstance( pev->owner );
 	if( !pOwner ) return flDamage;
 
-	 for (int i = 0; i < pOwner->Gear.size(); i++) 
+	 for (unsigned int i = 0; i < pOwner->Gear.size(); i++) 
 	{
 		CGenericItem *pItemWorn = pOwner->Gear[ i ];
 
@@ -66,7 +66,7 @@ CBodypart *CBodypart::Duplicate(CBodypart *pExistingBodypart)
 	CMSMonster *pOwner = (CMSMonster *)MSInstance( pev->owner );
 	if( !pOwner ) return flDamage;
 
-	 for (int i = 0; i < pOwner->Gear.size(); i++) 
+	 for (unsigned int i = 0; i < pOwner->Gear.size(); i++) 
 	{
 		CGenericItem *Item = *pOwner->Gear[ i ];
 		if( FBitSet(Item.MSProperties(),ITEM_ARMOR) )
@@ -127,16 +127,16 @@ void CBodypart::Set(int iState, void *vData)
 }
 void CBaseBody::Set(int iState, void *vData)
 {
-	for (int i = 0; i < Bodyparts.size(); i++)
+	for (unsigned int i = 0; i < Bodyparts.size(); i++)
 		Bodyparts[i]->Set(iState, vData);
 }
 void CBaseBody::Think(CMSMonster *pOwner)
 {
-	for (int b = 0; b < Bodyparts.size(); b++)
+	for (unsigned int b = 0; b < Bodyparts.size(); b++)
 	{
 		int Body = 0;
 		bool Visible = true;
-		for (int i = 0; i < pOwner->Gear.size(); i++)
+		for (unsigned int i = 0; i < pOwner->Gear.size(); i++)
 		{
 			if (pOwner->Gear[i]->m_Location <= ITEMPOS_HANDS)
 				continue;
@@ -157,13 +157,13 @@ void CBaseBody::Think(CMSMonster *pOwner)
 CBaseBody *CBaseBody::Duplicate()
 {
 	CBaseBody &NewBody = *msnew(CBaseBody);
-	for (int i = 0; i < Bodyparts.size(); i++)
+	for (unsigned int i = 0; i < Bodyparts.size(); i++)
 		NewBody.Bodyparts[i] = Bodyparts[i]->Duplicate();
 	return &NewBody;
 }
 void CBaseBody::Delete()
 {
-	for (int i = 0; i < Bodyparts.size(); i++)
+	for (unsigned int i = 0; i < Bodyparts.size(); i++)
 	{
 		Bodyparts[i]->SUB_Remove();
 		Bodyparts.erase(i--);
diff --git a/src/game/server/monsters/bodyparts/bodyparts_human.cpp b/src/game/server/monsters/bodyparts/bodyparts_human.cpp
index 1a723d87..7d63a766 100644
--- a/src/game/server/monsters/bodyparts/bodyparts_human.cpp
+++ b/src/game/server/monsters/bodyparts/bodyparts_human.cpp
@@ -12,7 +12,7 @@ CHumanBodypart *CHumanBodypart::Duplicate()
 
 void CHumanBody::Initialize(CBaseEntity *pOwner, void *pvData)
 {
-	for (int i = 0; i < HUMAN_BODYPARTS; i++)
+	for (unsigned int i = 0; i < HUMAN_BODYPARTS; i++)
 	{
 		CHumanBodypart& HumanBodypart = *(CHumanBodypart*)GetClassPtr((CHumanBodypart*)NULL);
 
@@ -27,7 +27,7 @@ void CHumanBody::Initialize(CBaseEntity *pOwner, void *pvData)
 CBaseBody *CHumanBody::Duplicate()
 {
 	CHumanBody *NewBody = new CHumanBody;
-	for (int i = 0; i < Bodyparts.size(); i++)
+	for (unsigned int i = 0; i < Bodyparts.size(); i++)
 		NewBody->Bodyparts.add(Bodyparts[i]->Duplicate());
 
 	return NewBody;
diff --git a/src/game/server/monsters/corpse.cpp b/src/game/server/monsters/corpse.cpp
index 4fbca19a..72827bbb 100644
--- a/src/game/server/monsters/corpse.cpp
+++ b/src/game/server/monsters/corpse.cpp
@@ -56,8 +56,8 @@ void CCorpse::CreateCorpse(CMSMonster* pSource, float LoseGoldPercent)
 	float CheckRange = 1024;
 	Vector delta = Vector(CheckRange, CheckRange, CheckRange);
 	CBaseEntity* pEnt[100];
-	int count = UTIL_EntitiesInBox(pEnt, 100, pev->origin - delta, pev->origin + delta, NULL);
-	for (int i = 0; i < count; i++)
+	unsigned int count = UTIL_EntitiesInBox(pEnt, 100, pev->origin - delta, pev->origin + delta, NULL);
+	for (unsigned int i = 0; i < count; i++)
 	{
 		//Cut every corpse's expire time in half
 		pCorpse = pEnt[i];
diff --git a/src/game/server/monsters/msmonster.h b/src/game/server/monsters/msmonster.h
index 95d51bf0..1c7604b3 100644
--- a/src/game/server/monsters/msmonster.h
+++ b/src/game/server/monsters/msmonster.h
@@ -273,9 +273,9 @@ class CMSMonster : public CBaseMonster
 		m_HPReq_min,  //Thothie AUG2007a - adding optional req total hp on server to spawn monster
 		m_HPReq_max,  //Thothie FEB2011_22 - adding option for "min;max" hpreq
 		m_ReqPlayers, //Thothie AUG2007a - adding optional REQ players to spawn monster
-		m_nRndMobs,	  //NOV2014_20 - Thothie msmonster_random
 		m_HPReq_useavg;
 
+	unsigned int m_nRndMobs; //NOV2014_20 - Thothie msmonster_random
 	float m_HPMulti, //Thothie SEP2007a - multiply HP by this amount
 		m_DMGMulti;	 //Thothie SEP2007a - multiply DMG by this amount
 
@@ -324,7 +324,7 @@ class CMSMonster : public CBaseMonster
 	//a relationship better than R_NO)
 	EHANDLE m_hEnemyList[MAX_ENEMYLIST],
 		m_LastEnemy;
-	int m_EnemyListNum;
+	unsigned int m_EnemyListNum;
 
 	CBaseBody *Body;								//If this monster uses body parts
 	CItemList Gear;									//This monster's gear
diff --git a/src/game/server/monsters/msmonsterserver.cpp b/src/game/server/monsters/msmonsterserver.cpp
index 553e740f..80948615 100644
--- a/src/game/server/monsters/msmonsterserver.cpp
+++ b/src/game/server/monsters/msmonsterserver.cpp
@@ -136,7 +136,7 @@ void CMSMonster::Spawn()
 	m_OldGold = 0;
 
 	// Initialize menu protection flags to false for all players
-	for (int i = 0; i < MAXPLAYERS; i++)
+	for (unsigned int i = 0; i < MAXPLAYERS; i++)
 	{
 		m_MenuOptionsProtected[i] = false;
 	}
@@ -150,7 +150,7 @@ void CMSMonster::Spawn()
 	{
 		//precache all random mob scripts
 		msstring orig_scriptName = m_ScriptName;
-		for (int i = 0; i < m_nRndMobs; i++)
+		for (unsigned int i = 0; i < m_nRndMobs; i++)
 		{
 			MS_DEBUG("DEBUG: msmonster_random precache #%i / %i as %s", i, m_nRndMobs, random_monsterdata[i].m_ScriptName.c_str());
 			CScript TempScript;
@@ -430,7 +430,7 @@ void CMSMonster::KeyValue(KeyValueData* pkvd)
 		if (random_monsterdata.size() == 0)
 		{
 			//random_monster_t tmp;
-			for (int i = 0; i < 32; i++)
+			for (unsigned int i = 0; i < 32; i++)
 			{
 				random_monsterdata.add_blank();
 			};
@@ -1262,7 +1262,7 @@ void CMSMonster::AvoidFrontObject(float MoveAmt)
 
 			Vector vAng, vAvoidDir, SideAng[2];
 			float Dist[2];
-			for (int i = 0; i < 2; i++) //Try each side
+			for (unsigned int i = 0; i < 2; i++) //Try each side
 			{
 				//Finds the forward vector of the avoidance direction
 				vAng.y = UTIL_AngleMod(m_LastYaw + ang * -Side[i]);
@@ -1613,13 +1613,13 @@ void CMSMonster::Speak(char* pszSentence, speech_type SpeechType)
 
 	CBaseEntity* pList[255], * pEnt = NULL;
 	// Fill pList with a all the monsters and players on the level including players that have died.
-	int count = UTIL_EntitiesInBox(pList, 255, Vector(-6000, -6000, -6000), Vector(6000, 6000, 6000), FL_MONSTER | FL_CLIENT | FL_SPECTATOR);
+	unsigned int count = UTIL_EntitiesInBox(pList, 255, Vector(-6000, -6000, -6000), Vector(6000, 6000, 6000), FL_MONSTER | FL_CLIENT | FL_SPECTATOR);
 
 	// Keep track of players that have already received a message;
 	std::set<CBaseEntity*> pTrackAlreadySent = {};
 
 	// Now try to speak to each one
-	for (int i = 0; i < count; i++)
+	for (unsigned int i = 0; i < count; i++)
 	{
 		pEnt = pList[i];
 		if (pEnt == NULL)
@@ -1727,18 +1727,18 @@ void CMSMonster::HearPhrase(CMSMonster* pSpeaker, const char* phrase)
 	listenphrase_t* BestPhrase = NULL;
 	float BestMatchedRatio = 0;
 
-	for (int i = 0; i < m_Phrases.size(); i++)
+	for (unsigned int i = 0; i < m_Phrases.size(); i++)
 	{
 		listenphrase_t& Phrase = m_Phrases[i];
-		for (int p = 0; p < Phrase.Phrases.size(); p++)
+		for (unsigned int p = 0; p < Phrase.Phrases.size(); p++)
 		{
 			const char* CheckPhrase = Phrase.Phrases[p];
 			const char* SubPhrase = NULL;
 			if (SubPhrase = strstr(cTemp1, CheckPhrase))
 			{
 				int Matched = 0;
-				int len = strlen(CheckPhrase);
-				for (int x = 0; x < len; x++)
+				unsigned int len = strlen(CheckPhrase);
+				for (unsigned int x = 0; x < len; x++)
 					if (SubPhrase[x] == CheckPhrase[x])
 						Matched++;
 
@@ -2213,7 +2213,7 @@ float CMSMonster::TraceAttack(damage_t& Damage)
 		//Damage Modifiers ( takedmg xxx )
 		Damage.flDamage *= m.GenericTDM;
 		if (Damage.sDamageType)
-			for (int i = 0; i < m.TakeDamageModifiers.size(); i++)
+			for (unsigned int i = 0; i < m.TakeDamageModifiers.size(); i++)
 			{
 				takedamagemodifier_t& TDM = m.TakeDamageModifiers[i];
 				//msstring thoth_my_dmgtype = TDM.DamageType;
@@ -2260,7 +2260,7 @@ float CMSMonster::TraceAttack(damage_t& Damage)
 			//Each script sets a ratio of damage you should take.  Factor each one into the damage
 			msstringlist DamageRatios;
 			TokenizeString(m_ReturnData, DamageRatios);
-			for (int i = 0; i < DamageRatios.size(); i++)
+			for (unsigned int i = 0; i < DamageRatios.size(); i++)
 				Damage.flDamage *= atof(DamageRatios[i]); //Script can reject the damage with "returndata"
 		}
 
@@ -2408,7 +2408,7 @@ void CMSMonster::Killed(entvars_t* pevAttacker, int iGib)
 		IScripted* pScripted = (pTarget ? pTarget->GetScripted() : NULL);
 		if (pScripted)
 		{
-			for (int i = 0; i < pScripted->m_Scripts.size(); i++) // Check each 
+			for (unsigned int i = 0; i < pScripted->m_Scripts.size(); i++) // Check each 
 			{
 				if (pScripted->m_Scripts[i]->VarExists("game.effect.id")) //This is an effect 
 				{
@@ -2707,7 +2707,7 @@ std::tuple<bool, int> CMSMonster::LearnSkill(int iStat, int iStatType, int Enemy
 
 		//Look through the other SubStats for one that's not at the cap, yet.
 		//Not random, but good enough.
-		for (int i = 0; i < 1; i++)
+		for (unsigned int i = 0; i < 1; i++)
 		{
 			iStatType = (iStatType + 1) % 3;
 			CSubStat& SubStat = pStat->m_SubStats[iStatType];
@@ -2795,7 +2795,7 @@ void CMSMonster::SetSpeed()
 	float SpeedPercent = 100.0f;
 	m_Framerate_Modifier = 1.0;
 
-	for (int i = 0; i < m_Scripts.size(); i++)
+	for (unsigned int i = 0; i < m_Scripts.size(); i++)
 	{
 		if (!m_Scripts[i]->VarExists("game.effect.id"))
 			continue;
@@ -2819,7 +2819,7 @@ void CMSMonster::SetSpeed()
 	//Can't move while a spell is preparing
 	//Thothie/Orochi APR2011_04 - undone
 	/*
-	 for (int i = 0; i < MAX_NPC_HANDS; i++)
+	 for (unsigned int i = 0; i < MAX_NPC_HANDS; i++)
 		if( Hand(i) && !Hand(i)->Spell_CanAttack() )
 			SpeedPercent = 0;  //Percentage of normal speed
 	*/
@@ -2869,7 +2869,7 @@ void CMSMonster::OpenMenu(CBasePlayer* pPlayer)
 
 	m_MenuCurrentOptions = NULL;
 
-	for (int i = 0; i < Menuoptions.size(); i++)
+	for (unsigned int i = 0; i < Menuoptions.size(); i++)
 	{
 		menuoption_t& MenuOption = Menuoptions[i];
 		if (MenuOption.Access != MOA_ALL)
@@ -2973,7 +2973,7 @@ void CMSMonster::UseMenuOption(CBasePlayer* pPlayer, int Option)
 			static mslist<CGenericItem*> TotalFoundItems;
 			TotalFoundItems.clearitems();
 
-			for (int i = 0; i < Payments.size(); i++)
+			for (unsigned int i = 0; i < Payments.size(); i++)
 			{
 				msstring& Payment = Payments[i];
 				if (Payment.starts_with("gold"))
@@ -3019,7 +3019,7 @@ void CMSMonster::UseMenuOption(CBasePlayer* pPlayer, int Option)
 						break;
 					}
 
-					for (int x = 0; x < FoundItems.size(); x++)
+					for (unsigned int x = 0; x < FoundItems.size(); x++)
 						TotalFoundItems.add(FoundItems[x]);
 				}
 			}
@@ -3035,7 +3035,7 @@ void CMSMonster::UseMenuOption(CBasePlayer* pPlayer, int Option)
 			if (PlayerCanPay)
 			{
 				pPlayer->m_Gold -= TotalGold;
-				for (int i = 0; i < TotalFoundItems.size(); i++)
+				for (unsigned int i = 0; i < TotalFoundItems.size(); i++)
 					TotalFoundItems[i]->SUB_Remove(); //MIB JUN2010_14 (original line commented below)
 				//pPlayer->RemoveItem( TotalFoundItems[i] );
 			}
@@ -3131,7 +3131,7 @@ void CMSMonster::UseMenuOption(CBasePlayer* pPlayer, int Option)
 			static mslist<CGenericItem*> TotalFoundItems;
 			TotalFoundItems.clearitems();
 
-			for (int i = 0; i < Payments.size(); i++)
+			for (unsigned int i = 0; i < Payments.size(); i++)
 			{
 				msstring& Payment = Payments[i];
 				if (Payment.starts_with("gold"))
@@ -3177,7 +3177,7 @@ void CMSMonster::UseMenuOption(CBasePlayer* pPlayer, int Option)
 						break;
 					}
 
-					for (int x = 0; x < FoundItems.size(); x++)
+					for (unsigned int x = 0; x < FoundItems.size(); x++)
 						TotalFoundItems.add(FoundItems[x]);
 				}
 			}
@@ -3193,7 +3193,7 @@ void CMSMonster::UseMenuOption(CBasePlayer* pPlayer, int Option)
 			if (PlayerCanPay)
 			{
 				pPlayer->m_Gold -= TotalGold;
-				for (int i = 0; i < TotalFoundItems.size(); i++)
+				for (unsigned int i = 0; i < TotalFoundItems.size(); i++)
 					TotalFoundItems[i]->SUB_Remove(); //MIB JUN2010_14 (original line commented below)
 				//pPlayer->RemoveItem( TotalFoundItems[i] );
 			}
diff --git a/src/game/server/monsters/npcglobal.cpp b/src/game/server/monsters/npcglobal.cpp
index 74ef031a..36d613df 100644
--- a/src/game/server/monsters/npcglobal.cpp
+++ b/src/game/server/monsters/npcglobal.cpp
@@ -12,7 +12,7 @@ void CMSMonster::DynamicPrecache()
 
 	TokenizeString(pszString, NPCs);
 
-	for (int i = 0; i < NPCs.size(); i++)
+	for (unsigned int i = 0; i < NPCs.size(); i++)
 	{
 		const char* ScriptFile = NPCs[i];
 
diff --git a/src/game/server/monsters/npcscript.cpp b/src/game/server/monsters/npcscript.cpp
index 3fea933e..74edd0bd 100644
--- a/src/game/server/monsters/npcscript.cpp
+++ b/src/game/server/monsters/npcscript.cpp
@@ -108,7 +108,7 @@ bool CMSMonster::Script_ExecuteCmd(CScript *Script, SCRIPT_EVENT &Event, scriptc
 	{ //say <sound>[mouth open length]
 		if (Params.size() >= 1)
 		{
-			for (int i = 0; i < Params.size(); i++)
+			for (unsigned int i = 0; i < Params.size(); i++)
 			{
 				float fDuration = 0.2;
 				msstring &FullWord = Params[i];
@@ -149,7 +149,7 @@ bool CMSMonster::Script_ExecuteCmd(CScript *Script, SCRIPT_EVENT &Event, scriptc
 			CBaseEntity *pTarget = RetrieveEntity(ENT_ME);
 			IScripted *pScripted = pTarget->GetScripted(); // UScripted? IScripted.
 
-			for (int i = 0; i < pScripted->m_Scripts.size(); i++) // Check each
+			for (unsigned int i = 0; i < pScripted->m_Scripts.size(); i++) // Check each
 			{
 				if (pScripted->m_Scripts[i]->VarExists("game.effect.id")) //This is an effect
 				{
@@ -403,11 +403,11 @@ bool CMSMonster::Script_ExecuteCmd(CScript *Script, SCRIPT_EVENT &Event, scriptc
 			}
 			//[end]
 
-			for (int p = 0; p < m_PlayerDamage.size(); p++)
+			for (unsigned int p = 0; p < m_PlayerDamage.size(); p++)
 			{
 				// for (int r = 0; r < SKILL_MAX_ATTACK; r++)
 				// {
-				// 	for (int s = 0; s < STATPROP_ALL_TOTAL; s++)
+				// 	for (unsigned int s = 0; s < STATPROP_ALL_TOTAL; s++)
 				// 		m_PlayerDamage[p].dmg[r][s] = 0;
 				// }
 				// m_PlayerDamage[p].dmgInTotal = 0;
@@ -435,11 +435,11 @@ bool CMSMonster::Script_ExecuteCmd(CScript *Script, SCRIPT_EVENT &Event, scriptc
 			if (atof(GetFirstScriptVar("NPC_ORIG_EXP")) > 0)
 			{
 				//first, wipe player hits, otherwise, we'll have problems
-				for (int p = 0; p < m_PlayerDamage.size(); p++)
+				for (unsigned int p = 0; p < m_PlayerDamage.size(); p++)
 				{
 					// for (int r = 0; r < SKILL_MAX_ATTACK; r++)
 					// {
-					// 	for (int s = 0; s < STATPROP_ALL_TOTAL; s++)
+					// 	for (unsigned int s = 0; s < STATPROP_ALL_TOTAL; s++)
 					// 		m_PlayerDamage[p].dmg[r][s] = 0;
 					// }
 					// m_PlayerDamage[p].dmgInTotal = 0;
@@ -695,7 +695,7 @@ bool CMSMonster::Script_ExecuteCmd(CScript *Script, SCRIPT_EVENT &Event, scriptc
 		{ //Parameters: <script event> <trigger1> [trigger2] [trigger3] [etc.]
 			listenphrase_t newphrase;
 			newphrase.ScriptEvent = Params[0];
-			for (int i = 0; i < (Params.size() - 1); i++) // Starts at parameter 2
+			for (unsigned int i = 0; i < (Params.size() - 1); i++) // Starts at parameter 2
 				newphrase.Phrases.add(Params[i + 1]);
 
 			m_Phrases.add(newphrase);
@@ -708,7 +708,7 @@ bool CMSMonster::Script_ExecuteCmd(CScript *Script, SCRIPT_EVENT &Event, scriptc
 	{
 		if (Params.size() >= 1)
 		{
-			for (int i = 0; i < Params.size(); i++)
+			for (unsigned int i = 0; i < Params.size(); i++)
 			{
 				if (i)
 					sTemp += " ";
@@ -973,12 +973,12 @@ bool CMSMonster::Script_ExecuteCmd(CScript *Script, SCRIPT_EVENT &Event, scriptc
 			MenuOption.Priority = atoi(SCRIPTVAR("reg.mitem.priority"));
 
 			bool Inserted = false;
-			for (int i = 0; i < Menuoptions.size(); i++)
+			for (unsigned int i = 0; i < Menuoptions.size(); i++)
 				if (MenuOption.Priority > Menuoptions[i].Priority)
 				{
 					Menuoptions.add_blank(); //Add blank item to end
 											 //Scoot all the items with lower priority down the line to make space for this item
-					for (int r = 0; r < (Menuoptions.size() - 1) - i; r++)
+					for (unsigned int r = 0; r < (Menuoptions.size() - 1) - i; r++)
 					{
 						int DstIdx = (Menuoptions.size() - 1) - r;
 						int SrcIdx = DstIdx - 1;
@@ -1001,7 +1001,7 @@ bool CMSMonster::Script_ExecuteCmd(CScript *Script, SCRIPT_EVENT &Event, scriptc
 			if (m_MenuCurrentOptions)
 			{
 				mslist<menuoption_t> &Menuoptions = *m_MenuCurrentOptions;
-				for (int i = 0; i < Menuoptions.size(); i++)
+				for (unsigned int i = 0; i < Menuoptions.size(); i++)
 					if (Params[0] == Menuoptions[i].ID) //Erase _all_ with this name.  Makes erasing big menus easy
 						Menuoptions.erase(i--);
 			}
@@ -1069,7 +1069,7 @@ bool CMSMonster::Script_ExecuteCmd(CScript *Script, SCRIPT_EVENT &Event, scriptc
 				bool found_entry = false;
 				//char Debug_Type[32];
 				//float Debug_AMT = 0.0;
-				for (int i = 0; i < m.TakeDamageModifiers.size(); i++)
+				for (unsigned int i = 0; i < m.TakeDamageModifiers.size(); i++)
 				{
 					takedamagemodifier_t &TDMC = m.TakeDamageModifiers[i];
 					if (TDM.DamageType == TDMC.DamageType)
@@ -1321,7 +1321,7 @@ bool CMSMonster::Script_ExecuteCmd(CScript *Script, SCRIPT_EVENT &Event, scriptc
 						int NextParm = 1;
 						//Thothie NOV2007a - This doesn't work with spellcasting (no changes, just bitching)
 						//- will eventually need this to function on spellcasting for apostle quests
-						for (int i = 0; i < pStat->m_SubStats.size(); i++)
+						for (unsigned int i = 0; i < pStat->m_SubStats.size(); i++)
 						{
 							if ((signed)Params.size() <= NextParm)
 								break; //Keep assigning stats until I run out of stats (for loop) or out of parameters (this check)
@@ -1663,7 +1663,7 @@ bool CMSMonster::Script_ExecuteCmd(CScript *Script, SCRIPT_EVENT &Event, scriptc
 
 							float StartYaw = UTIL_VecToAngles(FleeDir).y, newYaw;
 							bool fFoundVec = false;
-							for (int i = 0; i < 20; i++)
+							for (unsigned int i = 0; i < 20; i++)
 							{
 								//Try to pick a random flee angle
 								newYaw = StartYaw + RANDOM_FLOAT(-90, 90);
@@ -1679,7 +1679,7 @@ bool CMSMonster::Script_ExecuteCmd(CScript *Script, SCRIPT_EVENT &Event, scriptc
 							if (!fFoundVec)
 							{
 								//Couldn't pick a random flee angle, brute force one
-								for (int i = 0; i < 359; i++)
+								for (unsigned int i = 0; i < 359; i++)
 								{
 									newYaw = StartYaw + i;
 									UTIL_MakeVectorsPrivate(Vector(0, newYaw, 0), fleeVec, NULL, NULL);
@@ -1762,10 +1762,10 @@ bool CMSMonster::GetScriptVar(msstring &ParserName, msstringlist &Params, CScrip
 
 		if (pSpecificEnt)
 			SightedList.add(pSpecificEnt);
-		for (int i = 0; i < m_EnemyListNum; i++)
+		for (unsigned int i = 0; i < m_EnemyListNum; i++)
 			SightedList.add((CBaseEntity *)m_hEnemyList[i]);
 
-		for (int i = 0; i < SightedList.size(); i++)
+		for (unsigned int i = 0; i < SightedList.size(); i++)
 		{
 			bool fSawTarget = false;
 
@@ -1861,7 +1861,7 @@ bool CMSMonster::GetScriptVar(msstring &ParserName, msstringlist &Params, CScrip
 			CBaseEntity *pList[255], *pEnt = NULL;
 			ALERT( at_console, "$get_inarea got %f to %f", thoth_boxsize, neg_boxsize );
 			int count = UTIL_EntitiesInBox( pList, 255, Vector(neg_boxsize,neg_boxsize,neg_boxsize), Vector(thoth_boxsize,thoth_boxsize,thoth_boxsize), FL_MONSTER|FL_CLIENT );
-			 for (int i = 0; i < count; i++) 
+			 for (unsigned int i = 0; i < count; i++) 
 			{
 				pEnt = pList[i];
 				if( !pEnt->pev || FNullEnt(pEnt->edict()) ) continue;
diff --git a/src/game/server/msmapents.cpp b/src/game/server/msmapents.cpp
index 00a66e46..6af50d66 100644
--- a/src/game/server/msmapents.cpp
+++ b/src/game/server/msmapents.cpp
@@ -706,8 +706,9 @@ struct monster_data_t
 		livesleft,
 		hpreq_min,	//Thothie FEB2011_22 - allow min;max hpreq definition
 		hpreq_max,	//Thothie FEB2011_22 - allow min;max hpreq definition
-		nplayers,	//Thothie AUG2007a - req# players for monster to spawn
-		m_nRndMobs; //NOV2014_20 - Thothie msmonster_random
+		nplayers;	//Thothie AUG2007a - req# players for monster to spawn
+		
+	unsigned int m_nRndMobs; //NOV2014_20 - Thothie msmonster_random
 
 	Vector origin, angles;
 	bool spawned,
@@ -724,7 +725,7 @@ class CAreaMonsterSpawn : public CAreaInvisible
 {
 public:
 	monster_data_t mdSpawnMonster[32];
-	int iMonstersToSpawn;
+	unsigned int iMonstersToSpawn;
 	int iPlayerReq;			//Thothie AUG2007a - adding optional player req
 	int iHPReq_min;			//Thothie AUG2007a - adding optional total HP on server req
 	int iHPReq_max;			//Thothie FEB2011_22 - adding min;max option for reqhp
@@ -771,7 +772,7 @@ class CAreaMonsterSpawn : public CAreaInvisible
 		if (resetwhen == 1 && didfirstspawn) //>= just to deal with the stump below
 		{
 			//cycle through my m obs, see if any are out of lives, if so, reset their lives
-			for (int i = 0; i < iMonstersToSpawn; i++)
+			for (unsigned int i = 0; i < iMonstersToSpawn; i++)
 			{
 				if (mdSpawnMonster[i].livesleft == 0 && !mdSpawnMonster[i].spawned)
 				{
@@ -785,7 +786,7 @@ class CAreaMonsterSpawn : public CAreaInvisible
 		if (resetwhen == 2 && didfirstspawn)
 		{
 			//trigger a new wave
-			for (int i = 0; i < iMonstersToSpawn; i++)
+			for (unsigned int i = 0; i < iMonstersToSpawn; i++)
 			{
 				mdSpawnMonster[i].livesleft = mdSpawnMonster[i].lives;
 				mdSpawnMonster[i].spawned = false;
@@ -797,7 +798,7 @@ class CAreaMonsterSpawn : public CAreaInvisible
 		if (resetwhen && !didfirstspawn)
 		{
 			didfirstspawn = true;
-			for (int i = 0; i < iMonstersToSpawn; i++)
+			for (unsigned int i = 0; i < iMonstersToSpawn; i++)
 			{
 				mdSpawnMonster[i].livesleft = mdSpawnMonster[i].lives;
 				RespawnMonster(&mdSpawnMonster[i]);
@@ -810,7 +811,7 @@ class CAreaMonsterSpawn : public CAreaInvisible
 		if (!resetwhen)
 		{
 			didfirstspawn = true;
-			for (int i = 0; i < iMonstersToSpawn; i++)
+			for (unsigned int i = 0; i < iMonstersToSpawn; i++)
 			{
 				mdSpawnMonster[i].livesleft = mdSpawnMonster[i].lives;
 				RespawnMonster(&mdSpawnMonster[i]);
@@ -940,8 +941,8 @@ class CAreaMonsterSpawn : public CAreaInvisible
 		//NOV2014_20 - Thothie msmonster_random [begin]
 		if (pMonsterData->m_nRndMobs > 0)
 		{
-			int idx = RANDOM_LONG(0, float(pMonsterData->m_nRndMobs) - 1);
-			for (int i = 0; i < pMonsterData->m_nRndMobs; i++)
+			unsigned int idx = RANDOM_LONG(0, float(pMonsterData->m_nRndMobs) - 1);
+			for (unsigned int i = 0; i < pMonsterData->m_nRndMobs; i++)
 			{
 				MS_DEBUG("DEBUG: respawn randommob list #%i / %i as %s", pMonsterData->m_nRndMobs, pMonsterData->random_monsterdata[i].m_ScriptName.c_str() ? pMonsterData->random_monsterdata[i].m_ScriptName.c_str() : "???");
 			}
@@ -1014,9 +1015,9 @@ class CAreaMonsterSpawn : public CAreaInvisible
 		//NOV2014_20 - Thothie msmonster_random [begin]
 		if (pMonster->m_nRndMobs > 0)
 		{
-			int idx = RANDOM_LONG(0, float(pMonster->m_nRndMobs) - 1);
+			unsigned int idx = RANDOM_LONG(0, float(pMonster->m_nRndMobs) - 1);
 			mdSpawnMonster[iMonstersToSpawn].m_nRndMobs = pMonster->m_nRndMobs;
-			for (int i = 0; i < pMonster->m_nRndMobs; i++)
+			for (unsigned int i = 0; i < pMonster->m_nRndMobs; i++)
 			{
 				// logfile << UTIL_VarArgs("DEBUG: spawn adding randommob #%i / %i as %s\n", i, pMonster->m_nRndMobs, pMonster->random_monsterdata[i].m_ScriptName ? pMonster->random_monsterdata[i].m_ScriptName.c_str() : "???");
 				mdSpawnMonster[iMonstersToSpawn].random_monsterdata.add(pMonster->random_monsterdata[i]); //read em in
@@ -1116,7 +1117,7 @@ class CAreaMonsterSpawn : public CAreaInvisible
 		if (!pMonster)
 			return;
 
-		for (int i = 0; i < iMonstersToSpawn; i++)
+		for (unsigned int i = 0; i < iMonstersToSpawn; i++)
 		{
 			if (mdSpawnMonster[i].lPrivData == (long)pMonster)
 			{
@@ -1130,7 +1131,7 @@ class CAreaMonsterSpawn : public CAreaInvisible
 	{
 		if ( SpawnLimitReached() ) return; //Thothie OCT2016_18 spawnlimiter
 		
-		int i = 0, iDeadMonsters = 0;
+		unsigned int i = 0, iDeadMonsters = 0;
 		CMSMonster *pMonster;
 		for (i = 0; i < iMonstersToSpawn; i++)
 		{
@@ -1316,7 +1317,7 @@ class CAreaMonsterSpawn : public CAreaInvisible
 		if (!pMonster)
 			return NULL;
 
-		for (int i = 0; i < iMonstersToSpawn; i++)
+		for (unsigned int i = 0; i < iMonstersToSpawn; i++)
 			if (mdSpawnMonster[i].lTrigPrivData == (long)pMonster)
 			{
 				mdSpawnMonster[i].triggered = true;
@@ -1567,7 +1568,7 @@ class CAreaTransitionLocal : public CAreaInvisible
 	bool FAllPlayersAreTouchingMe()
 	{
 		Print("DEBUG: Ltrans FAllPlayersAreTouchingMe\n");
-		for (int i = 1; i <= gpGlobals->maxClients; i++)
+		for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
 		{
 			CBasePlayer *pOtherPlayer = (CBasePlayer *)UTIL_PlayerByIndex(i);
 			if (!pOtherPlayer)
@@ -1629,7 +1630,7 @@ class CAreaTransition : public CAreaInvisible
 
 	bool FAllPlayersAreTouchingMe()
 	{
-		for (int i = 1; i <= gpGlobals->maxClients; i++)
+		for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
 		{
 			CBasePlayer *pOtherPlayer = (CBasePlayer *)UTIL_PlayerByIndex(i);
 			if (!pOtherPlayer)
@@ -1696,7 +1697,7 @@ class CAreaTransition : public CAreaInvisible
 
 		if (fChangeLocalMap)
 		{
-			for (int i = 1; i <= gpGlobals->maxClients; i++)
+			for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
 			{
 				CBasePlayer *pOtherPlayer = (CBasePlayer *)UTIL_PlayerByIndex(i);
 				if (!pOtherPlayer)
@@ -1883,7 +1884,7 @@ class CAreaTransition : public CAreaInvisible
 
 		//Compare the votes to what it should be
 		int AllVotes = 0;
-		for (int i = 1; i <= gpGlobals->maxClients; i++)
+		for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
 		{
 			CBasePlayer *pOtherPlayer = (CBasePlayer *)UTIL_PlayerByIndex(i);
 			if (!pOtherPlayer || pOtherPlayer->m_CharacterState == CHARSTATE_UNLOADED || !pOtherPlayer->IsActive())
@@ -1900,7 +1901,7 @@ class CAreaTransition : public CAreaInvisible
 		if (PlayerVotes == AllVotes)
 		{
 			UTIL_ClientPrintAll(HUD_PRINTCENTER, UTIL_VarArgs("Traveling to %s\n", STRING(sDestName)));
-			for (int i = 1; i <= gpGlobals->maxClients; i++)
+			for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
 			{
 				CBasePlayer *pOtherPlayer = (CBasePlayer *)UTIL_PlayerByIndex(i);
 				if (!pOtherPlayer)
diff --git a/src/game/server/player/player.cpp b/src/game/server/player/player.cpp
index 0cbc83d8..d26c52e5 100644
--- a/src/game/server/player/player.cpp
+++ b/src/game/server/player/player.cpp
@@ -31,7 +31,6 @@
 #include "ms/angelscript/CAngelScriptManager.h"
 #include "decals.h"
 #include "gamerules/gamerules.h"
-#include "decals.h"
 #include "game.h"
 #include "hltv.h"
 
@@ -286,7 +285,7 @@ void LinkUserMessages(void)
 	gmsgFade = REG_USER_MSG("ScreenFade", sizeof(ScreenFade));
 
 	//Master Sword
-	for (int i = 0; i < NETMSG_NUM; i++)
+	for (unsigned int i = 0; i < NETMSG_NUM; i++)
 		g_netmsg[i] = REG_USER_MSG(g_PlayerMsgs[i], -1);
 	//------------
 
@@ -401,7 +400,7 @@ float CBasePlayer ::TraceAttack(damage_t &Damage)
 		Damage.iHitGroup = m_LastHitGroup = HitGroupToBodyPart(Damage.outTraceResult.iHitgroup);
 
 	//Let armor and shield do their magic
-	for (int i = 0; i < Gear.size(); i++)
+	for (unsigned int i = 0; i < Gear.size(); i++)
 		Gear[i]->OwnerTakeDamage(Damage);
 
 	if (Damage.flDamage <= 0)
@@ -504,7 +503,7 @@ int CBasePlayer ::TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, fl
 		static int damageTypes[CDMG_TIMEBASED] = {
 			DMG_PARALYZE, DMG_NERVEGAS, DMG_POISON, DMG_RADIATION, DMG_DROWNRECOVER, DMG_ACID, DMG_SLOWBURN, DMG_SLOWFREEZE
 		};
-		for (int i = 0; i < CDMG_TIMEBASED; i++)
+		for (unsigned int i = 0; i < CDMG_TIMEBASED; i++)
 		{
 			if (bitsDamageType & damageTypes[i])
 				m_rgbTimeBasedDamage[i] = 0;
@@ -775,7 +774,7 @@ void CBasePlayer::Killed(entvars_t *pevAttacker, int iGib)
 		IScripted *pScripted = GetScripted(); // UScripted? IScripted.
 		if (pScripted)
 		{
-			for (int i = 0; i < pScripted->m_Scripts.size(); i++)							 // Check each
+			for (unsigned int i = 0; i < pScripted->m_Scripts.size(); i++)							 // Check each
 			{
 				if (m_Scripts[i]->VarExists("game.effect.id"))								 //This is an effect
 				{
@@ -1271,7 +1270,7 @@ void FixPlayerCrouchStuck(edict_t *pPlayer)
 	TraceResult trace;
 
 	// Move up as many as 18 pixels if the player is stuck.
-	for (int i = 0; i < 18; i++)
+	for (unsigned int i = 0; i < 18; i++)
 	{
 		UTIL_TraceHull(pPlayer->v.origin, pPlayer->v.origin, dont_ignore_monsters, head_hull, pPlayer, &trace);
 		if (trace.fStartSolid)
@@ -1289,7 +1288,7 @@ void CBasePlayer::PlayerAction(const char* Action)
 {
 	CScript *EventScript = NULL;
 
-	for (int i = 0; i < m_Scripts.size(); i++)
+	for (unsigned int i = 0; i < m_Scripts.size(); i++)
 		if (!strcmp(m_Scripts[i]->GetVar("game.effect.id"), Action))
 		{
 			EventScript = m_Scripts[i];
@@ -2303,7 +2302,7 @@ BOOL IsSpawnPointValid(CBaseEntity *pPlayer, CBaseEntity *pSpot)
 	// Vector vMinBounds = pSpot->pev->origin - Vector(Range, Range, Range);
 	// Vector vMaxBounds = pSpot->pev->origin + Vector(Range, Range, Range);
 	// int count = UTIL_EntitiesInBox(g_pEntitiesInBox, MAX_ENTITIES_TO_SEARCH, vMinBounds, vMaxBounds, 0);
-	// for (int i = 0; i < count; i++)
+	// for (unsigned int i = 0; i < count; i++)
 	// {
 	// 	CBaseEntity *pSightEnt = g_pEntitiesInBox[i];
 	// 	if (!pSightEnt || pSightEnt->pev->solid == SOLID_NOT ||
@@ -2589,7 +2588,7 @@ void CBasePlayer::Spawn(void)
 	//Thothie - yeah, but we really, really need it now, attempting to compensate
 	if (!fRespawnPlayer)
 	{
-		for (int i = 0; i < Gear.size(); i++)
+		for (unsigned int i = 0; i < Gear.size(); i++)
 		{
 			CGenericItem *cur_item = Gear[i];
 
@@ -2800,7 +2799,7 @@ void CBasePlayer::Spawn(void)
 		//Shuriken - This should send an Exp message for all the players' stats.
 		//I have no idea how costly it is to send this many message each time a player joins
 		//so you might be better off just axing this and letting them update on monster kills.
-		/*for(int i = 0; i < SKILL_MAX_ATTACK; i++) {
+		/*for(unsigned int i = 0; i < SKILL_MAX_ATTACK; i++) {
 			CStat *pStat = FindStat( i + SKILL_FIRSTSKILL );
 			for(int p = 0; p < (signed)pStat->m_SubStats.size();p++) {
 				CSubStat &SubStat = pStat->m_SubStats[p];
@@ -2890,7 +2889,7 @@ void CBasePlayer::Spawn(void)
 	pev->netname = MAKE_STRING(m_NetName.c_str());
 
 	//Shurik3n AUG2007a - attempts to fix 100% bug
-	for (int i = 0; i < SKILL_MAX_STATS; i++)
+	for (unsigned int i = 0; i < SKILL_MAX_STATS; i++)
 	{
 		CStat *pStat = FindStat(i + SKILL_FIRSTSKILL);
 		for (int p = 0; p < (signed)pStat->m_SubStats.size(); p++)
@@ -3245,7 +3244,7 @@ CBaseEntity *CBasePlayer::GiveNamedItem(const char *pszName)
 		return NULL;
 
 	const char* WeaponScript = NULL;
-	for (int i = 0; i < CGenericItemMgr::ItemCount(); i++)
+	for (unsigned int i = 0; i < CGenericItemMgr::ItemCount(); i++)
 	{
 		GenItem_t &GlobalItem = *CGenericItemMgr::Item(i);
 		if (strstr(GlobalItem.pItem->ItemName.c_str(), pszName))
@@ -3649,7 +3648,7 @@ void CBasePlayer::UpdateClientData(void)
 				PlayerInterface += const char*(msstring(":") + (int)g_NetCode.s.FilePort);
 				logfile << "Sending server IP to " << DisplayName() << ": " << PlayerInterface.c_str() << "\r\n";
 				WRITE_STRING( PlayerInterface.c_str() );*/
-			for (int i = 0; i < CLPERMENT_TOTAL; i++)
+			for (unsigned int i = 0; i < CLPERMENT_TOTAL; i++)
 				WRITE_SHORT(MSGlobals::ClEntities[i]);
 
 			byte Flags = 0;
@@ -3712,7 +3711,7 @@ void CBasePlayer::UpdateClientData(void)
 		//Send all quickslots
 		MESSAGE_BEGIN(MSG_ONE, g_netmsg[NETMSG_CLDLLFUNC], NULL, pev); //Send the quickslots
 		WRITE_BYTE(21);
-		for (int i = 0; i < MAX_QUICKSLOTS; i++)
+		for (unsigned int i = 0; i < MAX_QUICKSLOTS; i++)
 		{
 			quickslot_t &QuickSlot = m_QuickSlots[i];
 			WRITE_BYTE(QuickSlot.Active ? 1 : 0);
@@ -3741,7 +3740,7 @@ void CBasePlayer::UpdateClientData(void)
 	}*/
 
 	//Send new items
-	for (int i = 0; i < Gear.size(); i++)
+	for (unsigned int i = 0; i < Gear.size(); i++)
 	{
 		CGenericItem *pItem = Gear[i];
 
@@ -3749,7 +3748,7 @@ void CBasePlayer::UpdateClientData(void)
 
 		bool fInCache = false, fCached = false;
 
-		for (int n = 0; n < m_ClientItems.size(); n++)
+		for (unsigned int n = 0; n < m_ClientItems.size(); n++)
 			if (m_ClientItems[n].ID == pItem->m_iId)
 			{
 				fInCache = true;
@@ -3798,7 +3797,7 @@ void CBasePlayer::UpdateClientData(void)
 	}
 
 	//Update and delete old items
-	for (int i = 0; i < m_ClientItems.size(); i++)
+	for (unsigned int i = 0; i < m_ClientItems.size(); i++)
 	{
 		ulong ClientItemID = m_ClientItems[i].ID;
 
@@ -3828,7 +3827,7 @@ void CBasePlayer::UpdateClientData(void)
 		m_ClientCurrentHand = m_CurrentHand;
 	}
 
-	for (int i = 0; i < m_Stats.size(); i++)
+	for (unsigned int i = 0; i < m_Stats.size(); i++)
 	{
 		CStat &Stat = m_Stats[i];
 		if (Stat.Changed())
@@ -3836,7 +3835,7 @@ void CBasePlayer::UpdateClientData(void)
 			MESSAGE_BEGIN(MSG_ONE, g_netmsg[NETMSG_SETSTAT], NULL, pev);
 			WRITE_BYTE(1);
 			WRITE_BYTE(i);
-			for (int r = 0; r < Stat.m_SubStats.size(); r++)
+			for (unsigned int r = 0; r < Stat.m_SubStats.size(); r++)
 			{
 				WRITE_BYTE(Stat.m_SubStats[r].Value);
 				if (Stat.m_Type == CStat::STAT_SKILL)
@@ -3897,7 +3896,7 @@ void CBasePlayer::UpdateClientData(void)
 	}*/
 
 	int Msg = 0, Amt = 0, *pLastAmt = NULL, Type = 0;
-	for (int i = 0; i < 4; i++)
+	for (unsigned int i = 0; i < 4; i++)
 	{
 		switch (i)
 		{
@@ -3960,7 +3959,7 @@ void CBasePlayer::UpdateClientData(void)
 	float *pLastSent; //MiB JAN2010_26 - Slowing down how often these send
 
 	//MiBJAN2010_17 - alterations to loop below
-	 for (int i = 0; i < 4; i++)
+	 for (unsigned int i = 0; i < 4; i++)
 	{
 		switch( i )
 		{
@@ -4021,7 +4020,7 @@ void CBasePlayer::UpdateClientData(void)
 	//Update player actions list
 	ClearBits(m_StatusFlags, PLAYER_MOVE_NORUN | PLAYER_MOVE_NOJUMP | PLAYER_MOVE_NODUCK | PLAYER_MOVE_NOATTACK | PLAYER_MOVE_NOMOVE | PLAYER_MOVE_STOPRUN);
 
-	for (int i = 0; i < m_Scripts.size(); i++)
+	for (unsigned int i = 0; i < m_Scripts.size(); i++)
 	{
 		CScript *Script = m_Scripts[i];
 
@@ -4619,8 +4618,8 @@ void CBasePlayer::UpdateMiscPositions(void)
 		Vector vMinBounds = pev->origin - Vector(Range, Range, Range);
 		Vector vMaxBounds = pev->origin + Vector(Range, Range, Range);
 
-		int count = UTIL_EntitiesInBox(g_pEntitiesInBox, MAX_ENTITIES_TO_SEARCH, vMinBounds, vMaxBounds, 0);
-		for (int i = 0; i < count && EntriesSent < 2; i++) //only send 2 at a time now
+		unsigned int count = UTIL_EntitiesInBox(g_pEntitiesInBox, MAX_ENTITIES_TO_SEARCH, vMinBounds, vMaxBounds, 0);
+		for (unsigned int i = 0; i < count && EntriesSent < 2; i++) //only send 2 at a time now
 		{
 			CBaseEntity *pSightEnt = g_pEntitiesInBox[i];
 
@@ -4683,7 +4682,7 @@ void CBasePlayer::UpdateMiscPositions(void)
 			}
 
 			entinfo_t *pSlot = NULL;
-			for (int e = 0; e < m_EntInfo.size(); e++) // Find the slot for this entity
+			for (unsigned int e = 0; e < m_EntInfo.size(); e++) // Find the slot for this entity
 				if (m_EntInfo[e].entindex == EntData.entindex)
 				{
 					pSlot = &m_EntInfo[e];
@@ -4697,7 +4696,7 @@ void CBasePlayer::UpdateMiscPositions(void)
 				else //Too many entities - overwrite the furthest one away
 				{
 					int iFarthestDist = -1, iFarthestEnt = 0;
-					for (int e = 0; e < m_EntInfo.size(); e++)
+					for (unsigned int e = 0; e < m_EntInfo.size(); e++)
 					{
 						CBaseEntity* pEntity = MSInstance(INDEXENT(m_EntInfo[e].entindex));
 						if (!pEntity)
@@ -4955,7 +4954,7 @@ void CBasePlayer::UpdateMiscPositions(void)
 			if (memcmp(&Info, &m_ScoreInfoCache, sizeof(scoreinfo_t)))
 			{
 				pev->frags = m_MaxHP; //FEB2008a - Report HP to Scoreboard
-				for (int i = 1; i <= gpGlobals->maxClients; i++)
+				for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
 				{
 					CBasePlayer *pSendPlayer = (CBasePlayer *)UTIL_PlayerByIndex(i);
 					if (pSendPlayer)
@@ -5045,13 +5044,13 @@ enum transtype_e
 };
 struct itemdesc_t
 {
-	int iEntIndex;
+	unsigned int iEntIndex;
 	CBaseEntity *pItem;
 	itemtype_e ItemType;
 	void *pvExtra;
 	CBasePlayerItem *pGroupList[256];
 	int GroupListEntidx[256];
-	int iGroupedItems, iGroupedItemTotal;
+	unsigned int iGroupedItems, iGroupedItemTotal;
 };
 
 #define MAX_GET_ITEMS 9
@@ -5060,7 +5059,7 @@ struct itemdesc_t
 struct itemtrans_t
 {
 	transtype_e TransType;
-	int ItemTotal;
+	unsigned int ItemTotal;
 	itemdesc_t ItemList[MAX_GET_ITEMS];
 	void *pvExtra;
 };
@@ -5070,7 +5069,7 @@ struct itemtrans_t
 void CBasePlayer::GetAnyItems()
 {
 	CBaseEntity *pObject = NULL;
-	int ItemCount = 0, MenuCount = 0;
+	unsigned int ItemCount = 0, MenuCount = 0;
 	char cItemList[256], cTemp[256];
 	itemtrans_t itItemTransaction;
 	memset(&itItemTransaction, 0, sizeof(itemtrans_t));
@@ -5108,7 +5107,7 @@ void CBasePlayer::GetAnyItems()
 		if(pArray)
 		{
 			ALLOW = false;
-			for(int i = 0; i < pArray->size(); i++)
+			for(unsigned int i = 0; i < pArray->size(); i++)
 			{
 				if (EntToString(this) == (*pArray)[i])
 				{
@@ -5148,7 +5147,7 @@ void CBasePlayer::GetAnyItems()
 		if (FBitSet(pItem->MSProperties(), ITEM_GROUPABLE))
 		{
 			CBaseEntity *pTestItem;
-			for (int i = 0; i < ItemCount; i++)
+			for (unsigned int i = 0; i < ItemCount; i++)
 			{
 				itemdesc_t *pOwnerDesc = NULL;
 				pTestItem = itItemTransaction.ItemList[i].pItem;
@@ -5160,7 +5159,7 @@ void CBasePlayer::GetAnyItems()
 					if (((CGenericItem *)pTestItem)->iQuantity +
 							pOwnerDesc->iGroupedItemTotal +
 							pItem->iQuantity <
-						V_min(pItem->iMaxGroupable, 256))
+						V_min(pItem->iMaxGroupable, (unsigned int)256))
 					{
 						pOwnerDesc->GroupListEntidx[pOwnerDesc->iGroupedItems] = pItem->entindex();
 						pOwnerDesc->pGroupList[pOwnerDesc->iGroupedItems++] = pItem;
@@ -5216,7 +5215,7 @@ void CBasePlayer::GetAnyItems()
 		}
 	}
 
-	for (int i = 0; i < ItemCount; i++)
+	for (unsigned int i = 0; i < ItemCount; i++)
 	{
 		CBaseEntity *pEnt = itItemTransaction.ItemList[i].pItem;
 		if (pEnt->IsMSMonster())
@@ -5465,7 +5464,7 @@ void CBasePlayer::TransactionCallback(CBasePlayer *pPlayer, int slot, TCallbackM
 	itemtrans_t *pTransaction = (itemtrans_t *)pcbMenu->vData;
 
 	//slot == -1: Free this menu data, the menu got cancelled
-	if (slot < 0 || slot >= pTransaction->ItemTotal)
+	if (slot < 0 || (unsigned int)slot >= pTransaction->ItemTotal)
 		goto freememory;
 
 	switch (pTransaction->TransType)
@@ -5510,7 +5509,7 @@ void CBasePlayer::TransactionCallback(CBasePlayer *pPlayer, int slot, TCallbackM
 			SendInfoMsg("You pick up %s", SPEECH_GetItemName(pItem));
 
 			if (pItemDesc->iGroupedItems)
-				for (int i = 0; i < pItemDesc->iGroupedItems; i++)
+				for (unsigned int i = 0; i < pItemDesc->iGroupedItems; i++)
 				{
 					edict_t *peGroupedItem = INDEXENT(pItemDesc->GroupListEntidx[i]);
 					if (peGroupedItem && peGroupedItem->pvPrivateData == pItemDesc->pGroupList[i])
@@ -5864,7 +5863,7 @@ tradeinfo_t *CBasePlayer::TradeItem(tradeinfo_t *ptiTradeInfo)
 					char stat_name[256];
 					 strncpy(stat_name,  StatName.c_str(), sizeof(stat_name) );
 					_strlwr(stat_name);
-					for (int i = 0; i < sizeof(stat_name); i++)
+					for (unsigned int i = 0; i < sizeof(stat_name); i++)
 					{
 						if (stat_name[i] == 0)
 							break;
@@ -5923,7 +5922,7 @@ tradeinfo_t *CBasePlayer::TradeItem(tradeinfo_t *ptiTradeInfo)
 						SendInfoMsg("You receive %s.", SPEECH_GetItemName(ptiTradeAnswer->pItem));
 						ptiTradeAnswer->pItem->GiveTo(this);
 						GiveGold(-ptiTradeAnswer->iPrice, false);
-						ptiTradeAnswer->psiStoreItem->Quantity -= V_max(ptiTradeAnswer->pItem->iQuantity, 1);
+						ptiTradeAnswer->psiStoreItem->Quantity -= V_max(ptiTradeAnswer->pItem->iQuantity, (unsigned int)1);
 
 						//Thothie FEB2008a - allow informing of other players of item transfer
 						static msstringlist Params;
@@ -5965,9 +5964,10 @@ tradeinfo_t *CBasePlayer::TradeItem(tradeinfo_t *ptiTradeInfo)
 				if (!ptiTradeAnswer->pItem)
 					goto EndTrade;
 
+				unsigned int Minimum = 1;
 				SendInfoMsg("You sell %s for %i gold.", SPEECH_GetItemName(ptiTradeAnswer->pItem), ptiTradeAnswer->iPrice);
 				GiveGold(ptiTradeAnswer->iPrice, false);
-				ptiTradeAnswer->psiStoreItem->Quantity += (short)V_max(ptiTradeAnswer->pItem->iQuantity, 1);
+				ptiTradeAnswer->psiStoreItem->Quantity += (short)V_max(ptiTradeAnswer->pItem->iQuantity, Minimum);
 				RemoveItem(ptiTradeAnswer->pItem);
 				ptiTradeAnswer->pItem->SUB_Remove();
 
@@ -6058,7 +6058,7 @@ bool CBasePlayer::PrepareSpell(const char *pszName)
 	//Thothie - make sure player actually HAS SPELL before giving it to him
 	//otherwise you can summon any spell with prep command
 	bool bCanGiveSpell = false;
-	for (int i = 0; i < m_SpellList.size(); i++)
+	for (unsigned int i = 0; i < m_SpellList.size(); i++)
 	{
 		msstring ShortName = m_SpellList[i];
 		if (ShortName == pszName)
@@ -6273,7 +6273,7 @@ void CBasePlayer::SetQuest(bool SetData, const char* Name, const char* Data)
 		ALERT( at_aiconsole, "Hard_Code-erasing quest data");
 		m_Quests.clearitems();
 		m_Quests.clear();
-		 for (int i = 0; i < m_Quests.size(); i++)
+		 for (unsigned int i = 0; i < m_Quests.size(); i++)
 		{
 			m_Quests.erase(i);
 		}
@@ -6282,7 +6282,7 @@ void CBasePlayer::SetQuest(bool SetData, const char* Name, const char* Data)
 	{*/
 
 	int Found = -1;
-	for (int i = 0; i < m_Quests.size(); i++)
+	for (unsigned int i = 0; i < m_Quests.size(); i++)
 	{
 		if (m_Quests[i].Name == Name)
 		{
@@ -6445,13 +6445,13 @@ bool CBasePlayer::RestoreAllServer(void *pData, ulong Size)
 	MESSAGE_END();
 
 	//Read Magic spells
-	for (int s = 0; s < Data.m_Spells.size(); s++)
+	for (unsigned int s = 0; s < Data.m_Spells.size(); s++)
 		LearnSpell(Data.m_Spells[s]);
 
 	mslist<CGenericItem *> Items; //Keep track of ALL items, for quickslot assignment later
 
 	//Read Items
-	for (int i = 0; i < Data.m_Items.size(); i++)
+	for (unsigned int i = 0; i < Data.m_Items.size(); i++)
 	{
 		CGenericItem *pItem = Data.m_Items[i].operator CGenericItem *();
 		
@@ -6465,7 +6465,7 @@ bool CBasePlayer::RestoreAllServer(void *pData, ulong Size)
 			pItem->AddToOwner(this);
 
 		Items.add(pItem);
-		for (int c = 0; c < pItem->Container_ItemCount(); c++)
+		for (unsigned int c = 0; c < pItem->Container_ItemCount(); c++)
 			Items.add(pItem->Container_GetItem(c));
 
 		//if( FBitSet(pItem->MSProperties(), ITEM_WEARABLE) && pItem->IsWorn() )	//Wear the wearable items
@@ -6481,7 +6481,7 @@ bool CBasePlayer::RestoreAllServer(void *pData, ulong Size)
 	m_Companions = Data.m_Companions;
 	//Thothie JUN2008a - just read in companions, save the summoning until the script command "summonpets"
 	//- scratch the above, if the player saves while his pet is not present, it corrupts the pet and character
-	for (int c = 0; c < m_Companions.size(); c++)
+	for (unsigned int c = 0; c < m_Companions.size(); c++)
 	{
 		companion_t &Companion = m_Companions[c];
 
@@ -6502,7 +6502,7 @@ bool CBasePlayer::RestoreAllServer(void *pData, ulong Size)
 		IScripted *pScripted = pCompanion->GetScripted();
 		if (!pScripted || !pScripted->m_Scripts.size())
 			continue;
-		for (int v = 0; v < Companion.SaveVarName.size(); v++)
+		for (unsigned int v = 0; v < Companion.SaveVarName.size(); v++)
 			pScripted->SetScriptVar(Companion.SaveVarName[v].c_str(), Companion.SaveVarValue[v].c_str());
 
 		pScripted->CallScriptEvent("game_companion_restore");
@@ -6515,7 +6515,7 @@ bool CBasePlayer::RestoreAllServer(void *pData, ulong Size)
 	m_Quests = Data.m_Quests;
 
 	//Read QuickSlots
-	for (int q = 0; q < Data.m_QuickSlots.size(); q++)
+	for (unsigned int q = 0; q < Data.m_QuickSlots.size(); q++)
 	{
 		quickslot_t &QuickSlot = Data.m_QuickSlots[q];
 		if (QuickSlot.Active && (QuickSlot.Type == QS_ITEM))
@@ -6536,7 +6536,7 @@ bool CBasePlayer::RestoreAllServer(void *pData, ulong Size)
 	}
 
 	//Make sure an update is sent from UpdateClientData ASAP
-	for (int i = 0; i < m_Stats.size(); i++)
+	for (unsigned int i = 0; i < m_Stats.size(); i++)
 		m_Stats[i].OutDate();
 
 	m_CharacterState = CHARSTATE_LOADED;
@@ -6586,7 +6586,7 @@ void CBasePlayer::Think_SendCharData()
 
 	msstringlist VisitedMaps;
 
-	for (int i = 0; i < MAX_CHARSLOTS; i++)
+	for (unsigned int i = 0; i < MAX_CHARSLOTS; i++)
 	{
 		charinfo_t& CharInfo = m_CharInfo[i];
 
@@ -6628,12 +6628,13 @@ void CBasePlayer::Think_SendCharData()
 		// Send items data
 		if (CharInfo.Status == CDS_LOADED)
 		{
-			const int maxItemsToSend = V_min(CharInfo.GearInfo.size(), 20);
+			unsigned int Maximum = 20;
+			const unsigned int maxItemsToSend = V_min(CharInfo.GearInfo.size(), Maximum);
 			MESSAGE_BEGIN(MSG_ONE, g_netmsg[NETMSG_CHARINFO], NULL, pev);
 			WRITE_BYTE(CHAR_TYPE_ITEMS);
 			WRITE_BYTE(CharInfo.Index);
 			WRITE_BYTE(maxItemsToSend);
-			for (int i = 0; i < maxItemsToSend; i++)
+			for (unsigned int i = 0; i < maxItemsToSend; i++)
 			{
 				const gearinfo_t& GearInfo = CharInfo.GearInfo[i];
 				WRITE_BYTE(GearInfo.Flags);
@@ -6659,7 +6660,7 @@ bool CBasePlayer::IsInAttackStance()
 	if (m_TimeResetLegs && gpGlobals->time < m_TimeResetLegs)
 		return true;
 
-	for (int i = 0; i < MAX_NPC_HANDS; i++)
+	for (unsigned int i = 0; i < MAX_NPC_HANDS; i++)
 		if (Hand(i) && Hand(i)->IsInAttackStance())
 			return true;
 
@@ -6689,7 +6690,7 @@ void CBasePlayer::Storage_Send()
 	MESSAGE_END();
 
 	//Send all storage items.
-	for (int s = 0; s < m_Storages.size(); s++)
+	for (unsigned int s = 0; s < m_Storages.size(); s++)
 	{
 		if (!m_Storages[s].Items.size())
 		{
@@ -6703,7 +6704,7 @@ void CBasePlayer::Storage_Send()
 		else
 		{
 			//If the storage has items, send a full message
-			for (int i = 0; i < m_Storages[s].Items.size(); i++)
+			for (unsigned int i = 0; i < m_Storages[s].Items.size(); i++)
 			{
 				MESSAGE_BEGIN(MSG_ONE, g_netmsg[NETMSG_STOREITEM], NULL, pev);
 				WRITE_BYTE(2); //storage item
@@ -6746,7 +6747,7 @@ void CBasePlayer::QuickSlot_Create(int Slot, ulong ID, bool Verbose)
 		}
 		else
 		{
-			for (int i = 0; i < m_SpellList.size(); i++)
+			for (unsigned int i = 0; i < m_SpellList.size(); i++)
 			{
 				msstring LongName = pItem->m_Scripts[0]->m.ScriptFile;
 				msstring ShortName = m_SpellList[i];
diff --git a/src/game/server/player/player.h b/src/game/server/player/player.h
index b5d08053..45947d57 100644
--- a/src/game/server/player/player.h
+++ b/src/game/server/player/player.h
@@ -384,7 +384,7 @@ struct chardata_t : savedata_t
 
 	CStat* GetStat(int index)
 	{
-		if ((index < 0) || (index >= m_Stats.size()))
+		if ((index < 0) || ((unsigned)index > m_Stats.size() - 1))
 			return NULL;
 		return &m_Stats[index];
 	}
diff --git a/src/game/server/player/playershared.cpp b/src/game/server/player/playershared.cpp
index daaf3a07..b64f2c48 100644
--- a/src/game/server/player/playershared.cpp
+++ b/src/game/server/player/playershared.cpp
@@ -40,7 +40,7 @@ const char* GetPlayerTitle(int Title)
 
 int GetPlayerTitleIdx(const char* pszTitle)
 {
-	for (int i = 0; i < CTitleManager::Titles.size(); i++)
+	for (unsigned int i = 0; i < CTitleManager::Titles.size(); i++)
 		if (FStrEq(CTitleManager::Titles[i].Name, pszTitle))
 			return i;
 	return 0;
@@ -71,13 +71,13 @@ title_t* CTitleManager::GetPlayerTitle(CBasePlayer* pPlayer)
 	skillcache_t Temp;
 	skillcache_t SwapTemp;
 
-	for (int i = 0; i < SKILL_MAX_STATS; i++)
+	for (unsigned int i = 0; i < (unsigned int)SKILL_MAX_STATS; i++)
 	{
 		Temp.Skill = i;
 		Temp.Value = pPlayer->GetSkillStat(SKILL_FIRSTSKILL + i);
 		Skills[i] = Temp;
 
-		for (int n = 0; n < i; n++)
+		for (unsigned int n = 0; n < i; n++)
 		{
 			if (Temp.Value > SortedSkills[n].Value)
 			{
@@ -90,19 +90,19 @@ title_t* CTitleManager::GetPlayerTitle(CBasePlayer* pPlayer)
 	}
 
 	/*#ifndef VALVE_DLL
-	 for (int i = 0; i < SKILL_MAX_STATS; i++)
+	 for (unsigned int i = 0; i < SKILL_MAX_STATS; i++)
 		Print( "Skill %i, [%i]%s (%i)\n", i, SortedSkills[i].Skill, SkillStatList[SortedSkills[i].Skill].Name, GetSkillName( SKILL_FIRSTSKILL + SortedSkills[i].Skill ) );
 #endif*/
 
 //Find a title
 	title_t* pBestTitle = &DefaultTitle;
 
-	for (int i = 0; i < Titles.size(); i++)
+	for (unsigned int i = 0; i < Titles.size(); i++)
 	{
 		title_t& Title = Titles[i];
 		bool SkillsAreValid = true;
 
-		for (int s = 0; s < Title.SkillsReq.size(); s++)
+		for (unsigned int s = 0; s < Title.SkillsReq.size(); s++)
 		{
 			int Skill = Title.SkillsReq[s] - SKILL_FIRSTSKILL;
 
@@ -114,7 +114,7 @@ title_t* CTitleManager::GetPlayerTitle(CBasePlayer* pPlayer)
 			} //Skill not high enough
 
 			bool IsHighestSkill = false;
-			for (int h = 0; h < Title.SkillsReq.size(); h++) 
+			for (unsigned int h = 0; h < Title.SkillsReq.size(); h++) 
 			{
 				if (SortedSkills[h].Skill == Skill)
 				{
@@ -184,10 +184,10 @@ const char* CBasePlayer::GetFullTitle()
 		Title = "";
 
 		int SkillLevel = 0;
-		int SkillsReq = pTitle->SkillsReq.size();
+		unsigned int SkillsReq = pTitle->SkillsReq.size();
 		if (SkillsReq)   //Only add the skill level if this title requires skills
 		{
-			for (int s = 0; s < SkillsReq; s++)
+			for (unsigned int s = 0; s < SkillsReq; s++)
 			{
 				SkillLevel += GetSkillStat(pTitle->SkillsReq[s]);
 			}
@@ -246,7 +246,7 @@ void CBasePlayer::InitialSpawn(void)
 	m_AnimSpeedAdj = 1;
 
 	// Reset char info
-	for (int i = 0; i < MAX_CHARSLOTS; i++)
+	for (unsigned int i = 0; i < MAX_CHARSLOTS; i++)
 		m_CharInfo[i].Index = i;
 
 	CreateStats();
@@ -270,7 +270,7 @@ void CBasePlayer::InitialSpawn(void)
 		CGlobalScriptedEffects::RegisterEffect( ManualEffect );
 			*/
 
-	for (int i = 0; i < CGlobalScriptedEffects::Effects.size(); i++)
+	for (unsigned int i = 0; i < CGlobalScriptedEffects::Effects.size(); i++)
 	{
 		globalscripteffect_t& Effect = CGlobalScriptedEffects::Effects[i];
 		if (!FBitSet(Effect.m_Flags, SCRIPTEFFECT_PLAYERACTION))
@@ -357,7 +357,7 @@ int CBasePlayer::NewItemHand(CGenericItem* pItem, bool CheckWeight, bool bVerbos
 	if (!pItem)
 		return -1;
 
-	for (int i = 0; i < MAX_PLAYER_HANDS; i++) //Am I already holding it?
+	for (unsigned int i = 0; i < MAX_PLAYER_HANDS; i++) //Am I already holding it?
 		if (Hand(i) && Hand(i) == pItem)
 			return 0;
 
@@ -366,7 +366,7 @@ int CBasePlayer::NewItemHand(CGenericItem* pItem, bool CheckWeight, bool bVerbos
 
 	bool HoldingTwoHandedItem = false;
 
-	for (int i = 0; i < MAX_PLAYER_HANDS; i++) //If either hand is holding a two-handed items, my hands are full
+	for (unsigned int i = 0; i < MAX_PLAYER_HANDS; i++) //If either hand is holding a two-handed items, my hands are full
 		if (Hand(i) && Hand(i)->m_PrefHand == BOTH_HANDS)
 		{
 			HoldingTwoHandedItem = true;
@@ -382,13 +382,13 @@ int CBasePlayer::NewItemHand(CGenericItem* pItem, bool CheckWeight, bool bVerbos
 			//check both, and use iPrefHand if both are empty
 			bool fHandAllowed[MAX_PLAYER_HANDS] = { false };
 			if (pItem->m_PrefHand == ANY_HAND)
-				for (int i = 0; i < MAX_PLAYER_HANDS; i++)
+				for (unsigned int i = 0; i < MAX_PLAYER_HANDS; i++)
 					fHandAllowed[i] = true;
 			else
 				fHandAllowed[pItem->m_PrefHand] = true;
 
 			//Check left hand first, so items set to ANY_HAND will go into it first
-			for (int i = 0; i < MAX_PLAYER_HANDS; i++)
+			for (unsigned int i = 0; i < MAX_PLAYER_HANDS; i++)
 				if (fHandAllowed[i] && !Hand(i))
 				{
 					iAddHand = i;
@@ -400,7 +400,7 @@ int CBasePlayer::NewItemHand(CGenericItem* pItem, bool CheckWeight, bool bVerbos
 			//Item requires both hands
 			iAddHand = m_PrefHand;
 
-			for (int i = 0; i < MAX_PLAYER_HANDS; i++) //If either hand is full, the item can't be held
+			for (unsigned int i = 0; i < MAX_PLAYER_HANDS; i++) //If either hand is full, the item can't be held
 				if (Hand(i))
 				{
 					iAddHand = -1;
@@ -448,7 +448,7 @@ int CBasePlayer::NewItemHand(CGenericItem* pItem, bool CheckWeight, bool bVerbos
 		{
 			if (FreeHands) //Try to free both hands
 			{
-				for (int i = 0; i < MAX_PLAYER_HANDS; i++)
+				for (unsigned int i = 0; i < MAX_PLAYER_HANDS; i++)
 				{
 					if (Hand(i))
 						if (!Hand(i)->PutAway(false))
@@ -482,11 +482,11 @@ int CBasePlayer::NewItemHand(CGenericItem* pItem, bool CheckWeight, bool bVerbos
 //#item Return Thothie SEP2011_07
 int CBasePlayer::NumItems(void)
 {
-	int TotalItems = Gear.size() - 1;
-	for (int i = 0; i < Gear.size(); i++)
+	unsigned int TotalItems = Gear.size() - 1;
+	for (unsigned int i = 0; i < Gear.size(); i++)
 	{
 		CGenericItem* pPack = Gear[i];
-		for (int n = 0; n < pPack->Container_ItemCount(); n++)
+		for (unsigned int n = 0; n < pPack->Container_ItemCount(); n++)
 		{
 			++TotalItems;
 		}
@@ -509,7 +509,7 @@ bool CBasePlayer::CanHold(CGenericItem* pItem, bool bVerbose, char* pszErrorStri
 	int MaxItems = NUM_MAX_ITEMS;
 	int WarnItems = NUM_MAX_ITEMS - 5;
 	/*
-	 for (int i = 0; i < Gear.size(); i++)
+	 for (unsigned int i = 0; i < Gear.size(); i++)
 	{
 		CGenericItem *pPack = Gear[i];
 		 for (int n = 0; n < pPack->Container_ItemCount(); n++)
@@ -684,7 +684,7 @@ bool CBasePlayer::PutInAnyPack(CGenericItem* pItem, bool bVerbose)
 {
 	int PackCount = 0;
 	CGenericItem* pFirstPack = NULL;
-	for (int i = 0; i < Gear.size(); i++)
+	for (unsigned int i = 0; i < Gear.size(); i++)
 		if (FBitSet(Gear[i]->MSProperties(), ITEM_CONTAINER) &&
 			Gear[i]->m_Location != ITEMPOS_HANDS)
 		{
@@ -735,7 +735,7 @@ bool CBasePlayer::UseItem(int iHand, bool bVerbose)
 		//Try to find a weapon to pull out from a sheath
 
 		CGenericItem *pItem = NULL;
-		 for (int i = 0; i < Gear.size(); i++)
+		 for (unsigned int i = 0; i < Gear.size(); i++)
 		{
 			CGenericItem *pPack = Gear[i];
 			if( !FBitSet(pPack->MSProperties(),ITEM_CONTAINER) || pPack->Container_Type() != CGenericItem::PACK_SHEATH || !pPack->Container_ItemCount() )
@@ -852,7 +852,7 @@ bool CBasePlayer::UseItem(int iHand, bool bVerbose)
 // Better way to remove items without dropping them.
 void CBasePlayer::RemoveAllItems(bool fDead, bool fDeleteItems)
 {
-	for (int i = 0; i < MAX_NPC_HANDS; i++)
+	for (unsigned int i = 0; i < MAX_NPC_HANDS; i++)
 	{
 		CGenericItem* pItem = Hand(i);
 		if (!pItem)
@@ -1061,7 +1061,7 @@ int CBasePlayer::SkillAvg()
 {
 	//Get the average of all skills
 	int iTemp = 0;
-	for (int i = 0; i < SKILL_MAX_STATS; i++)
+	for (unsigned int i = 0; i < SKILL_MAX_STATS; i++)
 		iTemp += GetSkillStat(i);
 	iTemp /= SKILL_MAX_STATS;
 
@@ -1108,7 +1108,7 @@ void CBasePlayer::SendHelpMsg(const char* Tipname, const char* Title, const char
 	if (mstipname.contains("generic"))
 		generic_tip = true;
 
-	for (int i = 0; i < m_ViewedHelpTips.size(); i++)
+	for (unsigned int i = 0; i < m_ViewedHelpTips.size(); i++)
 		if (m_ViewedHelpTips[i] == Tipname && !generic_tip)
 			return;
 
@@ -1277,7 +1277,7 @@ void CBasePlayer::Deactivate()
 	RemoveAllItems(false, true); // Destroy all of the player's weapons and items
 
 	//Must manually deallocate any player memory that was dynamically allocated
-	for (int i = 0; i < MAX_CHARSLOTS; i++)
+	for (unsigned int i = 0; i < MAX_CHARSLOTS; i++)
 		m_CharInfo[i].Destroy();
 
 	m_EntInfo.clear();
@@ -1325,7 +1325,7 @@ void CBasePlayer::LearnSpell(const char* pszSpellScript, bool fVerbose)
 {
 	spellgroup_v& SpellList = m_SpellList;
 
-	for (int s = 0; s < SpellList.size(); s++) //Already know this spell?
+	for (unsigned int s = 0; s < SpellList.size(); s++) //Already know this spell?
 		if (SpellList[s] == pszSpellScript)
 			return;
 
@@ -1341,7 +1341,7 @@ void CBasePlayer::LearnSpell(const char* pszSpellScript, bool fVerbose)
 	/*	MESSAGE_BEGIN( MSG_ONE, g_netmsg[NETMSG_SPELLS], NULL, pev );
 				WRITE_SHORT( SpellList.size() );					//Number of spells
 				WRITE_SHORT( fVerbose ? SpellList.size() : 0 );		//If Verbose: Which spell was learned (incremented by 1 | 0 = Non-verbose)
-				 for (int s = 0; s < SpellList.size(); s++)
+				 for (unsigned int s = 0; s < SpellList.size(); s++)
 					WRITE_STRING( SpellList[s] );				//Spell scriptname
 			MESSAGE_END();		*/
 #else
@@ -1358,7 +1358,7 @@ void CBasePlayer::LearnSpell(const char* pszSpellScript, bool fVerbose)
 
 storage_t* CBasePlayer::Storage_GetStorage(const char* pszStorageName)
 {
-	for (int s = 0; s < m_Storages.size(); s++)
+	for (unsigned int s = 0; s < m_Storages.size(); s++)
 		if (m_Storages[s].Name == pszStorageName)
 			return &m_Storages[s];
 
@@ -1423,7 +1423,7 @@ void CBasePlayer::PreLoadChars(int CharIdx)
 
 	//Load all characters from file, locally
 
-	for (int i = 0; i < MAX_CHARSLOTS; i++)
+	for (unsigned int i = 0; i < MAX_CHARSLOTS; i++)
 	{
 		charinfo_t& Char = m_CharInfo[i];
 		CPlayer_DataBuffer gFile;
@@ -1477,7 +1477,7 @@ void charinfo_t::AssignChar(int CharIndex, charloc_e eLocation, const char* pDat
 
 		//MiB JAN2010_27 - Char Selection Fix
 		//Find last body used
-		for (int i = 0; i < CharData.m_Quests.size(); i++)
+		for (unsigned int i = 0; i < CharData.m_Quests.size(); i++)
 		{
 			if (CharData.m_Quests[i].Name == "BODY")
 			{
@@ -1486,7 +1486,7 @@ void charinfo_t::AssignChar(int CharIndex, charloc_e eLocation, const char* pDat
 			}
 		}
 
-		for (int i = 0; i < CharData.m_Items.size(); i++) //Determine what model/body my gear is using
+		for (unsigned int i = 0; i < CharData.m_Items.size(); i++) //Determine what model/body my gear is using
 		{
 			genericitem_full_t& Item = CharData.m_Items[i];
 			CGenericItem* pItem = (CGenericItem*)Item;
@@ -1517,7 +1517,7 @@ void charinfo_t::AssignChar(int CharIndex, charloc_e eLocation, const char* pDat
 
 			gearinfo_t Info;
 			Info.Flags = 0;
-			for (int w = 0; w < pItem->m_WearModelPositions.size(); w++)
+			for (unsigned int w = 0; w < pItem->m_WearModelPositions.size(); w++)
 				SetBits(Info.Flags, (1 << pItem->m_WearModelPositions[w]));
 			if (Item.Location != ITEMPOS_HANDS)
 				SetBits(Info.Flags, GEARFL_WEARING);
@@ -1545,7 +1545,7 @@ charinfo_t::~charinfo_t()
 const char* GetOtherPlayerTransition(CBasePlayer* pPlayer)
 {
 #ifdef VALVE_DLL
-	for (int i = 1; i <= gpGlobals->maxClients; i++)
+	for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
 	{
 		CBasePlayer* pOtherPlayer = (CBasePlayer*)UTIL_PlayerByIndex(i);
 		if (!pOtherPlayer || pOtherPlayer == pPlayer)
diff --git a/src/game/server/player/playerstats.cpp b/src/game/server/player/playerstats.cpp
index 0b7452a3..18d87f18 100644
--- a/src/game/server/player/playerstats.cpp
+++ b/src/game/server/player/playerstats.cpp
@@ -84,7 +84,7 @@ std::tuple<bool, int> CBasePlayer::LearnSkill(int iStat, int iStatType, int Enem
 		//see if anything has lower substats than the first skill in the list
 		if (csExpStat->m_SubStats.size() < 4)
 		{
-			for (int idx = 0; idx < csExpStat->m_SubStats.size(); idx++) {
+			for (unsigned int idx = 0; idx < csExpStat->m_SubStats.size(); idx++) {
 				if (csExpStat->m_SubStats[idx].Value < iFirstSubValue) {
 					iBestSubstatId = idx;
 				} 
@@ -100,7 +100,7 @@ std::tuple<bool, int> CBasePlayer::LearnSkill(int iStat, int iStatType, int Enem
 			//if we didn't find a low substat, go through the remaining exp instead
 			if (iEqualCount == 3) {
 
-				for (int idx = 0; idx < csExpStat->m_SubStats.size(); idx++) {
+				for (unsigned int idx = 0; idx < csExpStat->m_SubStats.size(); idx++) {
 					long double ldCurrentExpRemaining = abs(GetExpNeeded(csExpStat->m_SubStats[idx].Value) - csExpStat->m_SubStats[idx].Exp);
 
 					if (ldCurrentExpRemaining >= ldHighestExpRemaining) {
diff --git a/src/game/server/shield.cpp b/src/game/server/shield.cpp
index 5f084d4c..de54cd7a 100644
--- a/src/game/server/shield.cpp
+++ b/src/game/server/shield.cpp
@@ -21,7 +21,7 @@ void G_SolidifyEnts(bool fEnable, bool fSolidShields, bool fEnableCorpses, bool
 	//Make corpses solid here too...
 	CBaseEntity *pEnt = NULL;
 	edict_t *pEdict = g_engfuncs.pfnPEntityOfEntIndex(1);
-	for (int i = 1; i < gpGlobals->maxEntities; i++, pEdict++)
+	for (unsigned int i = 1; i < gpGlobals->maxEntities; i++, pEdict++)
 	{
 		if (pEdict->free) // Not in use
 			continue;
diff --git a/src/game/server/shurispritedefs.h b/src/game/server/shurispritedefs.h
index cc179e97..1319e075 100644
--- a/src/game/server/shurispritedefs.h
+++ b/src/game/server/shurispritedefs.h
@@ -84,7 +84,7 @@ const char *SpriteArray[INV_SPRITE_NUM] = {
 //Shuriken FEB2008a to check old sprite names and get their frame
 int SpriteIsInArray(const char *SpriteName)
 {
-	for (int i = 0; i < INV_SPRITE_NUM; i++)
+	for (unsigned int i = 0; i < INV_SPRITE_NUM; i++)
 	{
 		if (strcmp(SpriteName, SpriteArray[i]) == 0)
 		{
diff --git a/src/game/server/store.cpp b/src/game/server/store.cpp
index 2362de85..f77f9ab9 100644
--- a/src/game/server/store.cpp
+++ b/src/game/server/store.cpp
@@ -33,7 +33,7 @@ bool CStore ::AddItem(const char *pszItemName, int iQuantity, int iCost, float f
 
 storeitem_t *CStore ::GetItem(const char *pszItemName)
 {
-	for (int i = 0; i < Items.size(); i++)
+	for (unsigned int i = 0; i < Items.size(); i++)
 		if (FStrEq(Items[i].Name, pszItemName))
 			return &Items[i];
 
@@ -50,7 +50,7 @@ storeitem_t *CStore ::GetItem(int idx)
 
 void CStore::RemoveItem(const char* Name)
 {
-	for (int i = 0; i < Items.size(); i++)
+	for (unsigned int i = 0; i < Items.size(); i++)
 		if (FStrEq(Items[i].Name, Name))
 		{
 			Items.erase(i--);
@@ -66,7 +66,7 @@ void CStore::RemoveAllItems()
 void CStore ::Deactivate()
 {
 	RemoveAllItems();
-	for (int i = 0; i < m_gStores.size(); i++)
+	for (unsigned int i = 0; i < m_gStores.size(); i++)
 		if (m_gStores[i] == this)
 		{
 			m_gStores.erase(i);
@@ -93,7 +93,7 @@ void CStore ::Offer(edict_t *pePlayer, int iBuyFlags, CBaseMonster *pVendor)
 	WRITE_BYTE(Items.size());
 	MESSAGE_END();
 
-	for (int i = 0; i < Items.size(); i++)
+	for (unsigned int i = 0; i < Items.size(); i++)
 	{
 		//Send all store items.
 
diff --git a/src/game/server/store.h b/src/game/server/store.h
index 975f5ce8..ac905f4a 100644
--- a/src/game/server/store.h
+++ b/src/game/server/store.h
@@ -17,7 +17,7 @@ class CStore
 
 	static CStore *GetStoreByName(const char* Name)
 	{
-		for (int i = 0; i < m_gStores.size(); i++)
+		for (unsigned int i = 0; i < m_gStores.size(); i++)
 			if (FStrEq(m_gStores[i]->m_Name, Name))
 				return m_gStores[i];
 		return NULL;
diff --git a/src/game/server/sv_character.cpp b/src/game/server/sv_character.cpp
index 0dd83ac8..86ac38ac 100644
--- a/src/game/server/sv_character.cpp
+++ b/src/game/server/sv_character.cpp
@@ -41,7 +41,7 @@ void CBasePlayer::CreateChar(createchar_t &CharData)
 	RemoveAllItems(false, true);
 #endif
 	//Give 1 skill to each stat
-	for (int i = 0; i < m_Stats.size(); i++)
+	for (unsigned int i = 0; i < m_Stats.size(); i++)
 	{
 		CStat &Stat = m_Stats[i];
 		if (Stat.m_SubStats.size() == 1) //Parry - Only give 1 to proficiency
@@ -49,12 +49,12 @@ void CBasePlayer::CreateChar(createchar_t &CharData)
 		else if (Stat.m_SubStats.size() <= STATPROP_TOTAL) //Weapon Skills - Give 1 to power
 			Stat.m_SubStats[STATPROP_POWER].Value = 1;
 		else if (Stat.m_SubStats.size() > STATPROP_TOTAL) //Spellcasting - Give 1 to each spell category
-			for (int r = 0; r < Stat.m_SubStats.size(); r++)
+			for (unsigned int r = 0; r < Stat.m_SubStats.size(); r++)
 				Stat.m_SubStats[r].Value = 1;
 	}
 
 	//Give free items.  Wear any packs
-	for (int i = 0; i < MSGlobals::DefaultFreeItems.size(); i++)
+	for (unsigned int i = 0; i < MSGlobals::DefaultFreeItems.size(); i++)
 	{
 		CGenericItem *pStartingItem = NewGenericItem(MSGlobals::DefaultFreeItems[i]);
 		if (!pStartingItem)
@@ -177,7 +177,7 @@ void chardata_t::ReadSkills1(byte DataID, CPlayer_DataBuffer &m_File)
 		byte Stats = 0;
 		m_File.ReadByte(Stats);
 
-		for (int i = 0; i < Stats; i++)
+		for (unsigned int i = 0; i < Stats; i++)
 		{
 			pStat = GetStat(i);
 			byte SubStats = 0;
@@ -217,8 +217,8 @@ void chardata_t::ReadSkills1(byte DataID, CPlayer_DataBuffer &m_File)
 
 		// MiB JUL2010_02 - Hacky, but if we add more stats and we load a character that doesn't have said stat in the file
 		//		we set it to the default new stat value (level 0 in Prof and Balance, 1 in Power)
-		int StatsRemaining = (m_Stats.size() - Stats);
-		for (int i = 0; i < StatsRemaining; i++)
+		unsigned int StatsRemaining = (m_Stats.size() - Stats);
+		for (unsigned int i = 0; i < StatsRemaining; i++)
 		{
 			CStat& Stat = m_Stats[i + Stats];
 			Stat.m_SubStats[Stat.m_SubStats.size() - 1].Value = 1;
@@ -233,7 +233,7 @@ void chardata_t::ReadSpells1(byte DataID, CPlayer_DataBuffer &m_File)
 		//Read Magic spells
 		byte Spells = 0;
 		m_File.ReadByte(Spells); //[BYTE]
-		for (int s = 0; s < Spells; s++)
+		for (unsigned int s = 0; s < Spells; s++)
 		{
 			m_File.ReadString(cTemp, MSSTRING_SIZE); //[STRING]
 			m_Spells.add(cTemp);
@@ -248,7 +248,7 @@ void chardata_t::ReadItems1(byte DataID, CPlayer_DataBuffer &m_File)
 		//Read Items
 		byte GearItems = 0;
 		m_File.ReadByte(GearItems); //[SHORT]
-		for (int i = 0; i < GearItems; i++)
+		for (unsigned int i = 0; i < GearItems; i++)
 		{
 			genericitem_full_t Item;
 			if (!ReadItem1(DataID, m_File, Item)) //[X ITEMS]
@@ -265,16 +265,16 @@ void chardata_t::ReadStorageItems1(byte DataID, CPlayer_DataBuffer &m_File)
 	{
 		//Read storage items
 
-		short Storages = 0;
+		unsigned short Storages = 0;
 		m_File.ReadShort(Storages); //[SHORT]
-		for (int i = 0; i < Storages; i++)
+		for (unsigned int i = 0; i < Storages; i++)
 		{
 			storage_t Storage;
 			m_File.ReadString(Storage.Name, MSSTRING_SIZE); //[X STRINGS]
 
-			short Items = 0;
+			unsigned short Items = 0;
 			m_File.ReadShort(Items); //[X SHORTS]
-			for (int i = 0; i < Items; i++)
+			for (unsigned int i = 0; i < Items; i++)
 			{
 				genericitem_full_t Item;
 				if (!ReadItem1(DataID, m_File, Item)) //[Y ITEMS]
@@ -443,11 +443,11 @@ bool chardata_t::ReadItem1(byte DataID, CPlayer_DataBuffer &Data, genericitem_fu
 
 	if (FBitSet(Properties, ITEM_CONTAINER))
 	{
-		short iItemCount = 0;
+		unsigned short iItemCount = 0;
 		Data.ReadShort(iItemCount); //[SHORT]
 
 		genericitem_full_t PackItem;
-		for (int i = 0; i < iItemCount; i++)
+		for (unsigned int i = 0; i < iItemCount; i++)
 		{
 			bool Success = ReadItem1(DataID, Data, PackItem);
 			if (!Success)
@@ -578,18 +578,18 @@ void MSChar_Interface::SaveChar(CBasePlayer *pPlayer, savedata_t *pData)
 	//Must come just after writing savedata_t Data
 	gFile.WriteByte(CHARDATA_MAPSVISITED1); //[BYTE - CHUNK - MAPS VISITED]
 	gFile.WriteInt(pPlayer->m_Maps.size()); //[INT]
-	for (int m = 0; m < pPlayer->m_Maps.size(); m++)
+	for (unsigned int m = 0; m < pPlayer->m_Maps.size(); m++)
 		gFile.WriteString(pPlayer->m_Maps[m]); //[STRING]
 
 	//Save skills
 	gFile.WriteByte(CHARDATA_SKILLS1); //[BYTE - CHUNK - STATS]
 	statlist &StatList = pPlayer->m_Stats;
 	gFile.WriteByte(static_cast<byte>(StatList.size())); //[BYTE]
-	for (int i = 0; i < StatList.size(); i++)
+	for (unsigned int i = 0; i < StatList.size(); i++)
 	{
 		CStat &Stat = StatList[i];
 		gFile.WriteByte(static_cast<byte>(Stat.m_SubStats.size())); //[BYTE]
-		for (int r = 0; r < Stat.m_SubStats.size(); r++)
+		for (unsigned int r = 0; r < Stat.m_SubStats.size(); r++)
 		{
 			CSubStat &SubStat = Stat.m_SubStats[r];
 			gFile.WriteShort(SubStat.Value); //[SHORT]
@@ -602,7 +602,7 @@ void MSChar_Interface::SaveChar(CBasePlayer *pPlayer, savedata_t *pData)
 	gFile.WriteByte(CHARDATA_SPELLS1); //[BYTE - CHUNK - SPELLS]
 	gFile.WriteByte(static_cast<byte>(SpellList.size())); //[BYTE]
 
-	for (int s = 0; s < SpellList.size(); s++)
+	for (unsigned int s = 0; s < SpellList.size(); s++)
 		gFile.WriteString(SpellList[s]); //[X STRINGS]
 
 	//Save Items
@@ -611,13 +611,13 @@ void MSChar_Interface::SaveChar(CBasePlayer *pPlayer, savedata_t *pData)
 	static mslist<CGenericItem *> WriteList;
 	WriteList.clearitems();
 
-	for (int i = 0; i < pPlayer->Gear.size(); i++)
+	for (unsigned int i = 0; i < pPlayer->Gear.size(); i++)
 		if (pPlayer->Gear[i] != pPlayer->PlayerHands) //Skip player hands
 			WriteList.add(pPlayer->Gear[i]);
 
 	gFile.WriteByte(static_cast<byte>(WriteList.size())); //[BYTE]
 
-	for (int i = 0; i < WriteList.size(); i++)
+	for (unsigned int i = 0; i < WriteList.size(); i++)
 	{
 		genericitem_full_t charItem = genericitem_full_t(WriteList[i]);
 		WriteItem(gFile, charItem); //[X ITEMS]
@@ -627,13 +627,13 @@ void MSChar_Interface::SaveChar(CBasePlayer *pPlayer, savedata_t *pData)
 	gFile.WriteByte(CHARDATA_STORAGE1);			  //[BYTE - CHUNK - STORAGE ITEMS]
 	gFile.WriteShort(static_cast<short>(pPlayer->m_Storages.size())); //[SHORT]
 
-	for (int s = 0; s < pPlayer->m_Storages.size(); s++)
+	for (unsigned int s = 0; s < pPlayer->m_Storages.size(); s++)
 	{
 		storage_t &Storage = pPlayer->m_Storages[s];
 
 		gFile.WriteString(Storage.Name);		//[STRING]
 		gFile.WriteShort(static_cast<short>(Storage.Items.size())); //[SHORT]
-		for (int i = 0; i < Storage.Items.size(); i++)
+		for (unsigned int i = 0; i < Storage.Items.size(); i++)
 			WriteItem(gFile, Storage.Items[i]); //[X ITEMS]
 	}
 
@@ -644,7 +644,7 @@ void MSChar_Interface::SaveChar(CBasePlayer *pPlayer, savedata_t *pData)
 	SaveVarName.clearitems();
 	SaveVarValue.clearitems();
 
-	for (int c = 0; c < pPlayer->m_Companions.size(); c++)
+	for (unsigned int c = 0; c < pPlayer->m_Companions.size(); c++)
 	{
 		companion_t &Companion = pPlayer->m_Companions[c];
 		gFile.WriteString(Companion.ScriptName); //[STRING]
@@ -660,7 +660,7 @@ void MSChar_Interface::SaveChar(CBasePlayer *pPlayer, savedata_t *pData)
 		pScripted->CallScriptEvent("game_companion_save");
 
 		CScript *Script = pScripted->m_Scripts[0];
-		for (int v = 0; v < Script->m_Variables.size(); v++)
+		for (unsigned int v = 0; v < Script->m_Variables.size(); v++)
 			if (Script->m_Variables[v].Name.starts_with("companion.save."))
 			{
 				SaveVarName.add(Script->m_Variables[v].Name);
@@ -668,7 +668,7 @@ void MSChar_Interface::SaveChar(CBasePlayer *pPlayer, savedata_t *pData)
 			}
 
 		gFile.WriteShort(static_cast<short>(SaveVarName.size())); //[SHORT]
-		for (int var = 0; var < SaveVarName.size(); var++)
+		for (unsigned int var = 0; var < SaveVarName.size(); var++)
 		{
 			gFile.WriteString(SaveVarName[var]);  //[STRING]
 			gFile.WriteString(SaveVarValue[var]); //[STRING]
@@ -680,13 +680,13 @@ void MSChar_Interface::SaveChar(CBasePlayer *pPlayer, savedata_t *pData)
 	//Save Help tips
 	gFile.WriteByte(CHARDATA_HELPTIPS1);				//[BYTE - CHUNK - HELPTIPS]
 	gFile.WriteShort(static_cast<short>(pPlayer->m_ViewedHelpTips.size())); //[SHORT]
-	for (int t = 0; t < pPlayer->m_ViewedHelpTips.size(); t++)
+	for (unsigned int t = 0; t < pPlayer->m_ViewedHelpTips.size(); t++)
 		gFile.WriteString(pPlayer->m_ViewedHelpTips[t]); //[STRING]
 
 	//Save Quests
 	gFile.WriteByte(CHARDATA_QUESTS1);		  //[BYTE - CHUNK - QUESTS]
 	gFile.WriteInt(pPlayer->m_Quests.size()); //[INT]
-	for (int q = 0; q < pPlayer->m_Quests.size(); q++)
+	for (unsigned int q = 0; q < pPlayer->m_Quests.size(); q++)
 	{
 		gFile.WriteString(pPlayer->m_Quests[q].Name); //[STRING]
 		gFile.WriteString(pPlayer->m_Quests[q].Data); //[STRING]
@@ -695,7 +695,7 @@ void MSChar_Interface::SaveChar(CBasePlayer *pPlayer, savedata_t *pData)
 	//Save Quickslots
 	gFile.WriteByte(CHARDATA_QUICKSLOTS1); //[BYTE - CHUNK - QUICKSLOTS]
 	gFile.WriteByte(MAX_QUICKSLOTS);	   //[INT]
-	for (int q = 0; q < MAX_QUICKSLOTS; q++)
+	for (unsigned int q = 0; q < MAX_QUICKSLOTS; q++)
 	{
 		quickslot_t &QuickSlot = pPlayer->m_QuickSlots[q];
 		if (QuickSlot.Active)
diff --git a/src/game/server/svglobals.cpp b/src/game/server/svglobals.cpp
index 96ee342f..56cf07da 100644
--- a/src/game/server/svglobals.cpp
+++ b/src/game/server/svglobals.cpp
@@ -439,7 +439,7 @@ void MSWorldSpawn()
 					};
 					
 					bool bSuccess = true;
-					for (int i = 0; i < 7; i++)
+					for (unsigned int i = 0; i < 7; i++)
 					{
 						unsigned long fileSize;
 						if (!g_ScriptPack.ReadEntry(legacyModules[i], NULL, fileSize))
@@ -536,7 +536,7 @@ void MSGameEnd()
 	}
 	
 	//Save all characters now - Solokiller 5/10/2017
-	for(int i = 1; i <= gpGlobals->maxClients; ++i)
+	for(unsigned int i = 1; i <= gpGlobals->maxClients; ++i)
 	{
 		CBasePlayer *pPlayer = static_cast<CBasePlayer*>(UTIL_PlayerByIndex(i));
 
@@ -557,7 +557,7 @@ void MSGameEnd()
 	//Deallocate any 'extra' memory the mod allocated for any entity
 	edict_t *pEdict = g_engfuncs.pfnPEntityOfEntIndex(0);
 	if (pEdict)
-		for (int i = 0; i < gpGlobals->maxEntities; i++, pEdict++)
+		for (unsigned int i = 0; i < gpGlobals->maxEntities; i++, pEdict++)
 		{
 			if (pEdict->free)
 				continue;
@@ -622,7 +622,7 @@ void MSGameEnd()
 
 void SendHUDMsgAll(const char* Title, const char* Text)
 {
-	for (int p = 0; p < gpGlobals->maxClients; p++)
+	for (unsigned int p = 0; p < gpGlobals->maxClients; p++)
 		if (MSInstance(INDEXENT(p + 1)))
 			((CBasePlayer *)MSInstance(INDEXENT(p + 1)))->SendHUDMsg(Title, Text);
 }
@@ -639,7 +639,7 @@ const char *EngineFunc::GetGameDir()
 void WRITE_FLOAT(float Float)
 {
 	byte *pData = (byte *)&Float;
-	for (int i = 0; i < sizeof(float); i++)
+	for (unsigned int i = 0; i < sizeof(float); i++)
 		WRITE_BYTE(pData[i]);
 }
 
@@ -647,7 +647,7 @@ int PRECACHE_SOUND(const char *pszSound)
 {
 	//Thothie tracking model precaches, avoiding duplicates
 	bool bNoLog = false;
-	for (int i = 0; i < gSoundPrecacheList.size(); i++)
+	for (unsigned int i = 0; i < gSoundPrecacheList.size(); i++)
 	{
 		msstring msPrecacheSoundName = pszSound;
 		if (strcmp(msPrecacheSoundName.c_str(), gSoundPrecacheList[i].PrecacheName.c_str()) == 0)
@@ -692,7 +692,7 @@ int PRECACHE_MODEL(const char *pszModelname)
 {
 	//Thothie tracking model precaches, avoiding duplicates
 	bool bNoLog = false;
-	for (int i = 0; i < gModelPrecacheList.size(); i++)
+	for (unsigned int i = 0; i < gModelPrecacheList.size(); i++)
 	{
 		msstring msPrecacheModelName = pszModelname;
 		if (strcmp(msPrecacheModelName.c_str(), gModelPrecacheList[i].PrecacheName.c_str()) == 0)
@@ -790,12 +790,12 @@ void CSVGlobals::WriteScriptLog()
 	scriptout << "Scripts loaded for " << STRING(gpGlobals->mapname) << std::endl;
 
 	int Total = 0;
-	for (int i = 0; i < SCRIPT_TYPES; i++)
+	for (unsigned int i = 0; i < SCRIPT_TYPES; i++)
 		Total += ScriptList[i].size();
 
 	scriptout << "Total: " << Total << std::endl;
 
-	for (int i = 0; i < SCRIPT_TYPES; i++)
+	for (unsigned int i = 0; i < SCRIPT_TYPES; i++)
 	{
 		scriptout << std::endl;
 
@@ -811,7 +811,7 @@ void CSVGlobals::WriteScriptLog()
 		scriptout << "------------" << std::endl;
 		scriptout << "Total: " << ScriptList[i].size() << std::endl;
 
-		for (int s = 0; s < ScriptList[i].size(); s++)
+		for (unsigned int s = 0; s < ScriptList[i].size(); s++)
 		{
 			CSVGlobals::scriptlistitem_t &ScriptListItem = ScriptList[i][s];
 			if (ScriptListItem.Included)
diff --git a/src/game/server/triggers.cpp b/src/game/server/triggers.cpp
index 6336f079..fc4533e1 100644
--- a/src/game/server/triggers.cpp
+++ b/src/game/server/triggers.cpp
@@ -308,8 +308,8 @@ class CMultiManager : public CBaseToggle
 
 	static TYPEDESCRIPTION m_SaveData[];
 
-	int m_cTargets;							  // the total number of targets in this manager's fire list.
-	int m_index;							  // Current target
+	unsigned int m_cTargets;							  // the total number of targets in this manager's fire list.
+	unsigned int m_index;							  // Current target
 	float m_startTime;						  // Time we started firing
 	int m_iTargetName[MAX_MULTI_TARGETS];	  // list if indexes into global string array
 	float m_flTargetDelay[MAX_MULTI_TARGETS]; // delay (in seconds) from time of manager fire to target fire
@@ -386,7 +386,7 @@ void CMultiManager ::Spawn(void)
 	while (swapped)
 	{
 		swapped = 0;
-		for (int i = 1; i < m_cTargets; i++)
+		for (unsigned int i = 1; i < m_cTargets; i++)
 		{
 			if (m_flTargetDelay[i] < m_flTargetDelay[i - 1])
 			{
@@ -405,7 +405,7 @@ void CMultiManager ::Spawn(void)
 
 BOOL CMultiManager::HasTarget(string_t targetname)
 {
-	for (int i = 0; i < m_cTargets; i++)
+	for (unsigned int i = 0; i < m_cTargets; i++)
 		if (FStrEq(STRING(targetname), STRING(m_iTargetName[i])))
 			return TRUE;
 
@@ -1537,7 +1537,7 @@ void CBaseTrigger ::ActivateMultiTrigger(CBaseEntity *pActivator)
 		if (myclass.starts_with("trigger_once") && trig_eventallinbounds)
 		{
 			CBaseEntity *pList[255];
-			int tcount;
+			unsigned int tcount;
 			//can't remember how to build flags off hand, so h4x...
 			if (!(pev->spawnflags & SF_TRIGGER_NOCLIENTS) && !(pev->spawnflags & SF_TRIGGER_ALLOWMONSTERS))
 				tcount = UTIL_EntitiesInBox(pList, 255, pev->absmin, pev->absmax, FL_CLIENT);
@@ -1545,7 +1545,7 @@ void CBaseTrigger ::ActivateMultiTrigger(CBaseEntity *pActivator)
 				tcount = UTIL_EntitiesInBox(pList, 255, pev->absmin, pev->absmax, FL_CLIENT | FL_MONSTER);
 			else if ((pev->spawnflags & SF_TRIGGER_NOCLIENTS) && (pev->spawnflags & SF_TRIGGER_ALLOWMONSTERS))
 				tcount = UTIL_EntitiesInBox(pList, 255, pev->absmin, pev->absmax, FL_MONSTER);
-			for (int i = 0; i < tcount; i++)
+			for (unsigned int i = 0; i < tcount; i++)
 			{
 				//Print("DEBUG: trigger_once running %s on %s\n", m_scriptevent.c_str(), pList[i]->m_DisplayName.c_str());
 				if (pList[i] != pActivator)
@@ -2715,7 +2715,7 @@ class CTriggerCamera : public CBaseDelay
 	static TYPEDESCRIPTION m_SaveData[];
 
 	EHANDLE m_hPlayer[MAXPLAYERS];
-	int m_iNumPlayers;
+	unsigned int m_iNumPlayers;
 
 	EHANDLE m_hTarget;
 	CBaseEntity *m_pentPath;
@@ -2829,7 +2829,7 @@ void CTriggerCamera::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE
 	//Camera takes control of all players?
 	if (FBitSet(pev->spawnflags, SF_CAMERA_PLAYER_ALL)) 
 	{
-		for (int i = 0; i < gpGlobals->maxClients; i++)
+		for (unsigned int i = 0; i < gpGlobals->maxClients; i++)
 		{
 			pActivator = UTIL_PlayerByIndex(i + 1); //get pointer to player's cbaseentity
 			if (!pActivator || !pActivator->IsPlayer())
@@ -2867,7 +2867,7 @@ void CTriggerCamera::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE
 
 	if (FBitSet(pev->spawnflags, SF_CAMERA_PLAYER_TAKECONTROL)) //Freeze player(s)?
 	{
-		for (int i = 0; i < m_iNumPlayers; i++)
+		for (unsigned int i = 0; i < m_iNumPlayers; i++)
 		{
 			((CBasePlayer*)((CBaseEntity*)m_hPlayer[i]))->EnableControl(FALSE);
 		}
@@ -2888,7 +2888,7 @@ void CTriggerCamera::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE
 	}
 
 	
-	for (int i = 0; i < m_iNumPlayers; i++)
+	for (unsigned int i = 0; i < m_iNumPlayers; i++)
 	{
 		SET_VIEW(m_hPlayer[i]->edict(), edict());
 
@@ -2907,7 +2907,7 @@ void CTriggerCamera::FollowTarget()
 {
 	if (m_hTarget == NULL || m_flReturnTime < gpGlobals->time) //Attempt to restore player view
 	{
-		for (int i = 0; i < m_iNumPlayers; i++) 
+		for (unsigned int i = 0; i < m_iNumPlayers; i++) 
 		{
 			if (m_hPlayer == NULL)
 				continue;
diff --git a/src/game/server/world.cpp b/src/game/server/world.cpp
index 35853733..09cf7db4 100644
--- a/src/game/server/world.cpp
+++ b/src/game/server/world.cpp
@@ -552,7 +552,7 @@ void CWorld ::Precache(void)
 	// 63 testing
 	LIGHT_STYLE(63, "a");
 
-	for (int i = 0; i < std::size(gDecals); i++)
+	for (unsigned int i = 0; i < std::size(gDecals); i++)
 		gDecals[i].index = DECAL_INDEX(gDecals[i].name);
 
 	// init the WorldGraph.
diff --git a/src/game/shared/movement/pm_shared.cpp b/src/game/shared/movement/pm_shared.cpp
index 85a2d760..012d9b94 100644
--- a/src/game/shared/movement/pm_shared.cpp
+++ b/src/game/shared/movement/pm_shared.cpp
@@ -3571,7 +3571,7 @@ void PM_Init(struct playermove_s *ppmove)
 	PM_InitTextureTypes();
 
 	//The engine copies the hull sizes initialized by PM_GetHullBounds *before* PM_GetHullBounds is actually called, so manually initialize these.
-	for (int i = 0; i < NUM_HULLS; ++i)
+	for (unsigned int i = 0; i < NUM_HULLS; ++i)
 	{
 		if (!PM_GetHullBounds(i, pmove->player_mins[i], pmove->player_maxs[i]))
 		{
diff --git a/src/game/shared/ms/angelscript/ASBindings.cpp b/src/game/shared/ms/angelscript/ASBindings.cpp
index 91e19df6..96c987f9 100644
--- a/src/game/shared/ms/angelscript/ASBindings.cpp
+++ b/src/game/shared/ms/angelscript/ASBindings.cpp
@@ -526,9 +526,10 @@ void ASBindings::LogRegistrationInfo(asIScriptEngine* pEngine)
     }
 
     // Count registered types
-    int typeCount = pEngine->GetObjectTypeCount();
+    unsigned int typeCount = pEngine->GetObjectTypeCount();
     MS_ANGEL_INFO("Registered Object Types: %d", typeCount);
-    for (int i = 0; i < typeCount && i < 10; i++) // Show first 10 types
+    unsigned int MaxTypesShown = 10;
+    for (unsigned int i = 0; i < typeCount && i < MaxTypesShown; i++) // Show first 10 types
     {
         asITypeInfo* pType = pEngine->GetObjectTypeByIndex(i);
         if (pType)
@@ -540,16 +541,16 @@ void ASBindings::LogRegistrationInfo(asIScriptEngine* pEngine)
         }
     }
     if (typeCount > 10)
-        MS_ANGEL_INFO("   ... and %d more types", typeCount - 10);
+        MS_ANGEL_INFO("   ... and %d more types", typeCount - MaxTypesShown);
     
     // Count global functions
-    int globalFuncCount = pEngine->GetGlobalFunctionCount();
+    unsigned int globalFuncCount = pEngine->GetGlobalFunctionCount();
     MS_ANGEL_INFO("Registered Global Functions: %d", globalFuncCount);
     
     // Count by category
     int stringFuncs = 0, mathFuncs = 0, gameFuncs = 0, vectorFuncs = 0, otherFuncs = 0;
     
-    for (int i = 0; i < globalFuncCount; i++)
+    for (unsigned int i = 0; i < globalFuncCount; i++)
     {
         asIScriptFunction* pFunc = pEngine->GetGlobalFunctionByIndex(i);
         if (pFunc)
@@ -583,11 +584,12 @@ void ASBindings::LogRegistrationInfo(asIScriptEngine* pEngine)
         MS_ANGEL_INFO("   - Other: %d functions", otherFuncs);
     
     // Count global properties
-    int globalPropCount = pEngine->GetGlobalPropertyCount();
+   unsigned int globalPropCount = pEngine->GetGlobalPropertyCount();
     if (globalPropCount > 0)
     {
         MS_ANGEL_INFO("Registered Global Properties: %d", globalPropCount);
-        for (int i = 0; i < globalPropCount && i < 5; i++)
+        unsigned int MaxPropShown = 5;
+        for (unsigned int i = 0; i < globalPropCount && i < MaxPropShown; i++)
         {
             const char* name;
             const char* nameSpace;
@@ -599,7 +601,7 @@ void ASBindings::LogRegistrationInfo(asIScriptEngine* pEngine)
             }
         }
         if (globalPropCount > 5)
-            MS_ANGEL_INFO("   ... and %d more properties", globalPropCount - 5);
+            MS_ANGEL_INFO("   ... and %d more properties", globalPropCount - MaxPropShown);
     }
     
     // Memory usage estimate
diff --git a/src/game/shared/ms/angelscript/ASBuiltinFunctions.cpp b/src/game/shared/ms/angelscript/ASBuiltinFunctions.cpp
index 8c52a5b3..f9372e69 100644
--- a/src/game/shared/ms/angelscript/ASBuiltinFunctions.cpp
+++ b/src/game/shared/ms/angelscript/ASBuiltinFunctions.cpp
@@ -47,11 +47,15 @@
 // Helper function to get player by index - implemented differently on server vs client
 static CBasePlayer* GetPlayerByIndexHelper(int index)
 {
+
+
 #ifndef VALVE_DLL
     return nullptr; // Client doesn't have access to other players
 #else
+
+    unsigned int idx = static_cast<unsigned int>(index);
     // Server-side implementation
-    if (index < 1 || index > gpGlobals->maxClients) {
+    if (idx < 1 || idx > gpGlobals->maxClients) {
         return nullptr;
     }
     
@@ -469,19 +473,22 @@ namespace ASBuiltinFunctions
             MS_ANGEL_DEBUG("GetPlayerByIndex called on client (index: %d)", index);
             return nullptr;
         #else
+
+        unsigned int idx = static_cast<unsigned int>(index);
+
             // Server-side: Real player lookup
-            if (index < 1 || index > gpGlobals->maxClients) {
-                MS_ANGEL_DEBUG("GetPlayerByIndex: Invalid index %d (max: %d)", index, gpGlobals->maxClients);
+            if (idx < 1 || idx > gpGlobals->maxClients) {
+                MS_ANGEL_DEBUG("GetPlayerByIndex: Invalid index %d (max: %d)", idx, gpGlobals->maxClients);
                 return nullptr;
             }
             
             CBasePlayer* pPlayer = GetPlayerByIndexHelper(index);
             if (pPlayer && pPlayer->edict() && !pPlayer->edict()->free) {
-                MS_ANGEL_DEBUG("GetPlayerByIndex: Found player %d (%s)", index, STRING(pPlayer->edict()->v.netname));
+                MS_ANGEL_DEBUG("GetPlayerByIndex: Found player %d (%s)", idx, STRING(pPlayer->edict()->v.netname));
                 return pPlayer;
             }
             
-            MS_ANGEL_DEBUG("GetPlayerByIndex: No valid player at index %d", index);
+            MS_ANGEL_DEBUG("GetPlayerByIndex: No valid player at index %d", idx);
             return nullptr;
         #endif
     }
@@ -495,7 +502,7 @@ namespace ASBuiltinFunctions
         #else
             // Server-side: Count connected players
             int playerCount = 0;
-            for (int i = 1; i <= gpGlobals->maxClients; i++) {
+            for (unsigned int i = 1; i <= gpGlobals->maxClients; i++) {
                 CBasePlayer* pPlayer = GetPlayerByIndexHelper(i);
                 if (pPlayer && pPlayer->edict() && !pPlayer->edict()->free) {
                     // Additional check: ensure player is fully connected
@@ -525,7 +532,7 @@ namespace ASBuiltinFunctions
         
         #ifdef VALVE_DLL
             // Server-side: Populate with real players
-            for (int i = 1; i <= gpGlobals->maxClients; i++) {
+            for (unsigned int i = 1; i <= gpGlobals->maxClients; i++) {
                 CBasePlayer* pPlayer = GetPlayerByIndexHelper(i);
                 if (pPlayer && pPlayer->edict() && !pPlayer->edict()->free) {
                     if (pPlayer->edict()->v.flags & FL_CLIENT) {
@@ -635,7 +642,7 @@ namespace ASBuiltinFunctions
                 return nullptr;
             }
             
-            for (int i = 1; i <= gpGlobals->maxClients; i++) {
+            for (unsigned int i = 1; i <= gpGlobals->maxClients; i++) {
                 CBasePlayer* pPlayer = GetPlayerByIndexHelper(i);
                 if (pPlayer && pPlayer->edict() && !pPlayer->edict()->free && (pPlayer->edict()->v.flags & FL_CLIENT)) {
                     // Get player's Steam ID through engine
@@ -739,7 +746,7 @@ namespace ASBuiltinFunctions
                           title.c_str(), message.c_str());
         #else
             // Send info message to all connected players
-            for (int i = 1; i <= gpGlobals->maxClients; i++) {
+            for (unsigned int i = 1; i <= gpGlobals->maxClients; i++) {
                 CBasePlayer* pPlayer = GetPlayerByIndexHelper(i);
                 if (pPlayer && pPlayer->edict() && !pPlayer->edict()->free && (pPlayer->edict()->v.flags & FL_CLIENT)) {
                     //ASEngineProvider::SendInfoMsg((void*)pPlayer, fullMessage);
@@ -1169,8 +1176,8 @@ void CallAngelScriptEventHandler(const char* eventName, msstringlist* params)
             }
         }
         
-        int paramCount = handler->GetParamCount();
-        for (int i = 0; i < paramCount && i < (int)stringParams.size(); i++) {
+        unsigned int paramCount = handler->GetParamCount();
+        for (unsigned int i = 0; i < paramCount && i < (int)stringParams.size(); i++) {
             // Check if parameter is by reference
             int typeId;
             asDWORD flags;
@@ -1359,7 +1366,7 @@ namespace ASBuiltinFunctions
             g_AdvancedSystems.activeSequences.clear();
             
             // Initialize HP monitoring for all players
-            for (int i = 1; i <= gpGlobals->maxClients; i++) {
+            for (unsigned int i = 1; i <= gpGlobals->maxClients; i++) {
                 CBasePlayer* pPlayer = GetPlayerByIndexHelper(i);
                 if (pPlayer && pPlayer->edict() && !pPlayer->edict()->free && (pPlayer->edict()->v.flags & FL_CLIENT)) {
                     // Set up HP monitoring for this player
diff --git a/src/game/shared/ms/angelscript/ASDebugger.cpp b/src/game/shared/ms/angelscript/ASDebugger.cpp
index e78e12d6..dc5fffe0 100644
--- a/src/game/shared/ms/angelscript/ASDebugger.cpp
+++ b/src/game/shared/ms/angelscript/ASDebugger.cpp
@@ -210,9 +210,9 @@ std::vector<ASVariableInfo> ASDebugger::GetLocalVariables(asIScriptContext* pCon
     }
     
     // Get local variable count from context
-    int varCount = pContext->GetVarCount();
+    unsigned int varCount = pContext->GetVarCount();
     
-    for (int i = 0; i < varCount; i++)
+    for (unsigned int i = 0; i < varCount; i++)
     {
         ASVariableInfo varInfo;
         
@@ -304,8 +304,8 @@ ASVariableInfo ASDebugger::GetVariableInfo(const std::string& varName, asIScript
     }
     
     // Try to find in local variables first
-    int varCount = pContext->GetVarCount();
-    for (int i = 0; i < varCount; i++)
+    unsigned int varCount = pContext->GetVarCount();
+    for (unsigned int i = 0; i < varCount; i++)
     {
         const char* localVarName = nullptr;
         int typeId = 0;
@@ -377,9 +377,9 @@ std::vector<ASCallFrame> ASDebugger::GetCallStack(asIScriptContext* pContext)
         return callStack;
     }
     
-    int stackSize = pContext->GetCallstackSize();
+    unsigned int stackSize = pContext->GetCallstackSize();
     
-    for (int i = 0; i < stackSize; i++)
+    for (unsigned int i = 0; i < stackSize; i++)
     {
         ASCallFrame frame;
         
diff --git a/src/game/shared/ms/angelscript/ASEngineEventManager.cpp b/src/game/shared/ms/angelscript/ASEngineEventManager.cpp
index d3eadf8f..69000669 100644
--- a/src/game/shared/ms/angelscript/ASEngineEventManager.cpp
+++ b/src/game/shared/ms/angelscript/ASEngineEventManager.cpp
@@ -530,7 +530,7 @@ void ASEngineEventManager::FirePlayerSayTextEvent(const char* szPlayerName, cons
 //==========================================================================
 bool ASEngineEventManager::IsParameterByReference(asIScriptFunction* pFunction, int paramIndex)
 {
-    if (!pFunction || paramIndex >= pFunction->GetParamCount())
+    if (!pFunction || (unsigned int)paramIndex >= (unsigned int)pFunction->GetParamCount())
         return false;
         
     int typeId;
diff --git a/src/game/shared/ms/angelscript/ASEntityBindings.cpp b/src/game/shared/ms/angelscript/ASEntityBindings.cpp
index 0f228c24..43380358 100644
--- a/src/game/shared/ms/angelscript/ASEntityBindings.cpp
+++ b/src/game/shared/ms/angelscript/ASEntityBindings.cpp
@@ -321,7 +321,7 @@ namespace ASEntityBindings
 #ifdef VALVE_DLL
         // Server-side: Populate with actual connected players using real engine functions
         
-        for (int i = 1; i <= gpGlobals->maxClients; i++)
+        for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
         {
             edict_t* pEdict = g_engfuncs.pfnPEntityOfEntIndex(i);
             if (!pEdict || pEdict->free)
@@ -360,34 +360,36 @@ namespace ASEntityBindings
     {
 #ifdef VALVE_DLL
         
-        if (index < 1 || index > gpGlobals->maxClients)
+        unsigned int idx = index;
+
+        if (idx < 1 || idx > gpGlobals->maxClients)
         {
-            MS_ANGEL_ERROR("PlayerByIndex: Invalid index %d", index);
+            MS_ANGEL_ERROR("PlayerByIndex: Invalid index %d", idx);
             return nullptr;
         }
         
         edict_t* pEdict = g_engfuncs.pfnPEntityOfEntIndex(index);
         if (!pEdict || pEdict->free)
         {
-            MS_ANGEL_DEBUG("PlayerByIndex: No valid edict at index %d", index);
+            MS_ANGEL_DEBUG("PlayerByIndex: No valid edict at index %d", idx);
             return nullptr;
         }
         
         CBaseEntity* pEntity = CBaseEntity::Instance(pEdict);
         if (!pEntity || !pEntity->IsPlayer())
         {
-            MS_ANGEL_DEBUG("PlayerByIndex: Entity at index %d is not a player", index);
+            MS_ANGEL_DEBUG("PlayerByIndex: Entity at index %d is not a player", idx);
             return nullptr;
         }
         
         CBasePlayer* pPlayer = static_cast<CBasePlayer*>(pEntity);
         if (!pPlayer->pev || !(pPlayer->pev->flags & FL_CLIENT))
         {
-            MS_ANGEL_DEBUG("PlayerByIndex: Player at index %d is not connected", index);
+            MS_ANGEL_DEBUG("PlayerByIndex: Player at index %d is not connected", idx);
             return nullptr;
         }
         
-        MS_ANGEL_DEBUG("PlayerByIndex: Found connected player at index %d: %s", index, STRING(pPlayer->pev->netname));
+        MS_ANGEL_DEBUG("PlayerByIndex: Found connected player at index %d: %s", idx, STRING(pPlayer->pev->netname));
         return pPlayer;
 #else
         // Client-side: Can't access other players
@@ -405,7 +407,7 @@ namespace ASEntityBindings
             return nullptr;
         }
         
-        for (int i = 1; i <= gpGlobals->maxClients; i++)
+        for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
         {
             CBasePlayer* pPlayer = AS_PlayerByIndex(i);
             if (pPlayer)
@@ -1477,7 +1479,7 @@ namespace ASEntityBindings
                     return array;  // Return empty array
                 }
                 // Iterate through all item slots
-                for (int i = 0; i < MAX_ITEM_TYPES; i++) {
+                for (unsigned int i = 0; i < MAX_ITEM_TYPES; i++) {
                     CBasePlayerItem* pItem = player->m_rgpPlayerItems[i];
                     // Walk the linked list of items in this slot
                     while (pItem != nullptr) {
@@ -1494,7 +1496,7 @@ namespace ASEntityBindings
                     return false;
                 }
                 // Search through all item slots
-                for (int i = 0; i < MAX_ITEM_TYPES; i++) {
+                for (unsigned int i = 0; i < MAX_ITEM_TYPES; i++) {
                     CBasePlayerItem* pItem = player->m_rgpPlayerItems[i];
                     // Walk the linked list of items in this slot
                     while (pItem != nullptr) {
diff --git a/src/game/shared/ms/angelscript/ASModuleSystem.cpp b/src/game/shared/ms/angelscript/ASModuleSystem.cpp
index 06b7eeb5..6090a855 100644
--- a/src/game/shared/ms/angelscript/ASModuleSystem.cpp
+++ b/src/game/shared/ms/angelscript/ASModuleSystem.cpp
@@ -1547,7 +1547,7 @@ bool ASModuleSystem::RefreshFromPak()
         printf("ASModuleSystem::RefreshFromPak: PAK file not currently open, searching for scripts.pak...\n");
         
         bool found = false;
-        for (int i = 0; i < numLocations; i++)
+        for (unsigned int i = 0; i < numLocations; i++)
         {
             printf("ASModuleSystem::RefreshFromPak: Trying location: %s\n", pakLocations[i]);
             
@@ -1564,7 +1564,7 @@ bool ASModuleSystem::RefreshFromPak()
         {
             printf("ASModuleSystem::RefreshFromPak: ERROR - Could not find scripts.pak in any location\n");
             printf("ASModuleSystem::RefreshFromPak: Searched locations:\n");
-            for (int i = 0; i < numLocations; i++)
+            for (unsigned int i = 0; i < numLocations; i++)
             {
                 printf("  - %s\n", pakLocations[i]);
             }
@@ -1601,7 +1601,7 @@ bool ASModuleSystem::RefreshFromPak()
         {
             printf("ASModuleSystem::RefreshFromPak: Initial refresh failed, trying fallback locations...\n");
             
-            for (int i = 0; i < numLocations; i++)
+            for (unsigned int i = 0; i < numLocations; i++)
             {
                 printf("ASModuleSystem::RefreshFromPak: Fallback attempt with: %s\n", pakLocations[i]);
                 
diff --git a/src/game/shared/ms/angelscript/CAngelScript.cpp b/src/game/shared/ms/angelscript/CAngelScript.cpp
index 526ba0a2..9e237e52 100644
--- a/src/game/shared/ms/angelscript/CAngelScript.cpp
+++ b/src/game/shared/ms/angelscript/CAngelScript.cpp
@@ -288,8 +288,8 @@ bool CAngelScript::ExecuteFunction(asIScriptFunction* pFunc, ASEventParams* pPar
     // Set parameters
     if (pParams)
     {
-        int paramCount = pFunc->GetParamCount();
-        for (int i = 0; i < paramCount && i < (int)pParams->Count(); i++)
+        unsigned int paramCount = pFunc->GetParamCount();
+        for (unsigned int i = 0; i < paramCount && i < (unsigned int)pParams->Count(); i++)
         {
             // For now, pass all as strings
             // TODO: Implement proper type handling
diff --git a/src/game/shared/ms/angelscript/CAngelScriptManager.cpp b/src/game/shared/ms/angelscript/CAngelScriptManager.cpp
index 12668ef8..af367e5a 100644
--- a/src/game/shared/ms/angelscript/CAngelScriptManager.cpp
+++ b/src/game/shared/ms/angelscript/CAngelScriptManager.cpp
@@ -531,7 +531,7 @@ void CAngelScriptManager::PrepareForLevelChange()
                   currentSize, totalDestroyed, totalDetected);
     
     // Force multiple full GC cycles to ensure everything is cleaned up
-    for (int i = 0; i < 3; i++)
+    for (unsigned int i = 0; i < 3; i++)
     {
         m_pEngine->GarbageCollect(asGC_FULL_CYCLE | asGC_DESTROY_GARBAGE);
     }
@@ -592,7 +592,7 @@ void CAngelScriptManager::ReinitializeForLevelChange()
     
     // Run final garbage collection before destroying engine
     MS_ANGEL_INFO("  Running final garbage collection...");
-    for (int i = 0; i < 5; i++)  // Extra cycles to be thorough
+    for (unsigned int i = 0; i < 5; i++)  // Extra cycles to be thorough
     {
         m_pEngine->GarbageCollect(asGC_FULL_CYCLE | asGC_DESTROY_GARBAGE | asGC_DETECT_GARBAGE);
     }
diff --git a/src/game/shared/ms/angelscript/IAngelScript.cpp b/src/game/shared/ms/angelscript/IAngelScript.cpp
index d0dfc0b8..be65c605 100644
--- a/src/game/shared/ms/angelscript/IAngelScript.cpp
+++ b/src/game/shared/ms/angelscript/IAngelScript.cpp
@@ -450,8 +450,8 @@ bool IAngelScript::SetEventParameters(asIScriptContext* pCtx, ASEventParams* pPa
     if (!pFunc || reinterpret_cast<uintptr_t>(pFunc) <= 0x10000)
         return false;
         
-    int paramCount = pFunc->GetParamCount();
-    for (int i = 0; i < paramCount && i < (int)pParams->Count(); i++)
+    unsigned int paramCount = pFunc->GetParamCount();
+    for (unsigned int i = 0; i < paramCount && i < (unsigned int)pParams->Count(); i++)
     {
         // For now, pass all parameters as strings
         // Later we can add type detection
diff --git a/src/game/shared/ms/findentities.cpp b/src/game/shared/ms/findentities.cpp
index e0a16f91..5ebcb25a 100644
--- a/src/game/shared/ms/findentities.cpp
+++ b/src/game/shared/ms/findentities.cpp
@@ -15,13 +15,13 @@ int UtilFindEntities(mslist<CFindEntity>& rFound, const mslist<CEntityFilter *>&
 	bool bValid;
 	bool bFilterFail;
 	bool bCheckMax = vMax > 0;
-	for (int i = 0; i < MAX_SEARCH_ENTITIES; i++)
+	for (unsigned int i = 0; i < MAX_SEARCH_ENTITIES; i++)
 	{
 		CFindEntity vEntity = CFindEntity::GetEntity(i, bValid);
 		if (!bValid || vEntity.GetWrapped() == pIgnoreEntity) continue;
 
 		bFilterFail = false;
-		for (int j = 0; j < vFilters.size(); j++)
+		for (unsigned int j = 0; j < vFilters.size(); j++)
 		{
 			if (!vFilters[j]->Allow(vEntity))
 			{
diff --git a/src/game/shared/ms/global.cpp b/src/game/shared/ms/global.cpp
index 988e3812..7add8c39 100644
--- a/src/game/shared/ms/global.cpp
+++ b/src/game/shared/ms/global.cpp
@@ -124,7 +124,7 @@ void MSGlobals::NewMap()
 	}
 	
 #if SPAWN_GLOBAL_ITEMS
-	for(int i = 0; i < CGenericItemMgr::ItemCount(); i++)
+	for(unsigned int i = 0; i < CGenericItemMgr::ItemCount(); i++)
 	{
 		GenItem_t * pGenItem = CGenericItemMgr::Item(i);
 		if (pGenItem) // Paranoid
@@ -221,8 +221,8 @@ void MSGlobals::DLLAttach(HINSTANCE hinstDLL)
 	size_t nullterm = 8;
 #endif
 
-	int len = DllFileName.len();
-	for (int i = 0; i < len; i++)
+	unsigned int len = DllFileName.len();
+	for (unsigned int i = 0; i < len; i++)
 	{
 		if (DllFileName.c_str()[len - 1 - i] == '\\' || DllFileName.c_str()[len - 1 - i] == '/')
 		{
@@ -302,7 +302,7 @@ genericitem_full_t::genericitem_full_t(CGenericItem *pItem) : genericitem_t(pIte
 	Spell_TimePrepare = pItem->Spell_TimePrepare;
 	Spell_CastSuccess = pItem->Spell_CastSuccess;
 	if (FBitSet(pItem->MSProperties(), ITEM_CONTAINER))
-		for (int i = 0; i < pItem->Container_ItemCount(); i++)
+		for (unsigned int i = 0; i < pItem->Container_ItemCount(); i++)
 			ContainerItems.add(pItem->Container_GetItem(i));
 }
 genericitem_full_t::operator class CGenericItem *()
@@ -316,7 +316,7 @@ genericitem_full_t::operator class CGenericItem *()
 	pItem->Spell_CastSuccess = Spell_CastSuccess ? true : false;
 	pItem->m_Hand = Hand;
 	if (FBitSet(pItem->MSProperties(), ITEM_CONTAINER))
-		for (int i = 0; i < ContainerItems.size(); i++)
+		for (unsigned int i = 0; i < ContainerItems.size(); i++)
 			pItem->Container_AddItem(ContainerItems[i]);
 
 	return pItem;
@@ -345,7 +345,7 @@ const char *g_EntTypeByName[ENT_TYPE_TOTAL] =
 };
 int EntityNameToType(const char *pszName)
 {
-	for (int i = 0; i < ENT_TYPE_TOTAL; i++)
+	for (unsigned int i = 0; i < ENT_TYPE_TOTAL; i++)
 		if (!_stricmp(pszName, g_EntTypeByName[i]))
 			return i;
 	return -1;
@@ -789,7 +789,7 @@ bool FindSkyHeight(Vector Origin, float &SkyHeight)
 		//Find the beginning or end of the sky.  If the traceline didn't work, trace up. If it did, trace down
 		int CheckStep = Direction ? CHECKSTEP : -CHECKSTEP;
 
-		for (int i = 0; i < 64; i++)
+		for (unsigned int i = 0; i < 64; i++)
 		{
 			int Contents = EngineFunc::Shared_PointContents(CurrentOrigin);
 			if ((Direction && Contents == CONTENTS_SKY) ||
diff --git a/src/game/shared/ms/globalmem.cpp b/src/game/shared/ms/globalmem.cpp
index 1795f119..a16fd9c7 100644
--- a/src/game/shared/ms/globalmem.cpp
+++ b/src/game/shared/ms/globalmem.cpp
@@ -115,7 +115,7 @@ void operator delete(void* ptr)
 		if (!AllocationStack)
 		{
 			bool found = false;
-			for (int i = 0; i < alloctotal; i++)
+			for (unsigned int i = 0; i < alloctotal; i++)
 				if (Allocations[i]->pAddr == ptr)
 				{
 					found = true;
@@ -166,7 +166,7 @@ void LogMemoryUsage(const char* Title)
 #ifdef TRACK_MEMORY
 	MS_INFO(Title);
 	MS_INFO("[Current Memory Allocations: %i][Highest Ever: %i]", alloctotal, allochighest);
-	for (int i = 0; i < alloctotal; i++)
+	for (unsigned int i = 0; i < alloctotal; i++)
 	{
 		//if( Allocations[i]->Index == 124117 )
 		MS_INFO("[Unfreed #%i][%i] %s:%i", i, Allocations[i]->Index, Allocations[i]->SourceFile.c_str(), Allocations[i]->LineNum);
diff --git a/src/game/shared/ms/groupfile.cpp b/src/game/shared/ms/groupfile.cpp
index dcd6b582..0206c058 100644
--- a/src/game/shared/ms/groupfile.cpp
+++ b/src/game/shared/ms/groupfile.cpp
@@ -115,7 +115,7 @@ bool CGameGroupFile::Open(const char* pszFilename)
 
 	//Read entries
 	printf("CGameGroupFile::Open: Reading %u directory entries...\n", Header.DirectoryCount);
-	for (int i = 0; i < Header.DirectoryCount; i++)
+	for (unsigned int i = 0; i < Header.DirectoryCount; i++)
 	{
 		pakDirectory_t Entry;
 		memset(&Entry, 0, sizeof(Entry)); // Initialize entry to prevent garbage data
@@ -198,7 +198,7 @@ bool CGameGroupFile::ReadEntry(const char* pszName, byte* pBuffer, unsigned long
 	msstring EntryName = pszName;
 	ReplaceChar(EntryName, '\\', '/');
 
-	for (int i = 0; i < m_EntryList.size(); i++)
+	for (unsigned int i = 0; i < m_EntryList.size(); i++)
 	{
 		pakDirectory_t Entry = m_EntryList[i];
 		
diff --git a/src/game/shared/ms/mscharacter.cpp b/src/game/shared/ms/mscharacter.cpp
index 002f3eec..ad363b66 100644
--- a/src/game/shared/ms/mscharacter.cpp
+++ b/src/game/shared/ms/mscharacter.cpp
@@ -231,7 +231,7 @@ jointype_e MSChar_Interface::CanJoinThisMap(charinfo_t &CharData, msstringlist &
 
 bool MSChar_Interface::HasVisited(const char* MapName, msstringlist &VisitedMaps)
 {
-	for (int m = 0; m < VisitedMaps.size(); m++)
+	for (unsigned int m = 0; m < VisitedMaps.size(); m++)
 		if (VisitedMaps[m] == MSGlobals::MapName)
 			return true;
 	return false;
@@ -268,7 +268,7 @@ bool MSChar_Interface::HasVisited(const char* MapName, msstringlist &VisitedMaps
 	{
 		gFile.RWShort( pItem->Container_ItemCount( ) ); //[SHORT] Container Item Total
 
-		 for (int i = 0; i < pItem->Container_ItemCount(); i++) 
+		 for (unsigned int i = 0; i < pItem->Container_ItemCount(); i++) 
 			WriteItem( gFile, pItem->Container_GetItem( i ) );
 	}
 }*/
@@ -305,7 +305,7 @@ void WriteItem(CPlayer_DataBuffer &gFile, genericitem_full_t &Item)
 	{
 		gFile.WriteShort(static_cast<short>(Item.ContainerItems.size())); //[SHORT] Container Item Total
 
-		for (int i = 0; i < Item.ContainerItems.size(); i++)
+		for (unsigned int i = 0; i < Item.ContainerItems.size(); i++)
 			WriteItem(gFile, Item.ContainerItems[i]);
 	}
 }
\ No newline at end of file
diff --git a/src/game/shared/ms/mscharacter.h b/src/game/shared/ms/mscharacter.h
index 624b9317..a8565ffe 100644
--- a/src/game/shared/ms/mscharacter.h
+++ b/src/game/shared/ms/mscharacter.h
@@ -52,7 +52,7 @@ enum charClientType
 struct charinfo_base_t
 {
 	int Index; // Keep track of index, because the characters might not be loaded in order	
-	int DataLen;
+	unsigned int DataLen;
 	char* Data;
 
 	charinfo_base_t()
@@ -194,7 +194,7 @@ struct charslot_t
 class ChooseChar_Interface
 {
 public:
-	static int ServerCharNum; //Max number of characters the server will allow (if server-side characters)
+	static unsigned int ServerCharNum; //Max number of characters the server will allow (if server-side characters)
 	static bool CentralServer;
 	static void UpdateCharScreen();
 	static void UpdateCharScreenUpload();
diff --git a/src/game/shared/ms/msfileio.cpp b/src/game/shared/ms/msfileio.cpp
index ac0b0e38..ef1d9a06 100644
--- a/src/game/shared/ms/msfileio.cpp
+++ b/src/game/shared/ms/msfileio.cpp
@@ -59,7 +59,7 @@ void CGameFile::ReadString(char* Data, size_t length)
 {
 	byte ReadIn = 0;
 	Data[0] = 0;
-	int i = 0;
+	int unsigned i = 0;
 	do
 	{
 		if (!Read(&ReadIn, 1))
diff --git a/src/game/shared/ms/msfileio.h b/src/game/shared/ms/msfileio.h
index 7b0d7b3b..450afc0e 100644
--- a/src/game/shared/ms/msfileio.h
+++ b/src/game/shared/ms/msfileio.h
@@ -25,7 +25,9 @@ class CGameFile
 	virtual bool Read(void* pvData, size_t Size);
 	void ReadByte(byte& Data) { Read((void*)&Data, 1); }
 	void ReadShort(short& Data) { Read((void*)&Data, 2); }
+	void ReadShort(unsigned short& Data) { Read((void*)&Data, 2); }
 	void ReadInt(int& Data) { Read((void*)&Data, sizeof(int)); }
+	void ReadInt(unsigned int& Data) { Read((void*)&Data, sizeof(int)); }
 	void ReadFloat(float& Data) { Read((void*)&Data, 8); }
 	void ReadCoord(Vector& Data) { Read((void*)&Data, 8 * 3); }
 	void ReadString(char* Data, size_t length);
diff --git a/src/game/shared/ms/mslogger.cpp b/src/game/shared/ms/mslogger.cpp
index 59b29cf8..62865696 100644
--- a/src/game/shared/ms/mslogger.cpp
+++ b/src/game/shared/ms/mslogger.cpp
@@ -123,7 +123,7 @@ void MSLogger::Initialize(const char* gameDir, bool isServer) {
 #if SPDLOG_AVAILABLE
     try {
         // Drop any existing loggers with our names
-        for (int i = 0; i < CATEGORY_COUNT; i++) {
+        for (unsigned int i = 0; i < CATEGORY_COUNT; i++) {
             spdlog::drop(GetCategoryName(static_cast<Category>(i)));
         }
         spdlog::drop("ERRORS");
diff --git a/src/game/shared/ms/msmonstershared.cpp b/src/game/shared/ms/msmonstershared.cpp
index 7180bc94..ed01eaa6 100644
--- a/src/game/shared/ms/msmonstershared.cpp
+++ b/src/game/shared/ms/msmonstershared.cpp
@@ -50,7 +50,7 @@ int CMSMonster::MSProperties() { return MS_NPC; }
 bool CMSMonster::IsActing()
 {
 	bool Charging = false;
-	for (int i = 0; i < Gear.size(); i++)
+	for (unsigned int i = 0; i < Gear.size(); i++)
 		if (Gear[i]->Attack_IsCharging())
 		{
 			Charging = true;
@@ -63,7 +63,7 @@ bool CMSMonster::IsActing()
 //MiB JUN2010_19 - Check if the player is holding a shield up
 bool CMSMonster::IsShielding()
 {
-	for (int i = 0; i < Gear.size(); i++)
+	for (unsigned int i = 0; i < Gear.size(); i++)
 		if (Gear[i]->CurrentAttack && msstring(Gear[i]->m_Name).starts_with("shields_"))
 			return true;
 	return false;
@@ -74,7 +74,7 @@ float CMSMonster::RunSpeed(bool bParseSpeed) { return 1.0; }
 
 void CMSMonster::CancelAttack()
 {
-	for (int i = 0; i < MAX_NPC_HANDS; i++)
+	for (unsigned int i = 0; i < MAX_NPC_HANDS; i++)
 		if (Hand(i))
 			Hand(i)->CancelAttack();
 
@@ -88,7 +88,7 @@ void CMSMonster::CancelAttack()
 
 CGenericItem *CMSMonster::GetContainer(const char *pNameSubstring)
 {
-	for (int i = 0; i < Gear.size(); i++)
+	for (unsigned int i = 0; i < Gear.size(); i++)
 		if (FBitSet(Gear[i]->MSProperties(), ITEM_CONTAINER) && strstr(Gear[i]->ItemName.c_str(), pNameSubstring))
 			return Gear[i];
 
@@ -96,7 +96,7 @@ CGenericItem *CMSMonster::GetContainer(const char *pNameSubstring)
 }
 CGenericItem *CMSMonster::GetContainer(ulong ID)
 {
-	for (int i = 0; i < Gear.size(); i++)
+	for (unsigned int i = 0; i < Gear.size(); i++)
 		if (FBitSet(Gear[i]->MSProperties(), ITEM_CONTAINER) && Gear[i]->m_iId == ID)
 			return Gear[i];
 
@@ -108,7 +108,7 @@ CGenericItem *CMSMonster::GetGearItem(ulong ID)
 }
 CGenericItem *CMSMonster::FindItem(ulong ID, bool CheckHands, bool CheckWorn, bool CheckPacks)
 {
-	for (int i = 0; i < Gear.size(); i++)
+	for (unsigned int i = 0; i < Gear.size(); i++)
 	{
 		CGenericItem *pPack = Gear[i];
 
@@ -122,7 +122,7 @@ CGenericItem *CMSMonster::FindItem(ulong ID, bool CheckHands, bool CheckWorn, bo
 		if (!CheckPacks || !FBitSet(pPack->MSProperties(), ITEM_CONTAINER))
 			continue;
 
-		for (int n = 0; n < pPack->Container_ItemCount(); n++)
+		for (unsigned int n = 0; n < pPack->Container_ItemCount(); n++)
 		{
 			CGenericItem *pPackItem = pPack->Container_GetItem(n);
 			if (pPackItem->m_iId == ID)
@@ -142,14 +142,14 @@ bool CMSMonster::GetItem(getitem_t &ItemDesc)
 	ItemDesc.retContainer = NULL;
 
 	//Loop twice.  First time, only check the hands.  Second time, check everything else
-	for (int t = 0; t < 2; t++)
+	for (unsigned int t = 0; t < 2; t++)
 	{
 		bool Loop_CheckHands = (t == 0);
 
 		if ((ItemDesc.IgnoreHands && Loop_CheckHands) || (ItemDesc.IgnoreWornItems && !Loop_CheckHands))
 			continue;
 
-		for (int i = 0; i < Gear.size(); i++)
+		for (unsigned int i = 0; i < Gear.size(); i++)
 		{
 			CGenericItem *pItem = Gear[i];
 
@@ -167,7 +167,7 @@ bool CMSMonster::GetItem(getitem_t &ItemDesc)
 			if (ItemDesc.IgnoreInsideContainers || !FBitSet(pItem->MSProperties(), ITEM_CONTAINER))
 				continue;
 
-			for (int n = 0; n < pItem->Container_ItemCount(); n++)
+			for (unsigned int n = 0; n < pItem->Container_ItemCount(); n++)
 			{
 				CGenericItem *pItemInPack = pItem->Container_GetItem(n);
 
@@ -194,19 +194,19 @@ CGenericItem *CMSMonster::GetItem(const char *pItemName, CGenericItem **rpPack)
 		*rpPack = NULL;
 
 	//Check hands first
-	for (int i = 0; i < MAX_NPC_HANDS; i++)
+	for (unsigned int i = 0; i < MAX_NPC_HANDS; i++)
 		if (Hand(i) && strstr(Hand(i)->ItemName.c_str(), pItemName))
 			return Hand(i);
 
 	//Check inside each pack
-	for (int i = 0; i < Gear.size(); i++)
+	for (unsigned int i = 0; i < Gear.size(); i++)
 	{
 		CGenericItem *pPack = Gear[i];
 
 		if (!FBitSet(pPack->MSProperties(), ITEM_CONTAINER))
 			continue;
 
-		for (int n = 0; n < pPack->Container_ItemCount(); n++)
+		for (unsigned int n = 0; n < pPack->Container_ItemCount(); n++)
 		{
 			CGenericItem *pProjInPack = pPack->Container_GetItem(n);
 			if (!strstr(pProjInPack->ItemName.c_str(), pItemName))
@@ -233,7 +233,7 @@ CGenericItem *CMSMonster::GetItemInInventory(uint StartID, bool WeaponOnly, bool
 
 	//Check hands first
 	if (CheckHands)
-		for (int i = 0; i < MAX_NPC_HANDS; i++)
+		for (unsigned int i = 0; i < MAX_NPC_HANDS; i++)
 		{
 			CGenericItem *pItem = Hand(i);
 			if (pItem)
@@ -242,7 +242,7 @@ CGenericItem *CMSMonster::GetItemInInventory(uint StartID, bool WeaponOnly, bool
 		}
 
 	//Check inside each pack
-	for (int i = 0; i < Gear.size(); i++)
+	for (unsigned int i = 0; i < Gear.size(); i++)
 	{
 		CGenericItem *pPack = Gear[i];
 
@@ -258,7 +258,7 @@ CGenericItem *CMSMonster::GetItemInInventory(uint StartID, bool WeaponOnly, bool
 		if (!FBitSet(pPack->MSProperties(), ITEM_CONTAINER))
 			continue;
 
-		for (int n = 0; n < pPack->Container_ItemCount(); n++)
+		for (unsigned int n = 0; n < pPack->Container_ItemCount(); n++)
 		{
 			CGenericItem *pItem = pPack->Container_GetItem(n);
 			if (!SearchName.len() || msstring(pItem->m_Name).starts_with(SearchName))
@@ -268,7 +268,7 @@ CGenericItem *CMSMonster::GetItemInInventory(uint StartID, bool WeaponOnly, bool
 
 	//Remove items that aren't weapons
 	if (WeaponOnly)
-		for (int i = 0; i < Items.size(); i++)
+		for (unsigned int i = 0; i < Items.size(); i++)
 		{
 			CGenericItem *pItem = Items[i];
 
@@ -277,7 +277,7 @@ CGenericItem *CMSMonster::GetItemInInventory(uint StartID, bool WeaponOnly, bool
 		}
 
 	bool UseNextItem = false;
-	for (int i = 0; i < Items.size(); i++)
+	for (unsigned int i = 0; i < Items.size(); i++)
 	{
 		CGenericItem *pItem = Items[i];
 
@@ -299,7 +299,7 @@ CGenericItem *CMSMonster::GetItemInInventory(uint StartID, bool WeaponOnly, bool
 //-1 if none
 int CMSMonster::NewItemHand(CGenericItem *pItem, bool CheckWeight, bool bVerbose, bool FreeHands, char *pszErrorString)
 {
-	for (int i = 0; i < MAX_NPC_HANDS; i++)
+	for (unsigned int i = 0; i < MAX_NPC_HANDS; i++)
 		if (!Hand(i))
 			return i;
 
@@ -405,7 +405,7 @@ bool CMSMonster ::SwitchHands(int iHand, bool bVerbose)
 //Switchs to the best hand
 bool CMSMonster ::SwitchToBestHand()
 {
-	for (int i = 0; i < MAX_NPC_HANDS; i++)
+	for (unsigned int i = 0; i < MAX_NPC_HANDS; i++)
 		if (SwitchHands(i))
 			return true;
 
@@ -416,7 +416,7 @@ CGenericItem *CMSMonster ::Hand(int iHand)
 	if (iHand < 0 || iHand >= MAX_NPC_HANDS)
 		return NULL;
 
-	for (int i = 0; i < Gear.size(); i++)
+	for (unsigned int i = 0; i < Gear.size(); i++)
 	{
 		CGenericItem *pItem = Gear[i];
 		if (pItem->m_Location == ITEMPOS_HANDS && pItem->m_Hand == iHand)
@@ -434,7 +434,7 @@ float CMSMonster::Weight()
 void CMSMonster ::DropAllItems()
 {
 	//Drop all items... Called here so it won't crash if I kill myself
-	for (int i = 0; i < Gear.size(); i++)
+	for (unsigned int i = 0; i < Gear.size(); i++)
 		Gear[i]->Drop();
 }
 
@@ -499,7 +499,7 @@ CStat *CMSMonster::FindStat(int idx)
 }
 CStat *CMSMonster::FindStat(const char* Name)
 {
-	for (int i = 0; i < m_Stats.size(); i++)
+	for (unsigned int i = 0; i < m_Stats.size(); i++)
 		if (!_stricmp(m_Stats[i].m_Name, Name)) //case in-sensitive compare
 			return &m_Stats[i];
 
diff --git a/src/game/shared/ms/netcodeshared.cpp b/src/game/shared/ms/netcodeshared.cpp
index 79cd4d1f..1e7a3a97 100644
--- a/src/game/shared/ms/netcodeshared.cpp
+++ b/src/game/shared/ms/netcodeshared.cpp
@@ -71,7 +71,7 @@ void CBasePlayer::SendChar(charinfo_base_t &CharBase)
 	SendInfo.DataLen = CharBase.DataLen * 2;
 	SendInfo.Data = msnew char[SendInfo.DataLen];
 
-	for (int i = 0; i < CharBase.DataLen; i++)
+	for (unsigned int i = 0; i < CharBase.DataLen; i++)
 	{
 		byte Value = CharBase.Data[i];
 		char Num1 = (Value / (uint)20) + UUENC_OFS;
@@ -82,7 +82,7 @@ void CBasePlayer::SendChar(charinfo_base_t &CharBase)
 	}
 
 	//Notify server the char file is about to be sent
-	msstring SendStr = msstring("ul new ") + SendInfo.Index + " " + SendInfo.DataLen + " " + CharBase.DataLen + "\n";
+	msstring SendStr = msstring("ul new ") + SendInfo.Index + " " + (int)SendInfo.DataLen + " " + (int)CharBase.DataLen + "\n";
 	ClientCmd(SendStr);
 	ChooseChar_Interface::UpdateCharScreen();
 #endif
@@ -161,14 +161,14 @@ void MSChar_Interface::Think_SendChar(CBasePlayer *pPlayer)
 		return;
 	}
 
-	int PacketDataSize = V_min(DataLeft, MAX_UL_SIZE);
+	unsigned int PacketDataSize = V_min(DataLeft, MAX_UL_SIZE);
 
 #ifdef VALVE_DLL
 	//Sending sequential data for a char
 	MESSAGE_BEGIN(MSG_ONE, g_netmsg[NETMSG_CLDLLFUNC], NULL, pPlayer->pev);
 	WRITE_BYTE(11);
 	WRITE_BYTE(PacketDataSize);
-	for (int i = 0; i < PacketDataSize; i++)
+	for (unsigned int i = 0; i < PacketDataSize; i++)
 		WRITE_BYTE(SendInfo.Data[SendInfo.DataSent++]);
 	MESSAGE_END();
 #else
@@ -176,7 +176,7 @@ void MSChar_Interface::Think_SendChar(CBasePlayer *pPlayer)
 
 	 strncpy(Buffer,  "ul ", sizeof(Buffer) );
 
-	for (int i = 0; i < PacketDataSize; i++)
+	for (unsigned int i = 0; i < PacketDataSize; i++)
 	{
 		strncat(Buffer, &SendInfo.Data[SendInfo.DataSent++], 1);
 	}
@@ -219,8 +219,8 @@ void MSChar_Interface::HL_SVReadCharData(CBasePlayer *pPlayer, const char *UUEnc
 	if (SendInfo.Status != CSS_RECEIVING)
 		return;
 
-	int Bytes = strlen(UUEncodedData) / 2;
-	for (int i = 0; i < Bytes; i++)
+	unsigned int Bytes = strlen(UUEncodedData) / 2;
+	for (unsigned int i = 0; i < Bytes; i++)
 	{
 		char Num1 = UUEncodedData[i * 2] - UUENC_OFS;
 		char Num2 = UUEncodedData[(i * 2) + 1] - UUENC_OFS;
@@ -275,8 +275,8 @@ void MSChar_Interface::HL_CLReadCharData()
 	if (SendInfo.Status != CSS_RECEIVING)
 		return;
 
-	int Bytes = READ_BYTE();
-	for (int i = 0; i < Bytes; i++)
+	unsigned int Bytes = READ_BYTE();
+	for (unsigned int i = 0; i < Bytes; i++)
 		SendInfo.Data[SendInfo.DataSent++] = READ_BYTE();
 
 	if ((signed)SendInfo.DataSent >= SendInfo.DataLen)
diff --git a/src/game/shared/ms/script.cpp b/src/game/shared/ms/script.cpp
index 47903c2e..66623f91 100644
--- a/src/game/shared/ms/script.cpp
+++ b/src/game/shared/ms/script.cpp
@@ -346,7 +346,7 @@ const char* CScript::GetConst(const char* Text)
 			MS_ERROR("%s: Script: %s, \"%s\" - Mismatched Parenthesis!", m.ScriptFile.c_str(), Text);
 	}
 	else
-		for (int i = 0; i < m_Constants.size(); i++)
+		for (unsigned int i = 0; i < m_Constants.size(); i++)
 			if (m_Constants[i].Name == Text)
 				return m_Constants[i].Value;
 
@@ -356,9 +356,9 @@ const char* CScript::GetConst(const char* Text)
 bool GetString(char* Return, size_t size, const char* sentence, int start, const char* endchars)
 {
 	// Quickie function to return the next CMD or parameter in a script string
-	int i = 0, n, iPosition = start, endCharSize = strlen(endchars);
+	unsigned int i = 0, n, iPosition = start, endCharSize = strlen(endchars);
 	strncpy(Return, "", size);
-	while (i < (size - 1))
+	while (i < (unsigned int)(size - 1))
 	{
 		for (n = 0; n < endCharSize; n++)
 			if (sentence[iPosition] == endchars[n])
@@ -378,7 +378,7 @@ bool GetString(char* Return, size_t size, const char* sentence, int start, const
 scriptvar_t* IVariables::FindVar(const char* Name)
 {
 	//Check local variables
-	for (int i = 0; i < m_Variables.size(); i++)
+	for (unsigned int i = 0; i < m_Variables.size(); i++)
 	{
 		if (FStrEq(Name, m_Variables[i].Name)) return &m_Variables[i];
 	}
@@ -403,7 +403,7 @@ scriptvar_t* IVariables::SetVar(const char* Name, const char* Value)
 // Find an event by its name...
 SCRIPT_EVENT* CScript::EventByName(const char* pszEventName)
 {
-	for (int i = 0; i < m.Events.size(); i++)
+	for (unsigned int i = 0; i < m.Events.size(); i++)
 	{
 		SCRIPT_EVENT& seEvent = m.Events[i];
 		if (!seEvent.Name || seEvent.Name != pszEventName)
@@ -421,10 +421,10 @@ scriptvar_t* CScript::FindVar(const char* pszName)
 	if (pScriptvar) return pScriptvar;
 
 	//Check global variables
-	for (int i = 0; i < m_gVariables.size(); i++)
+	for (unsigned int i = 0; i < m_gVariables.size(); i++)
 		if (FStrEq(pszName, m_gVariables[i].Name)) return &m_gVariables[i];
 
-	for (int i = 0; i < m_Constants.size(); i++)
+	for (unsigned int i = 0; i < m_Constants.size(); i++)
 	{
 		if (FStrEq(pszName, m_Constants[i].Name))
 		{
@@ -456,7 +456,7 @@ msstring CScript::ScriptGetter_Conjunction(msstring& FullName, msstring& ParserN
 
 	if (bIsAnd || bIsOr || bIsXor)
 	{
-		for (int i = 0; i < Params.size(); i++)
+		for (unsigned int i = 0; i < Params.size(); i++)
 		{
 			// Allow shortcutting
 			if (atoi(SCRIPTVAR(Params[i])))
@@ -505,7 +505,7 @@ msstring CScript::ScriptGetter_AlphaNum(msstring& FullName, msstring& ParserName
 		//yes, this is a shit way of doing this, but I'm in a rush...
 		msstring num_conv = Params[0];
 		msstring out_str;
-		int in_length = num_conv.len();
+		unsigned int in_length = num_conv.len();
 		const char* cc;
 		bool char_legit;
 		msstring extra_list;
@@ -515,7 +515,7 @@ msstring CScript::ScriptGetter_AlphaNum(msstring& FullName, msstring& ParserName
 			extra_list = Params[1];
 			check_extras = true;
 		}
-		for (int i = 0; i <= in_length; i++)
+		for (unsigned int i = 0; i <= in_length; i++)
 		{
 			char_legit = false;
 			cc = num_conv.substr(i, 1).c_str();
@@ -1009,7 +1009,7 @@ msstring CScript::ScriptGetter_Func(msstring& FullName, msstring& ParserName, ms
 	OutParams.clearitems();
 	if (Params.size() > 1)
 	{
-		for (int i = 0; i < Params.size(); i++)
+		for (unsigned int i = 0; i < Params.size(); i++)
 		{
 			if (i >= 1)
 			{
@@ -1523,7 +1523,7 @@ msstring CScript::ScriptGetter_GetCl(msstring& FullName, msstring& ParserName, m
 			int EntIdx = atoi(Params[0]);
 			if (EntIdx > 0)
 			{
-				for (int i = 0; i < CLPERMENT_TOTAL; i++)
+				for (unsigned int i = 0; i < CLPERMENT_TOTAL; i++)
 					if (EntIdx == MSCLGlobals::CLViewEntities[i].index)
 					{
 						pclEntity = &MSCLGlobals::CLViewEntities[i]; break;
@@ -1559,7 +1559,7 @@ msstring CScript::ScriptGetter_GetCl(msstring& FullName, msstring& ParserName, m
 msstring CScript::ScriptGetter_GetConst(msstring& FullName, msstring& ParserName, msstringlist& Params)
 {
 	//Thothie - JUNE2007 $get_cvar(<cvar_name>)
-	for (int i = 0; i < m_Constants.size(); i++)
+	for (unsigned int i = 0; i < m_Constants.size(); i++)
 	{
 		if (m_Constants[i].Name == Params[0])
 		{
@@ -1689,7 +1689,7 @@ msstring CScript::ScriptGetter_GetFileLine(msstring& FullName, msstring& ParserN
 		bool found = false;
 		if (m.pScriptedEnt->filesOpen.size() >= 1)
 		{
-			for (int i = 0; i < m.pScriptedEnt->filesOpen.size(); i++)
+			for (unsigned int i = 0; i < m.pScriptedEnt->filesOpen.size(); i++)
 			{
 				//Check to see if we already have this file open
 				if (m.pScriptedEnt->filesOpen[i].fileName == fileName)
@@ -1746,7 +1746,7 @@ msstring CScript::ScriptGetter_GetFindToken(msstring& FullName, msstring& Parser
 
 		int iFoundAtPos = -1;
 
-		for (int i = 0; i < Tokens.size(); i++)
+		for (unsigned int i = 0; i < Tokens.size(); i++)
 		{
 			if (!bPartialSearch) { if (Tokens[i] == TokenAdd) iFoundAtPos = i; } //Thothie SEP2019_09 - partial searches
 			else { if (Tokens[i].contains(TokenAdd)) iFoundAtPos = i; } //Thothie SEP2019_09 - partial searches
@@ -1790,7 +1790,7 @@ msstring CScript::ScriptGetter_tokenize(msstring& FullName, msstring& ParserName
 	if (Params.size() >= 1)
 	{
 		msstring stemp = "";
-		for (int i = 0; i < Params.size(); i++)
+		for (unsigned int i = 0; i < Params.size(); i++)
 		{
 			stemp.append(Params[i].c_str());
 			stemp.append(";");
@@ -2029,7 +2029,7 @@ msstring CScript::ScriptGetter_GetInSphere(msstring& FullName, msstring& ParserN
 	Vector StartPos;
 	if (Params.size() == 2) StartPos = m.pScriptedEnt->pev->origin;
 	else if (Params.size() >= 3) StartPos = StringToVec(Params[2]);
-	int count = UTIL_MonstersInSphere(pList, 255, StartPos, flAreaSize);
+	unsigned int count = UTIL_MonstersInSphere(pList, 255, StartPos, flAreaSize);
 	bool spec_search = false;
 
 	CBaseEntity* pSpecificEnt = RetrieveEntity(Name);
@@ -2038,7 +2038,7 @@ msstring CScript::ScriptGetter_GetInSphere(msstring& FullName, msstring& ParserN
 
 	//ALERT( at_aiconsole, "Searching through %i ents\n", count );
 
-	for (int i = 0; i < count; i++)
+	for (unsigned int i = 0; i < count; i++)
 	{
 		pEnt = pList[i];
 
@@ -2182,7 +2182,7 @@ msstring CScript::ScriptGetter_GetQuestData(msstring& FullName, msstring& Parser
 	if (pEntity && pEntity->IsPlayer())
 	{
 		CBasePlayer* pPlayer = (CBasePlayer*)pEntity;
-		for (int i = 0; i < pPlayer->m_Quests.size(); i++)
+		for (unsigned int i = 0; i < pPlayer->m_Quests.size(); i++)
 			if (pPlayer->m_Quests[i].Name == Name)
 				return pPlayer->m_Quests[i].Data;
 	}
@@ -2392,14 +2392,14 @@ msstring CScript::ScriptGetter_GetScriptFlag(msstring& FullName, msstring& Parse
 		if (Params[1] == "listall")
 		{
 			Print("Scriptflags for %s:\n", pEntity->m_DisplayName.c_str());
-			for (int i = 0; i < pEntity->m_scriptflags.names.size(); i++)
+			for (unsigned int i = 0; i < pEntity->m_scriptflags.names.size(); i++)
 			{
 				Print("# %i type %s name %s val %s exp %s\n", i, pEntity->m_scriptflags.types[i].c_str(), pEntity->m_scriptflags.names[i].c_str(), pEntity->m_scriptflags.values[i].c_str(), pEntity->m_scriptflags.expiretimes[i].c_str());
 			}
 			return "0";
 		}
 #endif
-		for (int i = 0; i < pEntity->m_scriptflags.names.size(); i++)
+		for (unsigned int i = 0; i < pEntity->m_scriptflags.names.size(); i++)
 		{
 			if (!sf_get_by_name)
 			{
@@ -2579,7 +2579,7 @@ msstring CScript::ScriptGetter_GetTakeDmg(msstring& FullName, msstring& ParserNa
 
 	msstring Return;
 	if (Params[1] == "all") RETURN_FLOAT(pTarget->m.GenericTDM); //MAR2010_03
-	for (int i = 0; i < pTarget->m.TakeDamageModifiers.size(); i++)
+	for (unsigned int i = 0; i < pTarget->m.TakeDamageModifiers.size(); i++)
 	{
 		CMSMonster::takedamagemodifier_t& TDM = pTarget->m.TakeDamageModifiers[i];
 		msstring read_dmgtype = TDM.DamageType;
@@ -2828,11 +2828,11 @@ msstring CScript::ScriptGetter_GetTSphereAndBox(msstring& FullName, msstring& Pa
 		Vector StartPos;
 		if (Params.size() == 2) StartPos = m.pScriptedEnt->pev->origin;
 		else if (Params.size() >= 3) StartPos = StringToVec(Params[2]);
-		int count = UTIL_MonstersInSphere(pList, 255, StartPos, flAreaSize);
+		unsigned int count = UTIL_MonstersInSphere(pList, 255, StartPos, flAreaSize);
 
 		//ALERT( at_aiconsole, "Searching through %i ents\n", count );
 
-		for (int i = 0; i < count; i++)
+		for (unsigned int i = 0; i < count; i++)
 		{
 			if ((int)msTokenString.len() > str_limit) break; //outta room
 
@@ -2955,11 +2955,11 @@ msstring CScript::ScriptGetter_GetTSphereAndBox(msstring& FullName, msstring& Pa
 			vMaximumBox = StringToVec(Params[2]);
 		}
 
-		int count = UTIL_EntitiesInBox(pList, 255, vMinimumBox, vMaximumBox, FL_CLIENT | FL_MONSTER);
+		unsigned int count = UTIL_EntitiesInBox(pList, 255, vMinimumBox, vMaximumBox, FL_CLIENT | FL_MONSTER);
 
 		//ALERT( at_aiconsole, "Searching through %i ents\n", count );
 
-		for (int i = 0; i < count; i++)
+		for (unsigned int i = 0; i < count; i++)
 		{
 			if ((int)msTokenString.len() > str_limit) continue;
 
@@ -3224,7 +3224,7 @@ msstring CScript::ScriptGetter_inrange(msstring& FullName, msstring& ParserName,
 			return "0"; //not enough params
 		}
 		msstring Result = "0";
-		for (int i = 0; i < Params.size(); i++)
+		for (unsigned int i = 0; i < Params.size(); i++)
 		{
 			if (i > 0)
 			{
@@ -3241,7 +3241,7 @@ msstring CScript::ScriptGetter_inrange(msstring& FullName, msstring& ParserName,
 			return "0"; //not enough params
 		}
 		msstring Result = "0";
-		for (int i = 0; i < Params.size(); i++)
+		for (unsigned int i = 0; i < Params.size(); i++)
 		{
 			if (i > 0)
 			{
@@ -3449,7 +3449,7 @@ msstring CScript::ScriptGetter_MinMax(msstring& FullName, msstring& ParserName,
 	{
 		float best = atof(Params[0].c_str());
 		bool max = ParserName == "$max";
-		for (int i = 0; i < Params.size(); i++)
+		for (unsigned int i = 0; i < Params.size(); i++)
 			best = max ? V_max(best, atof(Params[i].c_str())) : V_min(best, atof(Params[i].c_str()));
 		RETURN_FLOAT(best);
 	}
@@ -3486,7 +3486,7 @@ msstring CScript::ScriptGetter_Num(msstring& FullName, msstring& ParserName, mss
 		//yes, this is a shit way of doing this, but I'm in a rush...
 		msstring num_conv = Params[0];
 		msstring out_str;
-		int in_length = num_conv.len();
+		unsigned int in_length = num_conv.len();
 		const char* cc;
 		bool char_legit;
 		msstring extra_list;
@@ -3496,7 +3496,7 @@ msstring CScript::ScriptGetter_Num(msstring& FullName, msstring& ParserName, mss
 			extra_list = Params[1];
 			check_extras = true;
 		}
-		for (int i = 0; i <= in_length; i++)
+		for (unsigned int i = 0; i <= in_length; i++)
 		{
 			char_legit = false;
 			cc = num_conv.substr(i, 1).c_str();
@@ -3526,7 +3526,7 @@ msstring CScript::ScriptGetter_Quote(msstring& FullName, msstring& ParserName, m
 	{
 		msstring out_str = "\"";
 
-		for (int i = 0; i < Params.size(); i++)
+		for (unsigned int i = 0; i < Params.size(); i++)
 		{
 			if (i) out_str += " ";
 			out_str += Params[i];
@@ -3923,7 +3923,7 @@ msstring CScript::ScriptGetter_ScanShape(msstring& FullName, msstring& ParserNam
 				, m.pScriptedEnt
 #endif
 			);
-			for (int i = 0; i < vFilterList.size(); i++)
+			for (unsigned int i = 0; i < vFilterList.size(); i++)
 			{
 				delete vFilterList[i];
 			}
@@ -3931,7 +3931,7 @@ msstring CScript::ScriptGetter_ScanShape(msstring& FullName, msstring& ParserNam
 
 			msstring                    vsIndxString;
 			bool                        bFir = true;
-			for (int i = 0; i < vEntityList.size(); i++)
+			for (unsigned int i = 0; i < vEntityList.size(); i++)
 			{
 				CFindEntity             vEntity = vEntityList[i];
 				if (pArray)
@@ -3963,7 +3963,7 @@ msstring CScript::ScriptGetter_ScanShape(msstring& FullName, msstring& ParserNam
 		}
 		catch (...)
 		{
-			for (int i = 0; i < vFilterList.size(); i++)
+			for (unsigned int i = 0; i < vFilterList.size(); i++)
 			{
 				delete vFilterList[i];
 			}
@@ -4011,10 +4011,10 @@ msstring CScript::ScriptGetter_SortEntList(msstring& FullName, msstring& ParserN
 
 		if (Tokens.size() == 1) return Params[0].c_str(); //Thothie APR2016_23 - smashes if only given one entity otherwise
 
-		int size = (signed)Tokens.size();
-		for (int i = 0; i < size; i++)
+		unsigned int size = (signed)Tokens.size();
+		for (unsigned int i = 0; i < size; i++)
 		{
-			int curIdx = 0;
+			unsigned int curIdx = 0;
 			float curVal = 0;
 
 			CMSMonster* pZeroEnt = (m.pScriptedEnt ? (CMSMonster*)m.pScriptedEnt->RetrieveEntity(Tokens[0]) : NULL);
@@ -4032,7 +4032,7 @@ msstring CScript::ScriptGetter_SortEntList(msstring& FullName, msstring& ParserN
 				else if (compParam == "mp") curVal = pZeroEnt->m_MP;
 				else if (compParam == "maxmp") curVal = pZeroEnt->m_MaxMP;
 
-				for (int j = 0; j < (Tokens.size() - 1); j++)
+				for (unsigned int j = 0; j < (Tokens.size() - 1); j++)
 				{
 					float compVal = 0;
 					CMSMonster* pCurEnt = (CMSMonster*)m.pScriptedEnt->RetrieveEntity(Tokens[j + 1]);
@@ -4077,7 +4077,7 @@ msstring CScript::ScriptGetter_StrAdd(msstring& FullName, msstring& ParserName,
 	//Add strings together
 	//priority: moderate, scope: shared
 	msstring Return;
-	for (int i = 0; i < Params.size(); i++)
+	for (unsigned int i = 0; i < Params.size(); i++)
 		Return += Params[i];
 
 	return Return;
@@ -4413,7 +4413,7 @@ const char* CScript::GetVar(const char* pszText)
 	if (pszText[0] == '$')
 	{
 		BreakUpLine(FullName, ParserName, Params);
-		for (int i = 0; i < Params.size(); i++)
+		for (unsigned int i = 0; i < Params.size(); i++)
 			Params[i] = SCRIPTVAR(Params[i]);
 
 		//Handle entity-specific parser
@@ -4796,8 +4796,8 @@ void CScript::CopyAllData(CScript* pDestScript, CBaseEntity* pScriptedEnt, IScri
 	//pDestScript->m.Events = m.Events;
 
 	//Copy Variables
-	int variables = m_Variables.size();
-	for (int i = 0; i < variables; i++)
+	unsigned int variables = m_Variables.size();
+	for (unsigned int i = 0; i < variables; i++)
 		pDestScript->m_Variables.add(m_Variables[i]);
 }
 float GetNumeric(const char* pszText) {
@@ -4835,7 +4835,7 @@ bool CScript::Spawn(msstring Filename, CBaseEntity* pScriptedEnt, IScripted* pSc
 	//Update: A script can specify when it wants to allow duplicate includes
 	if (!m.AllowDupInclude)
 	{
-		for (int i = 0; i < m_Dependencies.size(); i++)
+		for (unsigned int i = 0; i < m_Dependencies.size(); i++)
 		{
 			if (!_stricmp(m_Dependencies[i], Filename))
 			{
@@ -4966,8 +4966,8 @@ void CScript::RunScriptEvents(bool fOnlyRunNamedEvents)
 {
 	//Run script events
 	//~ Runs unnamed events or named events that were specified with calleventtimed ~
-	int events = m.Events.size();
-	for (int i = 0; i < events; i++)
+	unsigned int events = m.Events.size();
+	for (unsigned int i = 0; i < events; i++)
 	{
 		SCRIPT_EVENT& Event = m.Events[i];
 		//Skip unnamed events when running named events only
@@ -4986,7 +4986,7 @@ void CScript::RunScriptEvents(bool fOnlyRunNamedEvents)
 			Event.fNextExecutionTime = -1;
 		}
 
-		for (int e = 0; e < Event.TimedExecutions.size(); e++)
+		for (unsigned int e = 0; e < Event.TimedExecutions.size(); e++)
 		{
 			if (gpGlobals->time < Event.TimedExecutions[e])
 				continue;
@@ -4996,7 +4996,7 @@ void CScript::RunScriptEvents(bool fOnlyRunNamedEvents)
 			Event.TimedExecutions.erase(e--);
 		}
 
-		for (int e = 0; e < CachedExecutions.size(); e++)
+		for (unsigned int e = 0; e < CachedExecutions.size(); e++)
 		{
 			Script_ExecuteEvent(Event);
 		}
@@ -5007,7 +5007,7 @@ void CScript::RunScriptEventByName(const char* pszEventName, msstringlist* Param
 	SCRIPT_EVENT* CurrentEvent = m.CurrentEvent; //Save the event currently executing
 
 	//Run every event with this name
-	for (int i = 0; i < m.Events.size(); i++)
+	for (unsigned int i = 0; i < m.Events.size(); i++)
 	{
 		SCRIPT_EVENT& seEvent = m.Events[i];
 		if (!seEvent.Name || seEvent.Name != pszEventName)
@@ -5036,8 +5036,8 @@ ::mslist<std::string> GetParams(std::string& str)
 	std::string word = "";
 	bool inQuote = false;
 
-	int strlen = str.length();
-	for (int i = 0; i < strlen; i++)
+	unsigned int strlen = str.length();
+	for (unsigned int i = 0; i < strlen; i++)
 	{
 		const char ch = str[i];
 
@@ -5194,7 +5194,7 @@ int CScript::ParseLine(const char* pszCommandLine, int LineNum, SCRIPT_EVENT** p
 			Event.Scope = esScope;
 
 			if (Name.len() && Override)
-				for (int i = 0; i < m.Events.size(); i++)
+				for (unsigned int i = 0; i < m.Events.size(); i++)
 					if (Name == m.Events[i].Name)
 					{
 						m.Events.erase(i); i--;
@@ -5308,7 +5308,7 @@ int CScript::ParseLine(const char* pszCommandLine, int LineNum, SCRIPT_EVENT** p
 
 			if (*CmdLineTmp == '(') TmpLineOfs++;
 			msstring ParamStr = msstring(CmdLineTmp).skip(SKIP_STR);
-			for (int i = 0; i < 3; i++)
+			for (unsigned int i = 0; i < 3; i++)
 			{
 				ScriptCmd.m_Params.add(GetConst(ParamStr.thru_char(SKIP_STR)));
 				ParamStr = msstring(ParamStr.findchar_str(SKIP_STR)).skip(SKIP_STR);
@@ -5409,7 +5409,7 @@ int CScript::ParseLine(const char* pszCommandLine, int LineNum, SCRIPT_EVENT** p
 			{
 				bool AddConst = true;
 
-				for (int i = 0; i < m_Constants.size(); i++)
+				for (unsigned int i = 0; i < m_Constants.size(); i++)
 				{
 					if (m_Constants[i].Name == VarName)
 					{
@@ -5429,7 +5429,7 @@ int CScript::ParseLine(const char* pszCommandLine, int LineNum, SCRIPT_EVENT** p
 	{
 		msstring VarName = Line.thru_char(SKIP_STR);
 
-		for (int i = 0; i < m_Constants.size(); i++)
+		for (unsigned int i = 0; i < m_Constants.size(); i++)
 			if (m_Constants[i].Name == VarName)
 			{
 				m_Constants.erase(i);
@@ -5461,7 +5461,7 @@ int CScript::ParseLine(const char* pszCommandLine, int LineNum, SCRIPT_EVENT** p
 
 		if (!m.PrecacheOnly)
 		{
-			for (int i = 0; i < m_Constants.size(); i++)
+			for (unsigned int i = 0; i < m_Constants.size(); i++)
 			{
 				if (m_Constants[i].Name == VarName)
 				{
@@ -5528,7 +5528,7 @@ int CScript::ParseLine(const char* pszCommandLine, int LineNum, SCRIPT_EVENT** p
 			pSearchLine = "%[ \t\r\n]%s";
 		}
 
-		for (int i = 0; i < Resources.size(); i++)
+		for (unsigned int i = 0; i < Resources.size(); i++)
 		{
 			msstring& FileName = Resources[i];
 
@@ -5695,7 +5695,7 @@ bool CScript::Script_SetupEvent(SCRIPT_EVENT& Event, msstringlist* Parameters)
 
 	//Setup option parameter variables
 	if (Parameters)
-		for (int i = 0; i < (*Parameters).size(); i++)
+		for (unsigned int i = 0; i < (*Parameters).size(); i++)
 			Event.SetLocal(msstring("PARAM") + int(i + 1), (*Parameters)[i]);
 
 	return m.pScriptedInterface ? m.pScriptedInterface->Script_SetupEvent(this, Event) : true;
@@ -5704,8 +5704,8 @@ void CScript::ErrorPrintCommand(const char* vsUniqueTag, SCRIPT_EVENT* pEvent, m
 {
 #if !TURN_OFF_ALERT
 	msstring                            vsParams;
-	for (int i = 0; i < vParams.size() - vParamStrt; i++)
-		vsParams += msstring("\n  ") + i + ": " + vParams[i + vParamStrt];
+	for (unsigned int i = 0; i < vParams.size() - vParamStrt; i++)
+		vsParams += msstring("\n  ") + (int)i + ": " + vParams[i + vParamStrt];
 	ErrorPrint(vsUniqueTag
 		, ERRORPRINT_LOG | ERRORPRINT_CONSOLE
 		, "Error with command '%s' %s for script file %s. Parameters:%s\n%s"
@@ -5725,13 +5725,13 @@ void CScript::ErrorPrintCommand(const char* vsUniqueTag, SCRIPT_EVENT* pEvent, m
 }
 bool CScript::Script_ExecuteCmds(SCRIPT_EVENT& Event, scriptcmd_list& Cmdlist)
 {
-	for (int c = 0; c < Cmdlist.m_Cmds.size(); c++)
+	for (unsigned int c = 0; c < Cmdlist.m_Cmds.size(); c++)
 	{
 		scriptcmd_t& Cmd = Cmdlist.m_Cmds[c];
 
 		//Convert the variable parameters
 		msstringlist Params;
-		for (int icmd = 0; icmd < Cmd.m_Params.size() - 1; icmd++)
+		for (unsigned int icmd = 0; icmd < Cmd.m_Params.size() - 1; icmd++)
 			Params.add(GetVar(Event.GetLocal(Cmd.m_Params[icmd + 1])));
 
 		// if Script_ExecuteCmd returns false, break execution of the event
@@ -5746,7 +5746,7 @@ bool CScript::Script_ExecuteCmds(SCRIPT_EVENT& Event, scriptcmd_list& Cmdlist)
 			if (!Cmd.m_NewConditional)
 				break; //Old if command.  Breaks event execution on failure
 
-			for (int e = 0; e < Cmd.m_ElseCmds.size(); e++) // Parse all else statements
+			for (unsigned int e = 0; e < Cmd.m_ElseCmds.size(); e++) // Parse all else statements
 				if (Script_ExecuteCmds(Event, Cmd.m_ElseCmds[e]))
 					break; //As soon as one returns true, don't parse any more
 
@@ -5791,9 +5791,9 @@ void CScript::SendScript(scriptsendcmd_t& SendCmd)
 			WRITE_BYTE(Type); //0 == Add | 1 == Update | 2 = Remove
 			WRITE_LONG(SendCmd.UniqueID);
 			if (Type == ST_NEW) WRITE_STRING(SendCmd.ScriptName);
-			int Parameters = SendCmd.Params.size();
+			unsigned int Parameters = SendCmd.Params.size();
 			WRITE_BYTE(Parameters);
-			for (int i = 0; i < Parameters; i++)
+			for (unsigned int i = 0; i < Parameters; i++)
 				WRITE_STRING(SendCmd.Params[i]);
 			MESSAGE_END();
 		}
@@ -5814,7 +5814,7 @@ Vector CScript::DetermineOrigin(msstring& vsOrigin)
 void CScript::CallEventTimed(const char* EventName, float Delay)
 {
 	float Time = gpGlobals->time + Delay;
-	for (int e = 0; e < m.Events.size(); e++)
+	for (unsigned int e = 0; e < m.Events.size(); e++)
 	{
 		SCRIPT_EVENT& seEvent = m.Events[e];
 		if (!seEvent.Name || seEvent.Name != EventName)
@@ -5834,7 +5834,7 @@ IScripted::IScripted()
 }
 void IScripted::Deactivate()
 {
-	for (int i = 0; i < m_Scripts.size(); i++)
+	for (unsigned int i = 0; i < m_Scripts.size(); i++)
 	{
 		Script_Remove(i); i--;
 	}
@@ -5862,7 +5862,7 @@ CScript* IScripted::Script_Add(msstring ScriptName, CBaseEntity* pEntity)
 }
 CScript* IScripted::Script_Get(msstring ScriptName)
 {
-	for (int i = 0; i < m_Scripts.size(); i++)
+	for (unsigned int i = 0; i < m_Scripts.size(); i++)
 		if (!strcmp(m_Scripts[i]->m.ScriptFile, ScriptName))
 			return m_Scripts[i];
 	return NULL;
@@ -5883,7 +5883,7 @@ int IScripted::Script_ParseLine(CScript* Script, const char* pszCommandLine, scr
 		return 0;
 
 	if (m_pScriptCommands)
-		for (int icommand = 0; icommand < m_pScriptCommands->size(); icommand++)
+		for (unsigned int icommand = 0; icommand < m_pScriptCommands->size(); icommand++)
 		{
 			scriptcmdname_t& Checkcmd = (*m_pScriptCommands)[icommand];
 			if (!_stricmp(TestCommand, Checkcmd.m_Name.c_str()))
@@ -5895,7 +5895,7 @@ int IScripted::Script_ParseLine(CScript* Script, const char* pszCommandLine, scr
 
 void IScripted::RunScriptEvents(bool fOnlyRunNamedEvents)
 {
-	for (int i = 0; i < m_Scripts.size(); i++)
+	for (unsigned int i = 0; i < m_Scripts.size(); i++)
 	{
 		CScript* Script = m_Scripts[i];
 
@@ -5915,14 +5915,14 @@ void IScripted::RunScriptEvents(bool fOnlyRunNamedEvents)
 
 void IScripted::CallScriptEventTimed(const char* EventName, float Delay)
 {
-	for (int i = 0; i < m_Scripts.size(); i++)
+	for (unsigned int i = 0; i < m_Scripts.size(); i++)
 		m_Scripts[i]->CallEventTimed(EventName, Delay);
 }
 
 void IScripted::CallScriptEvent(const char* EventName, msstringlist* Parameters)
 {
 	m_ReturnData = "";
-	for (int i = 0; i < m_Scripts.size(); i++)
+	for (unsigned int i = 0; i < m_Scripts.size(); i++)
 		m_Scripts[i]->RunScriptEventByName(EventName, Parameters);
 	
 	// Also try calling registered AngelScript global function handlers
@@ -5935,11 +5935,11 @@ void IScripted::CallScriptEvent(const char* EventName, msstringlist* Parameters)
 
 void IScripted::Script_InitHUD(CBasePlayer* pPlayer)
 {
-	for (int i = 0; i < m_Scripts.size(); i++)
+	for (unsigned int i = 0; i < m_Scripts.size(); i++)
 	{
 		CScript* Script = m_Scripts[i];
 		if (Script == NULL) continue;
-		for (int e = 0; e < Script->m.PersistentSendCmds.size(); e++)
+		for (unsigned int e = 0; e < Script->m.PersistentSendCmds.size(); e++)
 			Script->SendScript(Script->m.PersistentSendCmds[e]);
 	}
 }
@@ -5969,7 +5969,7 @@ const char* SCRIPT_EVENT::GetLocal(const char* Name)
 		if (Params->size() > 1)
 		{
 			msstring stemp = "";
-			for (int i = 0; i < Params->size(); i++)
+			for (unsigned int i = 0; i < Params->size(); i++)
 			{
 				msstring l_param = (*Params)[i];
 				stemp.append(l_param);
@@ -5991,7 +5991,7 @@ void CScript::CallScriptEventAll(const char* EventName, msstringlist* Parameters
 	CBaseEntity* pEntity = NULL;
 	IScripted* pScripted = NULL;
 
-	for (int i = 1; i < gpGlobals->maxEntities; i++)
+	for (unsigned int i = 1; i < gpGlobals->maxEntities; i++)
 	{
 		pEdict = g_engfuncs.pfnPEntityOfEntIndex(i);
 
@@ -6025,7 +6025,7 @@ void CScript::CallScriptPlayers(const char* EventName, msstringlist* Parameters)
 
 	IScripted* pScripted = NULL;
 
-	for (int i = 1; i <= gpGlobals->maxClients; i++)
+	for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
 	{
 		CBaseEntity* pEntity = UTIL_PlayerByIndex(i);
 		CBasePlayer* pPlayer = (CBasePlayer*)pEntity;;
@@ -6055,10 +6055,10 @@ void CScript::ClCallScriptPlayers(const char* EventName, msstringlist* Parameter
 		WRITE_BYTE(17);
 		WRITE_BYTE(1); //0 == Add | 1 == Update | 2 = Remove
 		WRITE_LONG(-2);
-		int nParameters = Parameters->size();
+		unsigned int nParameters = Parameters->size();
 		WRITE_BYTE(nParameters + 1);
 		WRITE_STRING(EventName);
-		for (int i = 0; i < nParameters; i++)
+		for (unsigned int i = 0; i < nParameters; i++)
 			WRITE_STRING((*Parameters)[i]);
 		MESSAGE_END();
 	}
@@ -6167,7 +6167,7 @@ void CScript::conflict_check(msstring testvar, msstring testvar_type, msstring t
 
 	if (cc_check_against_const)
 	{
-		for (int i = 0; i < m_Constants.size(); i++)
+		for (unsigned int i = 0; i < m_Constants.size(); i++)
 		{
 			if (m_Constants[i].Name == testvar)
 			{
@@ -6178,7 +6178,7 @@ void CScript::conflict_check(msstring testvar, msstring testvar_type, msstring t
 	}
 	if (cc_check_against_var)
 	{
-		for (int i = 0; i < m_Variables.size(); i++)
+		for (unsigned int i = 0; i < m_Variables.size(); i++)
 		{
 			if (m_Variables[i].Name == testvar)
 			{
@@ -6189,7 +6189,7 @@ void CScript::conflict_check(msstring testvar, msstring testvar_type, msstring t
 	}
 	if (cc_check_against_global)
 	{
-		for (int i = 0; i < m_gVariables.size(); i++)
+		for (unsigned int i = 0; i < m_gVariables.size(); i++)
 		{
 			if (m_gVariables[i].Name == testvar)
 			{
diff --git a/src/game/shared/ms/script.h b/src/game/shared/ms/script.h
index d4ee10e1..fe3ab970 100644
--- a/src/game/shared/ms/script.h
+++ b/src/game/shared/ms/script.h
@@ -34,7 +34,7 @@ class CEventList : public mslist<SCRIPT_EVENT *> //This class was created so I c
 	CEventList &operator = (const CEventList &OtherList)
 	{
 		clear();
-		for(int i = 0; i < OtherList.size(); i++)
+		for(unsigned int i = 0; i < OtherList.size(); i++)
 			add(OtherList[i]);
 
 		return *this;
diff --git a/src/game/shared/ms/scriptcmds.cpp b/src/game/shared/ms/scriptcmds.cpp
index 3acd0cef..3a906a63 100644
--- a/src/game/shared/ms/scriptcmds.cpp
+++ b/src/game/shared/ms/scriptcmds.cpp
@@ -300,7 +300,7 @@ struct SDebugInfo
 	// Info for finding entities
 	int                                 mTargetType;
 	int                                 mTimesLooked;
-	int                                 mStartIndex;
+	unsigned int                        mStartIndex;
 	msstring                            msScriptName;
 	CBaseEntity *                       mpFoundEntity;
 
@@ -350,8 +350,8 @@ bool GetNextDebugEntity(
 				ClientPrint( pCaller->pev, at_console, "No player target, using insphere...\n" );
 
 				CBaseEntity * vList[30];
-				int vNumFound = UTIL_MonstersInSphere( vList, 30, pCaller->pev->origin, 128 );
-				for(int i = 0; i < vNumFound; i++ )
+				unsigned int vNumFound = UTIL_MonstersInSphere( vList, 30, pCaller->pev->origin, 128 );
+				for(unsigned int i = 0; i < vNumFound; i++ )
 				{
 					rDebugInfo.mpFoundEntity = vList[i];
 					if (  pCaller->entindex() == rDebugInfo.mpFoundEntity->entindex()
@@ -527,7 +527,7 @@ bool CScript::ScriptCmd_DebugEntities(
 		return true;
 	}
 
-	for(int i = 0; i < Params.size() - 1; i++ )
+	for(unsigned int i = 0; i < Params.size() - 1; i++ )
 	{
 		if (Params[i + 1].starts_with("PARAM"))
 			break;
@@ -711,7 +711,7 @@ bool DoDebugEntities(CBasePlayer *pCallerPlayer, msstring vsCmdName, msstringlis
 				vGetPropParams.add( EntToString(vDebugInfo.mpFoundEntity) );
 				vGetPropParams.add( vDebugInfo.msVarName );
 
-				for(int i = 0; i < 2; i++)
+				for(unsigned int i = 0; i < 2; i++)
 				{
 					if ( i )
 					{
@@ -745,7 +745,7 @@ bool DoDebugEntities(CBasePlayer *pCallerPlayer, msstring vsCmdName, msstringlis
 					msstringlist        vSubParams;
 					vSubParams.add( msstring() + pSubEntity->entindex() );
 
-					for( int i = 0; i < vDebugInfo.mSubParams.size(); i++ )
+					for( unsigned int i = 0; i < vDebugInfo.mSubParams.size(); i++ )
 						vSubParams.add( vDebugInfo.mSubParams[i] );
 
 					vsOutAppend += "->";
@@ -825,14 +825,12 @@ bool DoDebugEntities(CBasePlayer *pCallerPlayer, msstring vsCmdName, msstringlis
 
 		if ( vDebugInfo.mbDumpArray && pScriptArray )
 		{
-			for( int i = 0; i < pScriptArray->size(); i++ )
+			for(unsigned int i = 0; i < pScriptArray->size(); i++ )
 			{
 				vPrintParams.clear();
-				vPrintParams.add( msstring( "#" )
-					+ i
-					+ " "
-					+ (*pScriptArray)[i]
-					);
+				vPrintParams.add( 
+					msstring( "#" ) + (int)i + " " + (*pScriptArray)[i]
+				);
 				pCallerPlayer->CallScriptEvent( ksPrintEvent, &vPrintParams );
 				Print("DEBUG: DumpArray - %i\n",i);
 			}
@@ -855,7 +853,7 @@ msstring CScript::ScriptGetter_GetItemTable(msstring& FullName, msstring& Parser
 		{
 			msstring vProp = Params[1];
 			msstringlist vSubParams;
-			for(int i = 0; i < Params.size() - 2; i++)
+			for(unsigned int i = 0; i < Params.size() - 2; i++)
 			{
 				vSubParams.add(Params[i + 2]);
 			}
@@ -1292,7 +1290,7 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 		{
 			if (Params.size() >= 3)
 			{
-				for(int i = 0; i < pScripted->m_Scripts.size(); i++) // Check each
+				for(unsigned int i = 0; i < pScripted->m_Scripts.size(); i++) // Check each
 				{
 					if (pScripted->m_Scripts[i]->VarExists("game.effect.id")) //This is an effect
 					if (strcmp(pScripted->m_Scripts[i]->GetVar("game.effect.id"), Params[2].c_str()) == 0) return "1";
@@ -1888,7 +1886,7 @@ bool CScript::ScriptCmd_ApplyEffect(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstr
 			Parameters.clearitems();
 			Parameters.add( Cmd.Name() );
 			Parameters.add( EntToString(m.pScriptedEnt) );
-			for(int i = 0; i < Params.size(); i++)
+			for(unsigned int i = 0; i < Params.size(); i++)
 			{
 				if ( i > 0 ) Parameters.add( Params[i] );
 			}
@@ -1901,7 +1899,7 @@ bool CScript::ScriptCmd_ApplyEffect(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstr
 					static msstringlist Tokens;
 					Tokens.clearitems();
 					TokenizeString( rdata, Tokens );
-					for(int i = 0; i < Tokens.size(); i++)
+					for(unsigned int i = 0; i < Tokens.size(); i++)
 					{
 						if ( Tokens[i] == "redirect" )
 						{
@@ -1915,7 +1913,7 @@ bool CScript::ScriptCmd_ApplyEffect(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstr
 			//[end] DEC2014_11 - allow script control of applyeffects
 
 			Parameters.clearitems();
-			for( int i = 0; i < Params.size() - 2; i++ )
+			for( unsigned int i = 0; i < Params.size() - 2; i++ )
 				Parameters.add( Params[i+2] );
 			CGlobalScriptedEffects::ApplyEffect( Params[1], pScripted, pEntity, &Parameters);
 		}
@@ -1995,7 +1993,7 @@ bool CScript::ScriptCmd_Array(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstringlis
 					msstring vsDest = Params[vParam++];
 					msscriptarray * pLocalArray = m.pScriptedEnt->GetScriptedArray(vsDest, true);
 
-					for(int i = 0; i < pArray->size(); i++)
+					for(unsigned int i = 0; i < pArray->size(); i++)
 					{
 						pLocalArray->add((*pArray)[i]);
 					}
@@ -2016,7 +2014,7 @@ bool CScript::ScriptCmd_Array(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstringlis
 				{
 					msstring sTemp = Params[vParam++];
 					bool bFoundEntry = false;
-					for(int i = 0; i < pArray->size(); i++)
+					for(unsigned int i = 0; i < pArray->size(); i++)
 					{
 						msstring vsCur = (*pArray)[i];
 						if (vsCur == sTemp)
@@ -2222,7 +2220,7 @@ bool CScript::ScriptCmd_CallEvent(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstrin
 		IScripted *pScripted = NULL;
 		const char* EventName = "<none>";
 		size_t NextParm = 0;
-		int Loops = 1;
+		unsigned int Loops = 1;
 		msstringlist Parameters;
 		enum calleventype_e { CE_NORMAL, CE_EXTERNAL, CE_EXTERNAL_ALL, CE_EXTERNAL_PLAYERS, CE_LOOP } Type = CE_NORMAL; //Thothie JUN2007a - added CE_EXTERNAL_PLAYERS
 
@@ -2273,7 +2271,7 @@ bool CScript::ScriptCmd_CallEvent(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstrin
 
 			if (Params.size() > NextParm)
 			{
-				for(int i = 0; i < (Params.size() - NextParm); i++)		//Parameters to pass
+				for(unsigned int i = 0; i < (Params.size() - NextParm); i++)		//Parameters to pass
 					Parameters.add(Params[i + NextParm]);
 			}
 
@@ -2304,7 +2302,7 @@ bool CScript::ScriptCmd_CallEvent(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstrin
 			{
 				SetVar("MSC_RESET_LOOP", "-5"); //Thothie SEP2019_08 - resetloop
 				int SaveIteration = m.m_Iteration;
-				for(int i = 0; i < Loops; i++)
+				for(unsigned int i = 0; i < Loops; i++)
 				{
 					m.m_Iteration = i;
 					RunScriptEventByName(EventName, Parameters.size() ? &Parameters : NULL);
@@ -2384,7 +2382,7 @@ bool CScript::ScriptCmd_ChatLog(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstringl
 	msstring msTemp;
 	if( Params.size() >= 1 )
 	{
-		for(int i = 0; i < Params.size(); i++ )
+		for(unsigned int i = 0; i < Params.size(); i++ )
 		{
 			if( i ) msTemp += " ";
 			msTemp += Params[i];
@@ -2515,7 +2513,7 @@ bool CScript::ScriptCmd_ClientCmd(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstrin
 	msstring msTemp;
 	if( Params.size() >= 2 )
 	{
-		for( int i = 0; i < Params.size()-1; i++ )
+		for (unsigned int i = 0; i < Params.size()-1; i++ )
 		{
 			if( i ) msTemp += " ";
 			msTemp += Params[i+1];
@@ -2538,7 +2536,7 @@ bool CScript::ScriptCmd_ClientCmd(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstrin
 		}
 		else
 		{
-			for( int i = 1; i <= gpGlobals->maxClients; i++ )
+			for( unsigned int i = 1; i <= gpGlobals->maxClients; i++ )
 			{
 				CBaseEntity *pEntity = UTIL_PlayerByIndex( i );
 				CBasePlayer *pPlayer = (CBasePlayer *)pEntity;;
@@ -2598,7 +2596,7 @@ bool CScript::ScriptCmd_ClientEvent(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstr
 		SendCmd.MsgTarget = Params[1];
 		if( Params.size() >= 4 )
 		{
-			for( int p = 0; p < Params.size() - 3; p++ )
+			for( unsigned int p = 0; p < Params.size() - 3; p++ )
 				SendCmd.Params.add( Params[p+3] );
 		}
 
@@ -2607,7 +2605,7 @@ bool CScript::ScriptCmd_ClientEvent(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstr
 		else if( Params[0] == "remove" )
 		{
 			//Stop event from persisting after "clientevent remove" is called on it
-			for(int e = 0; e < m.PersistentSendCmds.size( ); e++)
+			for (unsigned int e = 0; e < m.PersistentSendCmds.size( ); e++)
 			{
 					if( m.PersistentSendCmds[e].UniqueID == SendCmd.UniqueID )
 					{
@@ -2646,7 +2644,7 @@ bool CScript::ScriptCmd_Companion(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstrin
 				if( Params[0] == "add" )
 				{
 					bool CanAdd = true;
-					for( int i = 0; i < pPlayer->m_Companions.size(); i++ )
+					for( unsigned int i = 0; i < pPlayer->m_Companions.size(); i++ )
 					{
 							if( pPlayer->m_Companions[i].Entity.Entity() == pCompanion )
 							{
@@ -2670,7 +2668,7 @@ bool CScript::ScriptCmd_Companion(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstrin
 				}
 				else //"remove"
 				{
-					for( int i = 0; i < pPlayer->m_Companions.size(); i++ )
+					for (unsigned int i = 0; i < pPlayer->m_Companions.size(); i++ )
 					{
 						if( pPlayer->m_Companions[i].Entity.Entity() == pCompanion )
 						{
@@ -2714,23 +2712,23 @@ bool CScript::ScriptCmd_ConflictCheck(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, mss
 		if (!cc_noglobals)
 		{
 			Print("GLOBALS in %s:\n", pScripted->m_Scripts[0]->m.ScriptFile.c_str());
-			for(int i = 0; i < m_gVariables.size(); i++)
+			for(unsigned int i = 0; i < m_gVariables.size(); i++)
 			{
 				Print("setvarg: %s %s\n", m_gVariables[i].Name.c_str(), m_gVariables[i].Value.c_str());
 			}
 		}
 		Print("CONSTANTS in %s:\n", pScripted->m_Scripts[0]->m.ScriptFile.c_str());
-		for(int s = 0; s < pScripted->m_Scripts.size(); s++)
+		for (unsigned int s = 0; s < pScripted->m_Scripts.size(); s++)
 		{
-			for(int i = 0; i < pScripted->m_Scripts[s]->m_Constants.size(); i++)
+			for(unsigned int i = 0; i < pScripted->m_Scripts[s]->m_Constants.size(); i++)
 			{
 				Print("const: %s %s\n", pScripted->m_Scripts[s]->m_Constants[i].Name.c_str(), pScripted->m_Scripts[s]->m_Constants[i].Value.c_str());
 			}
 		}
 		Print("SETVARDS in %s:\n", pScripted->m_Scripts[0]->m.ScriptFile.c_str());
-		for(int s = 0; s < pScripted->m_Scripts.size(); s++)
+		for (unsigned int s = 0; s < pScripted->m_Scripts.size(); s++)
 		{
-			for(int i = 0; i < pScripted->m_Scripts[s]->m_Constants.size(); i++)
+			for(unsigned int i = 0; i < pScripted->m_Scripts[s]->m_Constants.size(); i++)
 			{
 				Print("setvard: %s %s\n", pScripted->m_Scripts[s]->m_Variables[i].Name.c_str(), pScripted->m_Scripts[s]->m_Variables[i].Value.c_str());
 			}
@@ -2742,11 +2740,11 @@ bool CScript::ScriptCmd_ConflictCheck(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, mss
 
 		//This will never find a conflict, as the variables cross reference is broken when they are set
 
-		for(int s = 0; s < pScripted->m_Scripts.size(); s++)
+		for (unsigned int s = 0; s < pScripted->m_Scripts.size(); s++)
 		{
-			for(int i = 0; i < pScripted->m_Scripts[s]->m_Variables.size(); i++)
+			for(unsigned int i = 0; i < pScripted->m_Scripts[s]->m_Variables.size(); i++)
 			{
-				for(int c = 0; c < pScripted->m_Scripts[s]->m_Constants.size(); c++)
+				for(unsigned int c = 0; c < pScripted->m_Scripts[s]->m_Constants.size(); c++)
 				{
 					if (pScripted->m_Scripts[s]->m_Constants[c].Name == pScripted->m_Scripts[s]->m_Variables[i].Name)
 					{
@@ -2858,7 +2856,7 @@ bool CScript::ScriptCmd_Create(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstringli
 				//Eveything starting from param 3 is passed to the created entity as PARAM1 PARAM2, etc.
 				static msstringlist Params2;
 				Params2.clearitems( );
-				for( int i = 0; i < Params.size() - 2; i++ )
+				for( unsigned int i = 0; i < Params.size() - 2; i++ )
 					Params2.add( Params[i+2] );
 
 				pScript->CallScriptEvent( "game_dynamically_created", &Params2 );
@@ -2897,7 +2895,7 @@ bool CScript::ScriptCmd_DarkenBloom(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstr
 bool CScript::ScriptCmd_Debug(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstringlist &Params)
 {
 	msstring sTemp;
-	for(int i = 0; i < Params.size(); i++)
+	for(unsigned int i = 0; i < Params.size(); i++)
 		sTemp += (i ? msstring(" ") : msstring("")) + Params[i];
 
 	//Thothie MAR2008a - prevent dbg overflows
@@ -2985,7 +2983,7 @@ bool CScript::ScriptCmd_Desc(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstringlist
 	msstring sTemp;
 	if (Params.size() >= 1)
 	{
-		for(int i = 0; i < Params.size(); i++)
+		for(unsigned int i = 0; i < Params.size(); i++)
 		{
 			if (i) sTemp += " ";  sTemp += Params[i];
 		}
@@ -3149,7 +3147,7 @@ bool CScript::ScriptCmd_EraseFile(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstrin
 
 
 		if( clearFromHere ) //Remove from the filesOpen list unless specified otherwise.
-			for( int i = 0; i < m.pScriptedEnt->filesOpen.size(); i++ )
+			for( unsigned int i = 0; i < m.pScriptedEnt->filesOpen.size(); i++ )
 		{
 				if( m.pScriptedEnt->filesOpen[i].fileName == fname )
 				{
@@ -3176,7 +3174,7 @@ bool CScript::ScriptCmd_ErrorMessage(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msst
 	//Thothie JUN2007a - send pop up message and exit
 	//Thothie FEB2009_21 - merging "errormessage" and "popup" to save elseif blocks
 	msstring sTemp;
-	for(int i = 0; i < Params.size(); i++)
+	for(unsigned int i = 0; i < Params.size(); i++)
 		sTemp += (i ? msstring(" ") : msstring("")) + Params[i];
 
 	//Print( "* Script Debug (%s): %s - %s\n", LocationString, m.pScriptedEnt ? m.pScriptedEnt->DisplayName() : "(No Entity)", sTemp.c_str() );
@@ -3248,9 +3246,9 @@ bool CScript::ScriptCmd_GetEnts(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstringl
 
 	CBaseEntity *pList[255], *pEnt = NULL;
 	Vector StartPos = Params.size() == 3 ? StringToVec(Params[2]) : m.pScriptedEnt->pev->origin;
-	int count = UTIL_MonstersInSphere( pList, 255, StartPos, flAreaSize);
+	unsigned int count = UTIL_MonstersInSphere( pList, 255, StartPos, flAreaSize);
 	int iCurrentStore = 0;
-	for(int i = 0; i < count; i++)
+	for(unsigned int i = 0; i < count; i++)
 	{
 		pEnt = pList[i];
 		if ( !pEnt->IsAlive() ) continue;
@@ -3301,7 +3299,7 @@ bool CScript::ScriptCmd_GetItemArray(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msst
 			pArray = pPlayer->GetScriptedArray( ArrayName, true, &bExisted );
 
 			pArray->clearitems();
-			for(int i = 0; i < pPlayer->Gear.size(); i++)
+			for(unsigned int i = 0; i < pPlayer->Gear.size(); i++)
 			{
 				CGenericItem *cur_item = pPlayer->Gear[i];
 				if ( cur_item->IsWorn() )
@@ -3313,7 +3311,7 @@ bool CScript::ScriptCmd_GetItemArray(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msst
 						CGenericItem *pPack = pPlayer->Gear[i];
 						if ( pPack->Container_ItemCount() )
 						{
-							for(int n = 0; n < pPack->Container_ItemCount(); n++)
+							for(unsigned int n = 0; n < pPack->Container_ItemCount(); n++)
 							{
 								pArray->add( EntToString(pPack->Container_GetItem(n)) );
 							}
@@ -3361,7 +3359,7 @@ bool CScript::ScriptCmd_GetPlayers(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstri
 	//- get all players, store in token string
 #ifdef VALVE_DLL
 	msstring msStorePlayers;
-	for( int i = 1; i <= gpGlobals->maxClients; i++ )
+	for(unsigned int i = 1; i <= gpGlobals->maxClients; i++ )
 	{
 		CBasePlayer *pOtherPlayer = (CBasePlayer *)UTIL_PlayerByIndex( i );
 		if ( !pOtherPlayer ) continue;
@@ -3388,7 +3386,7 @@ bool CScript::ScriptCmd_GetPlayersArray(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, m
 	msscriptarray *                     pArray = m.pScriptedEnt->GetScriptedArray( ArrName, true );
 	pArray->clearitems();
 
-	for( int i = 1; i <= gpGlobals->maxClients; i++ )
+	for(unsigned int i = 1; i <= gpGlobals->maxClients; i++ )
 	{
 		CBasePlayer *pOtherPlayer = (CBasePlayer *)UTIL_PlayerByIndex( i );
 		if ( !pOtherPlayer ) continue;
@@ -3410,7 +3408,7 @@ bool CScript::ScriptCmd_GetPlayersNB(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msst
 	//- saves a step in the bot mess, but for better security, use the script side verifications too (see base_treasurechest)
 #ifdef VALVE_DLL
 	msstring msStorePlayers;
-	for( int i = 1; i <= gpGlobals->maxClients; i++ )
+	for(unsigned int i = 1; i <= gpGlobals->maxClients; i++ )
 	{
 		CBasePlayer *pOtherPlayer = (CBasePlayer *)UTIL_PlayerByIndex( i );
 		if ( !pOtherPlayer )
@@ -3660,7 +3658,7 @@ bool CScript::ScriptCmd_HelpTip(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstringl
 	if( Params.size() >= 4 )
 	{
 		std::string buffer = "";
-		for(int i = 0; i < Params.size() - 3; i++)
+		for(unsigned int i = 0; i < Params.size() - 3; i++)
 			buffer += static_cast<const char*>(Params[i+3]);
 
 		if ( Params[0] != "all" )
@@ -3672,7 +3670,7 @@ bool CScript::ScriptCmd_HelpTip(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstringl
 		}
 		else
 		{
-			for( int i = 1; i <= gpGlobals->maxClients; i++ )
+			for( unsigned int i = 1; i <= gpGlobals->maxClients; i++ )
 			{
 				CBaseEntity *pEntity = UTIL_PlayerByIndex(i);
 				CBasePlayer *pPlayer = (CBasePlayer *)pEntity;;
@@ -3794,7 +3792,7 @@ bool CScript::ScriptCmd_HudIcon(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstringl
 			}
 			else
 			{
-				for( int i = 1; i <= gpGlobals->maxClients; i++ )
+				for(unsigned int i = 1; i <= gpGlobals->maxClients; i++ )
 				{
 					CBasePlayer *pPlayer = (CBasePlayer *)UTIL_PlayerByIndex( i );
 					if ( !pPlayer ) continue;
@@ -3864,7 +3862,7 @@ bool CScript::ScriptCmd_HudIcon(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstringl
 			}
 			else
 			{
-				for( int i = 1; i <= gpGlobals->maxClients; i++ )
+				for( unsigned int i = 1; i <= gpGlobals->maxClients; i++ )
 				{
 					CBasePlayer *pPlayer = (CBasePlayer *)UTIL_PlayerByIndex( i );
 					if ( !pPlayer ) continue;
@@ -4135,7 +4133,7 @@ bool CScript::ScriptCmd_InfoMessage(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstr
 				Title = Title.substr(0, 120); //Thothie DEC2010_04 - prevent overflows
 				Title += "*\n";
 			}
-			for(int i = 0; i < Params.size() - 2; i++)
+			for(unsigned int i = 0; i < Params.size() - 2; i++)
 			{
 				if (i) sTemp += " ";
 				sTemp += Params[i + 2];
@@ -4304,7 +4302,7 @@ bool CScript::ScriptCmd_Message(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstringl
 		CBaseEntity *pEntity = RetrieveEntity(Params[0]);
 		if (pEntity && pEntity->IsPlayer())
 		{
-			for(int i = 0; i < Params.size() - 1; i++)
+			for(unsigned int i = 0; i < Params.size() - 1; i++)
 			{
 				if (i) sTemp += " ";
 				sTemp += Params[i + 1];
@@ -4377,13 +4375,13 @@ bool CScript::ScriptCmd_MessageAll(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstri
 	{
 		msstring msColorString = Params[0];
 
-		for(int i = 0; i < Params.size()-1; i++)
+		for(unsigned int i = 0; i < Params.size()-1; i++)
 		{
 			if( i ) msTemp += " ";
 			msTemp += Params[i+1];
 		}
 
-		for(int i = 1; i <= gpGlobals->maxClients; i++)
+		for(unsigned int i = 1; i <= gpGlobals->maxClients; i++)
 		{
 			CBasePlayer *pPlayer = (CBasePlayer *)UTIL_PlayerByIndex( i );
 
@@ -4433,7 +4431,7 @@ bool CScript::ScriptCmd_Name(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstringlist
 	{
 		if (m.pScriptedEnt && !m.pScriptedEnt->IsPlayer())	//Don't rename players
 		{
-			for(int i = 0; i < Params.size(); i++)
+			for(unsigned int i = 0; i < Params.size(); i++)
 				sTemp += (i ? msstring(" ") : msstring("")) + Params[i];
 
 			int barloc = 0;
@@ -4943,7 +4941,7 @@ bool CScript::ScriptCmd_Quest(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstringlis
 				qd_outline = UTIL_VarArgs("Dumping Quest Data for %s:\n",pEntity->m_DisplayName.c_str());
 				Print ("%s",qd_outline.c_str());
 				MS_DEBUG(qd_outline.c_str());
-				for(int i = 0; i < pPlayer->m_Quests.size(); i++)
+				for(unsigned int i = 0; i < pPlayer->m_Quests.size(); i++)
 				{
 					qd_outline = UTIL_VarArgs("#%i name: %s data: %s\n",i,pPlayer->m_Quests[i].Name.c_str(),pPlayer->m_Quests[i].Data.c_str());
 					Print ("%s",qd_outline.c_str());
@@ -5052,7 +5050,7 @@ bool CScript::ScriptCmd_RegisterTexture(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, m
 	//Reflection settings
 	NewTexture.Mirror.Blending = atoi(SCRIPTVAR("reg.texture.reflect.blend")) ? true : false;
 	TokenizeString(SCRIPTVAR("reg.texture.reflect.color"), ColorParts);
-	for(int i = 0; i < ColorParts.size(); i++)
+	for(unsigned int i = 0; i < ColorParts.size(); i++)
 	{
 		if (i == 4) break;	//Too many elements specified - a color only has 4 elements
 		NewTexture.Mirror.Color[i] = atof(ColorParts[i]);
@@ -5097,7 +5095,7 @@ bool CScript::ScriptCmd_RegisterTitle(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, mss
 		TokenizeString(Params[1], Skills);
 		bool SkillSuccess = true;
 		int SKILL_FAILURE = -1;
-		for(int s = 0; s < Skills.size(); s++)
+		for (unsigned int s = 0; s < Skills.size(); s++)
 		{
 			int Skill = GetSkillStatByName(SCRIPTVAR(Skills[s]));
 			if (Skill == SKILL_FAILURE)
@@ -5148,7 +5146,7 @@ bool CScript::ScriptCmd_RemoveEffect(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msst
 		IScripted *pScripted = pTarget ? pTarget->GetScripted() : NULL; // UScripted? IScripted.
 		if ( pScripted )
 		{
-			for(int i = 0; i < pScripted->m_Scripts.size(); i++) // Check each
+			for(unsigned int i = 0; i < pScripted->m_Scripts.size(); i++) // Check each
 			if( pScripted->m_Scripts[i]->VarExists("game.effect.id") ) //This is an effect
 			if( strcmp( pScripted->m_Scripts[i]->GetVar("game.effect.id"), Params[1].c_str() ) == 0) //If the effect is SUPPOSED to be removed
 			{
@@ -5202,7 +5200,7 @@ bool CScript::ScriptCmd_Respawn(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstringl
 
 		if( Params[0] == "all" )
 		{
-			for( int i = 1; i <= gpGlobals->maxClients; i++ )
+			for( unsigned int i = 1; i <= gpGlobals->maxClients; i++ )
 			{
 				CBaseEntity *pEntity = UTIL_PlayerByIndex( i );
 				if( pEntity ) PlayerList.add( (CBasePlayer *)pEntity );
@@ -5215,7 +5213,7 @@ bool CScript::ScriptCmd_Respawn(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstringl
 				PlayerList.add( (CBasePlayer *)pEntity );
 		}
 
-		for(int i = 0; i < PlayerList.size(); i++)
+		for(unsigned int i = 0; i < PlayerList.size(); i++)
 			PlayerList[i]->MoveToSpawnSpot( );
 	}
 	else ERROR_MISSING_PARMS;
@@ -5245,7 +5243,7 @@ bool CScript::ScriptCmd_Return(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstringli
 			
 			if (m.pScriptedInterface->m_ReturnData.c_str()[0]) m.pScriptedInterface->m_ReturnData += ";";
 			
-			for(int i = 0; i < Params.size(); i++)
+			for(unsigned int i = 0; i < Params.size(); i++)
 			{
 				if (i) m.pScriptedInterface->m_ReturnData += " ";
 				m.pScriptedInterface->m_ReturnData += Params[i];
@@ -5344,7 +5342,7 @@ bool CScript::ScriptCmd_ScriptFlags(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstr
 				//such flags should have an expire time
 				if ( !Params[2].contains("stack") ) //Thothie SEP2019_11 - switching this to contains for ease of use
 				{
-					for(int i = 0; i < pEntity->m_scriptflags.names.size(); i++)
+					for(unsigned int i = 0; i < pEntity->m_scriptflags.names.size(); i++)
 					{
 						if ( pEntity->m_scriptflags.names[i] == Params[2] )
 						{
@@ -5378,7 +5376,7 @@ bool CScript::ScriptCmd_ScriptFlags(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstr
 				//though, looking back on it, adding one of the same name should have the same effect - meh.
 				//scriptflags <target> edit <name> <type> [value] [expiretime] [expiremsg]
 				int sfidx = -1;
-				for(int i = 0; i < pEntity->m_scriptflags.names.size(); i++)
+				for(unsigned int i = 0; i < pEntity->m_scriptflags.names.size(); i++)
 				{
 					if ( pEntity->m_scriptflags.names[i] == Params[2] ) sfidx = i;
 				}
@@ -5403,7 +5401,7 @@ bool CScript::ScriptCmd_ScriptFlags(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstr
 
 			if ( Params[1] == "remove" )
 			{
-				for(int i = 0; i < pEntity->m_scriptflags.names.size(); i++)
+				for(unsigned int i = 0; i < pEntity->m_scriptflags.names.size(); i++)
 				{
 					if ( pEntity->m_scriptflags.names[i] == Params[2] )
 					{
@@ -5423,7 +5421,7 @@ bool CScript::ScriptCmd_ScriptFlags(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstr
 
 			if ( Params[1] == "remove_expired" )
 			{
-				for(int i = 0; i < pEntity->m_scriptflags.names.size(); i++)
+				for(unsigned int i = 0; i < pEntity->m_scriptflags.names.size(); i++)
 				{
 					float sf_time_to_expire = atof(pEntity->m_scriptflags.expiretimes[i]);
 
@@ -5457,7 +5455,7 @@ bool CScript::ScriptCmd_ScriptFlags(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstr
 
 			if ( Params[1] == "cleartype" )
 			{
-				for(int i = 0; i < pEntity->m_scriptflags.names.size(); i++)
+				for(unsigned int i = 0; i < pEntity->m_scriptflags.names.size(); i++)
 				{
 					if ( pEntity->m_scriptflags.types[i] == Params[2] )
 					{
@@ -5477,7 +5475,7 @@ bool CScript::ScriptCmd_ScriptFlags(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstr
 
 			if ( Params[1] == "clearall" )
 			{
-				for(int i = 0; i < pEntity->m_scriptflags.names.size(); i++ )
+				for(unsigned int i = 0; i < pEntity->m_scriptflags.names.size(); i++ )
 				{
 					if( pPlayer )
 					{
@@ -5521,7 +5519,7 @@ bool CScript::ScriptCmd_ServerCmd(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstrin
 	msstring msTemp;
 	if( Params.size() >= 1 )
 	{
-		for(int i = 0; i < Params.size(); i++)
+		for(unsigned int i = 0; i < Params.size(); i++)
 		{
 			if( i ) msTemp += " ";
 			msTemp += Params[i];
@@ -6150,7 +6148,7 @@ bool CScript::ScriptCmd_SetModelBody(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msst
 			if ( pPlayer->pev->deadflag == DEAD_NO )
 			{
 				bool found = false;
-				for(int i = 0; i < pPlayer->m_Quests.size(); i++)
+				for(unsigned int i = 0; i < pPlayer->m_Quests.size(); i++)
 				{
 					if ( pPlayer->m_Quests[i].Name == "BODY" )
 					{
@@ -6627,7 +6625,7 @@ bool CScript::ScriptCmd_SetVar(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstringli
 		if (Params.size() >= 3)	//Add strings together
 		{
 			sTemp = "";
-			for(int i = 0; i < Params.size() - 1; i++)
+			for(unsigned int i = 0; i < Params.size() - 1; i++)
 				sTemp += Params[i + 1];
 			VarValue = sTemp;
 		}
@@ -6726,7 +6724,7 @@ bool CScript::ScriptCmd_SetWearPos(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstri
 			else if (Params.size() >= 2)
 			{
 				wearpos_t *pWearPos = NULL;
-				for(int i = 0; i < pPlayer->m_WearPositions.size(); i++)
+				for(unsigned int i = 0; i < pPlayer->m_WearPositions.size(); i++)
 				{
 					if (Params[0] != pPlayer->m_WearPositions[i].Name)
 						continue;
@@ -6877,7 +6875,7 @@ bool CScript::ScriptCmd_StrConc(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstringl
 	if (Params.size() >= 2)
 	{
 		sTemp += Params[0];
-		for(int i = 0; i < Params.size() - 1; i++)
+		for(unsigned int i = 0; i < Params.size() - 1; i++)
 		{
 			if (i) sTemp += " ";
 			sTemp += Params[i + 1];
@@ -6955,7 +6953,7 @@ bool CScript::ScriptCmd_TokenDel(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstring
 		{
 			Tokens.erase(DelItem);
 
-			for(int i = 0; i < Tokens.size(); i++)
+			for(unsigned int i = 0; i < Tokens.size(); i++)
 			{
 				if (TokenStr.len())	TokenStr += ";";
 				TokenStr += Tokens[i];
@@ -6983,11 +6981,11 @@ bool CScript::ScriptCmd_TokenScramble(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, mss
 		Tokens.clearitems();
 		TokenizeString(Params[0], Tokens);
 
-		int n_loops = Tokens.size();
+		unsigned int n_loops = Tokens.size();
 
-		for(int i = 0; i < n_loops; i++)
+		for(unsigned int i = 0; i < n_loops; i++)
 		{
-			int r = RANDOM_LONG(0, Tokens.size() - 1);
+			unsigned int r = RANDOM_LONG(0, Tokens.size() - 1);
 			new_tokens += Tokens[r];
 			new_tokens += ";";
 			Tokens.erase(r);
@@ -7020,7 +7018,7 @@ bool CScript::ScriptCmd_TokenSet(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstring
 
 		if (ChgItem >= 0 && ChgItem < (signed)Tokens.size())
 		{
-			for(int i = 0; i < Tokens.size(); i++)
+			for(unsigned int i = 0; i < Tokens.size(); i++)
 			{
 				if (TokenStr.len()) TokenStr += ";";
 
@@ -7114,7 +7112,7 @@ bool CScript::ScriptCmd_UseTrigger(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstri
 #ifdef VALVE_DLL
 	if( Params.size() >= 1 )
 	{
-		for(int i = 0; i < Params.size(); i++)
+		for(unsigned int i = 0; i < Params.size(); i++)
 			FireTargets( Params[i], m.pScriptedEnt, m.pScriptedEnt, USE_TOGGLE, 0 );
 	}
 	else ERROR_MISSING_PARMS;
@@ -7243,7 +7241,7 @@ bool CScript::ScriptCmd_Velocity(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstring
 					CMSMonster* pMonster = (pEntity->IsMSMonster() ? (CMSMonster*)pEntity : NULL);
 					if (pMonster)
 					{
-						for (int i = 0; i < pMonster->m.TakeDamageModifiers.size(); i++)
+						for (unsigned int i = 0; i < pMonster->m.TakeDamageModifiers.size(); i++)
 						{
 							CMSMonster::takedamagemodifier_t& TDM = pMonster->m.TakeDamageModifiers[i];
 							msstring read_dmgtype = TDM.DamageType;
@@ -7343,7 +7341,7 @@ bool CScript::ScriptCmd_WriteLine(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstrin
 		msstring lineToWrite = Params[1];
 
 		int ref = -1;
-		for(int i = 0; i < m.pScriptedEnt->filesOpen.size(); i++)
+		for(unsigned int i = 0; i < m.pScriptedEnt->filesOpen.size(); i++)
 		{
 			if (fileName == m.pScriptedEnt->filesOpen[i].fileName)
 			{
@@ -7427,7 +7425,7 @@ bool CScript::ScriptCmd_XDoDamage(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstrin
 			//process flags (currently only flag is dmgevent:<prefix>)
 			msstringlist dflags;
 			TokenizeString(Params[8],dflags);
-			for(int i = 0; i < dflags.size(); i++)
+			for(unsigned int i = 0; i < dflags.size(); i++)
 			{
 				msstring dflag = dflags[i].c_str();
 				if ( dflag.starts_with("dmgevent:") )
@@ -7717,7 +7715,7 @@ void scriptfile_t::AddLine(msstring line, int lineNum, bool overwrite)
 			//Insert the line
 			int lineNumTemp = lineNum;
 			msstringlist LinesTemp;
-			for(int i = 0; i < Lines.size(); i++)
+			for(unsigned int i = 0; i < Lines.size(); i++)
 			{
 				if (i == lineNumTemp) //You've found the correct line
 				{
diff --git a/src/game/shared/ms/scriptedeffects.cpp b/src/game/shared/ms/scriptedeffects.cpp
index 6d80ac73..bf6a5ba2 100644
--- a/src/game/shared/ms/scriptedeffects.cpp
+++ b/src/game/shared/ms/scriptedeffects.cpp
@@ -10,7 +10,7 @@ mslist<globalscripteffect_t> CGlobalScriptedEffects::Effects;
 
 void CGlobalScriptedEffects::RegisterEffect(globalscripteffect_t &Effect)
 {
-	for (int i = 0; i < Effects.size(); i++)
+	for (unsigned int i = 0; i < Effects.size(); i++)
 	{
 		if (!_stricmp(Effects[i].m_Name, Effect.m_Name))
 			return;
@@ -36,7 +36,7 @@ CScript *CGlobalScriptedEffects::ApplyEffect(const char* ScriptName, IScripted *
 
 	//Check if this effect is being stacked
 	if (Script->VarExists(EFFECT_ID))
-		for (int i = 0; i < pScriptTarget->m_Scripts.size(); i++)
+		for (unsigned int i = 0; i < pScriptTarget->m_Scripts.size(); i++)
 			if (pScriptTarget->m_Scripts[i] != Script && FStrEq(pScriptTarget->m_Scripts[i]->GetVar(EFFECT_ID), Script->GetVar(EFFECT_ID)))
 			{
 				//Check if the effect doesn't allow stacking
diff --git a/src/game/shared/ms/stackstring.cpp b/src/game/shared/ms/stackstring.cpp
index 910a7670..81c16fe6 100644
--- a/src/game/shared/ms/stackstring.cpp
+++ b/src/game/shared/ms/stackstring.cpp
@@ -126,7 +126,7 @@ msstring msstring::thru_char(const char* a, size_t start) const
 msstring msstring::skip(const char* a) const
 {
 	size_t my_sz = len();
-	for (int i = 0; i < my_sz; i++)
+	for (unsigned int i = 0; i < my_sz; i++)
 	{
 		char datachar[2] = {data[i], 0};
 		if (!strstr(a, datachar))
@@ -138,7 +138,7 @@ msstring msstring::tolower(void) const
 {
 	size_t my_sz = len();
 	msstring ret;
-	for (int i = 0; i < my_sz; i++)
+	for (unsigned int i = 0; i < my_sz; i++)
 	{
 		char ch = data[i];
 		ret += ::tolower(ch);
diff --git a/src/game/shared/stats/statdefs.h b/src/game/shared/stats/statdefs.h
index 50f98a14..9fab517b 100644
--- a/src/game/shared/stats/statdefs.h
+++ b/src/game/shared/stats/statdefs.h
@@ -86,7 +86,7 @@ struct playerdamage_t
 	// MiB MAR2019_22 [SLOT_EXP] - Added because this is done in multiple places and shouldn't be written out...
 	void Clear()
 	{
-		for(int i = 0; i < SKILL_MAX_ATTACK; i++)
+		for(unsigned int i = 0; i < SKILL_MAX_ATTACK; i++)
 		{
 			for(int j = 0; j < STATPROP_ALL_TOTAL; j++)
 			{
diff --git a/src/game/shared/stats/stats.cpp b/src/game/shared/stats/stats.cpp
index ef51710e..eb09f1b7 100644
--- a/src/game/shared/stats/stats.cpp
+++ b/src/game/shared/stats/stats.cpp
@@ -51,7 +51,7 @@ const char* SpellTypeList[5] =
 
 int GetSkillStatByName(const char* pszName) // Index lookup by name (Skill stats only)
 {
-	for (int i = 0; i < SKILL_MAX_STATS; i++)
+	for (unsigned int i = 0; i < SKILL_MAX_STATS; i++)
 		if (!_stricmp(pszName, SkillStatList[i].DllName))
 			return SKILL_FIRSTSKILL + i;
 	return -1;
@@ -70,17 +70,17 @@ int GetSubSkillByName(const char* pszName)
 {
 	if (!_stricmp(pszName, "prof")) // alias for proficiency
 		return 0;
-	for (int i = 0; i < STATPROP_TOTAL; i++)
+	for (unsigned int i = 0; i < STATPROP_TOTAL; i++)
 		if (!_stricmp(pszName, SkillTypeList[i]))
 			return i;
-	for (int i = 0; i < STAT_MAGIC_TOTAL; i++)
+	for (unsigned int i = 0; i < STAT_MAGIC_TOTAL; i++)
 		if (!_stricmp(pszName, SpellTypeList[i]))
 			return i;
 	return -1;
 }
 int GetNatStatByName(const char* pszName)
 {
-	for (int i = 0; i < NATURAL_MAX_STATS; i++)
+	for (unsigned int i = 0; i < NATURAL_MAX_STATS; i++)
 		if (!_stricmp(pszName, NatStatList[i].Name))
 			return i;
 	return -1;
@@ -145,8 +145,8 @@ int CStat::operator+=(int Add)
 int CStat::Value()
 {
 	int Total = 0;
-	int iSubStats = m_SubStats.size();
-	for (int i = 0; i < iSubStats; i++)
+	unsigned int iSubStats = m_SubStats.size();
+	for (unsigned int i = 0; i < iSubStats; i++)
 		Total += m_SubStats[i].Value;
 
 	// (x + floor(y / 2)) / y
@@ -227,7 +227,7 @@ bool CStat::operator!=(const CStat& Other)
 void CStat::InitStatList(statlist& Stats)
 {
 	Stats.reserve_once(STATS_TOTAL, STATS_TOTAL);
-	for (int i = 0; i < STATS_TOTAL; i++)
+	for (unsigned int i = 0; i < STATS_TOTAL; i++)
 	{
 		const char* Name = (i < NATURAL_MAX_STATS) ? NatStatList[i].Name : SkillStatList[i - NATURAL_MAX_STATS].DllName;
 		CStat::skilltype_e Type = (i < NATURAL_MAX_STATS) ? CStat::STAT_NAT : CStat::STAT_SKILL;
diff --git a/src/game/shared/voice_banmgr.cpp b/src/game/shared/voice_banmgr.cpp
index 1bd1fef6..59416597 100644
--- a/src/game/shared/voice_banmgr.cpp
+++ b/src/game/shared/voice_banmgr.cpp
@@ -17,7 +17,7 @@ unsigned char HashPlayerID(char const playerID[16])
 {
 	unsigned char curHash = 0;
 
-	for (int i = 0; i < 16; i++)
+	for (unsigned int i = 0; i < 16; i++)
 		curHash = (curHash + (playerID[i] & 0xFF)) & 0xFF; //Used 0xFF to cast down to byte
 
 	return curHash;
@@ -49,10 +49,10 @@ bool CVoiceBanMgr::Init(char const *pGameDir)
 		if (version == BANMGR_FILEVERSION)
 		{
 			fseek(fp, 0, SEEK_END);
-			int nIDs = (ftell(fp) - sizeof(version)) / 16;
+			unsigned int nIDs = (ftell(fp) - sizeof(version)) / 16;
 			fseek(fp, sizeof(version), SEEK_SET);
 
-			for (int i = 0; i < nIDs; i++)
+			for (unsigned int i = 0; i < nIDs; i++)
 			{
 				char playerID[16];
 				fread(playerID, 1, 16, fp);
@@ -69,7 +69,7 @@ bool CVoiceBanMgr::Init(char const *pGameDir)
 void CVoiceBanMgr::Term()
 {
 	// Free all the player structures.
-	for (int i = 0; i < 256; i++)
+	for (unsigned int i = 0; i < 256; i++)
 	{
 		BannedPlayer *pListHead = &m_PlayerHash[i];
 		BannedPlayer *pNext;
@@ -95,7 +95,7 @@ void CVoiceBanMgr::SaveState(char const *pGameDir)
 		int version = BANMGR_FILEVERSION;
 		fwrite(&version, 1, sizeof(version), fp);
 
-		for (int i = 0; i < 256; i++)
+		for (unsigned int i = 0; i < 256; i++)
 		{
 			BannedPlayer *pListHead = &m_PlayerHash[i];
 			for (BannedPlayer *pCur = pListHead->m_pNext; pCur != pListHead; pCur = pCur->m_pNext)
@@ -137,7 +137,7 @@ void CVoiceBanMgr::SetPlayerBan(char const playerID[16], bool bSquelch)
 
 void CVoiceBanMgr::ForEachBannedPlayer(void (*callback)(char id[16]))
 {
-	for (int i = 0; i < 256; i++)
+	for (unsigned int i = 0; i < 256; i++)
 	{
 		for (BannedPlayer *pCur = m_PlayerHash[i].m_pNext; pCur != &m_PlayerHash[i]; pCur = pCur->m_pNext)
 		{
@@ -149,7 +149,7 @@ void CVoiceBanMgr::ForEachBannedPlayer(void (*callback)(char id[16]))
 void CVoiceBanMgr::Clear()
 {
 	// Tie off the hash table entries.
-	for (int i = 0; i < 256; i++)
+	for (unsigned int i = 0; i < 256; i++)
 		m_PlayerHash[i].m_pNext = m_PlayerHash[i].m_pPrev = &m_PlayerHash[i];
 }
 
diff --git a/src/game/shared/voice_gamemgr.cpp b/src/game/shared/voice_gamemgr.cpp
index 2af866a8..c45b90fa 100644
--- a/src/game/shared/voice_gamemgr.cpp
+++ b/src/game/shared/voice_gamemgr.cpp
@@ -39,7 +39,7 @@ cvar_t sv_alltalk = {"sv_alltalk", "0"};
 // Find a player with a case-insensitive name search.
 static CBasePlayer *FindPlayerByName(const char *pTestName)
 {
-	for (int i = 1; i <= gpGlobals->maxClients; i++)
+	for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
 	{
 		edict_t *pEdict = g_engfuncs.pfnPEntityOfEntIndex(i);
 		if (pEdict)
diff --git a/src/game/shared/voice_status.cpp b/src/game/shared/voice_status.cpp
index 897385b9..2ac178c1 100644
--- a/src/game/shared/voice_status.cpp
+++ b/src/game/shared/voice_status.cpp
@@ -136,7 +136,7 @@ CVoiceStatus::~CVoiceStatus()
 {
 	g_pInternalVoiceStatus = NULL;
 
-	for (int i = 0; i < MAX_VOICE_SPEAKERS; i++)
+	for (unsigned int i = 0; i < MAX_VOICE_SPEAKERS; i++)
 	{
 		delete m_Labels[i].m_pLabel;
 		m_Labels[i].m_pLabel = NULL;
@@ -189,7 +189,7 @@ int CVoiceStatus::Init(
 	m_VoiceHeadModel = NULL;
 	memset(m_Labels, 0, sizeof(m_Labels));
 
-	for (int i = 0; i < MAX_VOICE_SPEAKERS; i++)
+	for (unsigned int i = 0; i < MAX_VOICE_SPEAKERS; i++)
 	{
 		CVoiceLabel *pLabel = &m_Labels[i];
 
@@ -304,16 +304,16 @@ void CVoiceStatus::Frame(double frametime)
 	// Update speaker labels.
 	if (m_pHelper->CanShowSpeakerLabels())
 	{
-		for (int i = 0; i < MAX_VOICE_SPEAKERS; i++)
+		for (unsigned int i = 0; i < MAX_VOICE_SPEAKERS; i++)
 			m_Labels[i].m_pBackground->setVisible(m_Labels[i].m_clientindex != -1);
 	}
 	else
 	{
-		for (int i = 0; i < MAX_VOICE_SPEAKERS; i++)
+		for (unsigned int i = 0; i < MAX_VOICE_SPEAKERS; i++)
 			m_Labels[i].m_pBackground->setVisible(false);
 	}
 
-	for (int i = 0; i < VOICE_MAX_PLAYERS; i++)
+	for (unsigned int i = 0; i < VOICE_MAX_PLAYERS; i++)
 		UpdateBanButton(i);
 }
 
@@ -326,7 +326,7 @@ void CVoiceStatus::CreateEntities()
 	cl_entity_t *localPlayer = gEngfuncs.GetLocalPlayer();
 
 	int iOutModel = 0;
-	for (int i = 0; i < VOICE_MAX_PLAYERS; i++)
+	for (unsigned int i = 0; i < VOICE_MAX_PLAYERS; i++)
 	{
 		if (!m_VoicePlayers[i])
 			continue;
@@ -654,7 +654,7 @@ bool CVoiceStatus::IsInSquelchMode()
 
 CVoiceLabel* CVoiceStatus::FindVoiceLabel(int clientindex)
 {
-	for (int i = 0; i < MAX_VOICE_SPEAKERS; i++)
+	for (unsigned int i = 0; i < MAX_VOICE_SPEAKERS; i++)
 	{
 		if (m_Labels[i].m_clientindex == clientindex)
 			return &m_Labels[i];
@@ -682,7 +682,7 @@ void CVoiceStatus::RepositionLabels()
 	}
 
 	// Reposition active labels.
-	for (int i = 0; i < MAX_VOICE_SPEAKERS; i++)
+	for (unsigned int i = 0; i < MAX_VOICE_SPEAKERS; i++)
 	{
 		CVoiceLabel *pLabel = &m_Labels[i];
 
@@ -778,7 +778,7 @@ void CVoiceStatus::FreeBitmaps()
 	m_pScoreboardBanned = NULL;
 
 	// Clear references to the images in panels.
-	for (int i = 0; i < VOICE_MAX_PLAYERS; i++)
+	for (unsigned int i = 0; i < VOICE_MAX_PLAYERS; i++)
 	{
 		if (m_pBanButtons[i])
 		{
diff --git a/src/game/shared/weapons/genericitem.cpp b/src/game/shared/weapons/genericitem.cpp
index 4dab5ee7..15e05e91 100644
--- a/src/game/shared/weapons/genericitem.cpp
+++ b/src/game/shared/weapons/genericitem.cpp
@@ -63,7 +63,7 @@ CGenericItem* GetGenericItemByName(const char* pItemName, bool bCallSpawnIfNeede
 
 CGenericItem* CGenericItemMgr::GetGlobalGenericItemByName(const char* pszItemName, bool bCallSpawnIfNeeded)
 {
-	for (int i = 0; i < m_Items.size(); i++)
+	for (unsigned int i = 0; i < m_Items.size(); i++)
 	{
 		GenItem_t& GlobalItem = m_Items[i];
 		if (FStrEq(GlobalItem.Name.c_str(), pszItemName))
@@ -134,7 +134,7 @@ CGenericItem* CGenericItemMgr::GetGlobalGenericItemByName(const char* pszItemNam
 //CGenericItem *GetGenericItemByID( int ID ) { return CGenericItemMgr::GetGlobalGenericItemByID( ID ); }
 /*CGenericItem *CGenericItemMgr::GetGlobalGenericItemByID( int Type )
 	{
-		 for (int i = 0; i < m_Items.size(); i++)
+		 for (unsigned int i = 0; i < m_Items.size(); i++)
 		{
 			GenItem_t &GlobalItem = m_Items[i];
 			if( GlobalItem.pItem->iWeaponType == Type )
@@ -229,7 +229,7 @@ void CGenericItemMgr::AddGlobalItem(GenItem_t& NewGlobalItem) {
 	m_Items.add(NewGlobalItem);
 }
 
-int CGenericItemMgr::ItemCount() {
+unsigned int CGenericItemMgr::ItemCount() {
 	return m_Items.size();
 }
 
@@ -240,7 +240,7 @@ GenItem_t* CGenericItemMgr::Item(int idx) {
 // MiB MAR2012_10 - Get item_name's index in the global array
 int CGenericItemMgr::LookUpItemIdx(msstring item_name)
 {
-	for (int i = 0; i < m_Items.size(); i++)
+	for (unsigned int i = 0; i < m_Items.size(); i++)
 	{
 		if (item_name == m_Items[i].Name)
 			return i;
@@ -260,7 +260,7 @@ mslist<GenItem_t> CGenericItemMgr::m_Items;
 
 void CGenericItemMgr::DeleteItem(CGenericItem* pItem)
 {
-	for (int i = 0; i < ItemCount(); i++)
+	for (unsigned int i = 0; i < ItemCount(); i++)
 		if (m_Items[i].pItem == pItem)
 			DeleteItem(i);
 }
@@ -275,8 +275,8 @@ void CGenericItemMgr::DeleteItem(int idx)
 
 void CGenericItemMgr::DeleteItems()
 {
-	int ItemCount = m_Items.size(); //Save because this will be changing
-	for (int i = 0; i < ItemCount; i++)
+	unsigned int ItemCount = m_Items.size(); //Save because this will be changing
+	for (unsigned int i = 0; i < ItemCount; i++)
 		DeleteItem(0); //Keep deleting the first item
 
 	m_Items.clear();
@@ -1011,10 +1011,10 @@ bool CGenericItem::CanWearItem()
 	CGenericItem* pItemConflict = NULL;
 	if (m_pPlayer)
 	{
-		for (int iloc = 0; iloc < m_WearPositions.size(); iloc++)
+		for (unsigned int iloc = 0; iloc < m_WearPositions.size(); iloc++)
 		{
 			wearpos_t* pPlayerPos = NULL;
-			for (int ploc = 0; ploc < m_pPlayer->m_WearPositions.size(); ploc++)
+			for (unsigned int ploc = 0; ploc < m_pPlayer->m_WearPositions.size(); ploc++)
 			{
 				const char* PlayerPosName = m_pPlayer->m_WearPositions[ploc].Name;
 				if (m_WearPositions[iloc].Name != m_pPlayer->m_WearPositions[ploc].Name)
@@ -1035,7 +1035,7 @@ bool CGenericItem::CanWearItem()
 			CGenericItem* pItemConflict = NULL;
 
 			int iSlots = 0;
-			for (int i = 0; i < m_pOwner->Gear.size(); i++)
+			for (unsigned int i = 0; i < m_pOwner->Gear.size(); i++)
 			{
 				CGenericItem* pItemWorn = m_pOwner->Gear[i];
 
@@ -1044,7 +1044,7 @@ bool CGenericItem::CanWearItem()
 					!pItemWorn->IsWorn())
 					continue;
 
-				for (int iwloc = 0; iwloc < pItemWorn->m_WearPositions.size(); iwloc++)
+				for (unsigned int iwloc = 0; iwloc < pItemWorn->m_WearPositions.size(); iwloc++)
 				{
 					if (pItemWorn->m_WearPositions[iwloc].Name != PlayerPos.Name)
 						continue;
@@ -1140,7 +1140,7 @@ CGenericItem* CGenericItem::FindPackForItem(CBasePlayer* pPlayer, bool fVerbose)
 	if (!fSuccess)
 	{
 		//Last resort, try to put in any pack
-		for (int i = 0; i < pPlayer->Gear.size(); i++)
+		for (unsigned int i = 0; i < pPlayer->Gear.size(); i++)
 		{
 			CGenericItem* pNextPack = pPlayer->Gear[i];
 
@@ -1594,7 +1594,7 @@ bool CGenericItem::Script_ExecuteCmd(CScript* Script, SCRIPT_EVENT& Event, scrip
 	msstring sTemp;
 
 	msstring DebugString = msstring("Action:");
-	for (int i = 0; i < Cmd.m_Params.size(); i++)
+	for (unsigned int i = 0; i < Cmd.m_Params.size(); i++)
 	{
 		DebugString += " ";
 		DebugString += Cmd.m_Params[i];
@@ -1754,12 +1754,12 @@ bool CGenericItem::Script_ExecuteCmd(CScript* Script, SCRIPT_EVENT& Event, scrip
 				msstringlist Positions;
 				TokenizeString(WearPos, Positions, ";|");
 
-				for (int i1 = 0; i1 < Positions.size(); i1++)
+				for (unsigned int i1 = 0; i1 < Positions.size(); i1++)
 				{
 					msstring& PosName = Positions[i1];
 
 					bool Exists = false;
-					for (int i2 = 0; i2 < m_WearPositions.size(); i2++)
+					for (unsigned int i2 = 0; i2 < m_WearPositions.size(); i2++)
 					{
 						if (PosName != m_WearPositions[i2].Name)
 							continue;
@@ -1833,7 +1833,7 @@ bool CGenericItem::Script_ExecuteCmd(CScript* Script, SCRIPT_EVENT& Event, scrip
 	{
 		if (Params.size() >= 1)
 		{
-			for (int i = 0; i < Params.size(); i++)
+			for (unsigned int i = 0; i < Params.size(); i++)
 			{
 				if (i)
 					sTemp += " ";
@@ -2031,7 +2031,7 @@ bool CGenericItem::Script_ExecuteCmd(CScript* Script, SCRIPT_EVENT& Event, scrip
 			if (m_pPlayer)
 			{
 				byte ReqHands = atoi(Params[0]), UsedHands = 0;
-				for (int i = 0; i < MAX_PLAYER_HANDS; i++)
+				for (unsigned int i = 0; i < MAX_PLAYER_HANDS; i++)
 					if (m_pPlayer->Hand(i) && m_pPlayer->Hand(i) != this)
 						UsedHands++;
 
@@ -2189,14 +2189,14 @@ CGenericItem* FindParryWeapon(CMSMonster* pMonster, /*out*/ int& iPlayerHand, /*
 	iHand[0] = pMonster->m_CurrentHand;
 	iHand[1] = !iHand[0];
 
-	for (int i = 0; i < MAX_PLAYER_HANDS; i++)
+	for (unsigned int i = 0; i < MAX_PLAYER_HANDS; i++)
 	{
 		int CheckHand = iHand[i];
 		pHandItem = pMonster->Hand(CheckHand);
 		if (!pHandItem)
 			continue;
 
-		for (int a = 0; a < pHandItem->m_Attacks.size(); a++)
+		for (unsigned int a = 0; a < pHandItem->m_Attacks.size(); a++)
 		{
 			attackdata_t& Attack = pHandItem->m_Attacks[a];
 			if (Attack.StatExp == SKILL_PARRY)
@@ -2336,7 +2336,7 @@ CGenericItem* MSUtil_GetItemByID(ulong m_iId, CMSMonster* pOwner)
 #include "../parsemsg.h"
 CGenericItem* MSUtil_GetItemByID(ulong lID)
 {
-	for (int e = 0; e < MSCLGlobals::m_ClEntites.size(); e++)
+	for (unsigned int e = 0; e < MSCLGlobals::m_ClEntites.size(); e++)
 	{
 		CBaseEntity* pEntity = MSCLGlobals::m_ClEntites[e];
 		if (!FBitSet(pEntity->MSProperties(), ITEM_GENERIC))
diff --git a/src/game/shared/weapons/genericitem.h b/src/game/shared/weapons/genericitem.h
index 5cd6b350..c6e2d8c0 100644
--- a/src/game/shared/weapons/genericitem.h
+++ b/src/game/shared/weapons/genericitem.h
@@ -131,7 +131,7 @@ class CGenericItemMgr
 	static CGenericItem *NewGenericItem(CGenericItem *pGlobalItem);										 //Copy a global item to a usable item
 	static CGenericItem *NewGenericItem(int idx);														 //[PackSwap]
 	static void AddGlobalItem(GenItem_t &NewGlobalItem);												 //Add a new global item
-	static int ItemCount();																				 //Number of global items
+	static unsigned int ItemCount();																	 //Number of global items
 	static GenItem_t *Item(int idx);																	 //Retreive item
 	static void DeleteItem(CGenericItem *pItem);														 //Delete one item by pointer
 	static void DeleteItem(int idx);																	 //Delete one item by index
@@ -247,7 +247,7 @@ class CGenericItem : public CBasePlayerItem
 	float flItemWeight; // TODO: This is for storing a item's weight on the actual item instead of the entity.
 
 	//Groupables
-	int iQuantity, iMaxGroupable, m_MaxGroupable; //MiB FEB2010_13 - Stackable Stacks added m_MaxGroupable
+	unsigned int iQuantity, iMaxGroupable, m_MaxGroupable; //MiB FEB2010_13 - Stackable Stacks added m_MaxGroupable
 
 	//Wearbles
 	mslist<wearpos_t> m_WearPositions; //Where the item goes when worn. Can use up multiple locations
@@ -269,7 +269,7 @@ class CGenericItem : public CBasePlayerItem
 	virtual void StrikeLand();
 	virtual void StrikeHold();
 	virtual void ChargeThrowProj();
-	virtual bool UseAmmo(int iAmt);
+	virtual bool UseAmmo(unsigned int iAmt);
 	virtual int ActivateButton();
 	virtual bool Attack_IsCharging();
 	virtual bool Attack_CanAttack();
@@ -301,7 +301,7 @@ class CGenericItem : public CBasePlayerItem
 	void Container_StackItems(); //FEB2011_16 Thothie
 	void Container_SendItem(CGenericItem *pItem, bool fAddItem);
 	//int Container_Type( );
-	int Container_ItemCount();
+	unsigned int Container_ItemCount();
 	float Container_Weight();
 	bool Container_IsOpen();
 	float Volume();
diff --git a/src/game/shared/weapons/giarmor.cpp b/src/game/shared/weapons/giarmor.cpp
index cf0916b0..d890e7a1 100644
--- a/src/game/shared/weapons/giarmor.cpp
+++ b/src/game/shared/weapons/giarmor.cpp
@@ -90,7 +90,7 @@ float CGenericItem::Armor_Protect(damage_t Damage)
 	//Thothie JAN2010_13 - not used, commetning out to save cycles (not related to Char screen display bug)
 	/*
 	bool ShouldProtect = false;
-	 for (int i = 0; i < m_WearModelPositions.size(); i++) 
+	 for (unsigned int i = 0; i < m_WearModelPositions.size(); i++) 
 		if( Damage.iHitGroup == m_WearModelPositions[i] )
 		{
 			ShouldProtect = true;
diff --git a/src/game/shared/weapons/giattack.cpp b/src/game/shared/weapons/giattack.cpp
index 1575461a..750fc128 100644
--- a/src/game/shared/weapons/giattack.cpp
+++ b/src/game/shared/weapons/giattack.cpp
@@ -53,7 +53,7 @@ bool CGenericItem::CheckKeys(attackdata_t *pAttData)
 	int iThisCmd = 0;
 
 	//Count the number of keys required
-	for (int i = 0; i < pAttData->ComboKeys.size(); i++)
+	for (unsigned int i = 0; i < pAttData->ComboKeys.size(); i++)
 	{
 		if (pAttData->ComboKeys[i].c_str()[0] == '~')
 			iThisCmd += 2;
@@ -89,7 +89,7 @@ bool CGenericItem::CheckKeys(attackdata_t *pAttData)
 	int LastCmdIdx = 0;
 	iLen = 0;
 	bool fFirstKey = true;
-	for (int i = 0; i < pAttData->ComboKeys.size(); i++)
+	for (unsigned int i = 0; i < pAttData->ComboKeys.size(); i++)
 	{
 		msstring &FullCmdString = pAttData->ComboKeys[i];
 
@@ -263,7 +263,7 @@ bool CGenericItem::StartAttack(int ForceAttackNum)
 	else if (!CurrentAttack)
 	{
 		//bool thoth_unskill_base = false;
-		for (int a = 0; a < m_Attacks.size(); a++)
+		for (unsigned int a = 0; a < m_Attacks.size(); a++)
 		{
 			attackdata_t &AttData = m_Attacks[a];
 
@@ -601,7 +601,7 @@ float CGenericItem::GetHighestAttackCharge()
 {
 	float HighestCharge = 0;
 
-	for (int i = 0; i < m_Attacks.size(); i++)
+	for (unsigned int i = 0; i < m_Attacks.size(); i++)
 	{
 		attackdata_t &Attack = m_Attacks[i];
 
@@ -856,7 +856,7 @@ void CGenericItem::StrikeHold()
 }
 
 //Uses ammo.  Projectiles or MP
-bool CGenericItem::UseAmmo(int iAmt)
+bool CGenericItem::UseAmmo(unsigned int iAmt)
 {
 	if (!m_pOwner || !CurrentAttack)
 		return false;
@@ -1341,7 +1341,7 @@ void CGenericItem::OwnerTakeDamage(damage_t &Damage)
 						//Each script either sets a ratio of damage to be dealt or cancels the damage
 						msstringlist DamageRatios;
 						TokenizeString( pAttMonster->m_ReturnData, DamageRatios );
-						 for (int i = 0; i < DamageRatios.size(); i++)
+						 for (unsigned int i = 0; i < DamageRatios.size(); i++)
 						{
 							if( DamageRatios[i] == "canceldamage" )
 							{
@@ -1555,7 +1555,7 @@ void DoDamage(damage_t &Damage, hitent_list &Hits)
 	{
 		if (Hits.size())
 		{
-			for (int h = 0; h < Hits.size(); h++)
+			for (unsigned int h = 0; h < Hits.size(); h++)
 			{
 				//Thothie FEB2009 - critical crash fix - make sure attacker is alive when passing damage
 				//- if he damages multiple targets while dead, it causes crash
@@ -1721,7 +1721,7 @@ CBaseEntity* DoDamage(damage_t &Damage, CBaseEntity *pTarget)
 						//Each script either sets a ratio of damage to be dealt or cancels the damage
 						msstringlist DamageRatios;
 						TokenizeString(pAttMonster->m_ReturnData, DamageRatios);
-						for (int i = 0; i < DamageRatios.size(); i++)
+						for (unsigned int i = 0; i < DamageRatios.size(); i++)
 						{
 							if (DamageRatios[i] == "canceldamage")
 							{
@@ -1840,7 +1840,7 @@ CBaseEntity* DoDamage(damage_t &Damage, CBaseEntity *pTarget)
 				float tdm_modifier;
 				if (pVictim)
 				{
-					for (int i = 0; i < pVictim->m.TakeDamageModifiers.size(); i++)
+					for (unsigned int i = 0; i < pVictim->m.TakeDamageModifiers.size(); i++)
 					{
 						CMSMonster::takedamagemodifier_t &TDM = pVictim->m.TakeDamageModifiers[i];
 						msstring tdm_damage_type = TDM.DamageType;
diff --git a/src/game/shared/weapons/gipack.cpp b/src/game/shared/weapons/gipack.cpp
index 6f495ca0..81c4eec3 100644
--- a/src/game/shared/weapons/gipack.cpp
+++ b/src/game/shared/weapons/gipack.cpp
@@ -77,7 +77,7 @@ void CGenericItem::RegisterContainer()
 
 	return PackData->Type;
 }*/
-int CGenericItem::Container_ItemCount()
+unsigned int CGenericItem::Container_ItemCount()
 {
 	if (!PackData)
 		return 0;
@@ -87,7 +87,7 @@ int CGenericItem::Container_ItemCount()
 	if ( PackData->iLockStrength != 44 )
 	{
 		//logfile << "======= PACK: " << m_Name << "======== \n";
-		 for (int i = 0; i < PackData->ItemList.size(); i++) 
+		 for (unsigned int i = 0; i < PackData->ItemList.size(); i++) 
 		{
 			//THOTHIEDEBUG
 			Print("Checking %i in %s", i, m_Name);
@@ -212,9 +212,12 @@ void CGenericItem::Wearable_WearOnOwner()
 }
 void CGenericItem::Container_SendContents()
 {
+	unsigned int TotalItemCount = Container_ItemCount();
 	//Send all items down to the client
-	for (int i = 0; i < Container_ItemCount(); i++)
-		Container_SendItem(Container_GetItem(i), true);
+	for (unsigned int i = 0; i < TotalItemCount; i++) {
+		int idx = static_cast<int>(i);
+		Container_SendItem(Container_GetItem(idx), true);
+	}
 }
 void CGenericItem::Wearable_ResetClientUpdate()
 {
@@ -247,13 +250,13 @@ bool CGenericItem::Container_CanAcceptItem(CGenericItem *pItem)
 
 #ifdef VALVE_DLL
 	//Some packs (like sheathes) can only hold a certain amount of items
-	if (PackData->MaxItems && Container_ItemCount() + 1 > PackData->MaxItems)
+	if (PackData->MaxItems && (int)Container_ItemCount() + 1 > PackData->MaxItems)
 	{
 		//MiB FEB2010_13 - Making this into an if-block - If the pack is "full" we check to see
 		//		if the item is groupable and if it can be fully grouped into another.
 		if (FBitSet(pItem->Properties, ITEM_GROUPABLE))
 		{
-			for (int i = 0; i < PackData->ItemList.size(); i++)
+			for (unsigned int i = 0; i < PackData->ItemList.size(); i++)
 			{
 				CGenericItem *pCur = Container_GetItem(i);
 
@@ -290,7 +293,7 @@ bool CGenericItem::Container_CanAcceptItem(CGenericItem *pItem)
 			fAccepted = false;
 		else
 		{
-			for (int i = 0; i < PackData->RejectItemsTypes.size(); i++)
+			for (unsigned int i = 0; i < PackData->RejectItemsTypes.size(); i++)
 			{
 				if (strstr(pItem->ItemName.c_str(), PackData->RejectItemsTypes[i]))
 				{
@@ -305,7 +308,7 @@ bool CGenericItem::Container_CanAcceptItem(CGenericItem *pItem)
 	if (PackData->AcceptItemsTypes.size())
 		fAccepted = false;
 
-	for (int i = 0; i < PackData->AcceptItemsTypes.size(); i++)
+	for (unsigned int i = 0; i < PackData->AcceptItemsTypes.size(); i++)
 	{
 		//fAccepted = false;
 		if (strstr(pItem->ItemName.c_str(), PackData->AcceptItemsTypes[i]))
@@ -340,7 +343,7 @@ int CGenericItem::Container_AddItem(CGenericItem *pItem)
 			if ( pOwner->m_CharacterState == CHARSTATE_LOADED )
 			{
 				//Only if I r loaded and in world
-				 for (int i = 0; i < PackData->ItemList.size(); i++) 
+				 for (unsigned int i = 0; i < PackData->ItemList.size(); i++) 
 				{
 					CGenericItem *pCur = Container_GetItem( i );
 					if ( msstring(pCur->m_Name) != msstring( pItem->m_Name ) ) //If it has the same script name
@@ -478,7 +481,7 @@ void CGenericItem::Container_StackItems()
 	if (!PackData)
 		return;
 
-	for (int i1 = 0; i1 < PackData->ItemList.size(); i1++)
+	for (unsigned int i1 = 0; i1 < PackData->ItemList.size(); i1++)
 	{
 		CGenericItem *pItem = Container_GetItem(i1);
 		if (FBitSet(pItem->Properties, ITEM_GROUPABLE))
@@ -489,7 +492,7 @@ void CGenericItem::Container_StackItems()
 				if (pOwner->m_CharacterState == CHARSTATE_LOADED)
 				{
 					//Only if I r loaded and in world
-					for (int i2 = 0; i2 < PackData->ItemList.size(); i2++)
+					for (unsigned int i2 = 0; i2 < PackData->ItemList.size(); i2++)
 					{
 						CGenericItem *pCur = Container_GetItem(i2);
 						if (pCur == pItem)
diff --git a/src/game/shared/weapons/weapons.cpp b/src/game/shared/weapons/weapons.cpp
index 9bfd2f3b..ed8323d2 100644
--- a/src/game/shared/weapons/weapons.cpp
+++ b/src/game/shared/weapons/weapons.cpp
@@ -74,7 +74,7 @@ MULTIDAMAGE gMultiDamage;
 //=========================================================
 int MaxAmmoCarry(int iszName)
 {
-	for (int i = 0; i < MAX_WEAPONS; i++)
+	for (unsigned int i = 0; i < MAX_WEAPONS; i++)
 	{
 		if (CBasePlayerItem::ItemInfoArray[i].pszAmmo1 && !strcmp(STRING(iszName), CBasePlayerItem::ItemInfoArray[i].pszAmmo1))
 			return CBasePlayerItem::ItemInfoArray[i].iMaxAmmo1;
diff --git a/src/game/shared/weapons/weapons.h b/src/game/shared/weapons/weapons.h
index 8168d0b3..83d87eeb 100644
--- a/src/game/shared/weapons/weapons.h
+++ b/src/game/shared/weapons/weapons.h
@@ -50,7 +50,7 @@ class hitent_list : public mslist<hitent_t>
 	{
 		CBaseEntity *pClosest = NULL;
 		float ClosestDist = 9999999;
-		for (int h = 0; h < size(); h++)
+		for (unsigned int h = 0; h < size(); h++)
 		{
 			hitent_t &Hit = operator[](h);
 			if (Hit.Dist < ClosestDist)
diff --git a/src/public/engine/eiface.h b/src/public/engine/eiface.h
index 248a15c2..577d8fb5 100644
--- a/src/public/engine/eiface.h
+++ b/src/public/engine/eiface.h
@@ -314,7 +314,7 @@ struct saverestore_s
 	int			size;			// Current data size
 	int			bufferSize;		// Total space for data
 	int			tokenSize;		// Size of the linear list of tokens
-	int			tokenCount;		// Number of elements in the pTokens table
+	unsigned int			tokenCount;		// Number of elements in the pTokens table
 	char		**pTokens;		// Hash table of entity strings (sparse)
 	int			currentIndex;	// Holds a global entity table ID
 	int			tableCount;		// Number of elements in the entity table
diff --git a/src/public/engine/progdefs.h b/src/public/engine/progdefs.h
index 10041d28..c8d9e548 100644
--- a/src/public/engine/progdefs.h
+++ b/src/public/engine/progdefs.h
@@ -46,9 +46,9 @@ typedef struct
 	int			trace_flags;
 	int			msg_entity;
 	int			cdAudioTrack;
-	int			maxClients;
+	unsigned int maxClients;
 	//int			PreCount;
-	int			maxEntities;
+	unsigned int maxEntities;
 	const char	*pStringBase;
 
 	void		*pSaveData;
@@ -113,7 +113,7 @@ typedef struct entvars_s
 	
 	int			light_level;
 
-	int			sequence;		// animation sequence
+	unsigned int			sequence;		// animation sequence
 	int			gaitsequence;	// movement animation sequence for player (0 for none)
 	float		frame;			// % playback position in animation sequences (0..255)
 	float		animtime;		// world time when frame was set
diff --git a/src/public/engine/studio.h b/src/public/engine/studio.h
index 8cee1d4d..f3059e4d 100644
--- a/src/public/engine/studio.h
+++ b/src/public/engine/studio.h
@@ -70,7 +70,7 @@ typedef struct
 	int					numhitboxes;			// complex bounding boxes
 	int					hitboxindex;			
 	
-	int					numseq;				// animation sequences
+	unsigned int					numseq;				// animation sequences
 	int					seqindex;
 
 	int					numseqgroups;		// demand loaded sequences
@@ -169,7 +169,7 @@ typedef struct
 	int					activity;
 	int					actweight;
 
-	int					numevents;
+	unsigned int		numevents;
 	int					eventindex;
 
 	int					numframes;	// number of frames per sequence
diff --git a/thirdparty/tartan/textureloader.cpp b/thirdparty/tartan/textureloader.cpp
index b9f77917..36c94eae 100644
--- a/thirdparty/tartan/textureloader.cpp
+++ b/thirdparty/tartan/textureloader.cpp
@@ -109,7 +109,7 @@ namespace Tartan
 
 			DataPixels = new GLubyte[NewSize];
 			int OldOfs = 0, NewOfs = 0;
-			for (int i = 0; i < (signed)LoadTex.Height; i++)
+			for (unsigned int i = 0; i < (signed)LoadTex.Height; i++)
 			{
 				int RowSize = BytesPerPixel * LoadTex.Width;
 				memcpy(&DataPixels[NewOfs], &Texture.imageData[OldOfs], RowSize);

From 40abb0a3ceac4b61cc9453b620a3fa8a8c9de0e1 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Wed, 11 Mar 2026 02:35:24 -0400
Subject: [PATCH 084/291] Fixed var references and set operations

---
 src/game/client/ms/hudscript.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/game/client/ms/hudscript.cpp b/src/game/client/ms/hudscript.cpp
index 8100f70d..1950a169 100644
--- a/src/game/client/ms/hudscript.cpp
+++ b/src/game/client/ms/hudscript.cpp
@@ -52,9 +52,9 @@ static void SCRIPT_CONTROLVEC_POS(CScript* Script, const char* name, Vector& vec
 	if (Script->VarExists(ScriptVarNameX.c_str())) vec.x += atof(Script->GetVar(ScriptVarNameX.c_str()));
 	if (Script->VarExists(ScriptVarNameY.c_str())) vec.y += atof(Script->GetVar(ScriptVarNameY.c_str()));
 	if (Script->VarExists(ScriptVarNameZ.c_str())) vec.z += atof(Script->GetVar(ScriptVarNameZ.c_str()));
-	if (Script->VarExists(ScriptVarSetNameX.c_str())) vec.x += atof(Script->GetVar(ScriptVarNameX.c_str()));
-	if (Script->VarExists(ScriptVarSetNameY.c_str())) vec.y += atof(Script->GetVar(ScriptVarNameY.c_str()));
-	if (Script->VarExists(ScriptVarSetNameZ.c_str())) vec.z += atof(Script->GetVar(ScriptVarNameZ.c_str()));
+	if (Script->VarExists(ScriptVarSetNameX.c_str())) vec.x = atof(Script->GetVar(ScriptVarNameX.c_str()));
+	if (Script->VarExists(ScriptVarSetNameY.c_str())) vec.y = atof(Script->GetVar(ScriptVarNameY.c_str()));
+	if (Script->VarExists(ScriptVarSetNameZ.c_str())) vec.z = atof(Script->GetVar(ScriptVarNameZ.c_str()));
 
 
 };
@@ -98,11 +98,11 @@ static void SCRIPT_CONTROLVEC_POS_CUSTOM(CScript* Script, const char* name, Vect
 	std::string ScriptVarCustomZSet{ name }; ScriptVarCustomZSet += set; ScriptVarCustomZSet += zname;
 
 	if (Script->VarExists(ScriptVarCustomXOffset.c_str())) vec.x += atof(Script->GetVar(ScriptVarCustomXOffset.c_str())); 
-	if (Script->VarExists(ScriptVarCustomYOffset.c_str())) vec.x += atof(Script->GetVar(ScriptVarCustomYOffset.c_str()));
-	if (Script->VarExists(ScriptVarCustomZOffset.c_str())) vec.x += atof(Script->GetVar(ScriptVarCustomZOffset.c_str()));
-	if (Script->VarExists(ScriptVarCustomXSet.c_str())) vec.x += atof(Script->GetVar(ScriptVarCustomXSet.c_str()));
-	if (Script->VarExists(ScriptVarCustomYSet.c_str())) vec.x += atof(Script->GetVar(ScriptVarCustomYSet.c_str()));
-	if (Script->VarExists(ScriptVarCustomZSet.c_str())) vec.x += atof(Script->GetVar(ScriptVarCustomZSet.c_str()));
+	if (Script->VarExists(ScriptVarCustomYOffset.c_str())) vec.y += atof(Script->GetVar(ScriptVarCustomYOffset.c_str()));
+	if (Script->VarExists(ScriptVarCustomZOffset.c_str())) vec.z += atof(Script->GetVar(ScriptVarCustomZOffset.c_str()));
+	if (Script->VarExists(ScriptVarCustomXSet.c_str())) vec.x = atof(Script->GetVar(ScriptVarCustomXSet.c_str()));
+	if (Script->VarExists(ScriptVarCustomYSet.c_str())) vec.y = atof(Script->GetVar(ScriptVarCustomYSet.c_str()));
+	if (Script->VarExists(ScriptVarCustomZSet.c_str())) vec.z = atof(Script->GetVar(ScriptVarCustomZSet.c_str()));
 
 };
 /*

From 1014da76614ecd2d34d0317704cf620ef7b1f75c Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Wed, 11 Mar 2026 06:41:21 -0400
Subject: [PATCH 085/291] Changed defines to constexpr/enums.
 Moved/deduplicated multiple defines for some constants.

---
 src/common/Platform.h               |   2 -
 src/game/client/ammo.h              |   8 +-
 src/game/client/ammohistory.h       |   3 +-
 src/game/client/camera.h            |   2 +-
 src/game/client/hud.h               |  25 ++++--
 src/game/server/cdll_dll.h          |  44 +++++-----
 src/game/shared/weapons/weapons.cpp |   2 +-
 src/game/shared/weapons/weapons.h   | 127 ++++++++++++++--------------
 8 files changed, 108 insertions(+), 105 deletions(-)

diff --git a/src/common/Platform.h b/src/common/Platform.h
index 12b18f5b..12b476e9 100644
--- a/src/common/Platform.h
+++ b/src/common/Platform.h
@@ -12,7 +12,6 @@ constexpr int DEBUG = 1
 #pragma warning(disable : 4201)	 // nameless struct/union
 #pragma warning(disable : 4514)	 // unreferenced inline function removed
 #pragma warning(disable : 4100)	 // unreferenced formal parameter
-//#pragma warning(disable : 4018) // signed/unsigned mismatch, this this probably isn't a good idea...
 #pragma warning(disable : 26495) // Variable is uninitialized
 #pragma warning(disable : 26451) // Arithmetic overflow
 #pragma warning(disable : 26812) // The enum type is unscoped
@@ -42,7 +41,6 @@ using word = unsigned short;
 // #endif
 // #define ARRAYSIZE(p) (sizeof(p) / sizeof(p[0]))
 
-
 template <typename T1, typename T2>
 inline auto V_min(const T1& a, const T2& b) {
 	return (a <= b) ? a : b;
diff --git a/src/game/client/ammo.h b/src/game/client/ammo.h
index 3ca1b1cd..acdb5791 100644
--- a/src/game/client/ammo.h
+++ b/src/game/client/ammo.h
@@ -16,11 +16,9 @@
 #ifndef __AMMO_H__
 #define __AMMO_H__
 
-#define MAX_WEAPON_NAME 128
-
-#define WEAPON_FLAGS_SELECTONEMPTY 1
-
-#define WEAPON_IS_ONTARGET 0x40
+constexpr int MAX_WEAPON_NAME = 128;
+constexpr int WEAPON_FLAGS_SELECTONEMPTY = 1;
+constexpr int WEAPON_IS_ONTARGET = 0x40;
 
 struct WEAPON
 {
diff --git a/src/game/client/ammohistory.h b/src/game/client/ammohistory.h
index f2e1f46a..71969039 100644
--- a/src/game/client/ammohistory.h
+++ b/src/game/client/ammohistory.h
@@ -17,7 +17,6 @@
 //
 
 // this is the max number of items in each bucket
-#define MAX_WEAPON_POSITIONS MAX_WEAPON_SLOTS
 
 class WeaponsResource
 {
@@ -94,7 +93,7 @@ class WeaponsResource
 
 extern WeaponsResource gWR;
 
-#define MAX_HISTORY 12
+constexpr int MAX_HISTORY = 12;
 enum
 {
 	HISTSLOT_EMPTY,
diff --git a/src/game/client/camera.h b/src/game/client/camera.h
index 041d373f..be008149 100644
--- a/src/game/client/camera.h
+++ b/src/game/client/camera.h
@@ -2,7 +2,7 @@
 // NOTE: must include quakedef.h first
 
 #ifndef _CAMERA_H_
-#define _CAMEA_H_
+#define _CAMERA_H_
 
 // pitch, yaw, dist
 extern vec3_t cam_ofs;
diff --git a/src/game/client/hud.h b/src/game/client/hud.h
index 8b50ecee..16519531 100644
--- a/src/game/client/hud.h
+++ b/src/game/client/hud.h
@@ -39,20 +39,27 @@ class CHudMisc;
 
 ///////////////////////\\\\\\\\\\\\\\\\\\\\\\\\\\\//
 
-#define RGB_YELLOWISH 0x00FFA000 //255,160,0
-#define RGB_REDISH 0x00FF1010	 //255,160,0
-#define RGB_GREENISH 0x0000A000	 //0,160,0
+enum {
+	RGB_YELLOWISH = 0x00FFA000,		//255,160,0
+	RGB_REDISH = 0x00FF1010,		//255,160,0
+	RGB_GREENISH = 0x0000A000		//0,160,0
+};
 
 #include "wrect.h"
 #include "cl_dll.h"
 #include "ammo.h"
 
-#define DHN_DRAWZERO 1
-#define DHN_2DIGITS 2
-#define DHN_3DIGITS 4
-#define MIN_ALPHA 100
+enum {
+	DHN_DRAWZERO = 1,
+	DHN_2DIGITS = 2,
+	DHN_3DIGITS = 4
+};
 
-#define HUDELEM_ACTIVE 1
+constexpr int MIN_ALPHA = 100;
+
+enum {
+	HUDELEM_ACTIVE = 1
+};
 
 enum
 {
@@ -448,7 +455,7 @@ class CHud
 	void ReloadClient();
 	int UpdateClientData(client_data_t *cdata, float time);
 
-	CHud() = default;
+	 CHud() = default;
 	~CHud() = default; // destructor, frees allocated memory
 
 	// user messages
diff --git a/src/game/server/cdll_dll.h b/src/game/server/cdll_dll.h
index 00519cee..665a0dfc 100644
--- a/src/game/server/cdll_dll.h
+++ b/src/game/server/cdll_dll.h
@@ -20,26 +20,30 @@
 #ifndef CDLL_DLL_H
 #define CDLL_DLL_H
 
-#define MAX_WEAPONS 32 // ???
+constexpr int MAX_WEAPONS = 32; // ???
+constexpr int MAX_NORMAL_BATTERY = 100;
+constexpr int WEAPON_NOCLIP = -1;
+constexpr int MAX_WEAPON_SLOTS = 5; // hud item selection slots
+constexpr int MAX_ITEM_TYPES = 6;   // hud item selection slots
+constexpr int MAX_ITEMS = 5; // hard coded item types
+constexpr int MAX_WEAPON_POSITIONS = MAX_WEAPON_SLOTS;
+
+enum {
+	HIDEHUD_WEAPONS = (1 << 0),
+	HIDEHUD_FLASHLIGHT = (1 << 1),
+	HIDEHUD_ALL = (1 << 2),
+	HIDEHUD_HEALTH = (1 << 3)
+};
+
+constexpr int MAX_AMMO_TYPES = 32;// ???
+constexpr int MAX_AMMO_SLOTS = 32;// not really slots
+
+enum {
+	HUD_PRINTNOTIFY = 1,
+	HUD_PRINTCONSOLE = 2,
+	HUD_PRINTTALK = 3,
+	HUD_PRINTCENTER = 4
+};
 
-#define MAX_WEAPON_SLOTS 5 // hud item selection slots
-#define MAX_ITEM_TYPES 6   // hud item selection slots
-
-#define MAX_ITEMS 5 // hard coded item types
-
-#define HIDEHUD_WEAPONS (1 << 0)
-#define HIDEHUD_FLASHLIGHT (1 << 1)
-#define HIDEHUD_ALL (1 << 2)
-#define HIDEHUD_HEALTH (1 << 3)
-
-#define MAX_AMMO_TYPES 32 // ???
-#define MAX_AMMO_SLOTS 32 // not really slots
-
-#define HUD_PRINTNOTIFY 1
-#define HUD_PRINTCONSOLE 2
-#define HUD_PRINTTALK 3
-#define HUD_PRINTCENTER 4
-
-#define WEAPON_SUIT 31
 
 #endif
\ No newline at end of file
diff --git a/src/game/shared/weapons/weapons.cpp b/src/game/shared/weapons/weapons.cpp
index ed8323d2..6c4643c8 100644
--- a/src/game/shared/weapons/weapons.cpp
+++ b/src/game/shared/weapons/weapons.cpp
@@ -48,7 +48,7 @@
 extern CGraph WorldGraph;
 extern int gEvilImpulse101;
 
-#define NOT_USED 255
+constexpr int NOT_USED = 255;
 
 //DLL_GLOBAL	short	g_sModelIndexLaser;// holds the index for the laser beam
 //DLL_GLOBAL  const char *g_pModelNameLaser = "sprites/laserbeam.spr";
diff --git a/src/game/shared/weapons/weapons.h b/src/game/shared/weapons/weapons.h
index 83d87eeb..0220106e 100644
--- a/src/game/shared/weapons/weapons.h
+++ b/src/game/shared/weapons/weapons.h
@@ -106,38 +106,36 @@ class CGrenade : public CBaseMonster
 };
 
 // constant items
-#define ITEM_HEALTHKIT 1
-#define ITEM_ANTIDOTE 2
-#define ITEM_SECURITY 3
-#define ITEM_BATTERY 4
-
-#define WEAPON_NONE 0
-#define WEAPON_CROWBAR 1
-#define WEAPON_GLOCK 2
-#define WEAPON_PYTHON 3
-#define WEAPON_MP5 4
-#define WEAPON_CHAINGUN 5
-#define WEAPON_CROSSBOW 6
-#define WEAPON_SHOTGUN 7
-#define WEAPON_RPG 8
-#define WEAPON_GAUSS 9
-#define WEAPON_EGON 10
-#define WEAPON_HORNETGUN 11
-#define WEAPON_HANDGRENADE 12
-#define WEAPON_TRIPMINE 13
-#define WEAPON_SATCHEL 14
-#define WEAPON_SNARK 15
-
-#define WEAPON_ALLWEAPONS (~(1 << WEAPON_SUIT))
-
-#define WEAPON_SUIT 31 // ?????
-
-#define MAX_WEAPONS 32
-
-#define MAX_NORMAL_BATTERY 100
+enum {
+	ITEM_HEALTHKIT = 1,
+	ITEM_ANTIDOTE = 2,
+	ITEM_SECURITY = 3,
+	ITEM_BATTERY = 4
+};
+
+enum {
+	WEAPON_NONE = 0,
+	WEAPON_CROWBAR = 1,
+	WEAPON_GLOCK = 2,
+	WEAPON_PYTHON = 3,
+	WEAPON_MP5 = 4,
+	WEAPON_CHAINGUN = 5,
+	WEAPON_CROSSBOW = 6,
+	WEAPON_SHOTGUN = 7,
+	WEAPON_RPG = 8,
+	WEAPON_GAUSS = 9,
+	WEAPON_EGON = 10,
+	WEAPON_HORNETGUN = 11,
+	WEAPON_HANDGRENADE = 12,
+	WEAPON_TRIPMINE = 13,
+	WEAPON_SATCHEL = 14,
+	WEAPON_SNARK = 15,
+	WEAPON_SUIT = 31,
+	WEAPON_ALLWEAPONS = (~(1 << WEAPON_SUIT))
+};
 
 // the maximum amount of ammo each weapon's clip can hold
-#define WEAPON_NOCLIP -1
+
 
 // bullet types
 typedef enum
@@ -148,19 +146,19 @@ typedef enum
 	BULLET_PLAYER_357,		// python
 	BULLET_PLAYER_BUCKSHOT, // shotgun
 	BULLET_PLAYER_CROWBAR,	// crowbar swipe
-
 	BULLET_MONSTER_9MM,
 	BULLET_MONSTER_MP5,
-	BULLET_MONSTER_12MM,
+	BULLET_MONSTER_12MM
 } Bullet;
 
-#define ITEM_FLAG_SELECTONEMPTY 1
-#define ITEM_FLAG_NOAUTORELOAD 2
-#define ITEM_FLAG_NOAUTOSWITCHEMPTY 4
-#define ITEM_FLAG_LIMITINWORLD 8
-#define ITEM_FLAG_EXHAUSTIBLE 16 // A player can totally exhaust their ammo supply and lose this weapon
-
-#define WEAPON_IS_ONTARGET 0x40
+enum {
+	ITEM_FLAG_SELECTONEMPTY = 1,
+	ITEM_FLAG_NOAUTORELOAD = 2,
+	ITEM_FLAG_NOAUTOSWITCHEMPTY = 4,
+	ITEM_FLAG_LIMITINWORLD = 8,
+	ITEM_FLAG_EXHAUSTIBLE = 16 
+	// A player can totally exhaust their ammo supply and lose this weapon
+};
 
 typedef struct
 {
@@ -369,31 +367,30 @@ typedef struct
 
 extern MULTIDAMAGE gMultiDamage;
 
-#define LOUD_GUN_VOLUME 1000
-#define NORMAL_GUN_VOLUME 600
-#define QUIET_GUN_VOLUME 200
-
-#define BRIGHT_GUN_FLASH 512
-#define NORMAL_GUN_FLASH 256
-#define DIM_GUN_FLASH 128
-
-#define BIG_EXPLOSION_VOLUME 2048
-#define NORMAL_EXPLOSION_VOLUME 1024
-#define SMALL_EXPLOSION_VOLUME 512
-
-#define WEAPON_ACTIVITY_VOLUME 64
-
-#define VECTOR_CONE_1DEGREES Vector(0.00873, 0.00873, 0.00873)
-#define VECTOR_CONE_2DEGREES Vector(0.01745, 0.01745, 0.01745)
-#define VECTOR_CONE_3DEGREES Vector(0.02618, 0.02618, 0.02618)
-#define VECTOR_CONE_4DEGREES Vector(0.03490, 0.03490, 0.03490)
-#define VECTOR_CONE_5DEGREES Vector(0.04362, 0.04362, 0.04362)
-#define VECTOR_CONE_6DEGREES Vector(0.05234, 0.05234, 0.05234)
-#define VECTOR_CONE_7DEGREES Vector(0.06105, 0.06105, 0.06105)
-#define VECTOR_CONE_8DEGREES Vector(0.06976, 0.06976, 0.06976)
-#define VECTOR_CONE_9DEGREES Vector(0.07846, 0.07846, 0.07846)
-#define VECTOR_CONE_10DEGREES Vector(0.08716, 0.08716, 0.08716)
-#define VECTOR_CONE_15DEGREES Vector(0.13053, 0.13053, 0.13053)
-#define VECTOR_CONE_20DEGREES Vector(0.17365, 0.17365, 0.17365)
+enum {
+	LOUD_GUN_VOLUME = 1000,
+	NORMAL_GUN_VOLUME = 600,
+	QUIET_GUN_VOLUME = 200,
+	BRIGHT_GUN_FLASH = 512,
+	NORMAL_GUN_FLASH = 256,
+	DIM_GUN_FLASH = 128,
+	BIG_EXPLOSION_VOLUME = 2048,
+	NORMAL_EXPLOSION_VOLUME = 1024,
+	SMALL_EXPLOSION_VOLUME = 512,
+	WEAPON_ACTIVITY_VOLUME = 64
+};
+
+constexpr Vector VECTOR_CONE_1DEGREES = Vector(0.00873, 0.00873, 0.00873);
+constexpr Vector VECTOR_CONE_2DEGREES = Vector(0.01745, 0.01745, 0.01745);
+constexpr Vector VECTOR_CONE_3DEGREES = Vector(0.02618, 0.02618, 0.02618);
+constexpr Vector VECTOR_CONE_4DEGREES = Vector(0.03490, 0.03490, 0.03490);
+constexpr Vector VECTOR_CONE_5DEGREES = Vector(0.04362, 0.04362, 0.04362);
+constexpr Vector VECTOR_CONE_6DEGREES = Vector(0.05234, 0.05234, 0.05234);
+constexpr Vector VECTOR_CONE_7DEGREES = Vector(0.06105, 0.06105, 0.06105);
+constexpr Vector VECTOR_CONE_8DEGREES = Vector(0.06976, 0.06976, 0.06976);
+constexpr Vector VECTOR_CONE_9DEGREES = Vector(0.07846, 0.07846, 0.07846);
+constexpr Vector VECTOR_CONE_10DEGREES = Vector(0.08716, 0.08716, 0.08716);
+constexpr Vector VECTOR_CONE_15DEGREES = Vector(0.13053, 0.13053, 0.13053);
+constexpr Vector VECTOR_CONE_20DEGREES = Vector(0.17365, 0.17365, 0.17365);
 
 #endif // WEAPONS_H

From 2260ce392b36bf0e78918705cb15f5c74ee88f87 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Wed, 11 Mar 2026 07:01:01 -0400
Subject: [PATCH 086/291] changed define to constexpr

---
 src/public/engine/cdll_int.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/public/engine/cdll_int.h b/src/public/engine/cdll_int.h
index 90e7ae93..fb937c1c 100644
--- a/src/public/engine/cdll_int.h
+++ b/src/public/engine/cdll_int.h
@@ -33,8 +33,10 @@
 
 typedef int HLSPRITE; // handle to a graphic
 
-#define SCRINFO_SCREENFLASH 1
-#define SCRINFO_STRETCHED 2
+enum {
+	SCRINFO_SCREENFLASH = 1,
+	SCRINFO_STRETCHED = 2
+};
 
 typedef struct SCREENINFO_s
 {
@@ -86,7 +88,7 @@ typedef struct hud_player_info_s
 
 #include "in_buttons.h"
 
-#define CLDLL_INTERFACE_VERSION 7
+constexpr int CLDLL_INTERFACE_VERSION = 7;
 
 //#include "server.h" // server_static_t define for apiproxy
 #include "APIProxy.h"

From d54129f9f9ad8eb0ad2b32fc3bcf0f3cc458cf74 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Wed, 11 Mar 2026 08:26:12 -0400
Subject: [PATCH 087/291] Changed macros to functions or constexpr where
 possible

---
 src/game/client/cl_util.h | 143 ++++++++++++++++++++++++++++----------
 1 file changed, 107 insertions(+), 36 deletions(-)

diff --git a/src/game/client/cl_util.h b/src/game/client/cl_util.h
index 39684dd7..7f56c12a 100644
--- a/src/game/client/cl_util.h
+++ b/src/game/client/cl_util.h
@@ -26,6 +26,11 @@
 #define FALSE 0
 #endif
 
+// ScreenHeight returns the height of the screen, in pixels
+#define ScreenHeight (gHUD.m_scrinfo.iHeight)
+// ScreenWidth returns the width of the screen, in pixels
+#define ScreenWidth (gHUD.m_scrinfo.iWidth)
+
 //these must stay macros, or we need to make a msg function for every command.
 // Macros to hook function calls into the HUD object
 #define HOOK_MESSAGE(x) gEngfuncs.pfnHookUserMsg(#x, __MsgFunc_##x);
@@ -68,53 +73,115 @@ inline float CVAR_GET_FLOAT(const char *x) { return gEngfuncs.pfnGetCvarFloat(x)
 inline const char *CVAR_GET_STRING(const char *x) { return gEngfuncs.pfnGetCvarString(x); }
 inline struct cvar_s *CVAR_CREATE(const char *cv, const char *val, const int flags) { return gEngfuncs.pfnRegisterVariable(cv, val, flags); }
 
-//HLSPRITE SPR_Load(const char* sprName) {
-//return gEngfuncs.pfnSPR_Load(sprName);
-//}
-
-
-//void SPR_Set(HLSPRITE& hPic, const int r, const int g, const int b ) {
-//	gEngfuncs.pfnSPR_Set(&hPic, r, g, b);
-//}
-
-#define SPR_Load (*gEngfuncs.pfnSPR_Load)
-#define SPR_Set (*gEngfuncs.pfnSPR_Set)
-#define SPR_Frames (*gEngfuncs.pfnSPR_Frames)
-#define SPR_GetList (*gEngfuncs.pfnSPR_GetList)
+//#define SPR_Load (gEngfuncs.pfnSPR_Load(
+//#define SPR_Set (*gEngfuncs.pfnSPR_Set)
+//#define SPR_Frames (*gEngfuncs.pfnSPR_Frames)
+//#define SPR_GetList (*gEngfuncs.pfnSPR_GetList)
 
 // SPR_Draw  draws a the current sprite as solid
-#define SPR_Draw (*gEngfuncs.pfnSPR_Draw)
-// SPR_DrawHoles  draws the current sprites,  with color index255 not drawn (transparent)
-#define SPR_DrawHoles (*gEngfuncs.pfnSPR_DrawHoles)
+//#define SPR_Draw (*gEngfuncs.pfnSPR_Draw)
+
+//#define SPR_DrawHoles (*gEngfuncs.pfnSPR_DrawHoles)
 // SPR_DrawAdditive  adds the sprites RGB values to the background  (additive transulency)
-#define SPR_DrawAdditive (*gEngfuncs.pfnSPR_DrawAdditive)
+//#define SPR_DrawAdditive (*gEngfuncs.pfnSPR_DrawAdditive)
 
 // SPR_EnableScissor  sets a clipping rect for HUD sprites.  (0,0) is the top-left hand corner of the screen.
-#define SPR_EnableScissor (*gEngfuncs.pfnSPR_EnableScissor)
-// SPR_DisableScissor  disables the clipping rect
-#define SPR_DisableScissor (*gEngfuncs.pfnSPR_DisableScissor)
-//
-#define FillRGBA (*gEngfuncs.pfnFillRGBA)
+//#define SPR_EnableScissor (*gEngfuncs.pfnSPR_EnableScissor)
 
-// ScreenHeight returns the height of the screen, in pixels
-#define ScreenHeight (gHUD.m_scrinfo.iHeight)
-// ScreenWidth returns the width of the screen, in pixels
-#define ScreenWidth (gHUD.m_scrinfo.iWidth)
+// SPR_DisableScissor  disables the clipping rect
+//#define SPR_DisableScissor (*gEngfuncs.pfnSPR_DisableScissor)
+//#define FillRGBA (*gEngfuncs.pfnFillRGBA)
 
 // Use this to set any co-ords in 640x480 space
-#define XRES(x) ((int)(float(x) * ((float)ScreenWidth / 640.0f) + 0.5f))
-#define YRES(y) ((int)(float(y) * ((float)ScreenHeight / 480.0f) + 0.5f))
+//#define XRES(x) ((int)(float(x) * ((float)ScreenWidth / 640.0f) + 0.5f))
+//#define YRES(y) ((int)(float(y) * ((float)ScreenHeight / 480.0f) + 0.5f))
 
 // use this to project world coordinates to screen coordinates
-#define XPROJECT(x) ((1.0f + (x)) * ScreenWidth * 0.5f)
-#define YPROJECT(y) ((1.0f - (y)) * ScreenHeight * 0.5f)
+//#define XPROJECT(x) ((1.0f + (x)) * ScreenWidth * 0.5f)
+//#define YPROJECT(y) ((1.0f - (y)) * ScreenHeight * 0.5f)
 
-#define GetScreenInfo (*gEngfuncs.pfnGetScreenInfo)
-#define ServerCmd (*gEngfuncs.pfnServerCmd)
-#define ClientCmd (*gEngfuncs.pfnClientCmd)
-#define SetCrosshair (*gEngfuncs.pfnSetCrosshair)
+//#define GetScreenInfo (*gEngfuncs.pfnGetScreenInfo)
+//#define ServerCmd (*gEngfuncs.pfnServerCmd)
+//#define ClientCmd (*gEngfuncs.pfnClientCmd)
+//#define SetCrosshair (*gEngfuncs.pfnSetCrosshair)
 //#define AngleVectors (*gEngfuncs.pfnAngleVectors)
 
+
+inline HLSPRITE SPR_Load(const char* sprName) {
+	return gEngfuncs.pfnSPR_Load(sprName);
+};
+
+inline void SPR_Set(HLSPRITE hpic, const int r, const int g, const int b) {
+	gEngfuncs.pfnSPR_Set(hpic, r, g, b);
+};
+
+inline int SPR_Frames(HLSPRITE hpic) {
+	return gEngfuncs.pfnSPR_Frames(hpic);
+};
+
+inline client_sprite_s* SPR_GetList(const char* psz, int* piCount) {
+	return gEngfuncs.pfnSPR_GetList(psz, piCount);
+};
+
+//SPR_Draw draws the current sprite as solid
+inline void SPR_Draw(const int frame, const int x, const int y, const Rect* pRect) {
+	gEngfuncs.pfnSPR_Draw(frame, x, y, pRect);
+};
+
+// SPR_DrawHoles  draws the current sprites,  with color index255 not drawn (transparent)
+inline void SPR_DrawHoles(const int frame, const int x, const int y, const Rect* pRect) {
+	gEngfuncs.pfnSPR_DrawHoles(frame, x, y, pRect);
+}
+
+inline void SPR_DrawAdditive(const int frame, const int x, const int y, const Rect* pRect) {
+	gEngfuncs.pfnSPR_DrawAdditive(frame, x, y, pRect);
+}
+
+inline void SPR_EnableScissor(const int x, const int y, const int width, const int height) {
+	gEngfuncs.pfnSPR_EnableScissor(x, y, width, height);
+}
+
+inline void SPR_DisableScissor() {
+	gEngfuncs.pfnSPR_DisableScissor();
+}
+
+inline void FillRGBA(const int x, const int y, const int width, const int height, const int r, const int b, const int g, const int a) {
+	gEngfuncs.pfnFillRGBA(x, y, width, height, r, g, b, a);
+}
+
+
+inline int XRES(const int x) {
+	return (int)(float(x) * ((float)ScreenWidth / 640.0f) + 0.5f);
+}
+
+inline int YRES(const int y) {
+	return (int)(float(y) * ((float)ScreenHeight / 480.0f) + 0.5f);
+}
+
+inline float XPROJECT(const float x) {
+	return (float)(1.0f + x) * ScreenWidth * 0.5f;
+}
+
+inline float YPROJECT(const float y) {
+	return (float)(1.0f - y) * ScreenHeight * 0.5f;
+}
+
+inline int GetScreenInfo(SCREENINFO_s * psScreenInfo) {
+	return gEngfuncs.pfnGetScreenInfo(psScreenInfo);
+}
+
+inline int ServerCmd(const char* pszCmdString) {
+	return gEngfuncs.pfnServerCmd(pszCmdString);
+}
+
+inline int ClientCmd(const char* pszCmdString) {
+	return gEngfuncs.pfnClientCmd(pszCmdString);
+}
+
+inline void SetCrosshair(const HLSPRITE hSprite, const Rect rt, const int r, const int g, const int b) {
+	gEngfuncs.pfnSetCrosshair(hSprite, rt, r, g, b);
+}
+
 // Gets the height & width of a sprite,  at the specified frame
 inline int SPR_Height(HLSPRITE x, int f) { return gEngfuncs.pfnSPR_Height(x, f); }
 inline int SPR_Width(HLSPRITE x, int f) { return gEngfuncs.pfnSPR_Width(x, f); }
@@ -153,8 +220,12 @@ inline void CenterPrint(const char *string)
 	gEngfuncs.pfnCenterPrint(string);
 }
 
-// returns the players name of entity no.
-#define GetPlayerInfo (*gEngfuncs.pfnGetPlayerInfo)
+inline void GetPlayerInfo(const int enum_num, hud_player_info_s* pInfo ) {
+	gEngfuncs.pfnGetPlayerInfo(enum_num, pInfo);
+}
+
+// returnsthe players name of entity no.
+//#define GetPlayerInfo (*gEngfuncs.pfnGetPlayerInfo)
 
 // sound functions
 inline void PlaySound(const char *szSound, float vol) { gEngfuncs.pfnPlaySoundByName(szSound, vol); }

From d1c70ace2df7d840c4dd241722b67039ba802c79 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Wed, 11 Mar 2026 08:32:40 -0400
Subject: [PATCH 088/291] changed some var to constexpr

---
 src/game/client/death.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/game/client/death.cpp b/src/game/client/death.cpp
index 98e45ae1..5437ddb6 100644
--- a/src/game/client/death.cpp
+++ b/src/game/client/death.cpp
@@ -39,17 +39,16 @@ struct DeathNoticeItem
 	float *VictimColor;
 };
 
-#define MAX_DEATHNOTICES 4
+constexpr int MAX_DEATHNOTICES = 4;
 static int DEATHNOTICE_DISPLAY_TIME = 6;
-
-#define DEATHNOTICE_TOP 20
+constexpr int DEATHNOTICE_TOP = 20;
 
 DeathNoticeItem rgDeathNoticeList[MAX_DEATHNOTICES + 1];
 
-float g_ColorBlue[3] = {0.6, 0.8, 1.0};
-float g_ColorRed[3] = {1.0, 0.25, 0.25};
-float g_ColorGreen[3] = {0.6, 1.0, 0.6};
-float g_ColorYellow[3] = {1.0, 0.7, 0.0};
+constexpr float g_ColorBlue[3] = {0.6, 0.8, 1.0};
+constexpr float g_ColorRed[3] = {1.0, 0.25, 0.25};
+constexpr float g_ColorGreen[3] = {0.6, 1.0, 0.6};
+constexpr float g_ColorYellow[3] = {1.0, 0.7, 0.0};
 
 float *GetClientColor(int clientIndex)
 {

From c740a1caafe3b65b24efc05f296bed64dab94a67 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Wed, 11 Mar 2026 17:07:46 -0400
Subject: [PATCH 089/291] removed unneeded define. change some defines to
 constexpr

---
 src/game/client/cdll_int.cpp         |  2 +-
 src/game/client/cl_util.h            |  7 -------
 src/game/client/entity.cpp           | 17 ++++++++++-------
 src/game/client/hud_spectator.cpp    | 14 +++++++-------
 src/game/client/hud_spectator.h      | 22 ++++++++++++----------
 src/game/client/view.cpp             |  2 +-
 src/game/shared/hl/vector.h          |  6 ++++++
 src/game/shared/movement/pm_shared.h | 16 +++++++++-------
 src/game/shared/ms/sharedutil.cpp    |  3 +--
 src/game/shared/ms/sharedutil.h      | 14 +++++++++-----
 10 files changed, 56 insertions(+), 47 deletions(-)

diff --git a/src/game/client/cdll_int.cpp b/src/game/client/cdll_int.cpp
index cef6d494..208d3a43 100644
--- a/src/game/client/cdll_int.cpp
+++ b/src/game/client/cdll_int.cpp
@@ -499,7 +499,7 @@ void DLLEXPORT HUD_ChatInputPosition(int* x, int* y)
 {
 	if (g_iUser1 != 0 || gEngfuncs.IsSpectateOnly())
 	{
-		if (gHUD.m_Spectator.m_pip->value == INSET_OFF)
+		if ((int)gHUD.m_Spectator.m_pip->value == INSET_OFF)
 		{
 			*y = YRES(64);
 		}
diff --git a/src/game/client/cl_util.h b/src/game/client/cl_util.h
index 7f56c12a..3c0f72b1 100644
--- a/src/game/client/cl_util.h
+++ b/src/game/client/cl_util.h
@@ -234,13 +234,6 @@ inline void PlayHUDSound(const char *Sound, float vol) { PlaySound((char *)Sound
 
 void ScaleColors(int &r, int &g, int &b, int a);
 
-template <typename Type>
-float DotProduct(Type* x, Type* y) {
-	return (x[0] * y[0]) + (x[1] * y[1]) + (x[2] + y[2]);
-};
-
-//#define DotProduct(x, y) ((x)[0] * (y)[0] + (x)[1] * (y)[1] + (x)[2] * (y)[2])
-
 // ugh, some bits of the client code expect a float[3] while others expect a Vector, and there's a macro that pretends they're the same
 // handle the extern with the correct types in the places where it's required
 // extern vec3_t vec3_origin;
diff --git a/src/game/client/entity.cpp b/src/game/client/entity.cpp
index a837a885..0fbcf60d 100644
--- a/src/game/client/entity.cpp
+++ b/src/game/client/entity.cpp
@@ -31,7 +31,7 @@
 
 #undef DLLEXPORT //Master Sword
 #define DLLEXPORT EXPORT
-#define MAX_TEMPENT_EXTRA 4096
+constexpr int MAX_TEMPENT_EXTRA = 4096;
 
 void Game_AddObjects(void);
 void SetClEntityProp(cl_entity_t &Ent, msstring &Cmd, mslist<msstring *> &ValueParams);
@@ -108,7 +108,7 @@ int DLLEXPORT HUD_AddEntity(int type, struct cl_entity_s *ent, const char *model
 	{
 		gHUD.m_Spectator.AddOverviewEntity(type, ent, modelname);
 
-		if ((g_iUser1 == OBS_IN_EYE || gHUD.m_Spectator.m_pip->value == INSET_IN_EYE) &&
+		if ((g_iUser1 == OBS_IN_EYE || (int)gHUD.m_Spectator.m_pip->value == INSET_IN_EYE) &&
 			ent->index == g_iUser2)
 			return 0; // don't draw the player we are following in eye
 	}
@@ -544,10 +544,13 @@ void DLLEXPORT HUD_CreateEntities(void)
 //Put here because all the cool headers are already defined here
 TEMPENTITY *g_CurrentTempEnt = NULL;
 cl_entity_t *g_CurrentEnt = NULL;
-#define MSTEMPENT_ID (1 << 0)
-#define MSTEMPENT_CALLBACK (1 << 1)
-#define MSTEMPENT_GRAVITY (1 << 2)
-#define MSTEMPENT_FOLLOWENT (1 << 3)
+
+enum {
+	MSTEMPENT_ID = (1 << 0),
+	MSTEMPENT_CALLBACK = (1 << 1),
+	MSTEMPENT_GRAVITY = (1 << 2),
+	MSTEMPENT_FOLLOWENT = (1 << 3)
+};
 
 void TempEntCallback(struct tempent_s *ent, float frametime, float currenttime)
 {
@@ -555,7 +558,7 @@ void TempEntCallback(struct tempent_s *ent, float frametime, float currenttime)
 		return;
 
 	g_CurrentTempEnt = ent;
-	HUDScript->Effects_UpdateTempEnt(STRING(ent->entity.curstate.iuser3));
+	gHUD.m_HUDScript->Effects_UpdateTempEnt(STRING(ent->entity.curstate.iuser3));
 	g_CurrentTempEnt = nullptr;
 }
 
diff --git a/src/game/client/hud_spectator.cpp b/src/game/client/hud_spectator.cpp
index c6f07553..5a613310 100644
--- a/src/game/client/hud_spectator.cpp
+++ b/src/game/client/hud_spectator.cpp
@@ -433,7 +433,7 @@ int CHudSpectator::Draw(float flTime)
 			continue;
 
 		// check if name would be in inset window
-		if (m_pip->value != INSET_OFF)
+		if ((int)m_pip->value != INSET_OFF)
 		{
 			if (m_vPlayerPos[i][0] > XRES(m_OverviewData.insetWindowX) &&
 				m_vPlayerPos[i][1] > YRES(m_OverviewData.insetWindowY) &&
@@ -1307,11 +1307,11 @@ void CHudSpectator::DrawOverviewEntities()
 
 	// get current camera position and angle
 
-	if (m_pip->value == INSET_IN_EYE || g_iUser1 == OBS_IN_EYE)
+	if ((int)m_pip->value == INSET_IN_EYE || g_iUser1 == OBS_IN_EYE)
 	{
 		V_GetInEyePos(g_iUser2, origin, angles);
 	}
-	else if (m_pip->value == INSET_CHASE_FREE || g_iUser1 == OBS_CHASE_FREE)
+	else if ((int)m_pip->value == INSET_CHASE_FREE || g_iUser1 == OBS_CHASE_FREE)
 	{
 		V_GetChasePos(g_iUser2, v_cl_angles, origin, angles);
 	}
@@ -1373,7 +1373,7 @@ void CHudSpectator::DrawOverview()
 	if (m_iDrawCycle == 0 && ((g_iUser1 != OBS_MAP_FREE) && (g_iUser1 != OBS_MAP_CHASE)))
 		return;
 
-	if (m_iDrawCycle == 1 && m_pip->value < INSET_MAP_FREE)
+	if (m_iDrawCycle == 1 && m_pip->value < (float)INSET_MAP_FREE)
 		return;
 
 	DrawOverviewLayer();
@@ -1465,13 +1465,13 @@ void CHudSpectator::CheckSettings()
 
 	m_pip->value = (int)m_pip->value;
 
-	if ((g_iUser1 < OBS_MAP_FREE) && (m_pip->value == INSET_CHASE_FREE || m_pip->value == INSET_IN_EYE))
+	if ((g_iUser1 < OBS_MAP_FREE) && ((int)m_pip->value == INSET_CHASE_FREE || (int)m_pip->value == INSET_IN_EYE))
 	{
 		// otherwise both would show in World picures
 		m_pip->value = INSET_MAP_FREE;
 	}
 
-	if ((g_iUser1 >= OBS_MAP_FREE) && (m_pip->value >= INSET_MAP_FREE))
+	if ((g_iUser1 >= OBS_MAP_FREE) && ((int)m_pip->value >= INSET_MAP_FREE))
 	{
 		// both would show map views
 		m_pip->value = INSET_CHASE_FREE;
@@ -1520,7 +1520,7 @@ void CHudSpectator::CheckSettings()
 		m_pip->value = INSET_OFF;
 
 	// draw small border around inset view, adjust upper black bar
-	gViewPort->m_pSpectatorPanel->EnableInsetView(m_pip->value != INSET_OFF);
+	gViewPort->m_pSpectatorPanel->EnableInsetView((int)m_pip->value != INSET_OFF);
 }
 
 int CHudSpectator::ToggleInset(bool allowOff)
diff --git a/src/game/client/hud_spectator.h b/src/game/client/hud_spectator.h
index 0fc474f6..2e820383 100644
--- a/src/game/client/hud_spectator.h
+++ b/src/game/client/hud_spectator.h
@@ -11,18 +11,20 @@
 
 #include "cl_entity.h"
 
-#define INSET_OFF 0
-#define INSET_CHASE_FREE 1
-#define INSET_IN_EYE 2
-#define INSET_MAP_FREE 3
-#define INSET_MAP_CHASE 4
+enum {
+	INSET_OFF = 0,
+	INSET_CHASE_FREE = 1,
+	INSET_IN_EYE = 2,
+	INSET_MAP_FREE = 3,
+	INSET_MAP_CHASE = 4
+};
 
-#define MAX_SPEC_HUD_MESSAGES 8
+constexpr int MAX_SPEC_HUD_MESSAGES = 8;
 
-#define OVERVIEW_TILE_SIZE 128 // don't change this
-#define OVERVIEW_MAX_LAYERS 1
+constexpr int OVERVIEW_TILE_SIZE = 128; // don't change this
+constexpr int OVERVIEW_MAX_LAYERS = 1;
 
-//-----------------------------------------------------------------------------
+;//-----------------------------------------------------------------------------
 // Purpose: Handles the drawing of the spectator stuff (camera & top-down map and all the things on it )
 //-----------------------------------------------------------------------------
 
@@ -50,7 +52,7 @@ typedef struct overviewEntity_s
 	double killTime;
 } overviewEntity_t;
 
-#define MAX_OVERVIEW_ENTITIES 128
+constexpr int MAX_OVERVIEW_ENTITIES = 128;
 
 class CHudSpectator : public CHudBase
 {
diff --git a/src/game/client/view.cpp b/src/game/client/view.cpp
index 1d7dc7af..346026f7 100644
--- a/src/game/client/view.cpp
+++ b/src/game/client/view.cpp
@@ -1498,7 +1498,7 @@ void V_CalcSpectatorRefdef(struct ref_params_s *pparams)
 	VectorCopy(pparams->viewangles, v_angles);
 	VectorCopy(pparams->vieworg, v_origin);
 
-	if ((g_iUser1 == OBS_IN_EYE || gHUD.m_Spectator.m_pip->value == INSET_IN_EYE) && ent)
+	if ((g_iUser1 == OBS_IN_EYE || (int)gHUD.m_Spectator.m_pip->value == INSET_IN_EYE) && ent)
 	{
 		// calculate player velocity
 		float timeDiff = ent->curstate.msg_time - ent->prevstate.msg_time;
diff --git a/src/game/shared/hl/vector.h b/src/game/shared/hl/vector.h
index 31cc3efc..f44d1e63 100644
--- a/src/game/shared/hl/vector.h
+++ b/src/game/shared/hl/vector.h
@@ -134,6 +134,12 @@ class Vector // same data-layout as engine's vec3_t,
 
 inline Vector operator*(float fl, const Vector& v) { return v * fl; }
 inline float DotProduct(const Vector &a, const Vector &b) { return (a.x * b.x + a.y * b.y + a.z * b.z); }
+
+//template <typename Type1, typename Type2>
+//inline float DotProduct(const Type1* x, const Type2* y) {
+	//return (x[0] * y[0]) + (x[1] * y[1]) + (x[2] + y[2]);
+//};
+
 inline Vector CrossProduct(const Vector &a, const Vector &b) { return Vector(a.y * b.z - a.z * b.y, a.z * b.x - a.x * b.z, a.x * b.y - a.y * b.x); }
 
 #define vec3_t Vector // temporary until we change all the files to use Vector.
diff --git a/src/game/shared/movement/pm_shared.h b/src/game/shared/movement/pm_shared.h
index 4f184f89..abc5e749 100644
--- a/src/game/shared/movement/pm_shared.h
+++ b/src/game/shared/movement/pm_shared.h
@@ -32,13 +32,15 @@ bool PM_GetHullBounds(int hullnumber, float* mins, float* maxs);
 char* memfgets(const byte* pMemFile, std::size_t fileSize, std::size_t& filePos, char* pBuffer, std::size_t bufferSize);
 
 // Spectator Movement modes (stored in pev->iuser1, so the physics code can get at them)
-#define OBS_NONE 0
-#define OBS_CHASE_LOCKED 1
-#define OBS_CHASE_FREE 2
-#define OBS_ROAMING 3
-#define OBS_IN_EYE 4
-#define OBS_MAP_FREE 5
-#define OBS_MAP_CHASE 6
+enum {
+	OBS_NONE = 0,
+	OBS_CHASE_LOCKED = 1,
+	OBS_CHASE_FREE = 2,
+	OBS_ROAMING = 3,
+	OBS_IN_EYE = 4,
+	OBS_MAP_FREE = 5,
+	OBS_MAP_CHASE = 6
+};
 
 inline bool g_CheckForPlayerStuck = false;
 
diff --git a/src/game/shared/ms/sharedutil.cpp b/src/game/shared/ms/sharedutil.cpp
index 1576b1f0..30e44c50 100644
--- a/src/game/shared/ms/sharedutil.cpp
+++ b/src/game/shared/ms/sharedutil.cpp
@@ -14,7 +14,6 @@ extern CBasePlayer player;
 #endif
 
 CBaseEntity *MSInstance(edict_t *pent);
-
 #define ENT_FORMAT ENT_PREFIX "(%i,%u)"
 msstring EntToString(class CBaseEntity *pEntity)
 {
@@ -45,7 +44,7 @@ CBaseEntity *StringToEnt(const char* EntString)
 	int Idx = -1;
 	unsigned int Addr = ~0;
 
-	if (sscanf(EntString, ENT_FORMAT, &Idx, &Addr) < 2)
+	if (sscanf(EntString, ENT_FORMAT, &Idx, &Addr) <  2)
 		return NULL;
 
 	CBaseEntity *pEntity = MSInstance(INDEXENT(Idx));
diff --git a/src/game/shared/ms/sharedutil.h b/src/game/shared/ms/sharedutil.h
index 87fde9be..79160e37 100644
--- a/src/game/shared/ms/sharedutil.h
+++ b/src/game/shared/ms/sharedutil.h
@@ -72,6 +72,14 @@ void WRITE_FLOAT( float Float );
 char *GetFullResourceName(const char* PartialName );	//Adds models/ or sprites/ to a model or sprite filename
 void dbgtxt(const char* Text );
 
+enum {
+	ERRORPRINT_LOG      = (1 << 0),
+	ERRORPRINT_CONSOLE  = (1 << 1),
+	ERRORPRINT_INFOMSG  = (1 << 2),
+	ERRORPRINT_CVAR     = (1 << 3),
+	ERRORPRINT_POPUP    = (1 << 4)
+};
+
 #ifdef CONST_H
 	//Data used in the client item delta comparison
 #pragma pack( push, 1 )
@@ -90,11 +98,7 @@ void dbgtxt(const char* Text );
 #pragma pack( pop )
 #endif
 
-#define ERRORPRINT_LOG      (1 << 0)
-#define ERRORPRINT_CONSOLE  (1 << 1)
-#define ERRORPRINT_INFOMSG  (1 << 2)
-#define ERRORPRINT_CVAR     (1 << 3)
-#define ERRORPRINT_POPUP    (1 << 4)
+	
 void ErrorPrint(msstring vsUnqeTag, int vFlags, const char *szFmt, ...);
 
 #endif // SHAREDUTIL_H

From 997c799a44bfc5051dcf013b177ff248a05cd381 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 12 Mar 2026 00:00:08 -0400
Subject: [PATCH 090/291] Changed iscrript RETURN Macros to functions. Fixed
 missing typedef in vector include for all builds

---
 src/game/client/entity.cpp             | 190 +++++++++++--------
 src/game/server/monsters/npcscript.cpp |  10 +-
 src/game/shared/hl/vector.h            |   8 +
 src/game/shared/movement/pm_shared.cpp |  16 +-
 src/game/shared/ms/iscript.h           | 175 +++++++++++++++--
 src/game/shared/ms/script.cpp          | 251 +++++++++++++------------
 src/game/shared/ms/script.h            |   7 +
 src/game/shared/ms/scriptcmds.cpp      | 203 ++++++++++----------
 src/game/shared/ms/sharedutil.cpp      |   9 -
 9 files changed, 537 insertions(+), 332 deletions(-)

diff --git a/src/game/client/entity.cpp b/src/game/client/entity.cpp
index 0fbcf60d..f9b03ba6 100644
--- a/src/game/client/entity.cpp
+++ b/src/game/client/entity.cpp
@@ -609,14 +609,14 @@ void CHudScript::Effects_UpdateTempEnt(const char* EventName, msstringlist *Para
 const char* CScript::CLGetCurrentTempEntProp(msstring &Prop)
 {
 	if (!g_CurrentTempEnt)
-		RETURN_NOTHING;
+		return RETURN_NOTHING();
 	TEMPENTITY *p = g_CurrentTempEnt;
 
 	static msstring Return;
 	if (Prop == "deathtime")
-		RETURN_FLOAT(p->die)
+		return RETURN_FLOAT( p->die);
 	else if (Prop == "bouncefactor")
-		RETURN_FLOAT(p->bounceFactor)
+		return RETURN_FLOAT( p->bounceFactor);
 	else
 	{
 		static msstringlist Params;
@@ -626,9 +626,42 @@ const char* CScript::CLGetCurrentTempEntProp(msstring &Prop)
 		return CLGetEntProp(&p->entity, Params);
 	}
 
-	RETURN_NOTHING;
+	return RETURN_NOTHING();
 }
 
+const char* RETURN_COLOR(const char* Prop, const char* name, const color24& color) {
+
+	if (Prop == name)
+	{
+		Vector vTemp = Vector(color.r, color.g, color.b);
+		return VecToString(vTemp);
+	}
+
+	msstring NameExt;
+	NameExt = name;
+	NameExt += ".r";
+
+
+	if (Prop == NameExt)
+		return RETURN_INT(color.r);
+
+	NameExt = name;
+	NameExt += ".g";
+
+
+	if (Prop == NameExt)
+		return RETURN_INT(color.g);
+
+	NameExt = name;
+	NameExt += ".b";
+
+	if (Prop == NameExt)
+		return RETURN_INT(color.b);
+
+	return RETURN_NOTHING();
+
+}
+/*
 #define RETURN_COLOR(name, color)                             \
 	{                                                         \
 		if (Prop == name)                                     \
@@ -637,13 +670,14 @@ const char* CScript::CLGetCurrentTempEntProp(msstring &Prop)
 			return (Return = VecToString(vTemp));             \
 		}                                                     \
 		else if (Prop == name ".r")                           \
-			RETURN_INT(color.r)                             \
+			return RETURN_INT(color.r);                               \
 		else if (Prop == name ".g")                           \
-			RETURN_INT(color.g)                             \
+			return RETURN_INT(color.g);                            \
 		else if (Prop == name ".b")                           \
-			RETURN_INT(color.b)                             \
+			return RETURN_INT(color.b);                             \
 	}
 
+*/
 //[begin] DEC2014_09 Thothie - beam_update
 //$getcl_beam(<idx|all>,<property>)
 const char* CScript::CLGetBeamProp(int beamid, msstringlist &Params)
@@ -676,35 +710,35 @@ const char* CScript::CLGetBeamProp(int beamid, msstringlist &Params)
 		else if (Prop == "delta")
 			beamret = VecToString(pBeam->delta);
 		else if (Prop == "width")
-			beamret = FloatToString(pBeam->width);
+			beamret = UTIL_VarArgs("%.2f", pBeam->width);
 		else if (Prop == "amplitude")
-			beamret = FloatToString(pBeam->amplitude);
+			beamret = UTIL_VarArgs("%.2f", pBeam->amplitude);
 		else if (Prop == "color")
 		{
 			beamret = UTIL_VarArgs("(%f,%f,%f)", pBeam->r, pBeam->g, pBeam->b);
 		}
 		else if (Prop == "brightness")
-			beamret = FloatToString(pBeam->brightness);
+			beamret = UTIL_VarArgs("%.2f", pBeam->brightness);
 		else if (Prop == "speed")
-			beamret = FloatToString(pBeam->speed);
+			beamret = UTIL_VarArgs("%.2f", pBeam->speed);
 		else if (Prop == "life")
-			beamret = FloatToString(pBeam->die);
+			beamret = UTIL_VarArgs("%.2f", pBeam->die);
 		else if (Prop == "segments")
-			beamret = IntToString(pBeam->segments);
+			beamret = UTIL_VarArgs("%i", pBeam->segments);
 		else if (Prop == "framerate")
-			beamret = FloatToString(pBeam->frameRate);
+			beamret = UTIL_VarArgs("%.2f", pBeam->frameRate);
 		else if (Prop == "framecount")
-			beamret = IntToString(pBeam->frameCount);
+			beamret = UTIL_VarArgs("%i", pBeam->frameCount);
 		else if (Prop == "sprite")
-			beamret = IntToString(pBeam->modelIndex);
+			beamret = UTIL_VarArgs("%i", pBeam->modelIndex);
 		else if (Prop == "startent")
-			beamret = IntToString(pBeam->startEntity);
+			beamret = UTIL_VarArgs("%i", pBeam->startEntity);
 		else if (Prop == "endent")
-			beamret = IntToString(pBeam->endEntity);
+			beamret = UTIL_VarArgs("%i", pBeam->endEntity);
 		else if (Prop == "flags")
-			beamret = IntToString(pBeam->flags);
+			beamret = UTIL_VarArgs("%i", pBeam->flags);
 		else if (Prop == "t")
-			beamret = FloatToString(pBeam->t);
+			beamret = UTIL_VarArgs("%.2f", pBeam->t);
 		return beamret;
 	}
 	else
@@ -717,21 +751,21 @@ const char* CScript::CLGetBeamProp(int beamid, msstringlist &Params)
 const char* CScript::CLGetEntProp(cl_entity_t *pclEntity, msstringlist &Params)
 {
 	if (!pclEntity)
-		RETURN_NOTHING;
+		return RETURN_NOTHING();
 	cl_entity_t &ent = *pclEntity;
 	static msstring Return;
 	msstring &Prop = Params[1];
 	if (Prop.starts_with("origin"))
-		RETURN_POSITION("origin", ent.origin)
+		return RETURN_POSITION( Prop, "origin", ent.origin);
 	else if (Prop.starts_with("center"))
 	{
 		Vector vecCenter = ent.curstate.origin + ((ent.curstate.mins + ent.curstate.maxs) * 0.5);
-		RETURN_POSITION("center", vecCenter)
+		return RETURN_POSITION( Prop, "center", vecCenter);
 	}
 	else if (Prop.starts_with("angles"))
-		RETURN_ANGLE("angles", ent.angles)
+		return RETURN_ANGLE( Prop, "angles", ent.angles);
 	else if (Prop.starts_with("velocity"))
-		RETURN_POSITION("velocity", ent.baseline.vuser1) //can't use baseline.origin - it's used by networked ents
+		return RETURN_POSITION( Prop, "velocity", ent.baseline.vuser1); //can't use baseline.origin - it's used by networked ents
 	else if (Prop.starts_with("inwater"))
 		return EngineFunc::Shared_PointContents(Vector(ent.origin.x, ent.origin.y, ent.origin.z + ent.curstate.mins.z)) == CONTENTS_WATER ? "1" : "0";
 	else if (Prop.starts_with("underwater"))
@@ -743,7 +777,7 @@ const char* CScript::CLGetEntProp(cl_entity_t *pclEntity, msstringlist &Params)
 		{
 			Origin.x = ent.origin.x;
 			Origin.y = ent.origin.y;
-			RETURN_POSITION("waterorigin", Origin)
+			return RETURN_POSITION( Prop, "waterorigin", Origin);
 		}
 	}
 	else if (Prop == "model")
@@ -763,106 +797,106 @@ const char* CScript::CLGetEntProp(cl_entity_t *pclEntity, msstringlist &Params)
 	//however you can store the time the tempent began on fuserX in the creation event
 	//then guess how far along the anim has gotten in that time based on the frame rate
 	/*
-	else if( Prop == "animtime" ) RETURN_FLOAT( ent.curstate.animtime ) //FEB2009_19 - experimenting
-	else if( Prop == "starttime" ) RETURN_FLOAT( ent.curstate.starttime ) //FEB2009_19 - experimenting
+	else if( Prop == "animtime" ) return RETURN_FLOAT( ent.curstate.animtime ); //FEB2009_19 - experimenting
+	else if( Prop == "starttime" ) return RETURN_FLOAT( ent.curstate.starttime ); //FEB2009_19 - experimenting
 	*/
 	else if (Prop == "ducking")
 		return FBitSet(player.pev->flags, FL_DUCKING) ? "1" : "0"; //Thothie JUN2010_25
 	else if (Prop == "modelidx")
-		RETURN_INT(ent.curstate.modelindex)
+		return RETURN_INT( ent.curstate.modelindex);
 	else if (Prop == "anim")
-		RETURN_INT(ent.curstate.sequence)
+		return RETURN_INT( ent.curstate.sequence);
 	else if (Prop == "height")
-		RETURN_FLOAT((ent.curstate.maxs.z) - (ent.curstate.mins.z)) //Thothie SEP2018_15 - return height/width for $getcl
+		return RETURN_FLOAT( (ent.curstate.maxs.z) - (ent.curstate.mins.z)); //Thothie SEP2018_15 - return height/width for $getcl
 	else if (Prop == "width")
-		RETURN_FLOAT((ent.curstate.maxs.x) - (ent.curstate.mins.x)) //Thothie SEP2018_15 - return height/width for $getcl
+		return RETURN_FLOAT( (ent.curstate.maxs.x) - (ent.curstate.mins.x)); //Thothie SEP2018_15 - return height/width for $getcl
 	else if (Prop == "mins")
-		RETURN_VECTOR(ent.curstate.mins)
+		return RETURN_VECTOR( ent.curstate.mins);
 	else if (Prop == "maxs")
-		RETURN_VECTOR(ent.curstate.maxs)
+		return RETURN_VECTOR( ent.curstate.maxs);
 	else if (Prop == "frame")
-		RETURN_FLOAT(ent.curstate.frame)
+		return RETURN_FLOAT( ent.curstate.frame);
 	else if (Prop == "framerate")
-		RETURN_FLOAT(ent.curstate.framerate)
+		return RETURN_FLOAT( ent.curstate.framerate);
 	else if (Prop == "exists")
 		return pclEntity->Exists() ? "1" : "0";
 	else if (Prop == "gravity")
-		RETURN_FLOAT(ent.curstate.gravity)
+		return	RETURN_FLOAT( ent.curstate.gravity);
 	else if (Prop == "scale")
-		RETURN_FLOAT(ent.curstate.scale)
+		return RETURN_FLOAT( ent.curstate.scale);
 	//NOV2014_16 dealing with the fact that MSC scripts can't hanle percision more than 2f
 	else if (Prop == "scaleHD")
-		RETURN_FLOAT(ent.curstate.scale * 1000)
+		return RETURN_FLOAT( ent.curstate.scale * 1000);
 	else if (Prop == "fuser1HD")
-		RETURN_FLOAT(ent.curstate.fuser1 * 1000)
+		return RETURN_FLOAT( ent.curstate.fuser1 * 1000);
 	else if (Prop == "renderfx")
-		RETURN_INT(ent.curstate.renderfx)
+		return RETURN_INT( ent.curstate.renderfx);
 	else if (Prop == "rendermode")
-		RETURN_INT(ent.curstate.rendermode)
+		return RETURN_INT( ent.curstate.rendermode);
 	else if (Prop == "renderamt")
-		RETURN_INT(ent.curstate.renderamt)
+		return RETURN_INT( ent.curstate.renderamt);
 	else if (Prop.starts_with("rendercolor"))
-		RETURN_COLOR("rendercolor", ent.curstate.rendercolor)
+		return RETURN_COLOR( Prop,"rendercolor", ent.curstate.rendercolor);
 	else if (Prop == "visible")
 		return FBitSet(ent.curstate.effects, EF_NODRAW) ? "0" : "1";
 	else if (Prop == "isplayer")
 		return ent.player ? "1" : "0";
 	else if (Prop.starts_with("attachment0"))
-		RETURN_POSITION("attachment0", ent.attachment[0])
+		return RETURN_POSITION( Prop, "attachment0", ent.attachment[0]);
 	else if (Prop.starts_with("attachment1"))
-		RETURN_POSITION("attachment1", ent.attachment[1])
+		return RETURN_POSITION( Prop, "attachment1", ent.attachment[1]);
 	else if (Prop.starts_with("attachment2"))
-		RETURN_POSITION("attachment2", ent.attachment[2])
+		return RETURN_POSITION( Prop, "attachment2", ent.attachment[2]);
 	else if (Prop.starts_with("attachment3"))
-		RETURN_POSITION("attachment3", ent.attachment[3])
+		return RETURN_POSITION( Prop, "attachment3", ent.attachment[3]);
 	else if (Prop == "iuser1")
-		RETURN_INT(ent.curstate.iuser1)
+		return RETURN_INT(ent.curstate.iuser1);
 	else if (Prop == "iuser2")
-		RETURN_INT(ent.curstate.iuser2)
+		return RETURN_INT(ent.curstate.iuser2);
 	else if (Prop == "iuser3")
-		RETURN_INT(ent.curstate.iuser3)
+		return RETURN_INT(ent.curstate.iuser3);
 	else if (Prop == "iuser4")
-		RETURN_INT(ent.curstate.iuser4)
+		return RETURN_INT(ent.curstate.iuser4);
 	else if (Prop == "fuser1")
-		RETURN_FLOAT(ent.curstate.fuser1)
+		return RETURN_FLOAT(ent.curstate.fuser1);
 	else if (Prop == "fuser2")
-		RETURN_FLOAT(ent.curstate.fuser2)
+		return RETURN_FLOAT(ent.curstate.fuser2);
 	else if (Prop == "fuser3")
-		RETURN_FLOAT(ent.curstate.fuser3)
+		return RETURN_FLOAT(ent.curstate.fuser3);
 	else if (Prop == "fuser4")
-		RETURN_FLOAT(ent.curstate.fuser4)
+		return RETURN_FLOAT(ent.curstate.fuser4);
 	else if (Prop == "prevstate.iuser1")
-		RETURN_INT(ent.prevstate.iuser1)
+		return RETURN_INT(ent.prevstate.iuser1);
 	else if (Prop == "prevstate.iuser2")
-		RETURN_INT(ent.prevstate.iuser2)
+		return RETURN_INT( ent.prevstate.iuser2);
 	else if (Prop == "prevstate.iuser3")
-		RETURN_INT(ent.prevstate.iuser3)
+		return RETURN_INT(ent.prevstate.iuser3);
 	else if (Prop == "prevstate.iuser4")
-		RETURN_INT(ent.prevstate.iuser4)
+		return RETURN_INT( ent.prevstate.iuser4);
 	else if (Prop == "prevstate.fuser1")
-		RETURN_FLOAT(ent.prevstate.fuser1)
+		return RETURN_FLOAT( ent.prevstate.fuser1);
 	else if (Prop == "prevstate.fuser2")
-		RETURN_FLOAT(ent.prevstate.fuser2)
+		return RETURN_FLOAT(ent.prevstate.fuser2);
 	else if (Prop == "prevstate.fuser3")
-		RETURN_FLOAT(ent.prevstate.fuser3)
+		return RETURN_FLOAT( ent.prevstate.fuser3);
 	else if (Prop == "prevstate.fuser4")
-		RETURN_FLOAT(ent.prevstate.fuser4)
+		return RETURN_FLOAT( ent.prevstate.fuser4);
 	else if (Prop == "baseline.iuser1")
-		RETURN_INT(ent.baseline.iuser1) //Baseline props are not overriden by
+		return RETURN_INT(ent.baseline.iuser1); //Baseline props are not overriden by;
 	else if (Prop == "baseline.iuser2")
-		RETURN_INT(ent.baseline.iuser2) //incoming server packets
+		return RETURN_INT(ent.baseline.iuser2); //incoming server packets;
 	else if (Prop == "baseline.iuser3")
-		RETURN_INT(ent.baseline.iuser3) //Stuff stored here is persistent
+		return RETURN_INT(ent.baseline.iuser3); //Stuff stored here is persistent;
 	else if (Prop == "baseline.iuser4")
-		RETURN_INT(ent.baseline.iuser4)
+		return RETURN_INT(ent.baseline.iuser4);
 	else if (Prop == "baseline.fuser1")
-		RETURN_FLOAT(ent.baseline.fuser1)
+		return RETURN_FLOAT( ent.baseline.fuser1);
 	else if (Prop == "baseline.fuser2")
-		RETURN_FLOAT(ent.baseline.fuser2)
+		return RETURN_FLOAT( ent.baseline.fuser2);
 	else if (Prop == "baseline.fuser3")
-		RETURN_FLOAT(ent.baseline.fuser3)
+		return RETURN_FLOAT( ent.baseline.fuser3);
 	else if (Prop == "baseline.fuser4")
-		RETURN_FLOAT(ent.baseline.fuser4)
+		return RETURN_FLOAT( ent.baseline.fuser4);
 	else if (Prop == "bonepos")
 	{
 		//Thothie (Comment Only) - We may want to move this up, as it is sometimes used every frame
@@ -870,33 +904,33 @@ const char* CScript::CLGetEntProp(cl_entity_t *pclEntity, msstringlist &Params)
 		//Vector Pos;
 		/*
 		if( !pclEntity->GetBonePos( atoi(Params[2]), Pos ) )
-			RETURN_ZERO;
+			return RETURN_ZERO();
 		*/
 
 		//AUG2013_25 Thothie - attempting to fix client side bonepos function
 		Vector Pos;
 		ent.GetBonePosVec(atoi(Params[2]), Pos); //GetBonePos is boolean, wtf?
 		//pclEntity->GetBonePosVec( atoi(Params[2]), Pos );
-		RETURN_VECTOR(Pos);
+		return RETURN_VECTOR( Pos);
 	}
 	else if (Prop.starts_with("bonecount"))
 	{
 		//AUG2013_25 - enabling getting bone count (be good to have this serverside too)
-		RETURN_INT(ent.GetBoneCount())
+		return RETURN_INT(ent.GetBoneCount());
 	}
 	else if (Prop.starts_with("viewangles"))
 	{
 		//MIB AUG2010_05
 		vec3_t viewangles;
 		gEngfuncs.GetViewAngles((float *)viewangles);
-		RETURN_ANGLE("viewangles", viewangles)
+		RETURN_ANGLE( Prop, "viewangles", viewangles);
 	}
 	/*
 	else if ( Prop.starts_with("eyepos") )
 	{
 		//Thoth APR2012_05 - attempting to return eye position (fail)
 		vec3_t eyepos = player.pev->view_ofs;
-		RETURN_ANGLE( "eyepos", eyepos )
+		return RETURN_ANGLE(Prop, "eyepos", eyepos );
 	}
 	*/
 
@@ -910,7 +944,7 @@ const char* CScript::CLGetEntProp(cl_entity_t *pclEntity, msstringlist &Params)
 		else if ( Prop == "race" ) return pPlayer->m_Race;
 	}
 	*/
-	RETURN_ZERO;
+	return RETURN_ZERO();
 }
 
 int CL_LoadModel(const char* RelativePathname, model_s **ppModel = NULL)
diff --git a/src/game/server/monsters/npcscript.cpp b/src/game/server/monsters/npcscript.cpp
index 74edd0bd..07644b1a 100644
--- a/src/game/server/monsters/npcscript.cpp
+++ b/src/game/server/monsters/npcscript.cpp
@@ -8,6 +8,8 @@
 #include "stats/races.h"
 #include "msitemdefs.h"
 
+
+
 // TODO: get rid of the macro for logging when we get rid of MSScript.
 #include "mslogger.h"
 
@@ -1908,13 +1910,13 @@ const char* CMSMonster::GetProp(CBaseEntity *pTarget, msstring &FullParams, msst
 	msstring &Prop = FullParams;
 
 	if (pMonster && Prop == "walkspeed")
-		RETURN_FLOAT(pMonster->WalkSpeed(true))
+		return RETURN_FLOAT(pMonster->WalkSpeed(true));
 	else if (pMonster && Prop == "runspeed")
-		RETURN_FLOAT(pMonster->RunSpeed(true))
+		return RETURN_FLOAT(pMonster->RunSpeed(true));
 	else if (pMonster && Prop == "movespeed")
-		RETURN_FLOAT(pMonster->m_flGroundSpeed) //Thothie MAR2008 - attempting to fix freeze_solid issues
+		return RETURN_FLOAT(pMonster->m_flGroundSpeed); //Thothie MAR2008 - attempting to fix freeze_solid issues
 	else if (pMonster && Prop == "framerate")
-		RETURN_FLOAT(pMonster->m_Framerate) //Thothie MAR2008 - attempting to fix freeze_solid issues
+		return RETURN_FLOAT(pMonster->m_Framerate); //Thothie MAR2008 - attempting to fix freeze_solid issues
 
 	return fSuccess ? "1" : CBaseEntity::GetProp(pTarget, FullParams, Params);
 }
diff --git a/src/game/shared/hl/vector.h b/src/game/shared/hl/vector.h
index f44d1e63..c5391252 100644
--- a/src/game/shared/hl/vector.h
+++ b/src/game/shared/hl/vector.h
@@ -12,9 +12,16 @@
 *   without written permission from Valve LLC.
 *
 ****/
+#ifndef vec_t
+typedef float vec_t;
+#endif
+
 #ifndef VECTOR_H
 #define VECTOR_H
 
+
+
+
 //=========================================================
 // 2DVector - used for many pathfinding and many other
 // operations that are treated as planar rather than 3d.
@@ -135,6 +142,7 @@ class Vector // same data-layout as engine's vec3_t,
 inline Vector operator*(float fl, const Vector& v) { return v * fl; }
 inline float DotProduct(const Vector &a, const Vector &b) { return (a.x * b.x + a.y * b.y + a.z * b.z); }
 
+
 //template <typename Type1, typename Type2>
 //inline float DotProduct(const Type1* x, const Type2* y) {
 	//return (x[0] * y[0]) + (x[1] * y[1]) + (x[2] + y[2]);
diff --git a/src/game/shared/movement/pm_shared.cpp b/src/game/shared/movement/pm_shared.cpp
index 012d9b94..9dcf45b3 100644
--- a/src/game/shared/movement/pm_shared.cpp
+++ b/src/game/shared/movement/pm_shared.cpp
@@ -40,6 +40,7 @@
 #include "hud.h"
 #include "cl_util.h"
 #include "ms/hudscript.h"
+
 void Player_DoJump();
 
 // Spectator Mode
@@ -178,6 +179,7 @@ static char grgchTextureType[CTEXTURESMAX];
 
 int g_onladder = 0;
 
+
 char* memfgets(const byte* pMemFile, std::size_t fileSize, std::size_t& filePos, char* pBuffer, std::size_t bufferSize)
 {
 	// Bullet-proofing
@@ -3612,17 +3614,17 @@ const char* PM_GetValue(msstringlist &Params)
 	msstring &Value = Params[2];
 
 	if (Name == "fallvelocity")
-		RETURN_FLOAT(pmove->flFallVelocity)
+		return RETURN_FLOAT(pmove->flFallVelocity);
 	else if (Name == "waterlevel")
-		RETURN_INT(pmove->waterlevel)
+		return RETURN_INT(pmove->waterlevel);
 	else if (Name == "oldwaterlevel")
-		RETURN_INT(pmove->oldwaterlevel)
+		return RETURN_INT(pmove->oldwaterlevel);
 	else if (Name == "origin")
-		RETURN_POSITION("origin", pmove->origin)
+		return RETURN_POSITION(Prop, "origin", pmove->origin);
 	else if (Name == "angles")
-		RETURN_ANGLE("angles", pmove->angles)
+		return RETURN_ANGLE(Prop, "angles", pmove->angles);
 	else if (Name == "velocity")
-		RETURN_ANGLE("velocity", pmove->velocity)
+		return RETURN_ANGLE(Prop, "velocity", pmove->velocity);
 
-	RETURN_NOTHING;
+	return RETURN_NOTHING();
 }
\ No newline at end of file
diff --git a/src/game/shared/ms/iscript.h b/src/game/shared/ms/iscript.h
index 95a3f600..1d0ce443 100644
--- a/src/game/shared/ms/iscript.h
+++ b/src/game/shared/ms/iscript.h
@@ -7,14 +7,20 @@
 class CScript;
 class CBaseEntity;
 #include <stdio.h>
+#include "sharedutil.h"
 #include "../../../public/archtypes.h"  // For ulong typedef
 
+#ifndef VECTOR_H
+#include "..\shared\hl\vector.h"
+#endif
+
 // Add Windows-specific ulong definition if not already defined
 #ifdef _WIN32
 #ifndef ulong
 typedef unsigned long ulong;
 #endif
-#endif
+#endif
+
 
 struct scriptvar_t
 {
@@ -216,59 +222,200 @@ struct scriptcmdbase_t
 
 //Definitions for functions like GetProp(), CLGetCurrentTempEntProp()
 //Returns different types of data as a string.  Requires static msstring Return
+
+/*
 #define RETURN_TRUE \
 	{               \
 		return "1"; \
 	}
+
+
 #define RETURN_FALSE \
 	{                \
 		return "0";  \
 	}
+
+
+*/
+
+constexpr const char* RETURN_NOTHING_STR = "-NA-";
+inline const char* RETURN_NOTHING() {
+	return RETURN_NOTHING_STR;
+}
+
+inline const char* RETURN_ZERO() {
+	return "0";
+}
+
+inline const char* RETURN_TRUE(){
+	return "1";
+}
+
+inline const char* RETURN_FALSE() {
+	return "0";
+}
+
+inline char * RETURN_FLOAT_PRECISION(const float &prfl) {
+	msstring Return;
+	_snprintf(Return, MSSTRING_SIZE, "%f", prfl); 
+	return Return;
+}
+
+inline char* RETURN_FLOAT(const float& fl) {
+	msstring Return;
+	_snprintf(Return, MSSTRING_SIZE, "%.2f", fl);
+	return Return;
+}
+
+inline char* RETURN_INT(const int& i) {
+	msstring Return;
+	_snprintf(Return, MSSTRING_SIZE, "%i", i);
+	return Return;
+}
+
+inline char* RETURN_VECTOR(const Vector vector){
+	msstring Return;
+	_snprintf(Return, MSSTRING_SIZE, "(%.2f,%.2f,%.2f)",vector.x, vector.y, vector.z);
+	return Return;
+}
+
+
+/*
 #define RETURN_FLOAT_PRECISION(a) \
 	{                             \
+
 		_snprintf(Return, MSSTRING_SIZE, "%f", a); \
 		return Return;            \
 	}
+
 #define RETURN_FLOAT(a)             \
 	{                               \
 		_snprintf(Return, MSSTRING_SIZE, "%.2f", a); \
 		return Return;              \
 	}
+
 #define RETURN_INT(a)             \
 	{                             \
 		_snprintf(Return, MSSTRING_SIZE, "%i", a); \
 		return Return;            \
 	}
+
+	
 #define RETURN_VECTOR(a)                                    \
 	{                                                       \
 		_snprintf(Return, MSSTRING_SIZE, "(%.2f,%.2f,%.2f)", a.x, a.y, a.z); \
 		return Return;                                      \
 	}
+	*/
+
+
+
+inline const char* VecToString(const Vector& Vec, bool bAs2D)
+{
+	msstring Return;
+	if (bAs2D)
+		_snprintf(Return, MSSTRING_SIZE, "(%.2f,%.2f)", Vec.x, Vec.y);
+	else
+		_snprintf(Return, MSSTRING_SIZE, "(%.2f,%.2f,%.2f)", Vec.x, Vec.y, Vec.z);
+	return Return;
+}
+
+
+inline const char* RETURN_POSITION(const char* Prop, const char * name, const Vector position, bool as2d = false) {
+
+	msstring NameExt;
+
+	if (Prop == name)	
+		return VecToString(position, as2d); 
+
+	NameExt = name;
+	NameExt += ".x";
+
+	if (Prop == NameExt) return RETURN_FLOAT(position.x);
+
+
+	NameExt = name;
+	NameExt += ".y";
+
+	if (Prop == NameExt) return RETURN_FLOAT(position.y);
+
+	NameExt = name;
+	NameExt += ".y";
+
+	if (Prop == NameExt) return RETURN_FLOAT(position.z);
+
+	return RETURN_NOTHING();
+
+}
+
+
+inline const char* RETURN_ANGLE(const char* Prop, const char* name, const Vector& angles, bool as2d = false) {
+
+	msstring NameExt;
+
+	if (Prop == name) {
+		return VecToString(angles, as2d);
+	}
+	
+
+	NameExt = name;
+	NameExt += ".pitch";
+
+
+	if (Prop == NameExt) {
+		return RETURN_FLOAT(angles.x);
+	}
+
+	NameExt = name;
+	NameExt += ".yaw";
+
+	if (Prop == NameExt) {
+		return RETURN_FLOAT(angles.y);
+	}
+
+	NameExt = name;
+	NameExt += ".roll";
+
+
+	if (Prop == NameExt) {
+		return RETURN_FLOAT(angles.z);
+	}
+
+	return RETURN_NOTHING();
+}
+
+
+
+
+
+
+/*
 #define RETURN_POSITION(name, position)              \
 	{                                                \
 		if (Prop == name)                            \
 			return (Return = VecToString(position)); \
 		else if (Prop == name ".x")                  \
-			RETURN_FLOAT(position.x)                 \
+			return RETURN_FLOAT(position.x);                \
 		else if (Prop == name ".y")                  \
-			RETURN_FLOAT(position.y)                 \
+			return RETURN_FLOAT(position.y);               \
 		else if (Prop == name ".z")                  \
-			RETURN_FLOAT(position.z)                 \
+			return RETURN_FLOAT(position.z);                \
 	}
+	
 #define RETURN_ANGLE(name, angles)                 \
 	{                                              \
 		if (Prop == name)                          \
 			return (Return = VecToString(angles)); \
 		else if (Prop == name ".pitch")            \
-			RETURN_FLOAT(angles.x)                 \
+			return RETURN_FLOAT(angles.x);             \
 		else if (Prop == name ".yaw")              \
-			RETURN_FLOAT(angles.y)                 \
+			return RETURN_FLOAT(angles.y);                 \
 		else if (Prop == name ".roll")             \
-			RETURN_FLOAT(angles.z)                 \
+			return RETURN_FLOAT(angles.z);                 \
 	}
-#define RETURN_NOTHING_STR "-NA-"
-#define RETURN_NOTHING return RETURN_NOTHING_STR
-#define RETURN_ZERO return "0"
+	*/
+
+
 
 // Legacy compatibility typedefs
 typedef LegacyScriptCmd scriptcmd_t;
@@ -278,9 +425,11 @@ typedef LegacyEventScope eventscope_e;
 
 // Legacy EVENTSCOPE macros - only define if not already defined by AngelScript headers
 #ifndef EVENTSCOPE_SERVER
-#define EVENTSCOPE_SERVER LEGACY_EVENTSCOPE_SERVER
-#define EVENTSCOPE_CLIENT LEGACY_EVENTSCOPE_CLIENT
-#define EVENTSCOPE_SHARED LEGACY_EVENTSCOPE_SHARED
+
+constexpr eventscope_e EVENTSCOPE_SERVER = LEGACY_EVENTSCOPE_SERVER;
+constexpr eventscope_e EVENTSCOPE_CLIENT = LEGACY_EVENTSCOPE_CLIENT;
+constexpr eventscope_e EVENTSCOPE_SHARED = LEGACY_EVENTSCOPE_SHARED;
+
 #endif
 
 #endif // MiB MAR2015_01 [LOCAL_PANEL] - Made this include-
diff --git a/src/game/shared/ms/script.cpp b/src/game/shared/ms/script.cpp
index 66623f91..0fff3a23 100644
--- a/src/game/shared/ms/script.cpp
+++ b/src/game/shared/ms/script.cpp
@@ -568,7 +568,7 @@ msstring CScript::ScriptGetter_Angles(msstring& FullName, msstring& ParserName,
 		float dx = End.x - Start.x;
 		float rang = atan2(dy, dx); //gets radians
 		float xang = rang * 57.295779; //back to degrees
-		RETURN_FLOAT(xang)
+		return RETURN_FLOAT(xang);
 	}
 	else return "0";
 }
@@ -590,7 +590,7 @@ msstring CScript::ScriptGetter_Angles3d(msstring& FullName, msstring& ParserName
 	//$angles3d(<viewer_origin>,<origin_to_face>) - returns angles required for a vector to face a location
 	//engine function fast, but not very accurate and doesn't work client side (returns normalized) - will need to flip pitch
 	out_vector = UTIL_VecToAngles((Start - End).Normalize());
-	RETURN_VECTOR(out_vector)
+	return RETURN_VECTOR(out_vector);
 		/*
 		//FAIL Thoth JAN2010_22 - steelin from the Quake source code so weez can do this client side
 		//- meh, think this is an entirely different function - maybe I can just vectormultiply the results of $dir(vec,vec) for same result?
@@ -674,10 +674,10 @@ msstring CScript::ScriptGetter_CanDamage(msstring& FullName, msstring& ParserNam
 
 		if (ThisEnt && ThatEnt)
 		{
-			RETURN_INT(ThisEnt->CanDamage(ThatEnt) ? 1 : 0)
+			return RETURN_INT(ThisEnt->CanDamage(ThatEnt) ? 1 : 0);
 		}
 	}
-	RETURN_INT(0)
+	return RETURN_INT(0);
 #endif
 		return FullName;
 }
@@ -760,12 +760,15 @@ msstring CScript::ScriptGetter_Cone(msstring& FullName, msstring& ParserName, ms
 
 		if (ParserName.starts_with("$within_cone"))
 		{
-			if (flDot >= ConeFOV) RETURN_TRUE
-			else RETURN_FALSE
+			if (flDot >= ConeFOV) 
+				return RETURN_TRUE();
+			else 
+				return RETURN_FALSE();
 		}
-		else RETURN_FLOAT(flDot);
+		else return RETURN_FLOAT(flDot);
 	}
-	else return "0";
+
+	return "0";
 }
 
 //$dir(<start origin>,<end origin>)
@@ -788,9 +791,10 @@ msstring CScript::ScriptGetter_Dir(msstring& FullName, msstring& ParserName, mss
 		Vector Start = StringToVec(Params[1]);
 		Vector End = StringToVec(Params[0]);
 		Vector Dir = (Start - End).Normalize();
-		RETURN_VECTOR(Dir);
+		return RETURN_VECTOR(Dir);
 	}
-	else return "0";
+
+	return "0";
 }
 
 //$dist(<start origin>,<end origin>)
@@ -811,7 +815,7 @@ msstring CScript::ScriptGetter_Dist(msstring& FullName, msstring& ParserName, ms
 		Vector Start = StringToVec(Params[0]);
 		Vector End = StringToVec(Params[1]);
 		float Dist = (ParserName == "$dist" ? (Start - End).Length() : (Start - End).Length2D());
-		RETURN_FLOAT(Dist);
+		return RETURN_FLOAT(Dist);
 	}
 	else
 		return "0";
@@ -892,7 +896,7 @@ msstring CScript::ScriptGetter_FileSize(msstring& FullName, msstring& ParserName
 			file.seekg(0, std::ios_base::end);
 			long fileSize = file.tellg();
 			file.close();
-			RETURN_INT(fileSize);
+			return RETURN_INT(fileSize);
 		}
 		else return "-1";
 	}
@@ -1328,17 +1332,17 @@ msstring CScript::ScriptGetter_GetArray(msstring& FullName, msstring& ParserName
 							break;
 						}
 						if (bFnd)
-							RETURN_INT(i);
+							return RETURN_INT(i);
 					}
 
-					RETURN_INT(-1);
+					return RETURN_INT(-1);
 				}
 				else
 					return "[ERROR_MISSING_PARAMS]";
 
 			}
 			else if (ParserName.ends_with("amt"))
-				RETURN_INT(pArray->size())
+				return RETURN_INT(pArray->size());
 	}
 	else
 		return "[ERROR_MISSING_PARAMS]";
@@ -1376,36 +1380,35 @@ msstring CScript::ScriptGetter_GetAttackProp(msstring& FullName, msstring& Parse
 		attackdata_t& AttData = pItem->m_Attacks[attackNum];
 		msstring& PropName = Params[2];
 
-		if (PropName == "type") return msstring(AttData.sDamageType.c_str());
-		else if (PropName == "numattacks") RETURN_INT(pItem->m_Attacks.size()) //Thothie OCT2016_22 get number of attacks
-		else if (PropName == "range") RETURN_FLOAT(AttData.flRange)
-		else if (PropName == "dmg") RETURN_FLOAT(AttData.flDamage)
-		else if (PropName == "dmg.range") RETURN_FLOAT(AttData.flDamageRange)
-		else if (PropName == "dmg.type") return msstring(AttData.sDamageType.c_str());
-		else if (PropName == "dmg.multi") RETURN_FLOAT(AttData.f1DmgMulti)
-		else if (PropName == "aoe.range") RETURN_FLOAT(AttData.flDamageAOERange)
-		else if (PropName == "aoe.falloff") RETURN_FLOAT(AttData.flDamageAOEAttn)
-		else if (PropName == "energydrain") RETURN_FLOAT(AttData.flEnergy)
-		else if (PropName == "mpdrain") RETURN_FLOAT(AttData.flMPDrain)
-			//else if( PropName == "stat" ) return STRING( AttData.
-		else if (PropName == "stat.prof") RETURN_INT(AttData.StatProf)
-		else if (PropName == "stat.balance") RETURN_INT(AttData.StatBalance)
-		else if (PropName == "stat.power") RETURN_INT(AttData.StatPower)
-		else if (PropName == "stat.exp") RETURN_INT(AttData.StatExp)
-		else if (PropName == "noise") RETURN_FLOAT(AttData.flNoise)
-		else if (PropName == "callback") return AttData.CallbackName;
-		else if (PropName == "ofs.startpos") return STRING(VecToString(AttData.StartOffset));
-		else if (PropName == "ofs.aimang") return STRING(VecToString(AttData.AimOffset));
-		else if (PropName == "priority") RETURN_INT(AttData.iPriority)
-		else if (PropName == "keys") return AttData.ComboKeys[0];
-		else if (PropName == "dmg.ignore") return AttData.NoDamage ? "1" : "0";
-		else if (PropName == "hitchance") RETURN_FLOAT(AttData.flAccuracyDefault)
-		else if (PropName == "critthreshold") RETURN_FLOAT(AttData.flCritThreshold)
-		else if (PropName == "critmulti") RETURN_FLOAT(AttData.flCritMulti) 
-		else if (PropName == "delay.end") RETURN_FLOAT(AttData.tDuration)
-		else if (PropName == "delay.strike") RETURN_FLOAT(AttData.tLandDelay)
-		else if (PropName == "dmg.noautoaim") return AttData.NoAutoAim ? "1" : "0";
-		else if (PropName == "ammodrain") RETURN_INT(AttData.iAmmoDrain)
+		if (PropName == "type")					return msstring(AttData.sDamageType.c_str());
+		else if (PropName == "numattacks")		return RETURN_INT(pItem->m_Attacks.size()); //Thothie OCT2016_22 get number of attacks;
+		else if (PropName == "range")			return RETURN_FLOAT(AttData.flRange);
+		else if (PropName == "dmg")				return RETURN_FLOAT(AttData.flDamage);
+		else if (PropName == "dmg.range")		return RETURN_FLOAT(AttData.flDamageRange);
+		else if (PropName == "dmg.type")		return msstring(AttData.sDamageType.c_str());
+		else if (PropName == "dmg.multi")		return RETURN_FLOAT(AttData.f1DmgMulti);
+		else if (PropName == "aoe.range")		return RETURN_FLOAT(AttData.flDamageAOERange);
+		else if (PropName == "aoe.falloff")		return RETURN_FLOAT(AttData.flDamageAOEAttn);
+		else if (PropName == "energydrain")		return RETURN_FLOAT(AttData.flEnergy);
+		else if (PropName == "mpdrain")			return RETURN_FLOAT(AttData.flMPDrain);
+		else if (PropName == "stat.prof")		return RETURN_INT(AttData.StatProf);
+		else if (PropName == "stat.balance")	return RETURN_INT(AttData.StatBalance);
+		else if (PropName == "stat.power")		return RETURN_INT(AttData.StatPower);
+		else if (PropName == "stat.exp")		return RETURN_INT(AttData.StatExp);
+		else if (PropName == "noise")			return RETURN_FLOAT(AttData.flNoise);
+		else if (PropName == "callback")		return AttData.CallbackName;
+		else if (PropName == "ofs.startpos")	return STRING(VecToString(AttData.StartOffset));
+		else if (PropName == "ofs.aimang")		return STRING(VecToString(AttData.AimOffset));
+		else if (PropName == "priority")		return RETURN_INT(AttData.iPriority);
+		else if (PropName == "keys")			return AttData.ComboKeys[0];
+		else if (PropName == "dmg.ignore")		return AttData.NoDamage ? "1" : "0";
+		else if (PropName == "hitchance")		return RETURN_FLOAT(AttData.flAccuracyDefault);
+		else if (PropName == "critthreshold")	return RETURN_FLOAT(AttData.flCritThreshold);
+		else if (PropName == "critmulti")		return RETURN_FLOAT(AttData.flCritMulti);
+		else if (PropName == "delay.end")		return RETURN_FLOAT(AttData.tDuration);
+		else if (PropName == "delay.strike")	return RETURN_FLOAT(AttData.tLandDelay);
+		else if (PropName == "dmg.noautoaim")	return AttData.NoAutoAim ? "1" : "0";
+		else if (PropName == "ammodrain")		return RETURN_INT(AttData.iAmmoDrain);
 		else if (PropName == "hold_min&max")
 		{
 			msstring Return;
@@ -1752,7 +1755,7 @@ msstring CScript::ScriptGetter_GetFindToken(msstring& FullName, msstring& Parser
 			else { if (Tokens[i].contains(TokenAdd)) iFoundAtPos = i; } //Thothie SEP2019_09 - partial searches
 		}
 
-		RETURN_INT(iFoundAtPos);
+		return RETURN_INT(iFoundAtPos);
 	}
 	else return "-1";
 }
@@ -1831,7 +1834,7 @@ msstring CScript::ScriptGetter_GetGroundHeight(msstring& FullName, msstring& Par
 		EngineFunc::Shared_TraceLine(StartOrigin, EndOrigin, ignore_monsters, Tr, 0, PM_GLASS_IGNORE | PM_WORLD_ONLY, NULL);
 
 		if (Tr.Fraction < 1.0)
-			RETURN_FLOAT(Tr.EndPos.z)
+			return RETURN_FLOAT(Tr.EndPos.z);
 			return "none";
 	}
 
@@ -1928,7 +1931,7 @@ msstring CScript::ScriptGetter_GetHashMap(
 				else
 					if (vsSubCmd == "get_hashmap_amt")
 					{
-						RETURN_INT(pHashMap->size());
+						return RETURN_INT(pHashMap->size());
 					}
 					else
 						if (vsSubCmd == "get_hashmap_keys"
@@ -2000,7 +2003,7 @@ msstring CScript::ScriptGetter_GetHashMap(
 									vsTokenReturn += vsToken;
 								}
 							}
-							if (pFirstArr) RETURN_INT(pFirstArr->size());
+							if (pFirstArr) return RETURN_INT(pFirstArr->size());
 							return vsTokenReturn;
 						}
 	}
@@ -2298,7 +2301,7 @@ msstring CScript::ScriptGetter_GetSet(msstring& FullName, msstring& ParserName,
 			else
 				if (vsSubCmd == "get_set_amt")
 				{
-					RETURN_INT(pSet->size());
+					return RETURN_INT(pSet->size());
 				}
 	}
 
@@ -2479,7 +2482,7 @@ msstring CScript::ScriptGetter_GetScriptFlag(msstring& FullName, msstring& Parse
 			//either type_value or type_count or type_array
 			if (!sf_array_values)
 			{
-				RETURN_FLOAT(sf_total_values)
+				return RETURN_FLOAT(sf_total_values);
 			}
 			else
 			{
@@ -2538,7 +2541,7 @@ msstring CScript::ScriptGetter_GetSkillRatio(msstring& FullName, msstring& Parse
 
 		float Range = Max - Min;
 		float Value = Min + Range * Ratio;
-		RETURN_FLOAT(Value)
+		return RETURN_FLOAT(Value);
 	}
 
 	return FullName;
@@ -2555,7 +2558,7 @@ msstring CScript::ScriptGetter_GetSkyHeight(msstring& FullName, msstring& Parser
 	{
 		float SkyHeight = 0;
 		bool FoundSky = FindSkyHeight(StringToVec(GetScriptVar(Params[0])), SkyHeight);
-		if (FoundSky) RETURN_FLOAT(SkyHeight);
+		if (FoundSky) return RETURN_FLOAT(SkyHeight);
 		return "none";
 	}
 
@@ -2578,13 +2581,13 @@ msstring CScript::ScriptGetter_GetTakeDmg(msstring& FullName, msstring& ParserNa
 	if (!pTarget) return "-1"; //FEB2009
 
 	msstring Return;
-	if (Params[1] == "all") RETURN_FLOAT(pTarget->m.GenericTDM); //MAR2010_03
+	if (Params[1] == "all") return RETURN_FLOAT(pTarget->m.GenericTDM); //MAR2010_03
 	for (unsigned int i = 0; i < pTarget->m.TakeDamageModifiers.size(); i++)
 	{
 		CMSMonster::takedamagemodifier_t& TDM = pTarget->m.TakeDamageModifiers[i];
 		msstring read_dmgtype = TDM.DamageType;
 		//Print("Reading_Takedmg %s\n", read_dmgtype.c_str() );
-		if (read_dmgtype.contains(Params[1]))	RETURN_FLOAT(TDM.modifier)
+		if (read_dmgtype.contains(Params[1]))	return RETURN_FLOAT(TDM.modifier);
 	}
 	return "1.0";
 #endif
@@ -2663,7 +2666,7 @@ msstring CScript::ScriptGetter_GetTokenAmt(msstring& FullName, msstring& ParserN
 
 		TokenizeString(Params[0], Tokens);
 
-		RETURN_INT(Tokens.size());
+		return RETURN_INT(Tokens.size());
 	}
 	else return "0";
 }
@@ -3185,7 +3188,7 @@ msstring CScript::ScriptGetter_Len(msstring& FullName, msstring& ParserName, mss
 	//priority: high, scope: shared
 	msstring Return;
 	if (Params.size() >= 1)
-		RETURN_INT(Params[0].len())
+		return RETURN_INT(Params[0].len());
 	else
 		return "0";
 }
@@ -3285,14 +3288,14 @@ msstring CScript::ScriptGetter_MathReturn(msstring& FullName, msstring& ParserNa
 			{
 				float num = atof(Params[1]);
 				num = sqrt(num);
-				RETURN_FLOAT(num);
+				return RETURN_FLOAT(num);
 			}
 		}
 		else if (Params[0] == "sin")
 		{
 			if (Params.size() > 1)
 			{
-				RETURN_FLOAT(sin(atof(Params[1])));
+				return RETURN_FLOAT(sin(atof(Params[1])));
 			}
 		}
 		MS_ERROR("ExecuteScriptCmd Script: %s, %s - not enough parameters!", m.ScriptFile.c_str(), ParserName.c_str());
@@ -3404,7 +3407,7 @@ msstring CScript::ScriptGetter_MathReturn(msstring& FullName, msstring& ParserNa
 		return "0";
 	}
 
-	RETURN_FLOAT(end_result);
+	return RETURN_FLOAT( end_result);
 }
 
 //$mid(<var>,<start>,[length])
@@ -3451,7 +3454,7 @@ msstring CScript::ScriptGetter_MinMax(msstring& FullName, msstring& ParserName,
 		bool max = ParserName == "$max";
 		for (unsigned int i = 0; i < Params.size(); i++)
 			best = max ? V_max(best, atof(Params[i].c_str())) : V_min(best, atof(Params[i].c_str()));
-		RETURN_FLOAT(best);
+		return RETURN_FLOAT( best);
 	}
 
 	return FullName;
@@ -3466,7 +3469,7 @@ msstring CScript::ScriptGetter_Neg(msstring& FullName, msstring& ParserName, mss
 	//priority: very high, scope: shared
 	msstring Return;
 	if (Params.size() >= 1)
-		RETURN_FLOAT((-atof(Params[0])))
+		return RETURN_FLOAT( (-atof(Params[0])));
 	else return "0";
 }
 
@@ -3548,9 +3551,9 @@ msstring CScript::ScriptGetter_Rand(msstring& FullName, msstring& ParserName, ms
 	//priority: very high, scope: shared
 	msstring Return;
 	if (ParserName.c_str()[5] == 'f') //float version
-		RETURN_FLOAT(RANDOM_FLOAT(atof(Params[0]), atof(Params[1])))
+		return RETURN_FLOAT(RANDOM_FLOAT(atof(Params[0]), atof(Params[1])));
 	else  //int version
-		RETURN_INT(RANDOM_LONG(atoi(Params[0]), atoi(Params[1])))
+		return RETURN_INT(RANDOM_LONG(atoi(Params[0]), atoi(Params[1])));
 }
 
 //$relpos(<vec_ofs>)
@@ -3588,7 +3591,7 @@ msstring CScript::ScriptGetter_RelPos(msstring& FullName, msstring& ParserName,
 		Vector vRelPos = GetRelativePos(Angle, vPosStr);
 		Vector vPos = StartPos + vRelPos;
 		//sprintf( cReturn, "(%.2f,%.2f,%.2f)", Pos.x, Pos.y, Pos.z );
-		RETURN_VECTOR(vPos)
+		return RETURN_VECTOR(vPos);
 	}
 	else return "0";
 }
@@ -3623,7 +3626,7 @@ msstring CScript::ScriptGetter_RelVel(msstring& FullName, msstring& ParserName,
 
 		Vector Final = vRight * RelVel.x + vForward * RelVel.y + vUp * RelVel.z;
 
-		RETURN_VECTOR(Final)
+		return RETURN_VECTOR(Final);
 	}
 	else return "0";
 }
@@ -3954,7 +3957,7 @@ msstring CScript::ScriptGetter_ScanShape(msstring& FullName, msstring& ParserNam
 			}
 			if (pArray)
 			{
-				RETURN_INT(vNumFound);
+				return RETURN_INT(vNumFound);
 			}
 			else
 			{
@@ -3984,7 +3987,7 @@ msstring CScript::ScriptGetter_SearchString(msstring& FullName, msstring& Parser
 	if (Params.size() >= 2)
 	{
 		int start = Params.size() >= 3 ? atoi(Params[2]) : 0;
-		RETURN_INT(Params[0].find(Params[1], start))
+		return RETURN_INT(Params[0].find(Params[1], start));
 	}
 	else
 		return "0";
@@ -4066,7 +4069,7 @@ msstring CScript::ScriptGetter_SortEntList(msstring& FullName, msstring& ParserN
 		return SortedList;
 	}
 	else
-		RETURN_INT(-1);
+		return RETURN_INT(-1);
 }
 
 //$stradd(<string...>,<string...>,<string...>)
@@ -4217,9 +4220,9 @@ msstring CScript::ScriptGetter_Vec(msstring& FullName, msstring& ParserName, mss
 		if (Params.size() == 1)
 		{
 			Vector Vec = StringToVec(Params[0]);
-			if (CoordName == "x" || CoordName == "pitch") RETURN_FLOAT(Vec.x)
-			else if (CoordName == "y" || CoordName == "yaw") RETURN_FLOAT(Vec.y)
-			else if (CoordName == "z" || CoordName == "roll") RETURN_FLOAT(Vec.z)
+			if (CoordName == "x" || CoordName == "pitch")     return RETURN_FLOAT(Vec.x);
+			else if (CoordName == "y" || CoordName == "yaw")  return RETURN_FLOAT(Vec.y);
+			else if (CoordName == "z" || CoordName == "roll") return RETURN_FLOAT(Vec.z);
 		}
 		else if (Params.size() >= 3)
 		{
@@ -4250,7 +4253,7 @@ msstring CScript::ScriptGetter_VecLen(msstring& FullName, msstring& ParserName,
 	if (Params.size() >= 1)
 	{
 		Vector Start = StringToVec(Params[0]);
-		RETURN_FLOAT(ParserName == "$veclen" ? Start.Length() : Start.Length2D());
+		return RETURN_FLOAT(ParserName == "$veclen" ? Start.Length() : Start.Length2D());
 	}
 	else return "0";
 }
@@ -4452,36 +4455,36 @@ const char* CScript::GetVar(const char* pszText)
 			if (PropName.starts_with("movetype."))	//eventually move sound to here
 			{
 				PropName = PropName.substr(9);
-				if (PropName == "none")				RETURN_INT(MOVETYPE_NONE)
-				else if (PropName == "walk")			RETURN_INT(MOVETYPE_WALK)
-				else if (PropName == "step")			RETURN_INT(MOVETYPE_STEP)
-				else if (PropName == "fly")			RETURN_INT(MOVETYPE_FLY)
-				else if (PropName == "toss")			RETURN_INT(MOVETYPE_TOSS)
-				else if (PropName == "push")			RETURN_INT(MOVETYPE_PUSH)
-				else if (PropName == "noclip")			RETURN_INT(MOVETYPE_NOCLIP)
-				else if (PropName == "flymissle")		RETURN_INT(MOVETYPE_FLYMISSILE)
-				else if (PropName == "bounce")			RETURN_INT(MOVETYPE_BOUNCE)
-				else if (PropName == "bouncemissle")	RETURN_INT(MOVETYPE_BOUNCEMISSILE)
-				else if (PropName == "follow")			RETURN_INT(MOVETYPE_FOLLOW)
-				else if (PropName == "pushstep")		RETURN_INT(MOVETYPE_PUSHSTEP)
+				if (PropName == "none")					return RETURN_INT(MOVETYPE_NONE);
+				else if (PropName == "walk")			return RETURN_INT(MOVETYPE_WALK);
+				else if (PropName == "step")			return RETURN_INT(MOVETYPE_STEP);
+				else if (PropName == "fly")				return RETURN_INT(MOVETYPE_FLY);
+				else if (PropName == "toss")			return RETURN_INT(MOVETYPE_TOSS);
+				else if (PropName == "push")			return RETURN_INT(MOVETYPE_PUSH);
+				else if (PropName == "noclip")			return RETURN_INT(MOVETYPE_NOCLIP);
+				else if (PropName == "flymissle")		return RETURN_INT(MOVETYPE_FLYMISSILE);
+				else if (PropName == "bounce")			return RETURN_INT(MOVETYPE_BOUNCE);
+				else if (PropName == "bouncemissle")	return RETURN_INT(MOVETYPE_BOUNCEMISSILE);
+				else if (PropName == "follow")			return RETURN_INT(MOVETYPE_FOLLOW);
+				else if (PropName == "pushstep")		return RETURN_INT(MOVETYPE_PUSHSTEP);
 			}
 			else if (PropName.starts_with("snd."))	//eventually move sound to here
 			{
 				PropName = PropName.substr(4);
-				if (PropName == "auto_channel")		RETURN_INT(CHAN_AUTO)
-				else if (PropName == "weapon")			RETURN_INT(CHAN_WEAPON)
-				else if (PropName == "voice")			RETURN_INT(CHAN_VOICE)
-				else if (PropName == "item")			RETURN_INT(CHAN_ITEM)
-				else if (PropName == "body")			RETURN_INT(CHAN_BODY)
-				else if (PropName == "stream")			RETURN_INT(CHAN_STREAM)
-				else if (PropName == "static")			RETURN_INT(CHAN_STATIC)
-				else if (PropName == "fullvol" || PropName == "maxvol")	RETURN_INT(10)
-				else if (PropName == "slientvol" || PropName == "novol")	RETURN_INT(0)
+				if (PropName == "auto_channel")			return RETURN_INT(CHAN_AUTO);
+				else if (PropName == "weapon")			return RETURN_INT(CHAN_WEAPON);
+				else if (PropName == "voice")			return RETURN_INT(CHAN_VOICE);
+				else if (PropName == "item")			return RETURN_INT(CHAN_ITEM);
+				else if (PropName == "body")			return RETURN_INT(CHAN_BODY);
+				else if (PropName == "stream")			return RETURN_INT(CHAN_STREAM);
+				else if (PropName == "static")			return RETURN_INT(CHAN_STATIC);
+				else if (PropName == "fullvol" || PropName == "maxvol")	return RETURN_INT(10);
+				else if (PropName == "slientvol" || PropName == "novol") return	RETURN_INT(0);
 			}
 			else if (PropName.starts_with("localplayer."))	//eventually move sound to here
 			{
 				PropName = PropName.substr(12);
-				if (PropName == "scriptID")		RETURN_INT(PLAYER_SCRIPT_ID)
+				if (PropName == "scriptID")		return RETURN_INT(PLAYER_SCRIPT_ID);
 			}
 		}
 		else if (FullName.starts_with("game."))
@@ -4498,7 +4501,7 @@ const char* CScript::GetVar(const char* pszText)
 
 			if (Name == "time")
 			{
-				RETURN_FLOAT(gpGlobals->time)
+				return RETURN_FLOAT(gpGlobals->time);
 			}
 			else if (Name.starts_with("time."))
 			{
@@ -4582,25 +4585,25 @@ const char* CScript::GetVar(const char* pszText)
 
 				}
 
-				RETURN_INT(theReturn);
+				return RETURN_INT(theReturn);
 			}
-			else if (Name == "frametime") RETURN_FLOAT(gpGlobals->frametime)
+			else if (Name == "frametime") return RETURN_FLOAT(gpGlobals->frametime);
 #ifdef VALVE_DLL
 			else if (Name == "maxlevel")
 			{
-				RETURN_INT(CHAR_LEVEL_CAP);
+				return RETURN_INT(CHAR_LEVEL_CAP);
 			}
 			//Thothie FEB2013_24 - consolidating all "game.players.xxx" functions into one conditional, and adding noafk
 			else if (Name.starts_with("players"))
 			{
 				//Thothie JUN2007a - make sure game.players does not return bots
 				//Thothie NOV2014_09 - using new centralized checking
-				if (Name.contains("totalhp")) RETURN_FLOAT(UTIL_TotalHP())
-				else if (Name.contains("avghp")) RETURN_FLOAT(UTIL_AvgHP())
-				else if (Name.contains("playersnb") || Name.contains("noafk")) RETURN_INT(UTIL_NumActivePlayers())
+				if (Name.contains("totalhp"))		return RETURN_FLOAT(UTIL_TotalHP());
+				else if (Name.contains("avghp"))	return RETURN_FLOAT(UTIL_AvgHP());
+				else if (Name.contains("playersnb") || Name.contains("noafk")) return RETURN_INT(UTIL_NumActivePlayers());
 				else
 				{
-					RETURN_INT(UTIL_NumPlayers())
+					return RETURN_INT(UTIL_NumPlayers());
 				}
 			}
 #endif
@@ -4633,7 +4636,7 @@ const char* CScript::GetVar(const char* pszText)
 				}
 				else if (Prop == "maxviewdistance") //Thothie SEP2007a, updated OCT2007a
 				{
-					RETURN_FLOAT(MSGlobals::maxviewdistance)
+					return RETURN_FLOAT(MSGlobals::maxviewdistance);
 				}
 				else if (Prop == "hpwarn") //Thothie SEP2007a, updated OCT2007a
 				{
@@ -4667,24 +4670,24 @@ const char* CScript::GetVar(const char* pszText)
 			else if (Name.starts_with("script."))
 			{
 				msstring Property = Name.substr(7);
-				if (Property == "last_sent_id")		RETURN_INT(m_gLastSendID)
-				else if (Property == "last_light_id")  RETURN_INT(m_gLastLightID)
-				else if (Property == "iteration")		RETURN_INT(m.m_Iteration)
+				if (Property == "last_sent_id")			return RETURN_INT(m_gLastSendID);
+				else if (Property == "last_light_id")	return RETURN_INT(m_gLastLightID);
+				else if (Property == "iteration")		return RETURN_INT(m.m_Iteration);
 			}
 			else if (Name.starts_with("sound."))
 			{
 				//ONLY STILL HERE FOR BACKWARDS COMPATIBILITY
 				//MOVED TO --> game.const.snd.x
 				msstring SoundProp = Name.substr(6);
-				if (SoundProp == "auto_channel")			RETURN_INT(CHAN_AUTO)
-				else if (SoundProp == "weapon")			RETURN_INT(CHAN_WEAPON)
-				else if (SoundProp == "voice")				RETURN_INT(CHAN_VOICE)
-				else if (SoundProp == "item")				RETURN_INT(CHAN_ITEM)
-				else if (SoundProp == "body")				RETURN_INT(CHAN_BODY)
-				else if (SoundProp == "stream")			RETURN_INT(CHAN_STREAM)
-				else if (SoundProp == "static")			RETURN_INT(CHAN_STATIC)
-				else if (SoundProp == "fullvol" || SoundProp == "maxvol")	RETURN_INT(10)
-				else if (SoundProp == "slientvol" || SoundProp == "novol")	RETURN_INT(0)
+				if (SoundProp == "auto_channel")	return RETURN_INT(CHAN_AUTO);
+				else if (SoundProp == "weapon")		return RETURN_INT(CHAN_WEAPON);
+				else if (SoundProp == "voice")		return RETURN_INT(CHAN_VOICE);
+				else if (SoundProp == "item")		return RETURN_INT(CHAN_ITEM);
+				else if (SoundProp == "body")		return RETURN_INT(CHAN_BODY);
+				else if (SoundProp == "stream")		return RETURN_INT(CHAN_STREAM);
+				else if (SoundProp == "static")		return RETURN_INT(CHAN_STATIC);
+				else if (SoundProp == "fullvol" || SoundProp == "maxvol")	return RETURN_INT(10);
+				else if (SoundProp == "slientvol" || SoundProp == "novol")	return RETURN_INT(0);
 			}
 			else
 			{
@@ -4707,14 +4710,14 @@ const char* CScript::GetVar(const char* pszText)
 				{
 
 					msstring& Prop = FullProp;
-					if (Prop == "index") RETURN_INT(MSCLGlobals::GetLocalPlayerIndex())
-					else if (Prop == "viewangles") RETURN_VECTOR(player.pev->v_angle) //Thothie JAN2013_08 - viewangles, sorta, only returns yaw
-					else if (Prop == "eyepos") RETURN_VECTOR(player.EyePosition()) //Thothie JAN2013_08 eyepos - sorta, returns pos on model
-					else if (Prop == "thirdperson") RETURN_INT((MSCLGlobals::CamThirdPerson ? 1 : 0))
-					else if (Prop == "viewmodel.left.id" || Prop == "viewmodel.0.id") RETURN_INT(player.Hand(0) ? player.Hand(0)->GetViewModelID() : -1)
-					else if (Prop == "viewmodel.right.id" || Prop == "viewmodel.1.id") RETURN_INT(player.Hand(1) ? player.Hand(1)->GetViewModelID() : -1)
-					else if (Prop == "viewmodel.active.id") RETURN_INT(player.ActiveItem() ? player.ActiveItem()->GetViewModelID() : -1)
-					else if (Prop == "canattack") RETURN_INT(FBitSet(player.m_StatusFlags, PLAYER_MOVE_NOATTACK) ? 0 : 1)
+					if (Prop == "index") return RETURN_INT(MSCLGlobals::GetLocalPlayerIndex());
+					else if (Prop == "viewangles") return RETURN_VECTOR(player.pev->v_angle); //Thothie JAN2013_08 - viewangles, sorta, only returns yaw
+					else if (Prop == "eyepos") return RETURN_VECTOR(player.EyePosition()); //Thothie JAN2013_08 eyepos - sorta, returns pos on model
+					else if (Prop == "thirdperson") return RETURN_INT((MSCLGlobals::CamThirdPerson ? 1 : 0));
+					else if (Prop == "viewmodel.left.id" || Prop == "viewmodel.0.id") return RETURN_INT(player.Hand(0) ? player.Hand(0)->GetViewModelID() : -1);
+					else if (Prop == "viewmodel.right.id" || Prop == "viewmodel.1.id") return RETURN_INT(player.Hand(1) ? player.Hand(1)->GetViewModelID() : -1);
+					else if (Prop == "viewmodel.active.id") return RETURN_INT(player.ActiveItem() ? player.ActiveItem()->GetViewModelID() : -1);
+					else if (Prop == "canattack") return RETURN_INT(FBitSet(player.m_StatusFlags, PLAYER_MOVE_NOATTACK) ? 0 : 1);
 				}
 				else if (Name == "tempent")
 					Value = CLGetCurrentTempEntProp(FullProp);
diff --git a/src/game/shared/ms/script.h b/src/game/shared/ms/script.h
index fe3ab970..1cf058ad 100644
--- a/src/game/shared/ms/script.h
+++ b/src/game/shared/ms/script.h
@@ -414,3 +414,10 @@ extern globalscriptinfo_t *g_MSScriptInfo;
 #else
 	#define SCRIPT_ID_START 10000	//Client: ID of next script to be created
 #endif
+
+
+#ifndef VECTOR_H
+
+#endif // !VECTOR_H
+
+
diff --git a/src/game/shared/ms/scriptcmds.cpp b/src/game/shared/ms/scriptcmds.cpp
index 3a906a63..b6180cf4 100644
--- a/src/game/shared/ms/scriptcmds.cpp
+++ b/src/game/shared/ms/scriptcmds.cpp
@@ -31,12 +31,17 @@
 #include "angelscript/ASEngineEventManager.h"
 #endif
 
+
+
+
 #undef SCRIPTVAR
 #define SCRIPTVAR GetVar								//A script-wide or global variable
 #define ERROR_MISSING_PARMS MS_ERROR("ExecuteScriptCmd: Script: %s, %s - not enough parameters!", m.ScriptFile.c_str(), Cmd.Name().c_str())
 void Player_UseStamina(float flAddAmt);
 extern "C" playermove_t *pmove;
 
+
+
 void CScript::Script_Setup()
 {
 	if (m_GlobalCmdHash.empty())
@@ -929,9 +934,9 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 	else if (Prop == "atkspeed")
 	{
 #ifdef VALVE_DLL
-		RETURN_FLOAT( pPlayer ? pPlayer->m_AnimSpeedAdj : 1 );
+		return RETURN_FLOAT(pPlayer ? pPlayer->m_AnimSpeedAdj : 1);
 #else
-		RETURN_FLOAT(player.m_AnimSpeedAdj);
+		return RETURN_FLOAT(player.m_AnimSpeedAdj);
 #endif
 	}
 	/* thothie - this failed, I *guess* because it's trying to pull a var for the player
@@ -945,17 +950,17 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 	}*/
 #ifdef VALVE_DLL
 	//Client can't use entity.index.  Only player.index (handled later under player)
-	else if( Prop == "index" ) RETURN_INT( pTarget->entindex() )
+	else if (Prop == "index") return RETURN_INT(pTarget->entindex());
 #endif
 	else if (Prop == "exists")			fSuccess = true;
 	else if (Prop == "alive" || Prop == "isalive")			fSuccess = pTarget->IsAlive() ? true : false;
-	else if (Prop == "hp")				RETURN_FLOAT(pTarget->pev->health)
+	else if (Prop == "hp")				return RETURN_FLOAT(pTarget->pev->health);
 #ifdef VALVE_DLL
 	else if( Prop == "xp" || Prop == "skilllevel" )
 	{
 		//Thothie JUN2008a - return monsters XP value
 		//NOV2014_21 - moving to top, as this is one we'll have to use at mob spawn repeatedly
-		RETURN_FLOAT( pMonster->m_SkillLevel )
+		return RETURN_FLOAT(pMonster->m_SkillLevel);
 	}
 	else if ( Prop == "blood" ) //greatguys1 August2018
 	{
@@ -1025,15 +1030,15 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 		//thoth_return_scriptname = thoth_return_scriptname.substr( thoth_return_scriptname.len() - ( thoth_return_scriptname.len() -1 ) );
 		return msScriptNameReturn.c_str();
 	}
-	else if (Prop == "gravity")		RETURN_FLOAT(pTarget->pev->gravity)
-	else if (Prop == "height")			RETURN_FLOAT(pTarget->pev->maxs.z - pTarget->pev->mins.z)
-	else if (Prop == "speed")			RETURN_FLOAT(pTarget->pev->velocity.Length())
-	else if (Prop == "speed2D")		RETURN_FLOAT(pTarget->pev->velocity.Length2D())
+	else if (Prop == "gravity")		return RETURN_FLOAT(pTarget->pev->gravity);
+	else if (Prop == "height")		return RETURN_FLOAT(pTarget->pev->maxs.z - pTarget->pev->mins.z);
+	else if (Prop == "speed")		return RETURN_FLOAT(pTarget->pev->velocity.Length());
+	else if (Prop == "speed2D")		return RETURN_FLOAT(pTarget->pev->velocity.Length2D());
 	else if (Prop == "forwardspeed")
 	{
 		Vector vForward;
 		EngineFunc::MakeVectors(pTarget->pev->v_angle, &vForward, NULL, NULL);
-		RETURN_FLOAT(DotProduct(pTarget->pev->velocity, vForward));
+		return RETURN_FLOAT(DotProduct(pTarget->pev->velocity, vForward));
 	}
 	else if (Prop == "absmin") //Thothie DEC2014_12
 	{
@@ -1091,7 +1096,7 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 	//MIB JUL2010_31 - debuggary
 	else if ( Prop == "deadflag" )
 	{
-	RETURN_INT(pTarget->pev->deadflag)
+	return RETURN_INT(pTarget->pev->deadflag);
 	}
 	*/
 	else if (Prop == "sitting") //Thothie JAN2010_09 - spariments
@@ -1109,7 +1114,7 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 		if (pItem && pItem->m_Value)
 		{
 			int iRealCost = int(pItem->m_Value);
-			RETURN_INT(iRealCost)
+			return RETURN_INT(iRealCost);
 		}
 		else return "unset";
 	}
@@ -1119,13 +1124,13 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 		//fSuccess = FBitSet(pTarget->pev->flags,FL_GODMODE) ? true : false;
 		//(still not workign) :/
 		//Thothie FEB2015_18 - yet another attempt:
-		RETURN_INT((pTarget->pev->flags & FL_GODMODE) ? 1 : 0);
+		return RETURN_INT( (pTarget->pev->flags & FL_GODMODE) ? 1 : 0);
 	}
-	else if (Prop == "waterlevel")		RETURN_INT(pTarget->pev->waterlevel)
-	else if (Prop == "anim.current_frame")		RETURN_FLOAT(pTarget->pev->frame)
-	else if (Prop == "anim.max_frames")		RETURN_FLOAT(255.0f)
-	//else if( Prop == "anim.lastset" ) RETURN_FLOAT ( pTarget->pev->animtime ) //Thothie - JUN2007b - useless, just keeps increasing regardless of anims
-	else if (Prop == "anim.index")  RETURN_INT(pTarget->pev->sequence)  //Thothie - JUN2007b
+	else if (Prop == "waterlevel")			return RETURN_INT(pTarget->pev->waterlevel);
+	else if (Prop == "anim.current_frame")	return RETURN_FLOAT(pTarget->pev->frame);
+	else if (Prop == "anim.max_frames")		return RETURN_FLOAT(255.0f);
+	//else if( Prop == "anim.lastset" )		return RETURN_FLOAT (Return, pTarget->pev->animtime ); //Thothie - JUN2007b - useless, just keeps increasing regardless of anims
+	else if (Prop == "anim.index")			return RETURN_INT(pTarget->pev->sequence);  //Thothie - JUN2007b
 	else if (Prop == "anim.name")
 	{
 		//Thothie - JUN2007b
@@ -1133,8 +1138,8 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 		//- meh, fail, just going to set animation indexes in the scripts for now
 		//return LookupSequenceName(pTarget->pev->model,pTarget->pev->sequence);
 	}
-	else if (Prop.starts_with("origin"))			RETURN_POSITION("origin", pTarget->pev->origin)
-	else if (Prop.starts_with("origin_center"))	RETURN_POSITION("origin_center", pTarget->Center())
+	else if (Prop.starts_with("origin"))		return RETURN_POSITION(Prop, "origin", pTarget->pev->origin);
+	else if (Prop.starts_with("origin_center"))	return RETURN_POSITION(Prop, "origin_center", pTarget->Center());
 	else if (Prop == "dist" || Prop == "dist2D" || Prop == "range" || Prop == "range2D")
 	{
 		//MIB JAN2010_20 - range check take model widths into account
@@ -1150,22 +1155,23 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 		else
 			Dist = (pTarget->pev->origin - pev->origin).Length2D();
 
-		RETURN_FLOAT(Dist)
+		return RETURN_FLOAT(Dist);
 			//original
 			//float Dist = (Prop == "range" || Prop == "dist" ) ? (pTarget->pev->origin - pev->origin).Length() : (pTarget->pev->origin - pev->origin).Length2D();
 			//RETURN_FLOAT( Dist )
 	}
-	else if (Prop.starts_with("eyepos"))	RETURN_POSITION("eyepos", pTarget->EyePosition())
-	else if (Prop.starts_with("velocity"))	RETURN_POSITION("velocity", pTarget->pev->velocity)
+	else if (Prop.starts_with("eyepos"))	return RETURN_POSITION(Prop, "eyepos", pTarget->EyePosition());
+	else if (Prop.starts_with("velocity"))	return RETURN_POSITION(Prop, "velocity", pTarget->pev->velocity);
 	else if (Prop.starts_with("angles"))
 	{
-		RETURN_ANGLE("angles", pTarget->pev->angles)
-		RETURN_POSITION("angles", pTarget->pev->angles)
+		return RETURN_ANGLE(Prop, "angles", pTarget->pev->angles);
+		//return RETURN_POSITION(Prop,"angles", pTarget->pev->angles); These would not be hit in this statement
 	}
 	else if (Prop.starts_with("viewangles"))
 	{
-		RETURN_ANGLE("viewangles", pTarget->pev->v_angle)
-		RETURN_POSITION("viewangles", pTarget->pev->v_angle)
+		return RETURN_ANGLE(Prop, "viewangles", pTarget->pev->v_angle);
+
+		//RETURN_POSITION(Prop,"viewangles", pTarget->pev->v_angle)// this would not be his in this statement due to previous macro return
 	}
 	else if (Prop == "target")
 	{
@@ -1278,7 +1284,7 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 	else if( Prop == "slot" )
 	{
 		CBasePlayer *pPlayer = (CBasePlayer *)pTarget; //MAR2010_08
-		if ( pPlayer ) RETURN_INT( pPlayer->m_CharacterNum )
+		if (pPlayer) return RETURN_INT(pPlayer->m_CharacterNum);
 	}
 #endif
 
@@ -1312,27 +1318,27 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 			else if (Prop == "inhand")			fSuccess = (pItem->m_Location == ITEMPOS_HANDS) ? true : false;
 			else if (Prop == "is_worn")		fSuccess = pItem->IsWorn() ? true : false;
 			else if (Prop == "inworld") fSuccess = pItem->IsInWorld() ? true : false;
-			else if (Prop == "drink_amt")	RETURN_INT(pItem->DrinkGetAmt()) //Thothie JUN2007
-			else if (Prop == "quality") RETURN_INT(pItem->Quality ? pItem->Quality : 0) //Thothie NOV2014_14
-			else if (Prop == "maxquality") RETURN_INT(pItem->MaxQuality ? pItem->MaxQuality : 0) //Thothie NOV2014_14
-			else if (Prop == "quantity") RETURN_INT(pItem->iQuantity ? pItem->iQuantity : 0) //Thothie NOV2014_14
-			else if (Prop == "hand_index") RETURN_INT(pItem->m_Hand)
+			else if (Prop == "drink_amt")	return RETURN_INT( pItem->DrinkGetAmt()); //Thothie JUN2007
+			else if (Prop == "quality")		return RETURN_INT( pItem->Quality ? pItem->Quality : 0); //Thothie NOV2014_14
+			else if (Prop == "maxquality")	return RETURN_INT( pItem->MaxQuality ? pItem->MaxQuality : 0); //Thothie NOV2014_14
+			else if (Prop == "quantity")	return RETURN_INT( pItem->iQuantity ? pItem->iQuantity : 0); //Thothie NOV2014_14
+			else if (Prop == "hand_index")	return RETURN_INT( pItem->m_Hand);
 			else if (Prop == "wielded") //Thothie OCT2015_31 - need a reliable way to be sure if item is active or not
 			{
-				if (pItem->IsWorn()) RETURN_INT(0); //reliable, item is worn thus not wielded (eg. bow/shield on back)
+				if (pItem->IsWorn()) return RETURN_INT(0); //reliable, item is worn thus not wielded (eg. bow/shield on back)
 				if (pItem->Owner())
 				{
-					CBasePlayer *pPlayerOwner = pItem->Owner()->IsPlayer() ? (CBasePlayer *)pItem->Owner() : NULL;
+					CBasePlayer* pPlayerOwner = pItem->Owner()->IsPlayer() ? (CBasePlayer*)pItem->Owner() : NULL;
 					//CBasePlayer *pPlayer = pItem->Owner();
 					if (pPlayerOwner)
 					{
-						if (pItem == pPlayerOwner->Hand(0)) RETURN_INT(1)
-						if (pItem == pPlayerOwner->Hand(1)) RETURN_INT(1)
+						if (pItem == pPlayerOwner->Hand(0)) return RETURN_INT( 1);
+							if (pItem == pPlayerOwner->Hand(1)) return RETURN_INT( 1);
 					}
 				}
-				RETURN_INT(0)
+				return RETURN_INT(0);
 			}
-			else if (Prop == "handpref") RETURN_INT(pItem->m_PrefHand) //Thothie DEC2010_04
+			else if (Prop == "handpref") return RETURN_INT( pItem->m_PrefHand); //Thothie DEC2010_04
 			else if (Prop == "owner")
 			{
 				//Thothie FEB2016_17 - this somehow got switched to no longer returning owner ID
@@ -1341,25 +1347,25 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 				//client can't determine owner ID, so just return if owned or not
 				fSuccess = pItem->m_pOwner ? true : false;
 #else
-				if ( pItem->RetrieveEntity(ENT_OWNER) )
+				if (pItem->RetrieveEntity(ENT_OWNER))
 				{
 					//on server, this will return proper for any item not on the ground
 					return EntToString(pItem->RetrieveEntity(ENT_OWNER));
 				}
 				else
-				if ( pItem->Owner() && pItem->Owner()->GetScripted() )
-				{
-					//this will handle items on ground or undeterminable
-					return EntToString(pItem->Owner());
-					//return pItem->RetrieveEntity(ENT_OWNER) ? EntToString(pItem->RetrieveEntity(ENT_OWNER)) : "0";
-				}
+					if (pItem->Owner() && pItem->Owner()->GetScripted())
+					{
+						//this will handle items on ground or undeterminable
+						return EntToString(pItem->Owner());
+						//return pItem->RetrieveEntity(ENT_OWNER) ? EntToString(pItem->RetrieveEntity(ENT_OWNER)) : "0";
+					}
 #endif
 			}
 			else if (Prop == "container.open") fSuccess = pItem->Container_IsOpen() ? true : false;
-			else if (Prop == "container.items") RETURN_INT(pItem->Container_ItemCount())
+			else if (Prop == "container.items") return RETURN_INT( pItem->Container_ItemCount());
 #ifndef VALVE_DLL
 			else if (Prop == "viewmodel")		return pItem->m_ViewModel;
-			else if (Prop == "viewmodel.id")  RETURN_INT(pItem->GetViewModelID());
+			else if (Prop == "viewmodel.id")  return RETURN_INT( pItem->GetViewModelID());
 #endif
 			//Thothie OCT2016_18 Item Mods
 #ifdef VALVE_DLL
@@ -1380,12 +1386,12 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 		else if (pMonster)
 		{
 			if (Prop == "race")		return _strlwr(pMonster->m_Race);
-			else if (Prop == "maxhp")	RETURN_FLOAT(pMonster->MaxHP())
+			else if (Prop == "maxhp")	return RETURN_FLOAT(pMonster->MaxHP());
 			else if (Prop == "relationship" && Params.size() >= 3)
 			{
-				CBaseEntity *pOtherEntity = RetrieveEntity(Params[2]);
+				CBaseEntity* pOtherEntity = RetrieveEntity(Params[2]);
 				int RelationShip = pMonster->IRelationship(pOtherEntity);
-				switch(RelationShip)
+				switch (RelationShip)
 				{
 				case RELATIONSHIP_NO:
 					return "neutral";
@@ -1409,35 +1415,35 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 			}
 			else if (Prop == "height")
 			{
-				RETURN_FLOAT(pMonster->m_Height)
+				return RETURN_FLOAT(pMonster->m_Height);
 			}
 			else if (Prop == "nopush") return (pMonster->m_nopush) ? "1" : "0";
 			else if (Prop == "width")
 			{
-				RETURN_FLOAT(pMonster->m_Width) //MIBJAN2010_20
+				return RETURN_FLOAT(pMonster->m_Width); //MIBJAN2010_20
 			}
-			else if (Prop == "mp")		RETURN_FLOAT(pMonster->m_MP)
-			else if (Prop == "maxmp")	RETURN_FLOAT(pMonster->MaxMP())
-			else if (Prop == "movedir") VecToString(pMonster->pev->movedir); //Thothie APR2016_07
+			else if (Prop == "mp")		return RETURN_FLOAT(pMonster->m_MP);
+			else if (Prop == "maxmp")	return RETURN_FLOAT(pMonster->MaxMP());
+			else if (Prop == "movedir") return VecToString(pMonster->pev->movedir); //Thothie APR2016_07
 #ifdef VALVE_DLL
-			else if( Prop == "svbonepos" )
+			else if (Prop == "svbonepos")
 			{
 				//Thothie MAR2008a - get positions of bones from server side
 				//$get(<target>,svbonepos,<bone_idx>)
 				Vector vBoneVec;
 				Vector vBoneAngle;
-				pMonster->GetBonePosition( atoi(Params[2]), vBoneVec, vBoneAngle );
-				return VecToString( vBoneVec );
+				pMonster->GetBonePosition(atoi(Params[2]), vBoneVec, vBoneAngle);
+				return VecToString(vBoneVec);
 				//if need be ye can return vBoneAngle by making a seperate command svboneang)
 			}
-			else if( Prop == "attachpos" )
+			else if (Prop == "attachpos")
 			{
 				//Thothie MAR2008a - get position of an attachment
 				//$get(<target>,attachpos,<attchment_idx>)
 				Vector vAttVec;
 				Vector vAttAngle;
-				pMonster->GetAttachment(atoi(Params[2]), vAttVec, vAttAngle );
-				return VecToString( vAttVec );
+				pMonster->GetAttachment(atoi(Params[2]), vAttVec, vAttAngle);
+				return VecToString(vAttVec);
 			}
 			/*
 			else if( Prop == "attachang" )
@@ -1452,24 +1458,24 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 			*/
 			//AUG2013_21 Thothie - attempting to return last hit group (for headshots)
 			//kinda working for players (always returns 2, lest not hit), but not monsters
-			else if( Prop == "lasthitgroup" )
+			else if (Prop == "lasthitgroup")
 			{
-				RETURN_INT( pMonster->m_LastHitGroup );
+				return RETURN_INT(pMonster->m_LastHitGroup);
 			}
 #endif
-			else if (Prop == "movedest.origin")	return VecToString(pMonster->m_MoveDest.Origin);
-			else if (Prop == "movedest.prox")		RETURN_FLOAT(pMonster->m_MoveDest.Proximity)
-			else if (Prop == "moveprox")			RETURN_FLOAT(pMonster->GetDefaultMoveProximity())
-			else if (Prop == "movedest.id")		return EntToString(pMonster->m_MoveDest.MoveTarget.Entity());
-			else if (Prop == "anim_end") RETURN_FLOAT(gpGlobals->time + ((256 / pMonster->m_flFrameRate) * pMonster->pev->framerate))
-			else if (Prop == "stepsize") RETURN_FLOAT(pMonster->m_StepSize)	//MiB DEC2007a
-			else if (Prop == "movetype") RETURN_INT(pTarget->pev->movetype) //Thothie JAN2013_20 (post patch)
-			else if (Prop == "name.full") return SPEECH::NPCName(pMonster);
-			else if (Prop == "name.prefix") return pMonster->DisplayPrefix.len() ? msstring(pMonster->DisplayPrefix) : msstring(""); //Thothie JAN2011_30
+			else if (Prop == "movedest.origin")		return VecToString(pMonster->m_MoveDest.Origin);
+			else if (Prop == "movedest.prox")		return RETURN_FLOAT( pMonster->m_MoveDest.Proximity);
+			else if (Prop == "moveprox")			return RETURN_FLOAT( pMonster->GetDefaultMoveProximity());
+			else if (Prop == "movedest.id")			return EntToString(pMonster->m_MoveDest.MoveTarget.Entity());
+			else if (Prop == "anim_end")			return RETURN_FLOAT( gpGlobals->time + ((256 / pMonster->m_flFrameRate) * pMonster->pev->framerate));
+			else if (Prop == "stepsize")			return RETURN_FLOAT( pMonster->m_StepSize);	//MiB DEC2007a
+			else if (Prop == "movetype")			return RETURN_INT(pTarget->pev->movetype); //Thothie JAN2013_20 (post patch)
+			else if (Prop == "name.full")			return SPEECH::NPCName(pMonster);
+			else if (Prop == "name.prefix")			return pMonster->DisplayPrefix.len() ? msstring(pMonster->DisplayPrefix) : msstring(""); //Thothie JAN2011_30
 			else if (Prop == "name.full.capital")	return SPEECH::NPCName(pMonster, true);
-			else if (Prop == "dmgmulti") RETURN_FLOAT(pMonster->m_DMGMulti) //APR2008a
-			else if (Prop == "hpmulti") RETURN_FLOAT(pMonster->m_HPMulti) //APR2008a
-			else if (Prop == "hitmulti") RETURN_FLOAT(pMonster->m_HITMulti) //FEB2009_18
+			else if (Prop == "dmgmulti")			return RETURN_FLOAT( pMonster->m_DMGMulti); //APR2008a
+			else if (Prop == "hpmulti")				return RETURN_FLOAT( pMonster->m_HPMulti); //APR2008a
+			else if (Prop == "hitmulti")			return RETURN_FLOAT( pMonster->m_HITMulti); //FEB2009_18
 			else if (Prop == "fly")
 			{
 				//NOV2014_13 - needed for anti-stuck
@@ -1494,7 +1500,7 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 						{
 						return EntToString(pOther);
 						}
-						else
+						else 
 						{
 						return "0";
 						}
@@ -1509,9 +1515,9 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 			{
 				if (Prop == "curhand") //Thothie JUN2018_13 return current active hand index
 				{
-					RETURN_INT(pPlayer->m_CurrentHand); //0=Left Hand Active, 1=Right Hand Active (active hand=left click, off hand=right click)
+					return RETURN_INT(pPlayer->m_CurrentHand); //0=Left Hand Active, 1=Right Hand Active (active hand=left click, off hand=right click)
 				}
-				else if (Prop == "glowcolor") RETURN_VECTOR(pPlayer->m_GlowColor) // MiB APR2019_10 [GLOW_COLOR] - Glow color
+				else if (Prop == "glowcolor") return RETURN_VECTOR(pPlayer->m_GlowColor); // MiB APR2019_10 [GLOW_COLOR] - Glow color
 				else if (Prop == "gender")
 				{
 					return (pPlayer->m_Gender == GENDER_MALE) ? "male" : "female";
@@ -1519,23 +1525,23 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 				else if (Prop == "ip") //MiB Dec2007a Returns the ip address of the player NOTE: This COULD be loopback.
 				{
 #ifdef VALVE_DLL
-					clientaddr_t &ClientInfo = g_NewClients[pPlayer->entindex()-1];
+					clientaddr_t& ClientInfo = g_NewClients[pPlayer->entindex() - 1];
 					return ClientInfo.Addr;
 #endif
 				}
 #ifdef VALVE_DLL
-				else if( Prop == "spellname" ) //MiB Dec2007a - returns the name of the spell on target player at slot 'idx'
+				else if (Prop == "spellname") //MiB Dec2007a - returns the name of the spell on target player at slot 'idx'
 				{
-					int idx = atoi( Params[2] );
+					int idx = atoi(Params[2]);
 					msstring msSpellNameReturn = pPlayer->m_SpellList[idx].c_str();
 					return msSpellNameReturn.c_str();
 				}
-				else if( Prop == "jumping" )	fSuccess = FBitSet( pPlayer->m_StatusFlags, PLAYER_MOVE_JUMPING ) ? true : false;
-				else if( Prop == "companions" )
+				else if (Prop == "jumping")	fSuccess = FBitSet(pPlayer->m_StatusFlags, PLAYER_MOVE_JUMPING) ? true : false;
+				else if (Prop == "companions")
 				{
 					//Thothie JUN2008a - return # of companions
 					//$get(<target>,companions)
-					RETURN_INT( pPlayer->m_Companions.size() )
+					return RETURN_INT(pPlayer->m_Companions.size());
 				}
 #endif
 				//Thothie JUL2010_29 - get keydown value
@@ -1555,12 +1561,12 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 					else if (msKeyCheck.starts_with("duck")) return ((FBitSet(pPlayer->pbs.ButtonsDown, IN_DUCK)) ? "1" : "0"); //APR2014_03 - Thothie - forgot about duck
 				}
 #ifndef VALVE_DLL
-				else if (Prop == "stamina")		RETURN_FLOAT(pPlayer->Stamina)
-				else if (Prop == "stamina.ratio")	RETURN_FLOAT(pPlayer->Stamina / pPlayer->MaxStamina())
+				else if (Prop == "stamina")			return RETURN_FLOAT(pPlayer->Stamina);
+				else if (Prop == "stamina.ratio")	return RETURN_FLOAT(pPlayer->Stamina / pPlayer->MaxStamina());
 #endif
-				else if (Prop == "stamina.max")	RETURN_FLOAT(pPlayer->MaxStamina())
+				else if (Prop == "stamina.max")		return RETURN_FLOAT(pPlayer->MaxStamina());
 				//else if( pPlayer && Prop == "sitting" )	fSuccess = FBitSet( pPlayer->m_StatusFlags, PLAYER_MOVE_SITTING ) ? true : false;
-				else if (Prop == "anim.type") { if (pPlayer->m_pAnimHandler) RETURN_INT(pPlayer->m_pAnimHandler->GetID()) else fSuccess = false; }
+				else if (Prop == "anim.type") { if (pPlayer->m_pAnimHandler) return RETURN_INT(pPlayer->m_pAnimHandler->GetID()); else fSuccess = false; }
 				else if (Prop == "anim.uselegs") { if (pPlayer->m_pAnimHandler) fSuccess = pPlayer->m_pAnimHandler->UseGait; }
 				else if (Prop == "torso_anim") return pPlayer->m_szAnimTorso;
 				else if (Prop == "legs_anim") return pPlayer->m_szAnimLegs;
@@ -1602,7 +1608,8 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 				{
 					int Max = 100;
 
-					if (Prop.contains(".max")) RETURN_INT(Max)
+					if (Prop.contains(".max")) 
+						return RETURN_INT(Max);
 					else
 					{
 						msstring Stat = Prop.substr(5).thru_char(".");
@@ -1611,8 +1618,10 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 						{
 							int Amount = pPlayer->GetNatStat(iStat);
 
-							if (Prop.contains(".ratio")) RETURN_FLOAT_PRECISION(Amount / (float)Max)
-							else RETURN_INT(Amount);
+							if (Prop.contains(".ratio"))
+								return RETURN_FLOAT_PRECISION(Amount / (float)Max);
+							else 
+								return RETURN_INT(Amount);
 						}
 						else ALERT(at_console, "Player stat %s doesn't exist!\n", Stat.c_str());
 					}
@@ -1633,13 +1642,13 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 					}
 					}
 					*/
-					RETURN_INT( pPlayer->NumItems() );
+					return RETURN_INT( pPlayer->NumItems() );
 				}
 				//Thothie SEP2011_17 - This failed because of differences in the two CBasePlayer Defines (I guess)
 				/*
 				else if( Prop == "lastpush" )
 				{
-				RETURN_FLOAT( pPlayer->LastPush );
+				return RETURN_FLOAT( pPlayer->LastPush );
 				}
 				*/
 #endif
@@ -1658,7 +1667,7 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 
 					int Max = (SubSkill > -1) ? (int)STATPROP_MAX_VALUE : (int)STAT_MAX_VALUE;
 
-					if (Prop.contains(".max")) RETURN_INT(Max)
+					if (Prop.contains(".max")) return RETURN_INT(Max);
 					else
 					{
 						msstring Skill = Prop.substr(6).thru_char(".");
@@ -1669,8 +1678,8 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 							if (SubSkill > -1) Amount = pPlayer->GetSkillStat(Skill.c_str(), SubSkill);
 							else Amount = pPlayer->GetSkillStat(Stat);
 
-							if (Prop.contains(".ratio")) RETURN_FLOAT_PRECISION(Amount / (float)Max)
-							else RETURN_INT(Amount);
+							if (Prop.contains(".ratio")) return RETURN_FLOAT_PRECISION(Amount / (float)Max);
+							else return RETURN_INT(Amount);
 						}
 						else ALERT(at_console, "Player skill %s doesn't exist!\n", Skill.c_str());
 					}
diff --git a/src/game/shared/ms/sharedutil.cpp b/src/game/shared/ms/sharedutil.cpp
index 30e44c50..05efb5c9 100644
--- a/src/game/shared/ms/sharedutil.cpp
+++ b/src/game/shared/ms/sharedutil.cpp
@@ -54,15 +54,6 @@ CBaseEntity *StringToEnt(const char* EntString)
 	return pEntity;
 }
 
-const char* VecToString(const Vector& Vec, bool bAs2D)
-{
-	static char RetString[128];
-	if (bAs2D)
-		_snprintf(RetString, sizeof(RetString), "(%.2f,%.2f)", Vec.x, Vec.y);
-	else
-		_snprintf(RetString, sizeof(RetString), "(%.2f,%.2f,%.2f)", Vec.x, Vec.y, Vec.z);
-	return RetString;
-}
 
 Vector StringToVec(const char* String)
 {

From 584e213c7730e2e5afcc3cf9d8d7e82dcb5638da Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 12 Mar 2026 00:00:45 -0400
Subject: [PATCH 091/291] fixed reference pass in for vector

---
 src/game/shared/ms/iscript.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/shared/ms/iscript.h b/src/game/shared/ms/iscript.h
index 1d0ce443..de12f518 100644
--- a/src/game/shared/ms/iscript.h
+++ b/src/game/shared/ms/iscript.h
@@ -321,7 +321,7 @@ inline const char* VecToString(const Vector& Vec, bool bAs2D)
 }
 
 
-inline const char* RETURN_POSITION(const char* Prop, const char * name, const Vector position, bool as2d = false) {
+inline const char* RETURN_POSITION(const char* Prop, const char * name, const Vector& position, bool as2d = false) {
 
 	msstring NameExt;
 

From a4042eda11a86eba815fdabb9d44758a52369de3 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 12 Mar 2026 00:12:48 -0400
Subject: [PATCH 092/291] changes some defines to constexpr where applicable

---
 src/game/shared/ms/iscript.h     | 92 +++-----------------------------
 src/game/shared/ms/script.h      |  6 +--
 src/game/shared/ms/stackstring.h |  6 +--
 3 files changed, 12 insertions(+), 92 deletions(-)

diff --git a/src/game/shared/ms/iscript.h b/src/game/shared/ms/iscript.h
index de12f518..73b6619b 100644
--- a/src/game/shared/ms/iscript.h
+++ b/src/game/shared/ms/iscript.h
@@ -189,10 +189,10 @@ class IScripted
 	mslist<CScript *> m_Scripts;		   //List of scripts
 	msstring m_ReturnData;				   //Data returned from an event.  Reset at next CallScriptEvent()
 };
-#define SKIP_STR " \t" //Whitespace characters
+constexpr const char* SKIP_STR = " \t"; //Whitespace characters
 
-#define DEFAULT_SCRIPT_ID -1
-#define PLAYER_SCRIPT_ID -2
+constexpr int DEFAULT_SCRIPT_ID = -1;
+constexpr int PLAYER_SCRIPT_ID = -2;
 
 // MiB 30NOV_2014 - Template structure for script function pointers
 // Keeps track of whether or not it's a conditional command and how many times it's been referenced (for testing and curiosity)
@@ -220,24 +220,6 @@ struct scriptcmdbase_t
 	P GetFunc() const { return pFunc; }
 };
 
-//Definitions for functions like GetProp(), CLGetCurrentTempEntProp()
-//Returns different types of data as a string.  Requires static msstring Return
-
-/*
-#define RETURN_TRUE \
-	{               \
-		return "1"; \
-	}
-
-
-#define RETURN_FALSE \
-	{                \
-		return "0";  \
-	}
-
-
-*/
-
 constexpr const char* RETURN_NOTHING_STR = "-NA-";
 inline const char* RETURN_NOTHING() {
 	return RETURN_NOTHING_STR;
@@ -273,44 +255,14 @@ inline char* RETURN_INT(const int& i) {
 	return Return;
 }
 
-inline char* RETURN_VECTOR(const Vector vector){
+inline char* RETURN_VECTOR(const Vector& vec){
 	msstring Return;
-	_snprintf(Return, MSSTRING_SIZE, "(%.2f,%.2f,%.2f)",vector.x, vector.y, vector.z);
+	_snprintf(Return, MSSTRING_SIZE, "(%.2f,%.2f,%.2f)",vec.x, vec.y, vec.z);
 	return Return;
 }
 
 
-/*
-#define RETURN_FLOAT_PRECISION(a) \
-	{                             \
-
-		_snprintf(Return, MSSTRING_SIZE, "%f", a); \
-		return Return;            \
-	}
-
-#define RETURN_FLOAT(a)             \
-	{                               \
-		_snprintf(Return, MSSTRING_SIZE, "%.2f", a); \
-		return Return;              \
-	}
-
-#define RETURN_INT(a)             \
-	{                             \
-		_snprintf(Return, MSSTRING_SIZE, "%i", a); \
-		return Return;            \
-	}
-
-	
-#define RETURN_VECTOR(a)                                    \
-	{                                                       \
-		_snprintf(Return, MSSTRING_SIZE, "(%.2f,%.2f,%.2f)", a.x, a.y, a.z); \
-		return Return;                                      \
-	}
-	*/
-
-
-
-inline const char* VecToString(const Vector& Vec, bool bAs2D)
+inline const char* VecToString(const Vector& Vec, bool bAs2D = false)
 {
 	msstring Return;
 	if (bAs2D)
@@ -385,38 +337,6 @@ inline const char* RETURN_ANGLE(const char* Prop, const char* name, const Vector
 }
 
 
-
-
-
-
-/*
-#define RETURN_POSITION(name, position)              \
-	{                                                \
-		if (Prop == name)                            \
-			return (Return = VecToString(position)); \
-		else if (Prop == name ".x")                  \
-			return RETURN_FLOAT(position.x);                \
-		else if (Prop == name ".y")                  \
-			return RETURN_FLOAT(position.y);               \
-		else if (Prop == name ".z")                  \
-			return RETURN_FLOAT(position.z);                \
-	}
-	
-#define RETURN_ANGLE(name, angles)                 \
-	{                                              \
-		if (Prop == name)                          \
-			return (Return = VecToString(angles)); \
-		else if (Prop == name ".pitch")            \
-			return RETURN_FLOAT(angles.x);             \
-		else if (Prop == name ".yaw")              \
-			return RETURN_FLOAT(angles.y);                 \
-		else if (Prop == name ".roll")             \
-			return RETURN_FLOAT(angles.z);                 \
-	}
-	*/
-
-
-
 // Legacy compatibility typedefs
 typedef LegacyScriptCmd scriptcmd_t;
 typedef LegacyScriptEvent SCRIPT_EVENT;
diff --git a/src/game/shared/ms/script.h b/src/game/shared/ms/script.h
index 1cf058ad..872d4cc9 100644
--- a/src/game/shared/ms/script.h
+++ b/src/game/shared/ms/script.h
@@ -416,8 +416,8 @@ extern globalscriptinfo_t *g_MSScriptInfo;
 #endif
 
 
-#ifndef VECTOR_H
-
-#endif // !VECTOR_H
+#ifndef VECTOR_H
+
+#endif // !VECTOR_H
 
 
diff --git a/src/game/shared/ms/stackstring.h b/src/game/shared/ms/stackstring.h
index 11aa17f2..2320be4f 100644
--- a/src/game/shared/ms/stackstring.h
+++ b/src/game/shared/ms/stackstring.h
@@ -160,9 +160,9 @@ class mslist
 
 //mstring - A fast string with features... no dynamic allocation
 //-Dogg
-#define MSSTRING_SIZE 256
-#define MSSTRING_MAXLEN (MSSTRING_SIZE-1)
-#define msstring_error ((size_t)-1)
+constexpr int MSSTRING_SIZE = 256;
+constexpr int MSSTRING_MAXLEN = (MSSTRING_SIZE - 1);
+constexpr int msstring_error = ((size_t)-1);
 
 class msstring
 {

From d582569b54635ba6be41d779c6062459134a41a8 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 12 Mar 2026 01:51:30 -0400
Subject: [PATCH 093/291] Fixed some magic number with enums. Changes a few
 defines to const.

---
 src/game/shared/ms/iscript.h      |   2 +-
 src/game/shared/ms/scriptcmds.cpp | 104 ++++++++++++++++--------------
 src/game/shared/stats/statdefs.h  |   4 +-
 3 files changed, 58 insertions(+), 52 deletions(-)

diff --git a/src/game/shared/ms/iscript.h b/src/game/shared/ms/iscript.h
index 73b6619b..df3f6dbe 100644
--- a/src/game/shared/ms/iscript.h
+++ b/src/game/shared/ms/iscript.h
@@ -262,7 +262,7 @@ inline char* RETURN_VECTOR(const Vector& vec){
 }
 
 
-inline const char* VecToString(const Vector& Vec, bool bAs2D = false)
+inline const char* VecToString(const Vector& Vec, bool bAs2D)
 {
 	msstring Return;
 	if (bAs2D)
diff --git a/src/game/shared/ms/scriptcmds.cpp b/src/game/shared/ms/scriptcmds.cpp
index b6180cf4..608e8a05 100644
--- a/src/game/shared/ms/scriptcmds.cpp
+++ b/src/game/shared/ms/scriptcmds.cpp
@@ -916,18 +916,18 @@ bool CScript::ScriptCmd_endgame(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstringl
 
 //Param1 = Property name
 //Param2 = Extra data
-const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, msstringlist &Params)
+const char* CBaseEntity::GetProp(CBaseEntity* pTarget, msstring& FullParams, msstringlist& Params)
 {
 	if (!pTarget) pTarget = this;
-	CGenericItem *pItem = pTarget->IsMSItem() ? (CGenericItem *)pTarget : NULL;
-	CMSMonster *pMonster = pTarget->IsMSMonster() ? (CMSMonster *)pTarget : NULL;
-	CBasePlayer *pPlayer = pTarget->IsPlayer() ? (CBasePlayer *)pTarget : NULL;
-	IScripted *pScripted = pTarget->GetScripted();
+	CGenericItem* pItem = pTarget->IsMSItem() ? (CGenericItem*)pTarget : NULL;
+	CMSMonster* pMonster = pTarget->IsMSMonster() ? (CMSMonster*)pTarget : NULL;
+	CBasePlayer* pPlayer = pTarget->IsPlayer() ? (CBasePlayer*)pTarget : NULL;
+	IScripted* pScripted = pTarget->GetScripted();
 
 	bool fSuccess = false;
 	int Stat = -1;
 	static msstring Return;
-	msstring &Prop = FullParams;
+	msstring& Prop = FullParams;
 
 	if (Prop == "name")				return pTarget->DisplayName();
 	else if (Prop == "id")				return EntToString(pTarget);
@@ -956,24 +956,24 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 	else if (Prop == "alive" || Prop == "isalive")			fSuccess = pTarget->IsAlive() ? true : false;
 	else if (Prop == "hp")				return RETURN_FLOAT(pTarget->pev->health);
 #ifdef VALVE_DLL
-	else if( Prop == "xp" || Prop == "skilllevel" )
+	else if (Prop == "xp" || Prop == "skilllevel")
 	{
 		//Thothie JUN2008a - return monsters XP value
 		//NOV2014_21 - moving to top, as this is one we'll have to use at mob spawn repeatedly
 		return RETURN_FLOAT(pMonster->m_SkillLevel);
 	}
-	else if ( Prop == "blood" ) //greatguys1 August2018
+	else if (Prop == "blood") //greatguys1 August2018
 	{
 		msstring blood;
-		if ( pTarget->BloodColor() == BLOOD_COLOR_RED )
+		if (pTarget->BloodColor() == BLOOD_COLOR_RED)
 		{
 			blood.append("red");
 		}
-		else if ( pTarget->BloodColor() == BLOOD_COLOR_GREEN )
+		else if (pTarget->BloodColor() == BLOOD_COLOR_GREEN)
 		{
 			blood.append("green");
 		}
-		else if ( pTarget->BloodColor() == BLOOD_COLOR_YELLOW )
+		else if (pTarget->BloodColor() == BLOOD_COLOR_YELLOW)
 		{
 			blood.append("yellow");
 		}
@@ -984,7 +984,7 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 
 		return blood.c_str();
 	}
-	else if( Prop == "renderprops" ) //Thothie MAR2015_17)
+	else if (Prop == "renderprops") //Thothie MAR2015_17)
 	{
 		msstring renderprops;
 		renderprops.append(FloatToString(pTarget->pev->scale));
@@ -1051,43 +1051,43 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 	else if (Prop == "ducking")		fSuccess = FBitSet(pTarget->pev->flags, FL_DUCKING) ? true : false;
 	else if (Prop == "onground")		fSuccess = FBitSet(pTarget->pev->flags, FL_ONGROUND) ? true : false;
 #ifdef VALVE_DLL
-	else if( Prop == "canattack" ) //Thothie AUG2007a
+	else if (Prop == "canattack") //Thothie AUG2007a
 	{
-		if ( pTarget->IsPlayer() )
+		if (pTarget->IsPlayer())
 		{
-			CBasePlayer *pPlayer = (CBasePlayer *)pTarget;
+			CBasePlayer* pPlayer = (CBasePlayer*)pTarget;
 			fSuccess = FBitSet(pPlayer->m_StatusFlags, PLAYER_MOVE_NOATTACK) ? false : true;
 		}
 	}
-	else if( Prop == "canmove" ) //Thothie AUG2007a
+	else if (Prop == "canmove") //Thothie AUG2007a
 	{
-		if ( pTarget->IsPlayer() )
+		if (pTarget->IsPlayer())
 		{
-			CBasePlayer *pPlayer = (CBasePlayer *)pTarget;
+			CBasePlayer* pPlayer = (CBasePlayer*)pTarget;
 			fSuccess = FBitSet(pPlayer->m_StatusFlags, PLAYER_MOVE_NOMOVE) ? false : true;
 		}
 	}
-	else if( Prop == "canjump" ) //Thothie AUG2007a
+	else if (Prop == "canjump") //Thothie AUG2007a
 	{
-		if ( pTarget->IsPlayer() )
+		if (pTarget->IsPlayer())
 		{
-			CBasePlayer *pPlayer = (CBasePlayer *)pTarget;
+			CBasePlayer* pPlayer = (CBasePlayer*)pTarget;
 			fSuccess = FBitSet(pPlayer->m_StatusFlags, PLAYER_MOVE_NOJUMP) ? false : true;
 		}
 	}
-	else if( Prop == "canrun" ) //Thothie AUG2007a
+	else if (Prop == "canrun") //Thothie AUG2007a
 	{
-		if ( pTarget->IsPlayer() )
+		if (pTarget->IsPlayer())
 		{
-			CBasePlayer *pPlayer = (CBasePlayer *)pTarget;
+			CBasePlayer* pPlayer = (CBasePlayer*)pTarget;
 			fSuccess = FBitSet(pPlayer->m_StatusFlags, PLAYER_MOVE_NORUN) ? false : true;
 		}
 	}
-	else if( Prop == "canduck" ) //Thothie AUG2007a
+	else if (Prop == "canduck") //Thothie AUG2007a
 	{
-		if ( pTarget->IsPlayer() )
+		if (pTarget->IsPlayer())
 		{
-			CBasePlayer *pPlayer = (CBasePlayer *)pTarget;
+			CBasePlayer* pPlayer = (CBasePlayer*)pTarget;
 			fSuccess = FBitSet(pPlayer->m_StatusFlags, PLAYER_MOVE_NODUCK) ? false : true;
 		}
 	}
@@ -1103,7 +1103,7 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 	{
 		if (pTarget->IsPlayer())
 		{
-			CBasePlayer *pPlayer = (CBasePlayer *)pTarget;
+			CBasePlayer* pPlayer = (CBasePlayer*)pTarget;
 			fSuccess = FBitSet(pPlayer->m_StatusFlags, PLAYER_MOVE_SITTING) ? true : false;
 		}
 	}
@@ -1124,7 +1124,7 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 		//fSuccess = FBitSet(pTarget->pev->flags,FL_GODMODE) ? true : false;
 		//(still not workign) :/
 		//Thothie FEB2015_18 - yet another attempt:
-		return RETURN_INT( (pTarget->pev->flags & FL_GODMODE) ? 1 : 0);
+		return RETURN_INT((pTarget->pev->flags & FL_GODMODE) ? 1 : 0);
 	}
 	else if (Prop == "waterlevel")			return RETURN_INT(pTarget->pev->waterlevel);
 	else if (Prop == "anim.current_frame")	return RETURN_FLOAT(pTarget->pev->frame);
@@ -1144,7 +1144,7 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 	{
 		//MIB JAN2010_20 - range check take model widths into account
 		float Dist;
-		CMSMonster *pMonsterMe = IsMSMonster() ? (CMSMonster *)this : NULL;
+		CMSMonster* pMonsterMe = IsMSMonster() ? (CMSMonster*)this : NULL;
 		if (Prop == "range" || Prop == "dist")
 		{
 			if (pMonster && pMonsterMe)
@@ -1156,22 +1156,29 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 			Dist = (pTarget->pev->origin - pev->origin).Length2D();
 
 		return RETURN_FLOAT(Dist);
-			//original
-			//float Dist = (Prop == "range" || Prop == "dist" ) ? (pTarget->pev->origin - pev->origin).Length() : (pTarget->pev->origin - pev->origin).Length2D();
-			//RETURN_FLOAT( Dist )
+		//original
+		//float Dist = (Prop == "range" || Prop == "dist" ) ? (pTarget->pev->origin - pev->origin).Length() : (pTarget->pev->origin - pev->origin).Length2D();
+		//RETURN_FLOAT( Dist )
 	}
 	else if (Prop.starts_with("eyepos"))	return RETURN_POSITION(Prop, "eyepos", pTarget->EyePosition());
 	else if (Prop.starts_with("velocity"))	return RETURN_POSITION(Prop, "velocity", pTarget->pev->velocity);
 	else if (Prop.starts_with("angles"))
 	{
-		return RETURN_ANGLE(Prop, "angles", pTarget->pev->angles);
-		//return RETURN_POSITION(Prop,"angles", pTarget->pev->angles); These would not be hit in this statement
+		if (Prop.contains("yaw") || Prop.contains("pitch") || Prop.contains("roll")) {
+			return RETURN_ANGLE(Prop, "angles", pTarget->pev->angles);
+		}
+		else {
+			return RETURN_POSITION(Prop, "angles", pTarget->pev->angles);
+		}
 	}
 	else if (Prop.starts_with("viewangles"))
 	{
-		return RETURN_ANGLE(Prop, "viewangles", pTarget->pev->v_angle);
-
-		//RETURN_POSITION(Prop,"viewangles", pTarget->pev->v_angle)// this would not be his in this statement due to previous macro return
+		if (Prop.contains("yaw") || Prop.contains("pitch") || Prop.contains("roll")) {
+			return RETURN_ANGLE(Prop, "viewangles", pTarget->pev->v_angle);
+		}
+		else {
+			return RETURN_POSITION(Prop, "viewangles", pTarget->pev->v_angle); 
+		}
 	}
 	else if (Prop == "target")
 	{
@@ -1186,7 +1193,7 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 
 		if (Params.size() > 1) remove_on_find = true;
 
-		if (!pPlayer->m_ChosenArrow || pPlayer->m_ChosenArrow->iQuantity <= 0 || !msstring(pPlayer->m_ChosenArrow->m_Name).starts_with("proj_bolt"))
+		if (pPlayer && !pPlayer->m_ChosenArrow || pPlayer->m_ChosenArrow->iQuantity <= 0 || !msstring(pPlayer->m_ChosenArrow->m_Name).starts_with("proj_bolt"))
 		{
 			//return "unset";
 			CGenericItem *pProjInPack = NULL, *pPack = NULL;
@@ -1655,15 +1662,14 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 				else if (Prop.starts_with("skill."))
 				{
 					int SubSkill = -1;
-					if (Prop.contains(".prof"))			SubSkill = 0;
-					else if (Prop.contains(".balance"))	SubSkill = 1;
-					else if (Prop.contains(".power"))		SubSkill = 2;
-
-					else if (Prop.contains(".fire"))			SubSkill = 0;	//Magic
-					else if (Prop.contains(".ice"))			SubSkill = 1;
-					else if (Prop.contains(".lightning"))		SubSkill = 2;
-					else if (Prop.contains(".divination"))		SubSkill = 3;
-					else if (Prop.contains(".affliction"))		SubSkill = 4;
+					if (Prop.contains(".prof"))				SubSkill = STATPROP_SKILL;
+					else if (Prop.contains(".balance"))		SubSkill = STATPROP_BALANCE;
+					else if (Prop.contains(".power"))		SubSkill = STATPROP_POWER;
+					else if (Prop.contains(".fire"))		SubSkill = STAT_MAGIC_FIRE;
+					else if (Prop.contains(".ice"))			SubSkill = STAT_MAGIC_ICE;
+					else if (Prop.contains(".lightning"))	SubSkill = STAT_MAGIC_LIGHTNING;
+					else if (Prop.contains(".divination"))	SubSkill = STAT_MAGIC_DIVINATION;
+					else if (Prop.contains(".affliction"))	SubSkill = STAT_MAGIC_AFFLICTION;
 
 					int Max = (SubSkill > -1) ? (int)STATPROP_MAX_VALUE : (int)STAT_MAX_VALUE;
 
@@ -1678,7 +1684,7 @@ const char* CBaseEntity::GetProp(CBaseEntity *pTarget, msstring &FullParams, mss
 							if (SubSkill > -1) Amount = pPlayer->GetSkillStat(Skill.c_str(), SubSkill);
 							else Amount = pPlayer->GetSkillStat(Stat);
 
-							if (Prop.contains(".ratio")) return RETURN_FLOAT_PRECISION(Amount / (float)Max);
+							if (Prop.contains(".ratio")) return RETURN_FLOAT_PRECISION((float)Amount / (float)Max);
 							else return RETURN_INT(Amount);
 						}
 						else ALERT(at_console, "Player skill %s doesn't exist!\n", Skill.c_str());
diff --git a/src/game/shared/stats/statdefs.h b/src/game/shared/stats/statdefs.h
index 9fab517b..0d87440d 100644
--- a/src/game/shared/stats/statdefs.h
+++ b/src/game/shared/stats/statdefs.h
@@ -72,8 +72,8 @@ int GetNatStatByName(const char *pszName);					 //Returns -1 if not found
 void GetStatIndices(const char *Name, int &Stat, int &Prop); //Converts stat.prop into valid indices
 const char *GetSkillName(int Skill);						 //Looks any skill
 
-#define STAT_MAX_VALUE 300.0
-#define STATPROP_MAX_VALUE 100.0
+constexpr float STAT_MAX_VALUE = 300.0f;
+constexpr float STATPROP_MAX_VALUE = 100.0f;
 	//level cap
 
 //For MSMonster::m_PlayerDamage

From 3c604c734f2f440075a1e346c2dbc018bd0a5b80 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 12 Mar 2026 14:34:07 -0400
Subject: [PATCH 094/291] Line end

---
 src/game/shared/ms/iscript.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/shared/ms/iscript.h b/src/game/shared/ms/iscript.h
index df3f6dbe..a71d818d 100644
--- a/src/game/shared/ms/iscript.h
+++ b/src/game/shared/ms/iscript.h
@@ -19,7 +19,7 @@ class CBaseEntity;
 #ifndef ulong
 typedef unsigned long ulong;
 #endif
-#endif
+#endif
 
 
 struct scriptvar_t

From d41b9acccb558620f355ae8fce03061670e354d8 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 12 Mar 2026 17:25:36 -0400
Subject: [PATCH 095/291] Rename STATPROP enums to STAT_PROP

---
 src/game/client/ui/ms/vgui_stats.cpp         |  2 +-
 src/game/server/client.cpp                   |  4 ++--
 src/game/server/monsters/msmonsterserver.cpp | 16 +++++++-------
 src/game/server/monsters/npcscript.cpp       |  6 +++---
 src/game/server/player/player.cpp            |  4 ++--
 src/game/server/sv_character.cpp             |  6 +++---
 src/game/shared/ms/mscharacter.h             | 10 ++++-----
 src/game/shared/ms/script.cpp                |  2 +-
 src/game/shared/ms/scriptcmds.cpp            |  8 +++----
 src/game/shared/stats/statdefs.h             | 16 +++++++-------
 src/game/shared/stats/stats.cpp              | 16 +++++++-------
 src/game/shared/weapons/giattack.cpp         | 22 ++++++++++----------
 src/game/shared/weapons/giprojectile.cpp     |  2 +-
 13 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/src/game/client/ui/ms/vgui_stats.cpp b/src/game/client/ui/ms/vgui_stats.cpp
index 1e90fd71..e61bd625 100644
--- a/src/game/client/ui/ms/vgui_stats.cpp
+++ b/src/game/client/ui/ms/vgui_stats.cpp
@@ -330,7 +330,7 @@ void CStatPanel::Update()
 				Percent = 0.0;
 
 			const char* Name = "";
-			if (iSubStats <= STATPROP_TOTAL)
+			if (iSubStats <= STAT_PROP_TOTAL)
 				Name = SkillTypeList[i];
 			else
 				Name = SpellTypeList[i];
diff --git a/src/game/server/client.cpp b/src/game/server/client.cpp
index 8aff1767..6c4288fb 100644
--- a/src/game/server/client.cpp
+++ b/src/game/server/client.cpp
@@ -1607,7 +1607,7 @@ void ClientCommand2(edict_t *pEntity)
 						if (iProp > -1)
 						{
 							int value = atoi(CMD_ARGV(2));
-							pStat->m_SubStats[iProp].Value = min(value, STATPROP_MAX_VALUE);
+							pStat->m_SubStats[iProp].Value = min(value, STAT_PROP_MAX_VALUE);
 						}
 					}
 				}
@@ -1619,7 +1619,7 @@ void ClientCommand2(edict_t *pEntity)
 						int iSubStat = atoi(CMD_ARGV(2));
 						int value = atoi(CMD_ARGV(3));
 						if (iSubStat < (signed)pStat->m_SubStats.size())
-							pStat->m_SubStats[iSubStat].Value = min(value, STATPROP_MAX_VALUE);
+							pStat->m_SubStats[iSubStat].Value = min(value, STAT_PROP_MAX_VALUE);
 					}
 				}
 			}
diff --git a/src/game/server/monsters/msmonsterserver.cpp b/src/game/server/monsters/msmonsterserver.cpp
index 80948615..8a412340 100644
--- a/src/game/server/monsters/msmonsterserver.cpp
+++ b/src/game/server/monsters/msmonsterserver.cpp
@@ -2129,7 +2129,7 @@ float CMSMonster::TraceAttack(damage_t& Damage)
 			//- maybe internalize Parry for monsters?
 			//- Thothie note of FEB2008a
 
-			int ParryValue = GetSkillStat("parry", STATPROP_SKILL);
+			int ParryValue = GetSkillStat("parry", STAT_PROP_SKILL);
 
 			if (ParryValue > 60)
 				ParryValue = 60; //Thothie JAN2010_22 - cap out parry (shhh)
@@ -2198,14 +2198,14 @@ float CMSMonster::TraceAttack(damage_t& Damage)
 				//Learn parry skill from  a successful parry
 				if( !pAttacker->IsPlayer() )  //Can't learn from being attacked by players
 					if ( GetSkillStat( SKILL_PARRY, 0 ) < CHAR_LEVEL_CAP )
-						LearnSkill ( SKILL_PARRY, STATPROP_SKILL, max( 0 , pMonster->m_SkillLevel * 2 ) );
+						LearnSkill ( SKILL_PARRY, STAT_PROP_SKILL, max( 0 , pMonster->m_SkillLevel * 2 ) );
 				//MiB Jul2008a (JAN2010_15) - Parry was capped at 40. What say we stop exp gain?
 
 					/*if (pMonster->m_SkillLevel * 2 > 0)
-						LearnSkill (SKILL_PARRY, STATPROP_SKILL, pMonster->m_SkillLevel * 2 );
+						LearnSkill (SKILL_PARRY, STAT_PROP_SKILL, pMonster->m_SkillLevel * 2 );
 					else
-						LearnSkill (SKILL_PARRY, STATPROP_SKILL, 0 );
-					//LearnSkill( SKILL_PARRY, STATPROP_SKILL, max(pAttacker->m_SkillLevel * 2,0) );*/
+						LearnSkill (SKILL_PARRY, STAT_PROP_SKILL, 0 );
+					//LearnSkill( SKILL_PARRY, STAT_PROP_SKILL, max(pAttacker->m_SkillLevel * 2,0) );*/
 			}
 		}
 
@@ -2434,7 +2434,7 @@ void CMSMonster::Killed(entvars_t* pevAttacker, int iGib)
 			float mult = V_min(1, m_MaxHP / m_PlayerDamage[i - 1].dmgInTotal);
 			for (int n = SKILL_FIRSTSKILL; n < SKILL_MAX_ATTACK; n++)
 			{
-				for (int r = 0; r < STATPROP_ALL_TOTAL; r++)
+				for (int r = 0; r < STAT_PROP_ALL_TOTAL; r++)
 				{
 					float dmg = m_PlayerDamage[i - 1].dmg[n][r];
 					if (dmg > 0)
@@ -2760,8 +2760,8 @@ std::tuple<bool, int> CMSMonster::LearnSkill(int iStat, int iStatType, int Enemy
 		return std::make_tuple(false, iExpRemaining);
 
 	SubStat.Value += 1;
-	if (SubStat.Value > STATPROP_MAX_VALUE)
-		SubStat.Value = STATPROP_MAX_VALUE;
+	if (SubStat.Value > STAT_PROP_MAX_VALUE)
+		SubStat.Value = STAT_PROP_MAX_VALUE;
 	SubStat.Exp = 0;
 
 	//Thothie - why's this here twice? I dont see where oldval could change.
diff --git a/src/game/server/monsters/npcscript.cpp b/src/game/server/monsters/npcscript.cpp
index 07644b1a..c920e6c2 100644
--- a/src/game/server/monsters/npcscript.cpp
+++ b/src/game/server/monsters/npcscript.cpp
@@ -409,7 +409,7 @@ bool CMSMonster::Script_ExecuteCmd(CScript *Script, SCRIPT_EVENT &Event, scriptc
 			{
 				// for (int r = 0; r < SKILL_MAX_ATTACK; r++)
 				// {
-				// 	for (unsigned int s = 0; s < STATPROP_ALL_TOTAL; s++)
+				// 	for (unsigned int s = 0; s < STAT_PROP_ALL_TOTAL; s++)
 				// 		m_PlayerDamage[p].dmg[r][s] = 0;
 				// }
 				// m_PlayerDamage[p].dmgInTotal = 0;
@@ -441,7 +441,7 @@ bool CMSMonster::Script_ExecuteCmd(CScript *Script, SCRIPT_EVENT &Event, scriptc
 				{
 					// for (int r = 0; r < SKILL_MAX_ATTACK; r++)
 					// {
-					// 	for (unsigned int s = 0; s < STATPROP_ALL_TOTAL; s++)
+					// 	for (unsigned int s = 0; s < STAT_PROP_ALL_TOTAL; s++)
 					// 		m_PlayerDamage[p].dmg[r][s] = 0;
 					// }
 					// m_PlayerDamage[p].dmgInTotal = 0;
@@ -1345,7 +1345,7 @@ bool CMSMonster::Script_ExecuteCmd(CScript *Script, SCRIPT_EVENT &Event, scriptc
 						if (iProp > -1)
 						{
 							int value = atoi(Params[1]);
-							pStat->m_SubStats[iProp].Value = V_min(value, STATPROP_MAX_VALUE);
+							pStat->m_SubStats[iProp].Value = V_min(value, STAT_PROP_MAX_VALUE);
 						}
 					}
 				}
diff --git a/src/game/server/player/player.cpp b/src/game/server/player/player.cpp
index d26c52e5..735fcb36 100644
--- a/src/game/server/player/player.cpp
+++ b/src/game/server/player/player.cpp
@@ -5549,7 +5549,7 @@ void CBasePlayer::TransactionCallback(CBasePlayer *pPlayer, int slot, TCallbackM
 		StealNoticeCheck( this, pMonster, false );
 		m_TimeCanSteal = gpGlobals->time + 3.0;
 		}
-		if( !pMonster->IsPlayer() ) LearnSkill( MAKE_STRING("stealing"), STATPROP_SKILL, 15 );
+		if( !pMonster->IsPlayer() ) LearnSkill( MAKE_STRING("stealing"), STAT_PROP_SKILL, 15 );
 		*/}
 		break;
 		case TRANS_STEALITEM:
@@ -5675,7 +5675,7 @@ void StealNoticeCheck(CBasePlayer *pPlayer, CMSMonster *pVictim, bool fStealSucc
 	}
 	else {
 		//Succes, advance the skill
-		if( !pVictim->IsPlayer() ) pPlayer->LearnSkill( MAKE_STRING("theft"), STATPROP_SKILL, pVictim->GetNatStat(NATURAL_AWR) + pVictim->SkillLevel );
+		if( !pVictim->IsPlayer() ) pPlayer->LearnSkill( MAKE_STRING("theft"), STAT_PROP_SKILL, pVictim->GetNatStat(NATURAL_AWR) + pVictim->SkillLevel );
 	}
 	*/
 }
diff --git a/src/game/server/sv_character.cpp b/src/game/server/sv_character.cpp
index 86ac38ac..a7d8a59f 100644
--- a/src/game/server/sv_character.cpp
+++ b/src/game/server/sv_character.cpp
@@ -46,9 +46,9 @@ void CBasePlayer::CreateChar(createchar_t &CharData)
 		CStat &Stat = m_Stats[i];
 		if (Stat.m_SubStats.size() == 1) //Parry - Only give 1 to proficiency
 			Stat.m_SubStats[0].Value = 1;
-		else if (Stat.m_SubStats.size() <= STATPROP_TOTAL) //Weapon Skills - Give 1 to power
-			Stat.m_SubStats[STATPROP_POWER].Value = 1;
-		else if (Stat.m_SubStats.size() > STATPROP_TOTAL) //Spellcasting - Give 1 to each spell category
+		else if (Stat.m_SubStats.size() <= STAT_PROP_TOTAL) //Weapon Skills - Give 1 to power
+			Stat.m_SubStats[STAT_PROP_POWER].Value = 1;
+		else if (Stat.m_SubStats.size() > STAT_PROP_TOTAL) //Spellcasting - Give 1 to each spell category
 			for (unsigned int r = 0; r < Stat.m_SubStats.size(); r++)
 				Stat.m_SubStats[r].Value = 1;
 	}
diff --git a/src/game/shared/ms/mscharacter.h b/src/game/shared/ms/mscharacter.h
index a8565ffe..d3b29c9a 100644
--- a/src/game/shared/ms/mscharacter.h
+++ b/src/game/shared/ms/mscharacter.h
@@ -109,17 +109,17 @@ struct charsendinfo_t : charinfo_base_t
 
 struct natstat_t
 {
-	short Value[STATPROP_TOTAL];
+	short Value[STAT_PROP_TOTAL];
 };
 struct skillstat_t
 {
-	short Value[STATPROP_TOTAL];
-	ulong Exp[STATPROP_TOTAL];
+	short Value[STAT_PROP_TOTAL];
+	ulong Exp[STAT_PROP_TOTAL];
 };
 struct spellskillstat_t
 {
-	short Value[STATPROP_TOTAL];
-	long Exp[STATPROP_TOTAL];
+	short Value[STAT_PROP_TOTAL];
+	long Exp[STAT_PROP_TOTAL];
 };
 
 #define SAVECHAR_VERSION_MSC 11 // Legacy MS: Classic
diff --git a/src/game/shared/ms/script.cpp b/src/game/shared/ms/script.cpp
index 0fff3a23..9d7f876b 100644
--- a/src/game/shared/ms/script.cpp
+++ b/src/game/shared/ms/script.cpp
@@ -5336,7 +5336,7 @@ int CScript::ParseLine(const char* pszCommandLine, int LineNum, SCRIPT_EVENT** p
 				}
 			}
 			else
-				MS_ERROR("Script::ParseLine() Script: %s Line: %i - if() statement missing ')'!", (const char*)m.ScriptFile.c_str(), LineNum);
+				MS_ERROR("Script::ParseLine() Script: %s Line: %i - if() statement missing ')'! Value: %c", (const char*)m.ScriptFile.c_str(), LineNum, ParamStr.c_str()[0]);
 		}
 	}
 	else if (!_stricmp(TestCommand, "else"))
diff --git a/src/game/shared/ms/scriptcmds.cpp b/src/game/shared/ms/scriptcmds.cpp
index 608e8a05..f078d694 100644
--- a/src/game/shared/ms/scriptcmds.cpp
+++ b/src/game/shared/ms/scriptcmds.cpp
@@ -1662,16 +1662,16 @@ const char* CBaseEntity::GetProp(CBaseEntity* pTarget, msstring& FullParams, mss
 				else if (Prop.starts_with("skill."))
 				{
 					int SubSkill = -1;
-					if (Prop.contains(".prof"))				SubSkill = STATPROP_SKILL;
-					else if (Prop.contains(".balance"))		SubSkill = STATPROP_BALANCE;
-					else if (Prop.contains(".power"))		SubSkill = STATPROP_POWER;
+					if (Prop.contains(".prof"))				SubSkill = STAT_PROP_SKILL;
+					else if (Prop.contains(".balance"))		SubSkill = STAT_PROP_BALANCE;
+					else if (Prop.contains(".power"))		SubSkill = STAT_PROP_POWER;
 					else if (Prop.contains(".fire"))		SubSkill = STAT_MAGIC_FIRE;
 					else if (Prop.contains(".ice"))			SubSkill = STAT_MAGIC_ICE;
 					else if (Prop.contains(".lightning"))	SubSkill = STAT_MAGIC_LIGHTNING;
 					else if (Prop.contains(".divination"))	SubSkill = STAT_MAGIC_DIVINATION;
 					else if (Prop.contains(".affliction"))	SubSkill = STAT_MAGIC_AFFLICTION;
 
-					int Max = (SubSkill > -1) ? (int)STATPROP_MAX_VALUE : (int)STAT_MAX_VALUE;
+					int Max = (SubSkill > -1) ? (int)STAT_PROP_MAX_VALUE : (int)STAT_MAX_VALUE;
 
 					if (Prop.contains(".max")) return RETURN_INT(Max);
 					else
diff --git a/src/game/shared/stats/statdefs.h b/src/game/shared/stats/statdefs.h
index 0d87440d..47a95d90 100644
--- a/src/game/shared/stats/statdefs.h
+++ b/src/game/shared/stats/statdefs.h
@@ -52,10 +52,10 @@ enum
 
 enum
 {
-	STATPROP_SKILL = 0,
-	STATPROP_BALANCE,
-	STATPROP_POWER,
-	STATPROP_TOTAL,
+	STAT_PROP_SKILL = 0,
+	STAT_PROP_BALANCE,
+	STAT_PROP_POWER,
+	STAT_PROP_TOTAL,
 
 	STAT_MAGIC_FIRE = 0, //Magic.  These override the above properties for spellcasting
 	STAT_MAGIC_ICE,
@@ -63,7 +63,7 @@ enum
 	STAT_MAGIC_DIVINATION,
 	STAT_MAGIC_AFFLICTION,
 	STAT_MAGIC_TOTAL,
-	STATPROP_ALL_TOTAL = STAT_MAGIC_TOTAL,
+	STAT_PROP_ALL_TOTAL = STAT_MAGIC_TOTAL,
 };
 
 int GetSkillStatByName(const char *pszName);				 //Returns -1 if not found
@@ -73,13 +73,13 @@ void GetStatIndices(const char *Name, int &Stat, int &Prop); //Converts stat.pro
 const char *GetSkillName(int Skill);						 //Looks any skill
 
 constexpr float STAT_MAX_VALUE = 300.0f;
-constexpr float STATPROP_MAX_VALUE = 100.0f;
+constexpr float STAT_PROP_MAX_VALUE = 100.0f;
 	//level cap
 
 //For MSMonster::m_PlayerDamage
 struct playerdamage_t
 {
-	float dmg[SKILL_MAX_ATTACK][STATPROP_ALL_TOTAL]; //Record damage done with with each combat skill
+	float dmg[SKILL_MAX_ATTACK][STAT_PROP_ALL_TOTAL]; //Record damage done with with each combat skill
 	float dmgInTotal; //MiB Mar2008a - For keeping track of all damage a player has done, regardless of what skill it was
 	char msId[32]; // MiB MAR2019_22 [SLOT_EXP] - Keep track of the steam id / slot to avoid passing exp to the wrong character
 
@@ -88,7 +88,7 @@ struct playerdamage_t
 	{
 		for(unsigned int i = 0; i < SKILL_MAX_ATTACK; i++)
 		{
-			for(int j = 0; j < STATPROP_ALL_TOTAL; j++)
+			for(int j = 0; j < STAT_PROP_ALL_TOTAL; j++)
 			{
 				dmg[i][j] = 0;
 			}
diff --git a/src/game/shared/stats/stats.cpp b/src/game/shared/stats/stats.cpp
index eb09f1b7..33c58609 100644
--- a/src/game/shared/stats/stats.cpp
+++ b/src/game/shared/stats/stats.cpp
@@ -16,18 +16,18 @@ statinfo_t NatStatList[6] =
 
 skillstatinfo_t SkillStatList[9] =
 {
-	{"Swordsmanship", "swordsmanship", STATPROP_TOTAL},
-	{"Martial Arts", "martialarts", STATPROP_TOTAL},
-	{"Small Arms", "smallarms", STATPROP_TOTAL},
-	{"Axe Handling", "axehandling", STATPROP_TOTAL},
-	{"Blunt Arms", "bluntarms", STATPROP_TOTAL},
-	{"Archery", "archery", STATPROP_TOTAL},
+	{"Swordsmanship", "swordsmanship", STAT_PROP_TOTAL},
+	{"Martial Arts", "martialarts", STAT_PROP_TOTAL},
+	{"Small Arms", "smallarms", STAT_PROP_TOTAL},
+	{"Axe Handling", "axehandling", STAT_PROP_TOTAL},
+	{"Blunt Arms", "bluntarms", STAT_PROP_TOTAL},
+	{"Archery", "archery", STAT_PROP_TOTAL},
 	//	"Shield handling",
 	//	"Two-handed weapons",
 	//	"Dual weapons",
 	{"Spell Casting", "spellcasting", STAT_MAGIC_TOTAL},
 	{"Parry", "parry", 1},
-	{"Pole Arms", "polearms", STATPROP_TOTAL}, // MiB JUL2010_02 - Pole Arms!
+	{"Pole Arms", "polearms", STAT_PROP_TOTAL}, // MiB JUL2010_02 - Pole Arms!
 	//	"Spell Preparation",
 	//	"Swimming",
 	//	"Pickpocket", true,
@@ -70,7 +70,7 @@ int GetSubSkillByName(const char* pszName)
 {
 	if (!_stricmp(pszName, "prof")) // alias for proficiency
 		return 0;
-	for (unsigned int i = 0; i < STATPROP_TOTAL; i++)
+	for (unsigned int i = 0; i < STAT_PROP_TOTAL; i++)
 		if (!_stricmp(pszName, SkillTypeList[i]))
 			return i;
 	for (unsigned int i = 0; i < STAT_MAGIC_TOTAL; i++)
diff --git a/src/game/shared/weapons/giattack.cpp b/src/game/shared/weapons/giattack.cpp
index 750fc128..f5aab401 100644
--- a/src/game/shared/weapons/giattack.cpp
+++ b/src/game/shared/weapons/giattack.cpp
@@ -504,9 +504,9 @@ void CGenericItem::RegisterAttack()
 		attData.StatPower = Stat;
 		attData.StatProf = Stat;
 		attData.StatExp = Stat;
-		attData.PropBalance = STATPROP_BALANCE;
-		attData.PropPower = STATPROP_POWER;
-		attData.PropProf = STATPROP_BALANCE;
+		attData.PropBalance = STAT_PROP_BALANCE;
+		attData.PropPower = STAT_PROP_POWER;
+		attData.PropProf = STAT_PROP_BALANCE;
 		attData.PropExp = -1;	//Random
 	}*/
 
@@ -753,7 +753,7 @@ void CGenericItem::StrikeLand()
 	long randomMulti = RANDOM_LONG(0, CurrentAttack->flDamageRange);
 	float flDamage = CurrentAttack->flDamage + randomMulti; //fine even if 0.
 
-	flDamageFraction = CurrentAttackBalance / STATPROP_MAX_VALUE;
+	flDamageFraction = CurrentAttackBalance / STAT_PROP_MAX_VALUE;
 	flDamageFraction = V_max(flDamageFraction, 0);
 
 	std::string szDamage = std::to_string(flDamage);
@@ -764,7 +764,7 @@ void CGenericItem::StrikeLand()
 	//UTIL_ClientPrintAll(HUD_PRINTCONSOLE, "Balance: %s : Fraction : %s", szBalance.c_str(), szFraction.c_str());
 
 	//fraction based on balance. Power stat for weapon -> 45? Multiplier is 0.45
-	flDamageFraction = CurrentAttackPower / STATPROP_MAX_VALUE;
+	flDamageFraction = CurrentAttackPower / STAT_PROP_MAX_VALUE;
 	flDamageFraction = V_max(flDamageFraction, 0.001f); //why is this 0.001f?
 
 	std::string szPower = std::to_string(CurrentAttackPower);
@@ -772,8 +772,8 @@ void CGenericItem::StrikeLand()
 
 	//UTIL_ClientPrintAll(HUD_PRINTCONSOLE, "Power: %s : Fraction: %s", szPower.c_str(), szFraction.c_str());	
 
-	//	flDmgFraction = max(mSStat( CurrentAttack->sAttackStat, STATPROP_POWER ) / STATPROP_MAX_VALUE,0);
-	//	ALERT( at_console, "Use stat: %i  Value: %i %i %i\n", GetStatByName( (char*)STRING(CurrentAttack->sAttackStat) ), mSStat( CurrentAttack->sAttackStat, STATPROP_SPEED ), mSStat( CurrentAttack->sAttackStat, STATPROP_BALANCE ), mSStat( CurrentAttack->sAttackStat, STATPROP_POWER ) );
+	//	flDmgFraction = max(mSStat( CurrentAttack->sAttackStat, STAT_PROP_POWER ) / STAT_PROP_MAX_VALUE,0);
+	//	ALERT( at_console, "Use stat: %i  Value: %i %i %i\n", GetStatByName( (char*)STRING(CurrentAttack->sAttackStat) ), mSStat( CurrentAttack->sAttackStat, STAT_PROP_SPEED ), mSStat( CurrentAttack->sAttackStat, STAT_PROP_BALANCE ), mSStat( CurrentAttack->sAttackStat, STAT_PROP_POWER ) );
 	// 	
 
 	flDamage *= flDamageFraction;
@@ -1041,7 +1041,7 @@ void CGenericItem::ChargeThrowProj()
 		flTimeHeldAdjusted = CurrentAttack->tMaxHold ? (flTimeHeldAdjusted / CurrentAttack->tMaxHold) : 0; //[0.0 to 1.0]
 
 		//Shoot more accurately for higher skill
-		float flAccFraction = m_pOwner->GetSkillStat(CurrentAttack->StatBalance, CurrentAttack->PropBalance) / STATPROP_MAX_VALUE;
+		float flAccFraction = m_pOwner->GetSkillStat(CurrentAttack->StatBalance, CurrentAttack->PropBalance) / STAT_PROP_MAX_VALUE;
 		flAccFraction = 1 - V_min(V_max(flAccFraction, 0.0f), 1.0f);
 
 		//Shoot more accurately for drawing the bow back longer
@@ -1286,12 +1286,12 @@ void CGenericItem::OwnerTakeDamage(damage_t &Damage)
 //									AttackStat = GetStatByName( STRING(pItem->CurrentAttack->sAttackStat) );
 //									//I missed the monster, so learn about accuracy
 //									if( !bActualHit )
-//										pPlayer->LearnSkill( AttackStat, STATPROP_BALANCE, pMonster->m_SkillLevel );
+//										pPlayer->LearnSkill( AttackStat, STAT_PROP_BALANCE, pMonster->m_SkillLevel );
 //									//I hit the monster, so learn about damage
 //									else
-//										pPlayer->LearnSkill( AttackStat, STATPROP_POWER, pMonster->m_SkillLevel );
+//										pPlayer->LearnSkill( AttackStat, STAT_PROP_POWER, pMonster->m_SkillLevel );
 //									//Always learn about proficiency
-//									pPlayer->LearnSkill( AttackStat, STATPROP_SKILL, pMonster->m_SkillLevel * max(pItem->CurrentAttack->iPriority,0.5) );
+//									pPlayer->LearnSkill( AttackStat, STAT_PROP_SKILL, pMonster->m_SkillLevel * max(pItem->CurrentAttack->iPriority,0.5) );
 //
 //								}
 //							}
diff --git a/src/game/shared/weapons/giprojectile.cpp b/src/game/shared/weapons/giprojectile.cpp
index 552773a0..0118eece 100644
--- a/src/game/shared/weapons/giprojectile.cpp
+++ b/src/game/shared/weapons/giprojectile.cpp
@@ -150,7 +150,7 @@ void CGenericItem::ProjectileTouch(CBaseEntity *pOther)
 		if (pOwner->IsPlayer())
 		{
 			CMSMonster *pMonsterOwner = (CMSMonster *)pOwner;
-			dmgMultiplier = pMonsterOwner->GetSkillStat(ProjectileData->StatPower, ProjectileData->PropPower) / STATPROP_MAX_VALUE;
+			dmgMultiplier = pMonsterOwner->GetSkillStat(ProjectileData->StatPower, ProjectileData->PropPower) / STAT_PROP_MAX_VALUE;
 			dmgMultiplier = V_max(dmgMultiplier, 0.001f);
 		}
 

From 9e3d9728702ba76e761c42fd3ebec926ccf8b180 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 12 Mar 2026 17:43:29 -0400
Subject: [PATCH 096/291] changed unsigned int to int with comment saying may
 return -1.

---
 src/public/engine/eiface.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/public/engine/eiface.h b/src/public/engine/eiface.h
index 577d8fb5..2badee2d 100644
--- a/src/public/engine/eiface.h
+++ b/src/public/engine/eiface.h
@@ -120,7 +120,7 @@ typedef struct enginefuncs_s
 	int			(*pfnGetEntityIllum)		(edict_t* pEnt);
 	edict_t*	(*pfnFindEntityInSphere)	(edict_t *pEdictStartSearchAfter, const float *org, float rad);
 	edict_t*	(*pfnFindClientInPVS)		(edict_t *pEdict);
-	edict_t* (*pfnEntitiesInPVS)			(edict_t *pplayer);
+	edict_t*    (*pfnEntitiesInPVS)			(edict_t *pplayer);
 	void		(*pfnMakeVectors)			(const float *rgflVector);
 	void		(*pfnAngleVectors)			(const float *rgflVector, float *forward, float *right, float *up);
 	edict_t*	(*pfnCreateEntity)			(void);
@@ -169,7 +169,7 @@ typedef struct enginefuncs_s
 	void*		(*pfnPvEntPrivateData)		(edict_t *pEdict);
 	void		(*pfnFreeEntPrivateData)	(edict_t *pEdict);
 	const char*	(*pfnSzFromIndex)			(int iString);
-	unsigned int			(*pfnAllocString)			(const char *szValue);
+	unsigned int		(*pfnAllocString)			(const char *szValue);
 	struct entvars_s*	(*pfnGetVarsOfEnt)			(edict_t *pEdict);
 	edict_t*	(*pfnPEntityOfEntOffset)	(int iEntOffset);
 	int			(*pfnEntOffsetOfPEntity)	(const edict_t *pEdict);
@@ -219,7 +219,7 @@ typedef struct enginefuncs_s
 	void		(*pfnBuildSoundMsg)			(edict_t *entity, int channel, const char *sample, /*int*/float volume, float attenuation, int fFlags, int pitch, int msg_dest, int msg_type, const float *pOrigin, edict_t *ed);
 	int			(*pfnIsDedicatedServer)		(void);// is this a dedicated server?
 	cvar_t		*(*pfnCVarGetPointer)		(const char *szVarName);
-	unsigned int (*pfnGetPlayerWONId)		(edict_t *e); // returns the server assigned WONid for this player.  useful for logging frags, etc.  returns -1 if the edict couldn't be found in the list of clients
+	int (*pfnGetPlayerWONId)				(edict_t *e); // returns the server assigned WONid for this player.  useful for logging frags, etc.  returns -1 if the edict couldn't be found in the list of clients
 
 	// YWB 8/1/99 TFF Physics additions
 	void		(*pfnInfo_RemoveKey)		(const char* s, const char *key );

From 4b6cc16d945b88405ceeadb0eacabe4d0e7655a7 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 12 Mar 2026 18:39:05 -0400
Subject: [PATCH 097/291] removed HUDSCRIPT macro in favor of referencing gHUD
 struct directly

---
 src/game/client/entity.cpp                     | 6 +++---
 src/game/client/ms/hudscript.h                 | 2 +-
 src/game/client/render/studiomodelrenderer.cpp | 2 +-
 src/game/shared/movement/pm_shared.cpp         | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/game/client/entity.cpp b/src/game/client/entity.cpp
index f9b03ba6..6d78a12e 100644
--- a/src/game/client/entity.cpp
+++ b/src/game/client/entity.cpp
@@ -582,7 +582,7 @@ void TempEntHitCallback(struct tempent_s *ent, struct pmtrace_s *ptr)
 		{
 			Params.add("world");
 		}
-		HUDScript->Effects_UpdateTempEnt(TempEntExtra.CBCollide_CallbackEvent, &Params);
+		gHUD.m_HUDScript->Effects_UpdateTempEnt(TempEntExtra.CBCollide_CallbackEvent, &Params);
 	}
 	g_CurrentTempEnt = NULL;
 }
@@ -2065,7 +2065,7 @@ void DLLEXPORT HUD_TempEntUpdate(
 							TempExtra.CBTimer_Enabled = false;
 
 							g_CurrentTempEnt = pTemp;
-							HUDScript->Effects_UpdateTempEnt(TempExtra.CBTimer_CallbackEvent);
+							gHUD.m_HUDScript->Effects_UpdateTempEnt(TempExtra.CBTimer_CallbackEvent);
 							g_CurrentTempEnt = NULL;
 						}
 
@@ -2086,7 +2086,7 @@ void DLLEXPORT HUD_TempEntUpdate(
 						{
 							TempExtra.CBWater_Enabled = false;
 							g_CurrentTempEnt = pTemp;
-							HUDScript->Effects_UpdateTempEnt(TempExtra.CBWater_CallbackEvent);
+							gHUD.m_HUDScript->Effects_UpdateTempEnt(TempExtra.CBWater_CallbackEvent);
 							g_CurrentTempEnt = NULL;
 						}
 				}
diff --git a/src/game/client/ms/hudscript.h b/src/game/client/ms/hudscript.h
index 21eabc1b..55e44b3d 100644
--- a/src/game/client/ms/hudscript.h
+++ b/src/game/client/ms/hudscript.h
@@ -35,6 +35,6 @@ class CHudScript : public CHudBase, public IScripted
 	void Effects_Render(cl_entity_t &Ent, bool InMirror);
 	void Effects_DrawTransPararentTriangles();
 };
-#define HUDScript gHUD.m_HUDScript
+
 
 #endif //HUDSCRIPT_H
diff --git a/src/game/client/render/studiomodelrenderer.cpp b/src/game/client/render/studiomodelrenderer.cpp
index bc39d678..234509f0 100644
--- a/src/game/client/render/studiomodelrenderer.cpp
+++ b/src/game/client/render/studiomodelrenderer.cpp
@@ -2184,7 +2184,7 @@ void CStudioModelRenderer::StudioRenderModel(void)
 	alight_t lighting;
 	vec3_t lightdir;
 
-	HUDScript->Effects_Render(*m_pCurrentEntity, CMirrorMgr::m_CurrentMirror.Enabled);
+	gHUD.m_HUDScript->Effects_Render(*m_pCurrentEntity, CMirrorMgr::m_CurrentMirror.Enabled);
 
 	lighting.plightvec = lightdir;
 	IEngineStudio.StudioDynamicLight(m_pCurrentEntity, &lighting);
diff --git a/src/game/shared/movement/pm_shared.cpp b/src/game/shared/movement/pm_shared.cpp
index 9dcf45b3..f83badfb 100644
--- a/src/game/shared/movement/pm_shared.cpp
+++ b/src/game/shared/movement/pm_shared.cpp
@@ -3521,7 +3521,7 @@ void PM_Move(struct playermove_s *ppmove, qboolean server)
 	CBasePlayer *pPlayer = (CBasePlayer *)UTIL_PlayerByIndex(pmove->player_index + 1);
 	PMScript = pPlayer ? pPlayer->GetScripted() : NULL;
 #else
-	PMScript = HUDScript;
+	PMScript = gHUD.m_HUDScript;
 #endif
 
 	PM_PlayerMove(server);

From d8069feae2240b3ab8732f9b0be7a4c3f8b41b6a Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 12 Mar 2026 19:04:17 -0400
Subject: [PATCH 098/291] changed defines to enum/constexpr. changes PI
 Reference. increased PI precision.

---
 src/common/const.h         |   2 +-
 src/public/engine/studio.h | 119 ++++++++++++++++++++-----------------
 2 files changed, 67 insertions(+), 54 deletions(-)

diff --git a/src/common/const.h b/src/common/const.h
index 9960916f..bc8ba2bc 100644
--- a/src/common/const.h
+++ b/src/common/const.h
@@ -21,7 +21,7 @@
 
 #include "Platform.h"
 
-constexpr double PI = 3.14159265358979323846;
+inline constexpr double PI = 3.14159265358979323846264338327950288;
 
 // edict->flags
 
diff --git a/src/public/engine/studio.h b/src/public/engine/studio.h
index f3059e4d..a6f812c7 100644
--- a/src/public/engine/studio.h
+++ b/src/public/engine/studio.h
@@ -29,20 +29,20 @@ Studio models are position independent, so the cache manager can move them.
 */
 
 
-#define MAXSTUDIOTRIANGLES	20000	// TODO: tune this
-#define MAXSTUDIOVERTS		2048	// TODO: tune this
-#define MAXSTUDIOSEQUENCES	2048	// total animation sequences
-#define MAXSTUDIOSKINS		100		// total textures
-#define MAXSTUDIOSRCBONES	512		// bones allowed at source movement
-#define MAXSTUDIOBONES		128		// total bones actually used
-#define MAXSTUDIOMODELS		32		// sub-models per model
-#define MAXSTUDIOBODYPARTS	32
-#define MAXSTUDIOGROUPS		16
-#define MAXSTUDIOANIMATIONS	2048	// per sequence
-#define MAXSTUDIOMESHES		256
-#define MAXSTUDIOEVENTS		1024
-#define MAXSTUDIOPIVOTS		256
-#define MAXSTUDIOCONTROLLERS 8
+constexpr int MAXSTUDIOTRIANGLES	= 20000;// TODO: tune this
+constexpr int MAXSTUDIOVERTS		= 2048;// TODO: tune this
+constexpr int MAXSTUDIOSEQUENCES	= 2048;// total animation sequences
+constexpr int MAXSTUDIOSKINS		= 100;// total textures
+constexpr int MAXSTUDIOSRCBONES		= 512;// bones allowed at source movement
+constexpr int MAXSTUDIOBONES		= 128;// total bones actually used
+constexpr int MAXSTUDIOMODELS		= 32;// sub-models per model
+constexpr int MAXSTUDIOBODYPARTS	= 32;
+constexpr int MAXSTUDIOGROUPS		= 16;
+constexpr int MAXSTUDIOANIMATIONS	= 2048;// per sequence
+constexpr int MAXSTUDIOMESHES		= 256;
+constexpr int MAXSTUDIOEVENTS		= 1024;
+constexpr int MAXSTUDIOPIVOTS		= 256;
+constexpr int MAXSTUDIOCONTROLLERS	= 8;
 
 typedef struct 
 {
@@ -324,53 +324,66 @@ typedef struct
 #endif
 
 // model flags
-#define	EF_ROCKET	1
-#define	EF_GRENADE	2
-#define	EF_GIB		4
-#define	EF_ROTATE	8
-#define	EF_TRACER	16
-#define	EF_ZOMGIB	32
-#define	EF_TRACER2	64
-#define	EF_TRACER3	128
+enum {
+	EF_ROCKET	= ( 1 << 0 ),
+	EF_GRENADE	= ( 1 << 1 ),
+	EF_GIB		= ( 1 << 2 ),
+	EF_ROTATE	= ( 1 << 3 ),
+	EF_TRACER	= ( 1 << 4 ),
+	EF_ZOMGIB	= ( 1 << 5 ),
+	EF_TRACER2	= ( 1 << 6 ),
+	EF_TRACER3	= ( 1 << 7 )
+};
 
 // lighting options
-#define STUDIO_NF_FLATSHADE		0x0001
-#define STUDIO_NF_CHROME		0x0002
-#define STUDIO_NF_FULLBRIGHT	0x0004
-#define STUDIO_NF_NOMIPS        0x0008
-#define STUDIO_NF_ALPHA         0x0010
-#define STUDIO_NF_ADDITIVE      0x0020
-#define STUDIO_NF_MASKED        0x0040
+enum {
+	STUDIO_NF_FLATSHADE		= ( 1 << 0 ),
+	STUDIO_NF_CHROME		= ( 1 << 1 ),
+	STUDIO_NF_FULLBRIGHT	= ( 1 << 2 ),
+	STUDIO_NF_NOMIPS        = ( 1 << 3 ),
+	STUDIO_NF_ALPHA         = ( 1 << 4 ),
+	STUDIO_NF_ADDITIVE      = ( 1 << 5 ),
+	STUDIO_NF_MASKED        = ( 1 << 6 )
+};
 
 // motion flags
-#define STUDIO_X		0x0001
-#define STUDIO_Y		0x0002	
-#define STUDIO_Z		0x0004
-#define STUDIO_XR		0x0008
-#define STUDIO_YR		0x0010
-#define STUDIO_ZR		0x0020
-#define STUDIO_LX		0x0040
-#define STUDIO_LY		0x0080
-#define STUDIO_LZ		0x0100
-#define STUDIO_AX		0x0200
-#define STUDIO_AY		0x0400
-#define STUDIO_AZ		0x0800
-#define STUDIO_AXR		0x1000
-#define STUDIO_AYR		0x2000
-#define STUDIO_AZR		0x4000
-#define STUDIO_TYPES	0x7FFF
-#define STUDIO_RLOOP	0x8000	// controller that wraps shortest distance
+
+enum {
+	STUDIO_X		= ( 1 << 0),
+	STUDIO_Y		= ( 1 << 1),
+	STUDIO_Z		= ( 1 << 2),
+	STUDIO_XR		= ( 1 << 3),
+	STUDIO_YR		= ( 1 << 4),
+	STUDIO_ZR		= ( 1 << 5),
+	STUDIO_LX		= ( 1 << 6),
+	STUDIO_LY		= ( 1 << 7),
+	STUDIO_LZ		= ( 1 << 8),
+	STUDIO_AX		= ( 1 << 9),
+	STUDIO_AY		= ( 1 << 10),
+	STUDIO_AZ		= ( 1 << 11),
+	STUDIO_AXR		= ( 1 << 12),
+	STUDIO_AYR		= ( 1 << 13),
+	STUDIO_AZR		= ( 1 << 14),
+	STUDIO_TYPES	= ( 1 << 15),
+	STUDIO_RLOOP	= ( 1 << 16)	// controller that wraps shortest distance
+};
 
 // sequence flags
-#define STUDIO_LOOPING	0x0001
+enum {
+	STUDIO_LOOPING = 0x0001
+};
 
 // bone flags
-#define STUDIO_HAS_NORMALS	0x0001
-#define STUDIO_HAS_VERTICES 0x0002
-#define STUDIO_HAS_BBOX		0x0004
-#define STUDIO_HAS_CHROME	0x0008	// if any of the textures have chrome on them
+enum {
+	STUDIO_HAS_NORMALS = 0x0001,
+	STUDIO_HAS_VERTICES = 0x0002,
+	STUDIO_HAS_BBOX = 0x0004,
+	STUDIO_HAS_CHROME = 0x0008	// if any of the textures have chrome on them
+
+};
 
-#define RAD_TO_STUDIO		(32768.0/M_PI)
-#define STUDIO_TO_RAD		(M_PI/32768.0)
+M_PI
+constexpr float RAD_TO_STUDIO = (32768.0 / PI);
+constexpr float STUDIO_TO_RAD = (PI / 32768.0);
 
 #endif

From dcfe9df9465dc8a6678c6338a5ee96d76d9a9737 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 12 Mar 2026 21:39:40 -0400
Subject: [PATCH 099/291] reverting commit

---
 src/game/client/cdll_int.cpp         |  2 +-
 src/game/client/cl_util.h            |  7 +++++++
 src/game/client/entity.cpp           | 17 +++++++----------
 src/game/client/hud_spectator.cpp    | 14 +++++++-------
 src/game/client/hud_spectator.h      | 22 ++++++++++------------
 src/game/client/view.cpp             |  2 +-
 src/game/shared/hl/vector.h          |  1 -
 src/game/shared/movement/pm_shared.h | 16 +++++++---------
 src/game/shared/ms/sharedutil.cpp    |  3 ++-
 src/game/shared/ms/sharedutil.h      | 14 +++++---------
 10 files changed, 47 insertions(+), 51 deletions(-)

diff --git a/src/game/client/cdll_int.cpp b/src/game/client/cdll_int.cpp
index 208d3a43..cef6d494 100644
--- a/src/game/client/cdll_int.cpp
+++ b/src/game/client/cdll_int.cpp
@@ -499,7 +499,7 @@ void DLLEXPORT HUD_ChatInputPosition(int* x, int* y)
 {
 	if (g_iUser1 != 0 || gEngfuncs.IsSpectateOnly())
 	{
-		if ((int)gHUD.m_Spectator.m_pip->value == INSET_OFF)
+		if (gHUD.m_Spectator.m_pip->value == INSET_OFF)
 		{
 			*y = YRES(64);
 		}
diff --git a/src/game/client/cl_util.h b/src/game/client/cl_util.h
index 3c0f72b1..7f56c12a 100644
--- a/src/game/client/cl_util.h
+++ b/src/game/client/cl_util.h
@@ -234,6 +234,13 @@ inline void PlayHUDSound(const char *Sound, float vol) { PlaySound((char *)Sound
 
 void ScaleColors(int &r, int &g, int &b, int a);
 
+template <typename Type>
+float DotProduct(Type* x, Type* y) {
+	return (x[0] * y[0]) + (x[1] * y[1]) + (x[2] + y[2]);
+};
+
+//#define DotProduct(x, y) ((x)[0] * (y)[0] + (x)[1] * (y)[1] + (x)[2] * (y)[2])
+
 // ugh, some bits of the client code expect a float[3] while others expect a Vector, and there's a macro that pretends they're the same
 // handle the extern with the correct types in the places where it's required
 // extern vec3_t vec3_origin;
diff --git a/src/game/client/entity.cpp b/src/game/client/entity.cpp
index 6d78a12e..85418918 100644
--- a/src/game/client/entity.cpp
+++ b/src/game/client/entity.cpp
@@ -31,7 +31,7 @@
 
 #undef DLLEXPORT //Master Sword
 #define DLLEXPORT EXPORT
-constexpr int MAX_TEMPENT_EXTRA = 4096;
+#define MAX_TEMPENT_EXTRA 4096
 
 void Game_AddObjects(void);
 void SetClEntityProp(cl_entity_t &Ent, msstring &Cmd, mslist<msstring *> &ValueParams);
@@ -108,7 +108,7 @@ int DLLEXPORT HUD_AddEntity(int type, struct cl_entity_s *ent, const char *model
 	{
 		gHUD.m_Spectator.AddOverviewEntity(type, ent, modelname);
 
-		if ((g_iUser1 == OBS_IN_EYE || (int)gHUD.m_Spectator.m_pip->value == INSET_IN_EYE) &&
+		if ((g_iUser1 == OBS_IN_EYE || gHUD.m_Spectator.m_pip->value == INSET_IN_EYE) &&
 			ent->index == g_iUser2)
 			return 0; // don't draw the player we are following in eye
 	}
@@ -544,13 +544,10 @@ void DLLEXPORT HUD_CreateEntities(void)
 //Put here because all the cool headers are already defined here
 TEMPENTITY *g_CurrentTempEnt = NULL;
 cl_entity_t *g_CurrentEnt = NULL;
-
-enum {
-	MSTEMPENT_ID = (1 << 0),
-	MSTEMPENT_CALLBACK = (1 << 1),
-	MSTEMPENT_GRAVITY = (1 << 2),
-	MSTEMPENT_FOLLOWENT = (1 << 3)
-};
+#define MSTEMPENT_ID (1 << 0)
+#define MSTEMPENT_CALLBACK (1 << 1)
+#define MSTEMPENT_GRAVITY (1 << 2)
+#define MSTEMPENT_FOLLOWENT (1 << 3)
 
 void TempEntCallback(struct tempent_s *ent, float frametime, float currenttime)
 {
@@ -558,7 +555,7 @@ void TempEntCallback(struct tempent_s *ent, float frametime, float currenttime)
 		return;
 
 	g_CurrentTempEnt = ent;
-	gHUD.m_HUDScript->Effects_UpdateTempEnt(STRING(ent->entity.curstate.iuser3));
+	HUDScript->Effects_UpdateTempEnt(STRING(ent->entity.curstate.iuser3));
 	g_CurrentTempEnt = nullptr;
 }
 
diff --git a/src/game/client/hud_spectator.cpp b/src/game/client/hud_spectator.cpp
index 5a613310..c6f07553 100644
--- a/src/game/client/hud_spectator.cpp
+++ b/src/game/client/hud_spectator.cpp
@@ -433,7 +433,7 @@ int CHudSpectator::Draw(float flTime)
 			continue;
 
 		// check if name would be in inset window
-		if ((int)m_pip->value != INSET_OFF)
+		if (m_pip->value != INSET_OFF)
 		{
 			if (m_vPlayerPos[i][0] > XRES(m_OverviewData.insetWindowX) &&
 				m_vPlayerPos[i][1] > YRES(m_OverviewData.insetWindowY) &&
@@ -1307,11 +1307,11 @@ void CHudSpectator::DrawOverviewEntities()
 
 	// get current camera position and angle
 
-	if ((int)m_pip->value == INSET_IN_EYE || g_iUser1 == OBS_IN_EYE)
+	if (m_pip->value == INSET_IN_EYE || g_iUser1 == OBS_IN_EYE)
 	{
 		V_GetInEyePos(g_iUser2, origin, angles);
 	}
-	else if ((int)m_pip->value == INSET_CHASE_FREE || g_iUser1 == OBS_CHASE_FREE)
+	else if (m_pip->value == INSET_CHASE_FREE || g_iUser1 == OBS_CHASE_FREE)
 	{
 		V_GetChasePos(g_iUser2, v_cl_angles, origin, angles);
 	}
@@ -1373,7 +1373,7 @@ void CHudSpectator::DrawOverview()
 	if (m_iDrawCycle == 0 && ((g_iUser1 != OBS_MAP_FREE) && (g_iUser1 != OBS_MAP_CHASE)))
 		return;
 
-	if (m_iDrawCycle == 1 && m_pip->value < (float)INSET_MAP_FREE)
+	if (m_iDrawCycle == 1 && m_pip->value < INSET_MAP_FREE)
 		return;
 
 	DrawOverviewLayer();
@@ -1465,13 +1465,13 @@ void CHudSpectator::CheckSettings()
 
 	m_pip->value = (int)m_pip->value;
 
-	if ((g_iUser1 < OBS_MAP_FREE) && ((int)m_pip->value == INSET_CHASE_FREE || (int)m_pip->value == INSET_IN_EYE))
+	if ((g_iUser1 < OBS_MAP_FREE) && (m_pip->value == INSET_CHASE_FREE || m_pip->value == INSET_IN_EYE))
 	{
 		// otherwise both would show in World picures
 		m_pip->value = INSET_MAP_FREE;
 	}
 
-	if ((g_iUser1 >= OBS_MAP_FREE) && ((int)m_pip->value >= INSET_MAP_FREE))
+	if ((g_iUser1 >= OBS_MAP_FREE) && (m_pip->value >= INSET_MAP_FREE))
 	{
 		// both would show map views
 		m_pip->value = INSET_CHASE_FREE;
@@ -1520,7 +1520,7 @@ void CHudSpectator::CheckSettings()
 		m_pip->value = INSET_OFF;
 
 	// draw small border around inset view, adjust upper black bar
-	gViewPort->m_pSpectatorPanel->EnableInsetView((int)m_pip->value != INSET_OFF);
+	gViewPort->m_pSpectatorPanel->EnableInsetView(m_pip->value != INSET_OFF);
 }
 
 int CHudSpectator::ToggleInset(bool allowOff)
diff --git a/src/game/client/hud_spectator.h b/src/game/client/hud_spectator.h
index 2e820383..0fc474f6 100644
--- a/src/game/client/hud_spectator.h
+++ b/src/game/client/hud_spectator.h
@@ -11,20 +11,18 @@
 
 #include "cl_entity.h"
 
-enum {
-	INSET_OFF = 0,
-	INSET_CHASE_FREE = 1,
-	INSET_IN_EYE = 2,
-	INSET_MAP_FREE = 3,
-	INSET_MAP_CHASE = 4
-};
+#define INSET_OFF 0
+#define INSET_CHASE_FREE 1
+#define INSET_IN_EYE 2
+#define INSET_MAP_FREE 3
+#define INSET_MAP_CHASE 4
 
-constexpr int MAX_SPEC_HUD_MESSAGES = 8;
+#define MAX_SPEC_HUD_MESSAGES 8
 
-constexpr int OVERVIEW_TILE_SIZE = 128; // don't change this
-constexpr int OVERVIEW_MAX_LAYERS = 1;
+#define OVERVIEW_TILE_SIZE 128 // don't change this
+#define OVERVIEW_MAX_LAYERS 1
 
-;//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 // Purpose: Handles the drawing of the spectator stuff (camera & top-down map and all the things on it )
 //-----------------------------------------------------------------------------
 
@@ -52,7 +50,7 @@ typedef struct overviewEntity_s
 	double killTime;
 } overviewEntity_t;
 
-constexpr int MAX_OVERVIEW_ENTITIES = 128;
+#define MAX_OVERVIEW_ENTITIES 128
 
 class CHudSpectator : public CHudBase
 {
diff --git a/src/game/client/view.cpp b/src/game/client/view.cpp
index 346026f7..1d7dc7af 100644
--- a/src/game/client/view.cpp
+++ b/src/game/client/view.cpp
@@ -1498,7 +1498,7 @@ void V_CalcSpectatorRefdef(struct ref_params_s *pparams)
 	VectorCopy(pparams->viewangles, v_angles);
 	VectorCopy(pparams->vieworg, v_origin);
 
-	if ((g_iUser1 == OBS_IN_EYE || (int)gHUD.m_Spectator.m_pip->value == INSET_IN_EYE) && ent)
+	if ((g_iUser1 == OBS_IN_EYE || gHUD.m_Spectator.m_pip->value == INSET_IN_EYE) && ent)
 	{
 		// calculate player velocity
 		float timeDiff = ent->curstate.msg_time - ent->prevstate.msg_time;
diff --git a/src/game/shared/hl/vector.h b/src/game/shared/hl/vector.h
index c5391252..5a14ae2d 100644
--- a/src/game/shared/hl/vector.h
+++ b/src/game/shared/hl/vector.h
@@ -142,7 +142,6 @@ class Vector // same data-layout as engine's vec3_t,
 inline Vector operator*(float fl, const Vector& v) { return v * fl; }
 inline float DotProduct(const Vector &a, const Vector &b) { return (a.x * b.x + a.y * b.y + a.z * b.z); }
 
-
 //template <typename Type1, typename Type2>
 //inline float DotProduct(const Type1* x, const Type2* y) {
 	//return (x[0] * y[0]) + (x[1] * y[1]) + (x[2] + y[2]);
diff --git a/src/game/shared/movement/pm_shared.h b/src/game/shared/movement/pm_shared.h
index abc5e749..4f184f89 100644
--- a/src/game/shared/movement/pm_shared.h
+++ b/src/game/shared/movement/pm_shared.h
@@ -32,15 +32,13 @@ bool PM_GetHullBounds(int hullnumber, float* mins, float* maxs);
 char* memfgets(const byte* pMemFile, std::size_t fileSize, std::size_t& filePos, char* pBuffer, std::size_t bufferSize);
 
 // Spectator Movement modes (stored in pev->iuser1, so the physics code can get at them)
-enum {
-	OBS_NONE = 0,
-	OBS_CHASE_LOCKED = 1,
-	OBS_CHASE_FREE = 2,
-	OBS_ROAMING = 3,
-	OBS_IN_EYE = 4,
-	OBS_MAP_FREE = 5,
-	OBS_MAP_CHASE = 6
-};
+#define OBS_NONE 0
+#define OBS_CHASE_LOCKED 1
+#define OBS_CHASE_FREE 2
+#define OBS_ROAMING 3
+#define OBS_IN_EYE 4
+#define OBS_MAP_FREE 5
+#define OBS_MAP_CHASE 6
 
 inline bool g_CheckForPlayerStuck = false;
 
diff --git a/src/game/shared/ms/sharedutil.cpp b/src/game/shared/ms/sharedutil.cpp
index 05efb5c9..2fa9e116 100644
--- a/src/game/shared/ms/sharedutil.cpp
+++ b/src/game/shared/ms/sharedutil.cpp
@@ -14,6 +14,7 @@ extern CBasePlayer player;
 #endif
 
 CBaseEntity *MSInstance(edict_t *pent);
+
 #define ENT_FORMAT ENT_PREFIX "(%i,%u)"
 msstring EntToString(class CBaseEntity *pEntity)
 {
@@ -44,7 +45,7 @@ CBaseEntity *StringToEnt(const char* EntString)
 	int Idx = -1;
 	unsigned int Addr = ~0;
 
-	if (sscanf(EntString, ENT_FORMAT, &Idx, &Addr) <  2)
+	if (sscanf(EntString, ENT_FORMAT, &Idx, &Addr) < 2)
 		return NULL;
 
 	CBaseEntity *pEntity = MSInstance(INDEXENT(Idx));
diff --git a/src/game/shared/ms/sharedutil.h b/src/game/shared/ms/sharedutil.h
index 79160e37..87fde9be 100644
--- a/src/game/shared/ms/sharedutil.h
+++ b/src/game/shared/ms/sharedutil.h
@@ -72,14 +72,6 @@ void WRITE_FLOAT( float Float );
 char *GetFullResourceName(const char* PartialName );	//Adds models/ or sprites/ to a model or sprite filename
 void dbgtxt(const char* Text );
 
-enum {
-	ERRORPRINT_LOG      = (1 << 0),
-	ERRORPRINT_CONSOLE  = (1 << 1),
-	ERRORPRINT_INFOMSG  = (1 << 2),
-	ERRORPRINT_CVAR     = (1 << 3),
-	ERRORPRINT_POPUP    = (1 << 4)
-};
-
 #ifdef CONST_H
 	//Data used in the client item delta comparison
 #pragma pack( push, 1 )
@@ -98,7 +90,11 @@ enum {
 #pragma pack( pop )
 #endif
 
-	
+#define ERRORPRINT_LOG      (1 << 0)
+#define ERRORPRINT_CONSOLE  (1 << 1)
+#define ERRORPRINT_INFOMSG  (1 << 2)
+#define ERRORPRINT_CVAR     (1 << 3)
+#define ERRORPRINT_POPUP    (1 << 4)
 void ErrorPrint(msstring vsUnqeTag, int vFlags, const char *szFmt, ...);
 
 #endif // SHAREDUTIL_H

From ec7df6155ad65ec51d58bae40a77240b20cce076 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 12 Mar 2026 21:40:31 -0400
Subject: [PATCH 100/291] Revert "changed unsigned int to int with comment
 saying may return -1."

This reverts commit 9e3d9728702ba76e761c42fd3ebec926ccf8b180.
---
 src/public/engine/eiface.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/public/engine/eiface.h b/src/public/engine/eiface.h
index 2badee2d..577d8fb5 100644
--- a/src/public/engine/eiface.h
+++ b/src/public/engine/eiface.h
@@ -120,7 +120,7 @@ typedef struct enginefuncs_s
 	int			(*pfnGetEntityIllum)		(edict_t* pEnt);
 	edict_t*	(*pfnFindEntityInSphere)	(edict_t *pEdictStartSearchAfter, const float *org, float rad);
 	edict_t*	(*pfnFindClientInPVS)		(edict_t *pEdict);
-	edict_t*    (*pfnEntitiesInPVS)			(edict_t *pplayer);
+	edict_t* (*pfnEntitiesInPVS)			(edict_t *pplayer);
 	void		(*pfnMakeVectors)			(const float *rgflVector);
 	void		(*pfnAngleVectors)			(const float *rgflVector, float *forward, float *right, float *up);
 	edict_t*	(*pfnCreateEntity)			(void);
@@ -169,7 +169,7 @@ typedef struct enginefuncs_s
 	void*		(*pfnPvEntPrivateData)		(edict_t *pEdict);
 	void		(*pfnFreeEntPrivateData)	(edict_t *pEdict);
 	const char*	(*pfnSzFromIndex)			(int iString);
-	unsigned int		(*pfnAllocString)			(const char *szValue);
+	unsigned int			(*pfnAllocString)			(const char *szValue);
 	struct entvars_s*	(*pfnGetVarsOfEnt)			(edict_t *pEdict);
 	edict_t*	(*pfnPEntityOfEntOffset)	(int iEntOffset);
 	int			(*pfnEntOffsetOfPEntity)	(const edict_t *pEdict);
@@ -219,7 +219,7 @@ typedef struct enginefuncs_s
 	void		(*pfnBuildSoundMsg)			(edict_t *entity, int channel, const char *sample, /*int*/float volume, float attenuation, int fFlags, int pitch, int msg_dest, int msg_type, const float *pOrigin, edict_t *ed);
 	int			(*pfnIsDedicatedServer)		(void);// is this a dedicated server?
 	cvar_t		*(*pfnCVarGetPointer)		(const char *szVarName);
-	int (*pfnGetPlayerWONId)				(edict_t *e); // returns the server assigned WONid for this player.  useful for logging frags, etc.  returns -1 if the edict couldn't be found in the list of clients
+	unsigned int (*pfnGetPlayerWONId)		(edict_t *e); // returns the server assigned WONid for this player.  useful for logging frags, etc.  returns -1 if the edict couldn't be found in the list of clients
 
 	// YWB 8/1/99 TFF Physics additions
 	void		(*pfnInfo_RemoveKey)		(const char* s, const char *key );

From 4748081a2947d233793881a7d09419da52c6df33 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 14 Mar 2026 16:34:33 -0400
Subject: [PATCH 101/291] Revert "changed defines to enum/constexpr."

This reverts commit d8069feae2240b3ab8732f9b0be7a4c3f8b41b6a.
---
 src/common/const.h         |   2 +-
 src/public/engine/studio.h | 119 +++++++++++++++++--------------------
 2 files changed, 54 insertions(+), 67 deletions(-)

diff --git a/src/common/const.h b/src/common/const.h
index bc8ba2bc..9960916f 100644
--- a/src/common/const.h
+++ b/src/common/const.h
@@ -21,7 +21,7 @@
 
 #include "Platform.h"
 
-inline constexpr double PI = 3.14159265358979323846264338327950288;
+constexpr double PI = 3.14159265358979323846;
 
 // edict->flags
 
diff --git a/src/public/engine/studio.h b/src/public/engine/studio.h
index a6f812c7..f3059e4d 100644
--- a/src/public/engine/studio.h
+++ b/src/public/engine/studio.h
@@ -29,20 +29,20 @@ Studio models are position independent, so the cache manager can move them.
 */
 
 
-constexpr int MAXSTUDIOTRIANGLES	= 20000;// TODO: tune this
-constexpr int MAXSTUDIOVERTS		= 2048;// TODO: tune this
-constexpr int MAXSTUDIOSEQUENCES	= 2048;// total animation sequences
-constexpr int MAXSTUDIOSKINS		= 100;// total textures
-constexpr int MAXSTUDIOSRCBONES		= 512;// bones allowed at source movement
-constexpr int MAXSTUDIOBONES		= 128;// total bones actually used
-constexpr int MAXSTUDIOMODELS		= 32;// sub-models per model
-constexpr int MAXSTUDIOBODYPARTS	= 32;
-constexpr int MAXSTUDIOGROUPS		= 16;
-constexpr int MAXSTUDIOANIMATIONS	= 2048;// per sequence
-constexpr int MAXSTUDIOMESHES		= 256;
-constexpr int MAXSTUDIOEVENTS		= 1024;
-constexpr int MAXSTUDIOPIVOTS		= 256;
-constexpr int MAXSTUDIOCONTROLLERS	= 8;
+#define MAXSTUDIOTRIANGLES	20000	// TODO: tune this
+#define MAXSTUDIOVERTS		2048	// TODO: tune this
+#define MAXSTUDIOSEQUENCES	2048	// total animation sequences
+#define MAXSTUDIOSKINS		100		// total textures
+#define MAXSTUDIOSRCBONES	512		// bones allowed at source movement
+#define MAXSTUDIOBONES		128		// total bones actually used
+#define MAXSTUDIOMODELS		32		// sub-models per model
+#define MAXSTUDIOBODYPARTS	32
+#define MAXSTUDIOGROUPS		16
+#define MAXSTUDIOANIMATIONS	2048	// per sequence
+#define MAXSTUDIOMESHES		256
+#define MAXSTUDIOEVENTS		1024
+#define MAXSTUDIOPIVOTS		256
+#define MAXSTUDIOCONTROLLERS 8
 
 typedef struct 
 {
@@ -324,66 +324,53 @@ typedef struct
 #endif
 
 // model flags
-enum {
-	EF_ROCKET	= ( 1 << 0 ),
-	EF_GRENADE	= ( 1 << 1 ),
-	EF_GIB		= ( 1 << 2 ),
-	EF_ROTATE	= ( 1 << 3 ),
-	EF_TRACER	= ( 1 << 4 ),
-	EF_ZOMGIB	= ( 1 << 5 ),
-	EF_TRACER2	= ( 1 << 6 ),
-	EF_TRACER3	= ( 1 << 7 )
-};
+#define	EF_ROCKET	1
+#define	EF_GRENADE	2
+#define	EF_GIB		4
+#define	EF_ROTATE	8
+#define	EF_TRACER	16
+#define	EF_ZOMGIB	32
+#define	EF_TRACER2	64
+#define	EF_TRACER3	128
 
 // lighting options
-enum {
-	STUDIO_NF_FLATSHADE		= ( 1 << 0 ),
-	STUDIO_NF_CHROME		= ( 1 << 1 ),
-	STUDIO_NF_FULLBRIGHT	= ( 1 << 2 ),
-	STUDIO_NF_NOMIPS        = ( 1 << 3 ),
-	STUDIO_NF_ALPHA         = ( 1 << 4 ),
-	STUDIO_NF_ADDITIVE      = ( 1 << 5 ),
-	STUDIO_NF_MASKED        = ( 1 << 6 )
-};
+#define STUDIO_NF_FLATSHADE		0x0001
+#define STUDIO_NF_CHROME		0x0002
+#define STUDIO_NF_FULLBRIGHT	0x0004
+#define STUDIO_NF_NOMIPS        0x0008
+#define STUDIO_NF_ALPHA         0x0010
+#define STUDIO_NF_ADDITIVE      0x0020
+#define STUDIO_NF_MASKED        0x0040
 
 // motion flags
-
-enum {
-	STUDIO_X		= ( 1 << 0),
-	STUDIO_Y		= ( 1 << 1),
-	STUDIO_Z		= ( 1 << 2),
-	STUDIO_XR		= ( 1 << 3),
-	STUDIO_YR		= ( 1 << 4),
-	STUDIO_ZR		= ( 1 << 5),
-	STUDIO_LX		= ( 1 << 6),
-	STUDIO_LY		= ( 1 << 7),
-	STUDIO_LZ		= ( 1 << 8),
-	STUDIO_AX		= ( 1 << 9),
-	STUDIO_AY		= ( 1 << 10),
-	STUDIO_AZ		= ( 1 << 11),
-	STUDIO_AXR		= ( 1 << 12),
-	STUDIO_AYR		= ( 1 << 13),
-	STUDIO_AZR		= ( 1 << 14),
-	STUDIO_TYPES	= ( 1 << 15),
-	STUDIO_RLOOP	= ( 1 << 16)	// controller that wraps shortest distance
-};
+#define STUDIO_X		0x0001
+#define STUDIO_Y		0x0002	
+#define STUDIO_Z		0x0004
+#define STUDIO_XR		0x0008
+#define STUDIO_YR		0x0010
+#define STUDIO_ZR		0x0020
+#define STUDIO_LX		0x0040
+#define STUDIO_LY		0x0080
+#define STUDIO_LZ		0x0100
+#define STUDIO_AX		0x0200
+#define STUDIO_AY		0x0400
+#define STUDIO_AZ		0x0800
+#define STUDIO_AXR		0x1000
+#define STUDIO_AYR		0x2000
+#define STUDIO_AZR		0x4000
+#define STUDIO_TYPES	0x7FFF
+#define STUDIO_RLOOP	0x8000	// controller that wraps shortest distance
 
 // sequence flags
-enum {
-	STUDIO_LOOPING = 0x0001
-};
+#define STUDIO_LOOPING	0x0001
 
 // bone flags
-enum {
-	STUDIO_HAS_NORMALS = 0x0001,
-	STUDIO_HAS_VERTICES = 0x0002,
-	STUDIO_HAS_BBOX = 0x0004,
-	STUDIO_HAS_CHROME = 0x0008	// if any of the textures have chrome on them
-
-};
+#define STUDIO_HAS_NORMALS	0x0001
+#define STUDIO_HAS_VERTICES 0x0002
+#define STUDIO_HAS_BBOX		0x0004
+#define STUDIO_HAS_CHROME	0x0008	// if any of the textures have chrome on them
 
-M_PI
-constexpr float RAD_TO_STUDIO = (32768.0 / PI);
-constexpr float STUDIO_TO_RAD = (PI / 32768.0);
+#define RAD_TO_STUDIO		(32768.0/M_PI)
+#define STUDIO_TO_RAD		(M_PI/32768.0)
 
 #endif

From 757a1e9c4f165521ae85f6636cc3a6fa6f7ba58e Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 14 Mar 2026 16:50:40 -0400
Subject: [PATCH 102/291] Fixed broken jaw bone, fixed position return not
 working right.

---
 src/game/client/entity.cpp        |  2 +-
 src/game/shared/ms/iscript.h      | 10 ++++++----
 src/game/shared/ms/scriptcmds.cpp | 24 ++++++++++++++----------
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/game/client/entity.cpp b/src/game/client/entity.cpp
index 85418918..785cbf86 100644
--- a/src/game/client/entity.cpp
+++ b/src/game/client/entity.cpp
@@ -555,7 +555,7 @@ void TempEntCallback(struct tempent_s *ent, float frametime, float currenttime)
 		return;
 
 	g_CurrentTempEnt = ent;
-	HUDScript->Effects_UpdateTempEnt(STRING(ent->entity.curstate.iuser3));
+	gHUD.m_HUDScript->Effects_UpdateTempEnt(STRING(ent->entity.curstate.iuser3));
 	g_CurrentTempEnt = nullptr;
 }
 
diff --git a/src/game/shared/ms/iscript.h b/src/game/shared/ms/iscript.h
index a71d818d..5ae9f4e3 100644
--- a/src/game/shared/ms/iscript.h
+++ b/src/game/shared/ms/iscript.h
@@ -273,9 +273,10 @@ inline const char* VecToString(const Vector& Vec, bool bAs2D)
 }
 
 
-inline const char* RETURN_POSITION(const char* Prop, const char * name, const Vector& position, bool as2d = false) {
+inline const char* RETURN_POSITION(const char* prop, const char * name, const Vector& position, bool as2d = false) {
 
-	msstring NameExt;
+	msstring NameExt = name;
+	msstring Prop = prop;
 
 	if (Prop == name)	
 		return VecToString(position, as2d); 
@@ -301,9 +302,10 @@ inline const char* RETURN_POSITION(const char* Prop, const char * name, const Ve
 }
 
 
-inline const char* RETURN_ANGLE(const char* Prop, const char* name, const Vector& angles, bool as2d = false) {
+inline const char* RETURN_ANGLE(const char* prop, const char* name, const Vector& angles, bool as2d = false) {
 
-	msstring NameExt;
+	msstring NameExt = name;
+	msstring Prop = prop;
 
 	if (Prop == name) {
 		return VecToString(angles, as2d);
diff --git a/src/game/shared/ms/scriptcmds.cpp b/src/game/shared/ms/scriptcmds.cpp
index f078d694..4197c4a1 100644
--- a/src/game/shared/ms/scriptcmds.cpp
+++ b/src/game/shared/ms/scriptcmds.cpp
@@ -1164,21 +1164,25 @@ const char* CBaseEntity::GetProp(CBaseEntity* pTarget, msstring& FullParams, mss
 	else if (Prop.starts_with("velocity"))	return RETURN_POSITION(Prop, "velocity", pTarget->pev->velocity);
 	else if (Prop.starts_with("angles"))
 	{
-		if (Prop.contains("yaw") || Prop.contains("pitch") || Prop.contains("roll")) {
-			return RETURN_ANGLE(Prop, "angles", pTarget->pev->angles);
-		}
-		else {
-			return RETURN_POSITION(Prop, "angles", pTarget->pev->angles);
+		Return  = RETURN_ANGLE(Prop, "angles", pTarget->pev->angles);
+		if (Return.contains(RETURN_NOTHING_STR)) {
+			Return = RETURN_POSITION(Prop, "angles", pTarget->pev->angles);
 		}
+
+		return Return;
+
 	}
 	else if (Prop.starts_with("viewangles"))
 	{
-		if (Prop.contains("yaw") || Prop.contains("pitch") || Prop.contains("roll")) {
-			return RETURN_ANGLE(Prop, "viewangles", pTarget->pev->v_angle);
-		}
-		else {
-			return RETURN_POSITION(Prop, "viewangles", pTarget->pev->v_angle); 
+
+		Return = RETURN_ANGLE(Prop, "viewangles", pTarget->pev->v_angle);
+		if (Return.contains(RETURN_NOTHING_STR)) {
+			Return = RETURN_POSITION(Prop, "viewangles", pTarget->pev->v_angle);
 		}
+
+		return Return;
+
+
 	}
 	else if (Prop == "target")
 	{

From ffdf4e357656d880731b5cd3c7707868e8324181 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 14 Mar 2026 16:58:09 -0400
Subject: [PATCH 103/291] fixed removal of not operastions

---
 src/game/shared/ms/scriptcmds.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/shared/ms/scriptcmds.cpp b/src/game/shared/ms/scriptcmds.cpp
index 4197c4a1..765b724a 100644
--- a/src/game/shared/ms/scriptcmds.cpp
+++ b/src/game/shared/ms/scriptcmds.cpp
@@ -1197,7 +1197,7 @@ const char* CBaseEntity::GetProp(CBaseEntity* pTarget, msstring& FullParams, mss
 
 		if (Params.size() > 1) remove_on_find = true;
 
-		if (pPlayer && !pPlayer->m_ChosenArrow || pPlayer->m_ChosenArrow->iQuantity <= 0 || !msstring(pPlayer->m_ChosenArrow->m_Name).starts_with("proj_bolt"))
+		if (!pPlayer && !pPlayer->m_ChosenArrow || pPlayer->m_ChosenArrow->iQuantity <= 0 || !msstring(pPlayer->m_ChosenArrow->m_Name).starts_with("proj_bolt"))
 		{
 			//return "unset";
 			CGenericItem *pProjInPack = NULL, *pPack = NULL;

From 611308b6db7e65c623f32c23ca22ae052aad0151 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Tue, 17 Mar 2026 17:14:59 -0400
Subject: [PATCH 104/291] Reapply "changed unsigned int to int with comment
 saying may return -1."

This reverts commit ec7df6155ad65ec51d58bae40a77240b20cce076.
---
 src/public/engine/eiface.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/public/engine/eiface.h b/src/public/engine/eiface.h
index 577d8fb5..2badee2d 100644
--- a/src/public/engine/eiface.h
+++ b/src/public/engine/eiface.h
@@ -120,7 +120,7 @@ typedef struct enginefuncs_s
 	int			(*pfnGetEntityIllum)		(edict_t* pEnt);
 	edict_t*	(*pfnFindEntityInSphere)	(edict_t *pEdictStartSearchAfter, const float *org, float rad);
 	edict_t*	(*pfnFindClientInPVS)		(edict_t *pEdict);
-	edict_t* (*pfnEntitiesInPVS)			(edict_t *pplayer);
+	edict_t*    (*pfnEntitiesInPVS)			(edict_t *pplayer);
 	void		(*pfnMakeVectors)			(const float *rgflVector);
 	void		(*pfnAngleVectors)			(const float *rgflVector, float *forward, float *right, float *up);
 	edict_t*	(*pfnCreateEntity)			(void);
@@ -169,7 +169,7 @@ typedef struct enginefuncs_s
 	void*		(*pfnPvEntPrivateData)		(edict_t *pEdict);
 	void		(*pfnFreeEntPrivateData)	(edict_t *pEdict);
 	const char*	(*pfnSzFromIndex)			(int iString);
-	unsigned int			(*pfnAllocString)			(const char *szValue);
+	unsigned int		(*pfnAllocString)			(const char *szValue);
 	struct entvars_s*	(*pfnGetVarsOfEnt)			(edict_t *pEdict);
 	edict_t*	(*pfnPEntityOfEntOffset)	(int iEntOffset);
 	int			(*pfnEntOffsetOfPEntity)	(const edict_t *pEdict);
@@ -219,7 +219,7 @@ typedef struct enginefuncs_s
 	void		(*pfnBuildSoundMsg)			(edict_t *entity, int channel, const char *sample, /*int*/float volume, float attenuation, int fFlags, int pitch, int msg_dest, int msg_type, const float *pOrigin, edict_t *ed);
 	int			(*pfnIsDedicatedServer)		(void);// is this a dedicated server?
 	cvar_t		*(*pfnCVarGetPointer)		(const char *szVarName);
-	unsigned int (*pfnGetPlayerWONId)		(edict_t *e); // returns the server assigned WONid for this player.  useful for logging frags, etc.  returns -1 if the edict couldn't be found in the list of clients
+	int (*pfnGetPlayerWONId)				(edict_t *e); // returns the server assigned WONid for this player.  useful for logging frags, etc.  returns -1 if the edict couldn't be found in the list of clients
 
 	// YWB 8/1/99 TFF Physics additions
 	void		(*pfnInfo_RemoveKey)		(const char* s, const char *key );

From b45b4a8e3f81ba24c53179d8d22258f9c0020437 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Tue, 17 Mar 2026 17:35:00 -0400
Subject: [PATCH 105/291] changes defines to constexpr enums. fixed enum/float
 equality comparison warnings.

---
 src/game/client/entity.cpp           | 18 ++++++++++--------
 src/game/client/hud_spectator.cpp    | 16 ++++++++--------
 src/game/client/hud_spectator.h      | 20 +++++++++++---------
 src/game/shared/movement/pm_shared.h | 18 +++++++++++-------
 4 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/src/game/client/entity.cpp b/src/game/client/entity.cpp
index 785cbf86..0659af4e 100644
--- a/src/game/client/entity.cpp
+++ b/src/game/client/entity.cpp
@@ -31,7 +31,7 @@
 
 #undef DLLEXPORT //Master Sword
 #define DLLEXPORT EXPORT
-#define MAX_TEMPENT_EXTRA 4096
+constexpr int MAX_TEMPENT_EXTRA = 4096;
 
 void Game_AddObjects(void);
 void SetClEntityProp(cl_entity_t &Ent, msstring &Cmd, mslist<msstring *> &ValueParams);
@@ -108,7 +108,7 @@ int DLLEXPORT HUD_AddEntity(int type, struct cl_entity_s *ent, const char *model
 	{
 		gHUD.m_Spectator.AddOverviewEntity(type, ent, modelname);
 
-		if ((g_iUser1 == OBS_IN_EYE || gHUD.m_Spectator.m_pip->value == INSET_IN_EYE) &&
+		if ((g_iUser1 == OBS_IN_EYE || (int)gHUD.m_Spectator.m_pip->value == INSET_IN_EYE) &&
 			ent->index == g_iUser2)
 			return 0; // don't draw the player we are following in eye
 	}
@@ -544,10 +544,14 @@ void DLLEXPORT HUD_CreateEntities(void)
 //Put here because all the cool headers are already defined here
 TEMPENTITY *g_CurrentTempEnt = NULL;
 cl_entity_t *g_CurrentEnt = NULL;
-#define MSTEMPENT_ID (1 << 0)
-#define MSTEMPENT_CALLBACK (1 << 1)
-#define MSTEMPENT_GRAVITY (1 << 2)
-#define MSTEMPENT_FOLLOWENT (1 << 3)
+
+enum {
+
+	MSTEMPENT_ID  = (1 << 0),
+	MSTEMPENT_CALLBACK  = (1 << 1),
+	MSTEMPENT_GRAVITY  = (1 << 2),
+	MSTEMPENT_FOLLOWENT  = (1 << 3)
+};
 
 void TempEntCallback(struct tempent_s *ent, float frametime, float currenttime)
 {
@@ -711,9 +715,7 @@ const char* CScript::CLGetBeamProp(int beamid, msstringlist &Params)
 		else if (Prop == "amplitude")
 			beamret = UTIL_VarArgs("%.2f", pBeam->amplitude);
 		else if (Prop == "color")
-		{
 			beamret = UTIL_VarArgs("(%f,%f,%f)", pBeam->r, pBeam->g, pBeam->b);
-		}
 		else if (Prop == "brightness")
 			beamret = UTIL_VarArgs("%.2f", pBeam->brightness);
 		else if (Prop == "speed")
diff --git a/src/game/client/hud_spectator.cpp b/src/game/client/hud_spectator.cpp
index c6f07553..e3105c8f 100644
--- a/src/game/client/hud_spectator.cpp
+++ b/src/game/client/hud_spectator.cpp
@@ -433,7 +433,7 @@ int CHudSpectator::Draw(float flTime)
 			continue;
 
 		// check if name would be in inset window
-		if (m_pip->value != INSET_OFF)
+		if ((int)m_pip->value != INSET_OFF)
 		{
 			if (m_vPlayerPos[i][0] > XRES(m_OverviewData.insetWindowX) &&
 				m_vPlayerPos[i][1] > YRES(m_OverviewData.insetWindowY) &&
@@ -1307,11 +1307,11 @@ void CHudSpectator::DrawOverviewEntities()
 
 	// get current camera position and angle
 
-	if (m_pip->value == INSET_IN_EYE || g_iUser1 == OBS_IN_EYE)
+	if ((int)m_pip->value == INSET_IN_EYE || g_iUser1 == OBS_IN_EYE)
 	{
 		V_GetInEyePos(g_iUser2, origin, angles);
 	}
-	else if (m_pip->value == INSET_CHASE_FREE || g_iUser1 == OBS_CHASE_FREE)
+	else if ((int)m_pip->value == INSET_CHASE_FREE || g_iUser1 == OBS_CHASE_FREE)
 	{
 		V_GetChasePos(g_iUser2, v_cl_angles, origin, angles);
 	}
@@ -1370,10 +1370,10 @@ void CHudSpectator::DrawOverview()
 		return;
 
 	// Only draw the overview if Map Mode is selected for this view
-	if (m_iDrawCycle == 0 && ((g_iUser1 != OBS_MAP_FREE) && (g_iUser1 != OBS_MAP_CHASE)))
+	if (!m_iDrawCycle && ((g_iUser1 != OBS_MAP_FREE) && (g_iUser1 != OBS_MAP_CHASE)))
 		return;
 
-	if (m_iDrawCycle == 1 && m_pip->value < INSET_MAP_FREE)
+	if (m_iDrawCycle && (int)m_pip->value < INSET_MAP_FREE)
 		return;
 
 	DrawOverviewLayer();
@@ -1465,13 +1465,13 @@ void CHudSpectator::CheckSettings()
 
 	m_pip->value = (int)m_pip->value;
 
-	if ((g_iUser1 < OBS_MAP_FREE) && (m_pip->value == INSET_CHASE_FREE || m_pip->value == INSET_IN_EYE))
+	if ((g_iUser1 < OBS_MAP_FREE) && ((int)m_pip->value == INSET_CHASE_FREE || (int)m_pip->value == INSET_IN_EYE))
 	{
 		// otherwise both would show in World picures
 		m_pip->value = INSET_MAP_FREE;
 	}
 
-	if ((g_iUser1 >= OBS_MAP_FREE) && (m_pip->value >= INSET_MAP_FREE))
+	if ((g_iUser1 >= OBS_MAP_FREE) && ((int)m_pip->value >= INSET_MAP_FREE))
 	{
 		// both would show map views
 		m_pip->value = INSET_CHASE_FREE;
@@ -1520,7 +1520,7 @@ void CHudSpectator::CheckSettings()
 		m_pip->value = INSET_OFF;
 
 	// draw small border around inset view, adjust upper black bar
-	gViewPort->m_pSpectatorPanel->EnableInsetView(m_pip->value != INSET_OFF);
+	gViewPort->m_pSpectatorPanel->EnableInsetView((int)m_pip->value != INSET_OFF);
 }
 
 int CHudSpectator::ToggleInset(bool allowOff)
diff --git a/src/game/client/hud_spectator.h b/src/game/client/hud_spectator.h
index 0fc474f6..850dc00c 100644
--- a/src/game/client/hud_spectator.h
+++ b/src/game/client/hud_spectator.h
@@ -11,16 +11,18 @@
 
 #include "cl_entity.h"
 
-#define INSET_OFF 0
-#define INSET_CHASE_FREE 1
-#define INSET_IN_EYE 2
-#define INSET_MAP_FREE 3
-#define INSET_MAP_CHASE 4
+enum {
+	INSET_OFF = 0,
+	INSET_CHASE_FREE = 1,
+	INSET_IN_EYE = 2,
+	INSET_MAP_FREE = 3,
+	INSET_MAP_CHASE = 4
+};
 
-#define MAX_SPEC_HUD_MESSAGES 8
 
-#define OVERVIEW_TILE_SIZE 128 // don't change this
-#define OVERVIEW_MAX_LAYERS 1
+constexpr int MAX_SPEC_HUD_MESSAGES = 8;
+constexpr int OVERVIEW_TILE_SIZE = 128;// don't change this
+constexpr int OVERVIEW_MAX_LAYERS = 1;
 
 //-----------------------------------------------------------------------------
 // Purpose: Handles the drawing of the spectator stuff (camera & top-down map and all the things on it )
@@ -50,7 +52,7 @@ typedef struct overviewEntity_s
 	double killTime;
 } overviewEntity_t;
 
-#define MAX_OVERVIEW_ENTITIES 128
+constexpr int MAX_OVERVIEW_ENTITIES = 128;
 
 class CHudSpectator : public CHudBase
 {
diff --git a/src/game/shared/movement/pm_shared.h b/src/game/shared/movement/pm_shared.h
index 4f184f89..1428cbae 100644
--- a/src/game/shared/movement/pm_shared.h
+++ b/src/game/shared/movement/pm_shared.h
@@ -32,13 +32,17 @@ bool PM_GetHullBounds(int hullnumber, float* mins, float* maxs);
 char* memfgets(const byte* pMemFile, std::size_t fileSize, std::size_t& filePos, char* pBuffer, std::size_t bufferSize);
 
 // Spectator Movement modes (stored in pev->iuser1, so the physics code can get at them)
-#define OBS_NONE 0
-#define OBS_CHASE_LOCKED 1
-#define OBS_CHASE_FREE 2
-#define OBS_ROAMING 3
-#define OBS_IN_EYE 4
-#define OBS_MAP_FREE 5
-#define OBS_MAP_CHASE 6
+enum {
+
+	OBS_NONE = 0,
+	OBS_CHASE_LOCKED = 1,
+	OBS_CHASE_FREE = 2,
+	OBS_ROAMING = 3,
+	OBS_IN_EYE = 4,
+	OBS_MAP_FREE = 5,
+	OBS_MAP_CHASE = 6
+
+};
 
 inline bool g_CheckForPlayerStuck = false;
 

From c8d4381447f25a41f4cac7a8cd6feddcf2746e56 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Tue, 17 Mar 2026 17:49:44 -0400
Subject: [PATCH 106/291] Fixed flot/int equality comparison warning.

---
 src/game/client/cdll_int.cpp | 2 +-
 src/game/client/view.cpp     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/game/client/cdll_int.cpp b/src/game/client/cdll_int.cpp
index cef6d494..208d3a43 100644
--- a/src/game/client/cdll_int.cpp
+++ b/src/game/client/cdll_int.cpp
@@ -499,7 +499,7 @@ void DLLEXPORT HUD_ChatInputPosition(int* x, int* y)
 {
 	if (g_iUser1 != 0 || gEngfuncs.IsSpectateOnly())
 	{
-		if (gHUD.m_Spectator.m_pip->value == INSET_OFF)
+		if ((int)gHUD.m_Spectator.m_pip->value == INSET_OFF)
 		{
 			*y = YRES(64);
 		}
diff --git a/src/game/client/view.cpp b/src/game/client/view.cpp
index 1d7dc7af..346026f7 100644
--- a/src/game/client/view.cpp
+++ b/src/game/client/view.cpp
@@ -1498,7 +1498,7 @@ void V_CalcSpectatorRefdef(struct ref_params_s *pparams)
 	VectorCopy(pparams->viewangles, v_angles);
 	VectorCopy(pparams->vieworg, v_origin);
 
-	if ((g_iUser1 == OBS_IN_EYE || gHUD.m_Spectator.m_pip->value == INSET_IN_EYE) && ent)
+	if ((g_iUser1 == OBS_IN_EYE || (int)gHUD.m_Spectator.m_pip->value == INSET_IN_EYE) && ent)
 	{
 		// calculate player velocity
 		float timeDiff = ent->curstate.msg_time - ent->prevstate.msg_time;

From 94994a551c0cf5264dc7778327812463a234b598 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Tue, 17 Mar 2026 18:18:43 -0400
Subject: [PATCH 107/291] Changed RANDOM_LONG to template. Fixed
 signed/unsigned warnings.

---
 src/game/server/enginecallback.h                 | 16 +++++++++++++++-
 src/game/server/player/player.cpp                |  2 +-
 src/game/server/triggers.cpp                     |  2 +-
 .../shared/ms/angelscript/ASBuiltinFunctions.cpp |  2 +-
 src/game/shared/ms/msmonstershared.cpp           |  2 +-
 src/game/shared/ms/script.cpp                    |  2 +-
 src/game/shared/ms/scriptcmds.cpp                |  6 +++---
 7 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/game/server/enginecallback.h b/src/game/server/enginecallback.h
index b070b102..4795a911 100644
--- a/src/game/server/enginecallback.h
+++ b/src/game/server/enginecallback.h
@@ -72,7 +72,21 @@ void SET_MODEL( edict_t *e, const char *szModel );
 #define CRC32_PROCESS_BUFFER (*g_engfuncs.pfnCRC32_ProcessBuffer)
 #define CRC32_PROCESS_BYTE (*g_engfuncs.pfnCRC32_ProcessByte)
 #define CRC32_FINAL (*g_engfuncs.pfnCRC32_Final)
-#define RANDOM_LONG (*g_engfuncs.pfnRandomLong)
+//#define RANDOM_LONG (*g_engfuncs.pfnRandomLong)
+
+template <typename Type1, typename Type2>
+int32 RANDOM_LONG(Type1 low, Type2 high) {
+
+	if (low < high) {
+		return g_engfuncs.pfnRandomLong(low, high);
+	}
+	else {
+		return g_engfuncs.pfnRandomLong(high, low);
+	}
+}
+
+
+
 #define RANDOM_FLOAT (*g_engfuncs.pfnRandomFloat)
 #define GETPLAYERAUTHID (*g_engfuncs.pfnGetPlayerAuthId)
 #define ALERT (*g_engfuncs.pfnAlertMessage)
diff --git a/src/game/server/player/player.cpp b/src/game/server/player/player.cpp
index 735fcb36..89664558 100644
--- a/src/game/server/player/player.cpp
+++ b/src/game/server/player/player.cpp
@@ -2385,7 +2385,7 @@ spawnspot_e GetRandomSpawnSpot(const char* Name, const char* TransitionName, CBa
 
 	while (Spawnpoints.size())
 	{
-		RandSpot = RANDOM_LONG(0, (Spawnpoints.size() - 1));
+		RandSpot = RANDOM_LONG((unsigned int)0, (Spawnpoints.size() - 1));
 
 		pSpot = Spawnpoints[RandSpot];
 		if (!IsSpawnPointValid(pPlayer, pSpot))
diff --git a/src/game/server/triggers.cpp b/src/game/server/triggers.cpp
index fc4533e1..0fae878b 100644
--- a/src/game/server/triggers.cpp
+++ b/src/game/server/triggers.cpp
@@ -485,7 +485,7 @@ void CMultiManager ::ManagerUse(CBaseEntity *pActivator, CBaseEntity *pCaller, U
 	float flNextThink = gpGlobals->time;
 	if (fFireRandom)
 	{
-		m_index = RANDOM_LONG(0, m_cTargets - 1);
+		m_index = RANDOM_LONG((unsigned int)0, m_cTargets - 1);
 		flNextThink = gpGlobals->time + m_flTargetDelay[m_index];
 	}
 
diff --git a/src/game/shared/ms/angelscript/ASBuiltinFunctions.cpp b/src/game/shared/ms/angelscript/ASBuiltinFunctions.cpp
index f9372e69..4345e40c 100644
--- a/src/game/shared/ms/angelscript/ASBuiltinFunctions.cpp
+++ b/src/game/shared/ms/angelscript/ASBuiltinFunctions.cpp
@@ -898,7 +898,7 @@ namespace ASBuiltinFunctions
         if (spawnpoints.size() > 0)
         {
             // Pick a random spawn point
-            int loc = RANDOM_LONG(0, spawnpoints.size() - 1);
+            int loc = RANDOM_LONG((unsigned int)0, spawnpoints.size() - 1);
             pPlayer->pev->origin = spawnpoints[loc]->pev->origin;
             
             MS_ANGEL_INFO("MovePlayerToRandomSpawn: Moved player %s to random spawn (found %d nearby spawns)", 
diff --git a/src/game/shared/ms/msmonstershared.cpp b/src/game/shared/ms/msmonstershared.cpp
index ed01eaa6..6e3a0291 100644
--- a/src/game/shared/ms/msmonstershared.cpp
+++ b/src/game/shared/ms/msmonstershared.cpp
@@ -612,7 +612,7 @@ void CMSMonster ::MarkDamage(CBasePlayer * pPlayer, int vStat, int vProp, float
 		CStat * pStat = pPlayer->FindStat(vStat);
 		if(pStat)
 		{
-			vProp = RANDOM_LONG( 0, pStat->m_SubStats.size() - 1 );
+			vProp = RANDOM_LONG( (unsigned int)0, pStat->m_SubStats.size() - 1 );
 		}
 	}
 
diff --git a/src/game/shared/ms/script.cpp b/src/game/shared/ms/script.cpp
index 9d7f876b..02250765 100644
--- a/src/game/shared/ms/script.cpp
+++ b/src/game/shared/ms/script.cpp
@@ -1778,7 +1778,7 @@ msstring CScript::ScriptGetter_get_random_token(msstring& FullName, msstring& Pa
 		//int token_found_at = -1;
 
 		//int max_token = Tokens.size()-1; //Thothie SEP2019_04 Never seems to return 0 token
-		int rnd_token_idx = (RANDOM_LONG(1, Tokens.size())) - 1;
+		int rnd_token_idx = (RANDOM_LONG((unsigned int)1, Tokens.size())) - 1;
 		return Tokens[rnd_token_idx].c_str();
 	}
 	else return "-1";
diff --git a/src/game/shared/ms/scriptcmds.cpp b/src/game/shared/ms/scriptcmds.cpp
index 765b724a..792e71dc 100644
--- a/src/game/shared/ms/scriptcmds.cpp
+++ b/src/game/shared/ms/scriptcmds.cpp
@@ -4801,7 +4801,7 @@ bool CScript::ScriptCmd_PlaySound(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstrin
 
 			if (Cmd.Name() == "playrandomsound" || Cmd.Name() == "svplayrandomsound")
 			{
-				pszSound = Params[NextParm + RANDOM_LONG(0, Params.size() - (Volume > -1 ? 3 : 2))];
+				pszSound = Params[NextParm + RANDOM_LONG((unsigned int)0, Params.size() - (Volume > -1 ? 3 : 2))];
 			}
 
 			//Todo: Allow changing pitch/attenuation with additional parameters on playsound/svplaysound
@@ -7004,7 +7004,7 @@ bool CScript::ScriptCmd_TokenScramble(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, mss
 
 		for(unsigned int i = 0; i < n_loops; i++)
 		{
-			unsigned int r = RANDOM_LONG(0, Tokens.size() - 1);
+			unsigned int r = RANDOM_LONG((unsigned int)0, Tokens.size() - 1);
 			new_tokens += Tokens[r];
 			new_tokens += ";";
 			Tokens.erase(r);
@@ -7087,7 +7087,7 @@ bool CScript::ScriptCmd_ToRandomSpawn(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, mss
 
 			if ( Spawnpoints.size() )
 			{
-				int loc = RANDOM_LONG( 0 , Spawnpoints.size()-1 );
+				int loc = RANDOM_LONG( (unsigned int)0 , Spawnpoints.size()-1 );
 				pTarget->pev->origin = Spawnpoints[ loc ]->pev->origin;
 			}
 		}

From c671bed0b8b50b44ca29da1ca73542363193e287 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Tue, 17 Mar 2026 19:12:32 -0400
Subject: [PATCH 108/291] turned random_float macro into template.

---
 src/game/server/enginecallback.h | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/game/server/enginecallback.h b/src/game/server/enginecallback.h
index 4795a911..20b10737 100644
--- a/src/game/server/enginecallback.h
+++ b/src/game/server/enginecallback.h
@@ -75,19 +75,31 @@ void SET_MODEL( edict_t *e, const char *szModel );
 //#define RANDOM_LONG (*g_engfuncs.pfnRandomLong)
 
 template <typename Type1, typename Type2>
-int32 RANDOM_LONG(Type1 low, Type2 high) {
+int32 RANDOM_LONG(const Type1 &lLow, const Type2 &lHigh) {
 
-	if (low < high) {
-		return g_engfuncs.pfnRandomLong(low, high);
-	}
-	else {
-		return g_engfuncs.pfnRandomLong(high, low);
+	if (lLow > lHigh) {
+		return g_engfuncs.pfnRandomLong(lHigh, lLow);
 	}
+
+	return g_engfuncs.pfnRandomLong(lLow, lHigh);
+
+
 }
 
 
+template <typename Type1, typename Type2>
+float RANDOM_FLOAT(const Type1 &flLow, const Type2 &flHigh) {
+
+	if (flLow > flHigh) {
+		return g_engfuncs.pfnRandomFloat(flHigh, flLow);
+	}
+	
+	return g_engfuncs.pfnRandomFloat(flLow, flHigh);
+
+}
+
 
-#define RANDOM_FLOAT (*g_engfuncs.pfnRandomFloat)
+//#define RANDOM_FLOAT (*g_engfuncs.pfnRandomFloat)
 #define GETPLAYERAUTHID (*g_engfuncs.pfnGetPlayerAuthId)
 #define ALERT (*g_engfuncs.pfnAlertMessage)
 

From 60efcd60e6a29cb9221ebfe836f6e95d3cf57652 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Wed, 18 Mar 2026 19:01:09 -0400
Subject: [PATCH 109/291] changed macros to enums and/or constexpr.
 functionalize ALLOC_STRING for client def.

---
 src/game/client/entity.cpp       |  2 +-
 src/game/client/eventscripts.h   | 87 ++++++++++++++++----------------
 src/game/server/enginecallback.h | 17 +++++--
 3 files changed, 58 insertions(+), 48 deletions(-)

diff --git a/src/game/client/entity.cpp b/src/game/client/entity.cpp
index 0659af4e..7b07e85e 100644
--- a/src/game/client/entity.cpp
+++ b/src/game/client/entity.cpp
@@ -638,7 +638,7 @@ const char* RETURN_COLOR(const char* Prop, const char* name, const color24& colo
 		return VecToString(vTemp);
 	}
 
-	msstring NameExt;
+	std::string NameExt;
 	NameExt = name;
 	NameExt += ".r";
 
diff --git a/src/game/client/eventscripts.h b/src/game/client/eventscripts.h
index 169819d1..73fded32 100644
--- a/src/game/client/eventscripts.h
+++ b/src/game/client/eventscripts.h
@@ -3,53 +3,52 @@
 #define EVENTSCRIPTSH
 
 // defaults for clientinfo messages
-#define DEFAULT_VIEWHEIGHT 28
-#define VEC_DUCK_VIEW 12
+constexpr int DEFAULT_VIEWHEIGHT = 28;
+constexpr int VEC_DUCK_VIEW = 12;
 
-#define FTENT_FADEOUT 0x00000080
+enum {
+	FTENT_FADEOUT = 0x00000080
+};
 
-#define DMG_GENERIC 0            // generic damage was done
-#define DMG_CRUSH (1 << 0)       // crushed by falling or moving object
-#define DMG_BULLET (1 << 1)      // shot
-#define DMG_SLASH (1 << 2)       // cut, clawed, stabbed
-#define DMG_BURN (1 << 3)        // heat burned
-#define DMG_FREEZE (1 << 4)      // frozen
-#define DMG_FALL (1 << 5)        // fell too far
-#define DMG_BLAST (1 << 6)       // explosive blast damage
-#define DMG_CLUB (1 << 7)        // crowbar, punch, headbutt
-#define DMG_SHOCK (1 << 8)       // electric shock
-#define DMG_SONIC (1 << 9)       // sound pulse shockwave
-#define DMG_ENERGYBEAM (1 << 10) // laser or other high energy beam
-#define DMG_NEVERGIB (1 << 12)   // with this bit OR'd in, no damage type will be able to gib victims upon death
-#define DMG_ALWAYSGIB (1 << 13)  // with this bit OR'd in, any damage type can be made to gib victims upon death.
+enum {
+	DMG_GENERIC = 0,            // generic damage was done
+	DMG_CRUSH = (1 << 0),       // crushed by falling or moving object
+	DMG_BULLET = (1 << 1),      // shot
+	DMG_SLASH = (1 << 2),       // cut, clawed, stabbed
+	DMG_BURN = (1 << 3),        // heat burned
+	DMG_FREEZE = (1 << 4),      // frozen
+	DMG_FALL = (1 << 5),        // fell too far
+	DMG_BLAST = (1 << 6),       // explosive blast damage
+	DMG_CLUB = (1 << 7),        // crowbar, punch, headbutt
+	DMG_SHOCK = (1 << 8),       // electric shock
+	DMG_SONIC = (1 << 9),       // sound pulse shockwave
+	DMG_ENERGYBEAM = (1 << 10), // laser or other high energy beam
+	DMG_NEVERGIB = (1 << 12),   // with this bit OR'd in, no damage type will be able to gib victims upon death
+	DMG_ALWAYSGIB = (1 << 13),  // with this bit OR'd in, any damage type can be made to gib victims upon death.
 
-// time-based damage
-//mask off TF-specific stuff too
-#define DMG_TIMEBASED (~(0xff003fff)) // mask for time-based damage
-
-#define DMG_DROWN (1 << 14) // Drowning
-#define DMG_FIRSTTIMEBASED DMG_DROWN
-
-#define DMG_PARALYZE (1 << 15)     // slows affected creature down
-#define DMG_NERVEGAS (1 << 16)     // nerve toxins, very bad
-#define DMG_POISON (1 << 17)       // blood poisioning
-#define DMG_RADIATION (1 << 18)    // radiation exposure
-#define DMG_DROWNRECOVER (1 << 19) // drowning recovery
-#define DMG_ACID (1 << 20)         // toxic chemicals or acid burns
-#define DMG_SLOWBURN (1 << 21)     // in an oven
-#define DMG_SLOWFREEZE (1 << 22)   // in a subzero freezer
-#define DMG_MORTAR (1 << 23)       // Hit by air raid (done to distinguish grenade from mortar)
-
-//TF ADDITIONS
-#define DMG_IGNITE (1 << 24)       // Players hit by this begin to burn
-#define DMG_RADIUS_MAX (1 << 25)   // Radius damage with this flag doesn't decrease over distance
-#define DMG_RADIUS_QUAKE (1 << 26) // Radius damage is done like Quake. 1/2 damage at 1/2 radius.
-#define DMG_IGNOREARMOR (1 << 27)  // Damage ignores target's armor
-#define DMG_AIMED (1 << 28)        // Does Hit location damage
-#define DMG_WALLPIERCING (1 << 29) // Blast Damages ents through walls
-
-#define DMG_CALTROP (1 << 30)
-#define DMG_HALLUC (1 << 31)
+	// time-based damage
+	//mask off TF-specific stuff too
+	DMG_TIMEBASED = (~(0xff003fff)), // mask for time-based damage
+	DMG_DROWN = (1 << 14), // Drowning
+	DMG_FIRSTTIMEBASED = DMG_DROWN,
+	DMG_PARALYZE = (1 << 15),     // slows affected creature down
+	DMG_NERVEGAS = (1 << 16),     // nerve toxins, very bad
+	DMG_POISON = (1 << 17),       // blood poisioning
+	DMG_RADIATION = (1 << 18),    // radiation exposure
+	DMG_DROWNRECOVER = (1 << 19), // drowning recovery
+	DMG_ACID = (1 << 20),         // toxic chemicals or acid burns
+	DMG_SLOWBURN = (1 << 21),     // in an oven
+	DMG_SLOWFREEZE = (1 << 22),   // in a subzero freezer
+	DMG_MORTAR = (1 << 23),       // Hit by air raid (done to distinguish grenade from mortar)
+	DMG_IGNITE = (1 << 24),       // Players hit by this begin to burn
+	DMG_RADIUS_MAX = (1 << 25),   // Radius damage with this flag doesn't decrease over distance
+	DMG_RADIUS_QUAKE = (1 << 26), // Radius damage is done like Quake. 1/2 damage at 1/2 radius.
+	DMG_IGNOREARMOR = (1 << 27),  // Damage ignores target's armor
+	DMG_AIMED = (1 << 28),        // Does Hit location damage
+	DMG_WALLPIERCING = (1 << 29), // Blast Damages ents through walls
+	DMG_CALTROP = (1 << 30),
+	DMG_HALLUC = (1 << 31)
+};
 
 // Some of these are HL/TFC specific?
 void EV_EjectBrass(float *origin, float *velocity, float rotation, int model, int soundtype);
diff --git a/src/game/server/enginecallback.h b/src/game/server/enginecallback.h
index 20b10737..76e9d1d2 100644
--- a/src/game/server/enginecallback.h
+++ b/src/game/server/enginecallback.h
@@ -73,6 +73,8 @@ void SET_MODEL( edict_t *e, const char *szModel );
 #define CRC32_PROCESS_BYTE (*g_engfuncs.pfnCRC32_ProcessByte)
 #define CRC32_FINAL (*g_engfuncs.pfnCRC32_Final)
 //#define RANDOM_LONG (*g_engfuncs.pfnRandomLong)
+//#define RANDOM_FLOAT (*g_engfuncs.pfnRandomFloat)
+//#define GETPLAYERAUTHID (*g_engfuncs.pfnGetPlayerAuthId)
 
 template <typename Type1, typename Type2>
 int32 RANDOM_LONG(const Type1 &lLow, const Type2 &lHigh) {
@@ -99,8 +101,12 @@ float RANDOM_FLOAT(const Type1 &flLow, const Type2 &flHigh) {
 }
 
 
-//#define RANDOM_FLOAT (*g_engfuncs.pfnRandomFloat)
-#define GETPLAYERAUTHID (*g_engfuncs.pfnGetPlayerAuthId)
+inline const char* GETPLAYERAUTHID(edict_t* e) {
+	return g_engfuncs.pfnGetPlayerAuthId(e);
+}
+
+
+//undoing this would just invite more macros, will keep this and any others that user variadic args / fmt
 #define ALERT (*g_engfuncs.pfnAlertMessage)
 
 //MIB JUN2010_17 - enable total disable of debug alert messages
@@ -214,7 +220,12 @@ inline void *GET_PRIVATE(edict_t *pent)
 int ALLOC_STRING(const char *szValue); //Master Sword - Keep track of all string allocations on server
 void ClearStringPool();
 #else
-#define ALLOC_STRING (*g_engfuncs.pfnAllocString)
+
+inline unsigned int ALLOC_STRING(const char* szValue) {
+	return g_engfuncs.pfnAllocString(szValue);
+}
+
+//#define ALLOC_STRING (*g_engfuncs.pfnAllocString)
 #endif
 
 #define FIND_ENTITY_BY_STRING (*g_engfuncs.pfnFindEntityByString)

From c5853d9ea54dd8c1b49cdcea53f9807178ca19ed Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Wed, 18 Mar 2026 19:09:35 -0400
Subject: [PATCH 110/291] removed vec3_t define. Changed references to Vector
 type.

---
 src/common/beamdef.h                          |   6 +-
 src/common/cl_entity.h                        |  14 +-
 src/common/com_model.h                        |  14 +-
 src/common/const.h                            |   4 +-
 src/common/dlight.h                           |   2 +-
 src/common/entity_state.h                     |  40 +++---
 src/common/particledef.h                      |   4 +-
 src/common/pmtrace.h                          |   6 +-
 src/common/r_efx.h                            |   2 +-
 src/common/r_studioint.h                      |   4 +-
 src/common/usercmd.h                          |   4 +-
 .../client/angelscript/ASClientBindings.cpp   |  28 ++--
 src/game/client/camera.h                      |   2 +-
 src/game/client/cl_util.h                     |   2 +-
 src/game/client/com_weapons.cpp               |   4 +-
 src/game/client/com_weapons.h                 |   2 +-
 src/game/client/entity.cpp                    |   8 +-
 src/game/client/ev_common.cpp                 |   6 +-
 src/game/client/ev_hldm.cpp                   | 132 +++++++++---------
 src/game/client/eventscripts.h                |   8 +-
 src/game/client/hud_spectator.cpp             |  14 +-
 src/game/client/hud_spectator.h               |  10 +-
 src/game/client/hud_update.cpp                |   4 +-
 src/game/client/in_camera.cpp                 |  20 +--
 src/game/client/input.cpp                     |   6 +-
 src/game/client/inputw32.cpp                  |   6 +-
 src/game/client/ms/clplayer.cpp               |   4 +-
 src/game/client/ms/health.cpp                 |  12 +-
 src/game/client/ms/health.h                   |   2 +-
 src/game/client/overview.cpp                  |   2 +-
 src/game/client/render/clrendermirror.cpp     |   2 +-
 .../client/render/studiomodelrenderer.cpp     |  22 +--
 src/game/client/view.cpp                      |  48 +++----
 src/game/server/bmodels.cpp                   |   4 +-
 src/game/server/client.cpp                    |   2 +-
 src/game/server/hl/buttons.cpp                |   4 +-
 src/game/server/hl/client.h                   |   2 +-
 src/game/shared/hl/vector.h                   |   3 +-
 src/game/shared/movement/pm_debug.cpp         |  34 ++---
 src/game/shared/movement/pm_debug.h           |   4 +-
 src/game/shared/movement/pm_defs.h            |  44 +++---
 src/game/shared/movement/pm_shared.cpp        | 106 +++++++-------
 src/public/engine/eiface.h                    |  10 +-
 src/public/engine/progdefs.h                  |  58 ++++----
 src/public/engine/studio.h                    |  34 ++---
 utils/common/bspfile.c                        |   2 +-
 utils/common/bspfile.h                        |   4 +-
 utils/common/bsplib.c                         |   2 +-
 utils/common/bsplib.h                         |   4 +-
 utils/common/mathlib.c                        |  40 +++---
 utils/common/mathlib.h                        |  42 +++---
 utils/common/polylib.c                        |  38 ++---
 utils/common/polylib.h                        |  20 +--
 utils/common/trilib.h                         |   2 +-
 54 files changed, 450 insertions(+), 453 deletions(-)

diff --git a/src/common/beamdef.h b/src/common/beamdef.h
index 7c80afc1..84796e67 100644
--- a/src/common/beamdef.h
+++ b/src/common/beamdef.h
@@ -39,9 +39,9 @@ struct beam_s
 	BEAM *next;
 	int type;
 	int flags;
-	vec3_t source;
-	vec3_t target;
-	vec3_t delta;
+	Vector  source;
+	Vector  target;
+	Vector  delta;
 	float t; // 0 .. 1 over lifetime of beam
 	float freq;
 	float die;
diff --git a/src/common/cl_entity.h b/src/common/cl_entity.h
index dbdbca62..1b04451e 100644
--- a/src/common/cl_entity.h
+++ b/src/common/cl_entity.h
@@ -39,8 +39,8 @@ typedef struct
 	float prevanimtime;
 	float sequencetime;
 	byte prevseqblending[2];
-	vec3_t prevorigin;
-	vec3_t prevangles;
+	Vector  prevorigin;
+	Vector  prevangles;
 
 	unsigned int prevsequence;
 	float prevframe;
@@ -54,8 +54,8 @@ typedef struct
 	// Time stamp for this movement
 	float animtime;
 
-	vec3_t origin;
-	vec3_t angles;
+	Vector  origin;
+	Vector  angles;
 } position_history_t;
 
 typedef struct cl_entity_s cl_entity_t;
@@ -93,11 +93,11 @@ struct cl_entity_s
 	float lastmove;
 
 	// Actual render position and angles
-	vec3_t origin;
-	vec3_t angles;
+	Vector  origin;
+	Vector  angles;
 
 	// Attachment points
-	vec3_t attachment[4];
+	Vector  attachment[4];
 
 	// Other entity local information
 	int trivial_accept;
diff --git a/src/common/com_model.h b/src/common/com_model.h
index d3be02e6..d66482ec 100644
--- a/src/common/com_model.h
+++ b/src/common/com_model.h
@@ -88,7 +88,7 @@ typedef struct
 //  'model.h' and 'gl_model.h'
 typedef struct mplane_s
 {
-    vec3_t normal; // surface normal
+    Vector  normal; // surface normal
     float dist;    // closest appoach to origin
     byte type;     // for texture axis selection and fast side tests
     byte signbits; // signx + signy<<1 + signz<<1
@@ -97,7 +97,7 @@ typedef struct mplane_s
 
 typedef struct
 {
-    vec3_t position;
+    Vector  position;
 } mvertex_t;
 
 // 06/23/2002 MAH
@@ -388,8 +388,8 @@ typedef struct hull_s
     mplane_t *planes;
     int firstclipnode;
     int lastclipnode;
-    vec3_t clip_mins;
-    vec3_t clip_maxs;
+    Vector  clip_mins;
+    Vector  clip_maxs;
 } hull_t;
 
 #if !defined(CACHE_USER) && !defined(QUAKEDEF_H)
@@ -414,7 +414,7 @@ typedef struct model_s
     //
     // volume occupied by the model
     //
-    vec3_t mins, maxs; // +0x054, +060
+    Vector  mins, maxs; // +0x054, +060
     float radius;      // +0x06C
 
     //
@@ -479,7 +479,7 @@ typedef struct alight_s
 {
     int ambientlight; // clip at 128
     int shadelight;   // clip at 192 - ambientlight
-    vec3_t color;
+    Vector  color;
     float *plightvec;
 } alight_t;
 
@@ -524,7 +524,7 @@ typedef struct player_info_s
     unsigned int gaitsequence;
     float gaitframe;
     float gaityaw;
-    vec3_t prevgaitorigin;
+    Vector  prevgaitorigin;
 
     customization_t customdata;
 } player_info_t;
diff --git a/src/common/const.h b/src/common/const.h
index 9960916f..84d83a98 100644
--- a/src/common/const.h
+++ b/src/common/const.h
@@ -801,7 +801,7 @@ typedef struct edict_s edict_t;
 
 typedef struct
 {
-	vec3_t normal;
+	Vector  normal;
 	float dist;
 } plane_t;
 
@@ -811,7 +811,7 @@ typedef struct
 	qboolean startsolid; // if true, the initial point was in a solid area
 	qboolean inopen, inwater;
 	float fraction; // time completed, 1.0 = didn't hit anything
-	vec3_t endpos;	// final position
+	Vector  endpos;	// final position
 	plane_t plane;	// surface normal at impact
 	edict_t *ent;	// entity the surface is on
 	int hitgroup;	// 0 == generic, non zero is specific body part
diff --git a/src/common/dlight.h b/src/common/dlight.h
index 024ffadf..7a8b1b5c 100644
--- a/src/common/dlight.h
+++ b/src/common/dlight.h
@@ -20,7 +20,7 @@
 
 typedef struct dlight_s
 {
-	vec3_t origin;
+	Vector  origin;
 	float radius;
 	color24 color;
 	float die;		// stop lighting after this time
diff --git a/src/common/entity_state.h b/src/common/entity_state.h
index 3d8120ab..b3aa6c98 100644
--- a/src/common/entity_state.h
+++ b/src/common/entity_state.h
@@ -40,8 +40,8 @@ struct entity_state_s
 	int messagenum;
 
 	// Fields which can be transmitted and reconstructed over the network stream
-	vec3_t origin;
-	vec3_t angles;
+	Vector  origin;
+	Vector  angles;
 
 	int modelindex;
 	unsigned int sequence;
@@ -66,11 +66,11 @@ struct entity_state_s
 	int body;
 	byte controller[4];
 	byte blending[4];
-	vec3_t velocity;
+	Vector  velocity;
 
 	// Send bbox down to client for use during prediction.
-	vec3_t mins;
-	vec3_t maxs;
+	Vector  mins;
+	Vector  maxs;
 
 	int aiment;
 	// If owned by a player, the index of that player ( for projectiles ).
@@ -89,7 +89,7 @@ struct entity_state_s
 	int weaponmodel;
 	unsigned int gaitsequence;
 	// If standing on conveyor, e.g.
-	vec3_t basevelocity;
+	Vector  basevelocity;
 	// Use the crouched hull, or the regular player hull.
 	int usehull;
 	// Latched buttons last time state updated.
@@ -104,8 +104,8 @@ struct entity_state_s
 	int weaponanim;
 
 	// Parametric movement overrides
-	vec3_t startpos;
-	vec3_t endpos;
+	Vector  startpos;
+	Vector  endpos;
 	float impacttime; //MS - Used for model scale
 	float starttime;
 
@@ -118,25 +118,25 @@ struct entity_state_s
 	float fuser2;
 	float fuser3;
 	float fuser4;
-	vec3_t vuser1;
-	vec3_t vuser2;
-	vec3_t vuser3;
-	vec3_t vuser4; //MS - vuser4.x used to store idx of extra info (including all current bone positions)
+	Vector  vuser1;
+	Vector  vuser2;
+	Vector  vuser3;
+	Vector  vuser4; //MS - vuser4.x used to store idx of extra info (including all current bone positions)
 };
 
 #include "pm_info.h"
 
 typedef struct clientdata_s
 {
-	vec3_t origin;
-	vec3_t velocity;
+	Vector  origin;
+	Vector  velocity;
 
 	int viewmodel;
-	vec3_t punchangle;
+	Vector  punchangle;
 	int flags;
 	int waterlevel;
 	int watertype;
-	vec3_t view_ofs;
+	Vector  view_ofs;
 	float health;
 
 	int bInDuck;
@@ -177,10 +177,10 @@ typedef struct clientdata_s
 	float fuser2;
 	float fuser3;
 	float fuser4;
-	vec3_t vuser1;
-	vec3_t vuser2;
-	vec3_t vuser3;
-	vec3_t vuser4;
+	Vector  vuser1;
+	Vector  vuser2;
+	Vector  vuser3;
+	Vector  vuser4;
 } clientdata_t;
 
 #include "weaponinfo.h"
diff --git a/src/common/particledef.h b/src/common/particledef.h
index aadb22b1..ce66bc91 100644
--- a/src/common/particledef.h
+++ b/src/common/particledef.h
@@ -37,12 +37,12 @@ typedef enum
 typedef struct particle_s
 {
 	// driver-usable fields
-	vec3_t org;
+	Vector  org;
 	short color;
 	short packedColor;
 	// drivers never touch the following fields
 	struct particle_s *next;
-	vec3_t vel;
+	Vector  vel;
 	float ramp;
 	float die;
 	ptype_t type;
diff --git a/src/common/pmtrace.h b/src/common/pmtrace.h
index 868eb110..a08059c8 100644
--- a/src/common/pmtrace.h
+++ b/src/common/pmtrace.h
@@ -20,7 +20,7 @@
 
 typedef struct
 {
-	vec3_t normal;
+	Vector  normal;
 	float dist;
 } pmplane_t;
 
@@ -32,10 +32,10 @@ struct pmtrace_s
 	qboolean startsolid;	  // if true, the initial point was in a solid area
 	qboolean inopen, inwater; // End point is in empty space or in water
 	float fraction;			  // time completed, 1.0 = didn't hit anything
-	vec3_t endpos;			  // final position
+	Vector  endpos;			  // final position
 	pmplane_t plane;		  // surface normal at impact
 	int ent;				  // entity at impact
-	vec3_t deltavelocity;	  // Change in player's velocity caused by impact.
+	Vector  deltavelocity;	  // Change in player's velocity caused by impact.
 							  // Only run on server.
 	int hitgroup;
 };
diff --git a/src/common/r_efx.h b/src/common/r_efx.h
index ae34b02a..add595ee 100644
--- a/src/common/r_efx.h
+++ b/src/common/r_efx.h
@@ -112,7 +112,7 @@ typedef struct tempent_s
 					   // if COLLIDEALL, this is the index of the client to ignore
 					   // TENTS with FTENT_PLYRATTACHMENT MUST set the clientindex!
 
-	vec3_t tentOffset; // if attached, client origin + tentOffset = tent origin.
+	Vector  tentOffset; // if attached, client origin + tentOffset = tent origin.
 	cl_entity_t entity;
 
 	// baseline.origin		- velocity
diff --git a/src/common/r_studioint.h b/src/common/r_studioint.h
index 7d28782a..43de192d 100644
--- a/src/common/r_studioint.h
+++ b/src/common/r_studioint.h
@@ -135,8 +135,8 @@ typedef struct sv_blending_interface_s
 	void (*SV_StudioSetupBones)(struct model_s *pModel,
 								float frame,
 								int sequence,
-								const vec3_t angles,
-								const vec3_t origin,
+								const Vector  angles,
+								const Vector  origin,
 								const byte *pcontroller,
 								const byte *pblending,
 								int iBone,
diff --git a/src/common/usercmd.h b/src/common/usercmd.h
index 8de5525c..80cec914 100644
--- a/src/common/usercmd.h
+++ b/src/common/usercmd.h
@@ -22,7 +22,7 @@ typedef struct usercmd_s
 {
 	short lerp_msec;   // Interpolation time on client
 	byte msec;		   // Duration in ms of command
-	vec3_t viewangles; // Command view angles.
+	Vector  viewangles; // Command view angles.
 
 	// intended velocities
 	float forwardmove;		// Forward velocity.
@@ -35,7 +35,7 @@ typedef struct usercmd_s
 
 	// Experimental player impact stuff.
 	int impact_index;
-	vec3_t impact_position;
+	Vector  impact_position;
 } usercmd_t;
 
 #endif // USERCMD_H
diff --git a/src/game/client/angelscript/ASClientBindings.cpp b/src/game/client/angelscript/ASClientBindings.cpp
index ec54d71c..29402620 100644
--- a/src/game/client/angelscript/ASClientBindings.cpp
+++ b/src/game/client/angelscript/ASClientBindings.cpp
@@ -853,7 +853,7 @@ static CBeam* AS_CreateBeamEntPoint(int startIdx, int attachment, const Vector3&
 
 static void AS_CreateSpark(const Vector3& origin)
 {
-    vec3_t pos = {origin.x, origin.y, origin.z};
+    Vector  pos = {origin.x, origin.y, origin.z};
     gEngfuncs.pEfxAPI->R_SparkEffect(pos, 5, -200, 200);
 }
 
@@ -862,7 +862,7 @@ static void AS_CreateSparkOnModel(int entityIndex, int attachment)
     cl_entity_t* pEnt = gEngfuncs.GetEntityByIndex(entityIndex);
     if (pEnt)
     {
-        vec3_t pos;
+        Vector  pos;
         VectorCopy(pEnt->origin, pos);
         gEngfuncs.pEfxAPI->R_SparkEffect(pos, 5, -200, 200);
     }
@@ -956,7 +956,7 @@ class CClientSound
     
     void PlaySoundAtPosition(const Vector3& pos, const std::string& soundPath, float volume)
     {
-        vec3_t position = {pos.x, pos.y, pos.z};
+        Vector  position = {pos.x, pos.y, pos.z};
         gEngfuncs.pEfxAPI->R_RicochetSound((float*)&position);
     }
 };
@@ -975,8 +975,8 @@ static CClientSound* AS_GetClientSound()
 static Vector3 AS_GetGroundHeight(const Vector3& origin)
 {
     pmtrace_t trace;
-    vec3_t start = {origin.x, origin.y, origin.z};
-    vec3_t end = {origin.x, origin.y, origin.z - 8192.0f};
+    Vector  start = {origin.x, origin.y, origin.z};
+    Vector  end = {origin.x, origin.y, origin.z - 8192.0f};
     gEngfuncs.pEventAPI->EV_PlayerTrace(start, end, PM_WORLD_ONLY, -1, &trace);
     return Vector3(trace.endpos[0], trace.endpos[1], trace.endpos[2]);
 }
@@ -984,8 +984,8 @@ static Vector3 AS_GetGroundHeight(const Vector3& origin)
 static Vector3 AS_GetSkyHeight(const Vector3& origin)
 {
     pmtrace_t trace;
-    vec3_t start = {origin.x, origin.y, origin.z};
-    vec3_t end = {origin.x, origin.y, origin.z + 8192.0f};
+    Vector  start = {origin.x, origin.y, origin.z};
+    Vector  end = {origin.x, origin.y, origin.z + 8192.0f};
     gEngfuncs.pEventAPI->EV_PlayerTrace(start, end, PM_WORLD_ONLY, -1, &trace);
     return Vector3(trace.endpos[0], trace.endpos[1], trace.endpos[2]);
 }
@@ -993,8 +993,8 @@ static Vector3 AS_GetSkyHeight(const Vector3& origin)
 static bool AS_IsUnderSky(const Vector3& origin)
 {
     pmtrace_t trace;
-    vec3_t start = {origin.x, origin.y, origin.z};
-    vec3_t end = {origin.x, origin.y, origin.z + 8192.0f};
+    Vector  start = {origin.x, origin.y, origin.z};
+    Vector  end = {origin.x, origin.y, origin.z + 8192.0f};
     gEngfuncs.pEventAPI->EV_PlayerTrace(start, end, PM_WORLD_ONLY, -1, &trace);
     return trace.fraction >= 1.0f || trace.ent == 0;
 }
@@ -1002,8 +1002,8 @@ static bool AS_IsUnderSky(const Vector3& origin)
 static Vector3 AS_TraceLine(const Vector3& start, const Vector3& end, bool worldOnly)
 {
     pmtrace_t trace;
-    vec3_t vStart = {start.x, start.y, start.z};
-    vec3_t vEnd = {end.x, end.y, end.z};
+    Vector  vStart = {start.x, start.y, start.z};
+    Vector  vEnd = {end.x, end.y, end.z};
     gEngfuncs.pEventAPI->EV_PlayerTrace(vStart, vEnd, worldOnly ? PM_WORLD_ONLY : PM_NORMAL, -1, &trace);
     return Vector3(trace.endpos[0], trace.endpos[1], trace.endpos[2]);
 }
@@ -1011,15 +1011,15 @@ static Vector3 AS_TraceLine(const Vector3& start, const Vector3& end, bool world
 static int AS_TraceLineEntity(const Vector3& start, const Vector3& end)
 {
     pmtrace_t trace;
-    vec3_t vStart = {start.x, start.y, start.z};
-    vec3_t vEnd = {end.x, end.y, end.z};
+    Vector  vStart = {start.x, start.y, start.z};
+    Vector  vEnd = {end.x, end.y, end.z};
     gEngfuncs.pEventAPI->EV_PlayerTrace(vStart, vEnd, PM_NORMAL, -1, &trace);
     return trace.ent;
 }
 
 static int AS_GetContents(const Vector3& origin)
 {
-    vec3_t pos = {origin.x, origin.y, origin.z};
+    Vector  pos = {origin.x, origin.y, origin.z};
     return gEngfuncs.PM_PointContents(pos, nullptr);
 }
 
diff --git a/src/game/client/camera.h b/src/game/client/camera.h
index be008149..35442bff 100644
--- a/src/game/client/camera.h
+++ b/src/game/client/camera.h
@@ -5,7 +5,7 @@
 #define _CAMERA_H_
 
 // pitch, yaw, dist
-extern vec3_t cam_ofs;
+extern Vector  cam_ofs;
 // Using third person camera
 //extern int cam_thirdperson;	//Master Sword - Moved to MSCLGlobals
 
diff --git a/src/game/client/cl_util.h b/src/game/client/cl_util.h
index 7f56c12a..0498f24d 100644
--- a/src/game/client/cl_util.h
+++ b/src/game/client/cl_util.h
@@ -243,7 +243,7 @@ float DotProduct(Type* x, Type* y) {
 
 // ugh, some bits of the client code expect a float[3] while others expect a Vector, and there's a macro that pretends they're the same
 // handle the extern with the correct types in the places where it's required
-// extern vec3_t vec3_origin;
+// extern Vector  vec3_origin;
 
 // disable 'possible loss of data converting float to int' warning message
 //#pragma warning(disable : 4244)
diff --git a/src/game/client/com_weapons.cpp b/src/game/client/com_weapons.cpp
index 70ce421c..4b58d4ce 100644
--- a/src/game/client/com_weapons.cpp
+++ b/src/game/client/com_weapons.cpp
@@ -130,8 +130,8 @@ Directly queue up an event on the client
 void HUD_PlaybackEvent(int flags, const edict_t *pInvoker, unsigned short eventindex, float delay,
 					   float *origin, float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2)
 {
-	vec3_t org;
-	vec3_t ang;
+	Vector  org;
+	Vector  ang;
 
 	if (!g_runfuncs || !g_finalstate)
 		return;
diff --git a/src/game/client/com_weapons.h b/src/game/client/com_weapons.h
index 1638fad1..5fdfa247 100644
--- a/src/game/client/com_weapons.h
+++ b/src/game/client/com_weapons.h
@@ -33,7 +33,7 @@ void stub_SetModel(struct edict_s *e, const char *m);
 extern cvar_t *cl_lw;
 
 extern int g_runfuncs;
-extern vec3_t v_angles;
+extern Vector  v_angles;
 extern float g_lastFOV;
 extern struct local_state_s *g_finalstate;
 
diff --git a/src/game/client/entity.cpp b/src/game/client/entity.cpp
index 7b07e85e..e3bc832a 100644
--- a/src/game/client/entity.cpp
+++ b/src/game/client/entity.cpp
@@ -464,7 +464,7 @@ void TempEnts( void )
 	TEMPENTITY *p;
 	int i, j;
 	struct model_s *mod;
-	vec3_t origin;
+	Vector  origin;
 	int index;
 
 	mod = gEngfuncs.CL_LoadModel( "sprites/laserdot.spr", &index );
@@ -920,7 +920,7 @@ const char* CScript::CLGetEntProp(cl_entity_t *pclEntity, msstringlist &Params)
 	else if (Prop.starts_with("viewangles"))
 	{
 		//MIB AUG2010_05
-		vec3_t viewangles;
+		Vector  viewangles;
 		gEngfuncs.GetViewAngles((float *)viewangles);
 		RETURN_ANGLE( Prop, "viewangles", viewangles);
 	}
@@ -928,7 +928,7 @@ const char* CScript::CLGetEntProp(cl_entity_t *pclEntity, msstringlist &Params)
 	else if ( Prop.starts_with("eyepos") )
 	{
 		//Thoth APR2012_05 - attempting to return eye position (fail)
-		vec3_t eyepos = player.pev->view_ofs;
+		Vector  eyepos = player.pev->view_ofs;
 		return RETURN_ANGLE(Prop, "eyepos", eyepos );
 	}
 	*/
@@ -2191,7 +2191,7 @@ void DLLEXPORT HUD_TempEntUpdate(
 
 				if (pTemp->flags & (FTENT_COLLIDEALL | FTENT_COLLIDEWORLD))
 				{
-					vec3_t traceNormal;
+					Vector  traceNormal;
 					float traceFraction = 1;
 
 					if (pTemp->flags & FTENT_COLLIDEALL)
diff --git a/src/game/client/ev_common.cpp b/src/game/client/ev_common.cpp
index 63418887..3d12d18c 100644
--- a/src/game/client/ev_common.cpp
+++ b/src/game/client/ev_common.cpp
@@ -98,7 +98,7 @@ Figure out the height of the gun
 void EV_GetGunPosition(event_args_t *args, float *pos, float *origin)
 {
 	int idx;
-	vec3_t view_ofs;
+	Vector  view_ofs;
 
 	idx = args->entindex;
 
@@ -130,7 +130,7 @@ Bullet shell casings
 */
 void EV_EjectBrass(float *origin, float *velocity, float rotation, int model, int soundtype)
 {
-	vec3_t endpos;
+	Vector  endpos;
 	VectorClear(endpos);
 	endpos[1] = rotation;
 	gEngfuncs.pEfxAPI->R_TempModel(origin, velocity, endpos, 2.5, model, soundtype);
@@ -146,7 +146,7 @@ Determine where to eject shells from
 void EV_GetDefaultShellInfo(event_args_t *args, float *origin, float *velocity, float *ShellVelocity, float *ShellOrigin, float *forward, float *right, float *up, float forwardScale, float upScale, float rightScale)
 {
 	int i;
-	vec3_t view_ofs;
+	Vector  view_ofs;
 	float fR, fU;
 
 	int idx;
diff --git a/src/game/client/ev_hldm.cpp b/src/game/client/ev_hldm.cpp
index 9ba4734d..13044326 100644
--- a/src/game/client/ev_hldm.cpp
+++ b/src/game/client/ev_hldm.cpp
@@ -325,11 +325,11 @@ int EV_HLDM_CheckTracer(int idx, float *vecSrc, float *end, float *forward, floa
 
 	if (iTracerFreq != 0 && ((*tracerCount)++ % iTracerFreq) == 0)
 	{
-		vec3_t vecTracerSrc;
+		Vector  vecTracerSrc;
 
 		if (player)
 		{
-			vec3_t offset(0, 0, -4);
+			Vector  offset(0, 0, -4);
 
 			// adjust tracer position for player
 			for (i = 0; i < 3; i++)
@@ -372,7 +372,7 @@ void EV_HLDM_FireBullets(int idx, float *forward, float *right, float *up, int c
 	int i;
 	pmtrace_t tr;
 	int iShot;
-	vec3_t vecRight, vecUp;
+	Vector  vecRight, vecUp;
 	int tracer;
 
 	VectorCopy(right, vecRight);
@@ -380,10 +380,10 @@ void EV_HLDM_FireBullets(int idx, float *forward, float *right, float *up, int c
 
 	for (iShot = 1; iShot <= cShots; iShot++)
 	{
-		vec3_t vecDir, vecEnd;
+		Vector  vecDir, vecEnd;
 
 		// get circular gaussian spread
-		vec3_t spread;
+		Vector  spread;
 		do
 		{
 			spread[0] = gEngfuncs.pfnRandomFloat(-0.5, 0.5) + gEngfuncs.pfnRandomFloat(-0.5, 0.5);
@@ -453,18 +453,18 @@ void EV_HLDM_FireBullets(int idx, float *forward, float *right, float *up, int c
 void EV_FireGlock1(event_args_t *args)
 {
 	int idx;
-	vec3_t origin;
-	vec3_t angles;
-	vec3_t velocity;
+	Vector  origin;
+	Vector  angles;
+	Vector  velocity;
 	int empty;
 
 	int i;
-	vec3_t ShellVelocity;
-	vec3_t ShellOrigin;
+	Vector  ShellVelocity;
+	Vector  ShellOrigin;
 	int shell;
-	vec3_t vecSrc, vecAiming;
-	vec3_t vecSpread;
-	vec3_t up, right, forward;
+	Vector  vecSrc, vecAiming;
+	Vector  vecSpread;
+	Vector  up, right, forward;
 	float flSpread = 0.01;
 
 	idx = args->entindex;
@@ -509,17 +509,17 @@ void EV_FireGlock1(event_args_t *args)
 void EV_FireGlock2(event_args_t *args)
 {
 	int idx;
-	vec3_t origin;
-	vec3_t angles;
-	vec3_t velocity;
+	Vector  origin;
+	Vector  angles;
+	Vector  velocity;
 
 	int i;
-	vec3_t ShellVelocity;
-	vec3_t ShellOrigin;
+	Vector  ShellVelocity;
+	Vector  ShellOrigin;
 	int shell;
-	vec3_t vecSrc, vecAiming;
-	vec3_t vecSpread;
-	vec3_t up, right, forward;
+	Vector  vecSrc, vecAiming;
+	Vector  vecSpread;
+	Vector  up, right, forward;
 	float flSpread = 0.1;
 
 	idx = args->entindex;
@@ -564,17 +564,17 @@ void EV_FireGlock2(event_args_t *args)
 void EV_FireShotGunDouble(event_args_t *args)
 {
 	int idx;
-	vec3_t origin;
-	vec3_t angles;
-	vec3_t velocity;
+	Vector  origin;
+	Vector  angles;
+	Vector  velocity;
 
 	int i, j;
-	vec3_t ShellVelocity;
-	vec3_t ShellOrigin;
+	Vector  ShellVelocity;
+	Vector  ShellOrigin;
 	int shell;
-	vec3_t vecSrc, vecAiming;
-	vec3_t vecSpread;
-	vec3_t up, right, forward;
+	Vector  vecSrc, vecAiming;
+	Vector  vecSpread;
+	Vector  up, right, forward;
 	float flSpread = 0.01;
 
 	idx = args->entindex;
@@ -630,17 +630,17 @@ void EV_FireShotGunDouble(event_args_t *args)
 void EV_FireShotGunSingle(event_args_t *args)
 {
 	int idx;
-	vec3_t origin;
-	vec3_t angles;
-	vec3_t velocity;
+	Vector  origin;
+	Vector  angles;
+	Vector  velocity;
 
 	int i;
-	vec3_t ShellVelocity;
-	vec3_t ShellOrigin;
+	Vector  ShellVelocity;
+	Vector  ShellOrigin;
 	int shell;
-	vec3_t vecSrc, vecAiming;
-	vec3_t vecSpread;
-	vec3_t up, right, forward;
+	Vector  vecSrc, vecAiming;
+	Vector  vecSpread;
+	Vector  up, right, forward;
 	float flSpread = 0.01;
 
 	idx = args->entindex;
@@ -693,15 +693,15 @@ void EV_FireShotGunSingle(event_args_t *args)
 void EV_FireMP5(event_args_t *args)
 {
 	int idx;
-	vec3_t origin;
-	vec3_t angles;
-	vec3_t velocity;
+	Vector  origin;
+	Vector  angles;
+	Vector  velocity;
 
-	vec3_t ShellVelocity;
-	vec3_t ShellOrigin;
+	Vector  ShellVelocity;
+	Vector  ShellOrigin;
 	int shell;
-	vec3_t vecSrc, vecAiming;
-	vec3_t up, right, forward;
+	Vector  vecSrc, vecAiming;
+	Vector  up, right, forward;
 	float flSpread = 0.01;
 
 	idx = args->entindex;
@@ -755,12 +755,12 @@ void EV_FireMP5(event_args_t *args)
 void EV_FirePython(event_args_t *args)
 {
 	int idx;
-	vec3_t origin;
-	vec3_t angles;
-	vec3_t velocity;
+	Vector  origin;
+	Vector  angles;
+	Vector  velocity;
 
-	vec3_t vecSrc, vecAiming;
-	vec3_t up, right, forward;
+	Vector  vecSrc, vecAiming;
+	Vector  up, right, forward;
 	float flSpread = 0.01;
 
 	idx = args->entindex;
@@ -807,9 +807,9 @@ void EV_FirePython(event_args_t *args)
 void EV_SpinGauss(event_args_t *args)
 {
 	int idx;
-	vec3_t origin;
-	vec3_t angles;
-	vec3_t velocity;
+	Vector  origin;
+	Vector  angles;
+	Vector  velocity;
 	int iSoundState = 0;
 
 	int pitch;
@@ -830,16 +830,16 @@ void EV_SpinGauss(event_args_t *args)
 void EV_FireGauss(event_args_t *args)
 {
 	int idx;
-	vec3_t origin;
-	vec3_t angles;
-	vec3_t velocity;
+	Vector  origin;
+	Vector  angles;
+	Vector  velocity;
 	float flDamage = args->fparam1;
 	int primaryfire = args->bparam1;
 
 	int m_fPrimaryFire = args->bparam1;
 	int m_iWeaponVolume = GAUSS_PRIMARY_FIRE_VOLUME;
-	vec3_t vecSrc;
-	vec3_t vecDest;
+	Vector  vecSrc;
+	Vector  vecDest;
 	edict_t *pentIgnore;
 	pmtrace_t tr, beam_tr;
 	float flMaxFrac = 1.0;
@@ -849,7 +849,7 @@ void EV_FireGauss(event_args_t *args)
 	int nMaxHits = 10;
 	physent_t *pEntity;
 	int m_iBeam, m_iGlow, m_iBalls;
-	vec3_t up, right, forward;
+	Vector  up, right, forward;
 
 	idx = args->entindex;
 	VectorCopy(args->origin, origin);
@@ -956,7 +956,7 @@ void EV_FireGauss(event_args_t *args)
 			{
 				// ALERT( at_console, "reflect %f\n", n );
 				// reflect
-				vec3_t r;
+				Vector  r;
 
 				VectorMA(forward, 2.0 * n, tr.plane.normal, r);
 
@@ -970,7 +970,7 @@ void EV_FireGauss(event_args_t *args)
 				gEngfuncs.pEfxAPI->R_TempSprite(tr.endpos, Vector(0,0,0), 0.2, m_iGlow, kRenderGlow, kRenderFxNoDissipation, flDamage * n / 255.0, flDamage * n * 0.5 * 0.1, FTENT_FADEOUT);
 
 				{
-					vec3_t fwd;
+					Vector  fwd;
 					VectorAdd(tr.endpos, tr.plane.normal, fwd);
 					gEngfuncs.pEfxAPI->R_Sprite_Trail(TE_SPRITETRAIL, tr.endpos, fwd, m_iBalls, (int)(n * flDamage * 0.3), 0.1, gEngfuncs.pfnRandomFloat(10, 20) / 100.0, 100,
 													  255, 200);
@@ -1001,7 +1001,7 @@ void EV_FireGauss(event_args_t *args)
 				// try punching through wall if secondary attack (primary is incapable of breaking through)
 				if (!m_fPrimaryFire)
 				{
-					vec3_t start;
+					Vector  start;
 
 					VectorMA(tr.endpos, 8.0, forward, start);
 
@@ -1016,7 +1016,7 @@ void EV_FireGauss(event_args_t *args)
 
 					if (!beam_tr.allsolid)
 					{
-						vec3_t delta;
+						Vector  delta;
 						float n;
 
 						// trace backwards to find exit point
@@ -1035,7 +1035,7 @@ void EV_FireGauss(event_args_t *args)
 
 							// absorption balls
 							{
-								vec3_t fwd;
+								Vector  fwd;
 								VectorSubtract(tr.endpos, forward, fwd);
 								gEngfuncs.pEfxAPI->R_Sprite_Trail(TE_SPRITETRAIL, tr.endpos, fwd, m_iBalls, 3, 0.1, gEngfuncs.pfnRandomFloat(10, 20) / 100.0, 100,
 																  255, 100);
@@ -1050,7 +1050,7 @@ void EV_FireGauss(event_args_t *args)
 
 							// balls
 							{
-								vec3_t fwd;
+								Vector  fwd;
 								VectorSubtract(beam_tr.endpos, forward, fwd);
 								gEngfuncs.pEfxAPI->R_Sprite_Trail(TE_SPRITETRAIL, beam_tr.endpos, fwd, m_iBalls, (int)(flDamage * 0.3), 0.1, gEngfuncs.pfnRandomFloat(10, 20) / 100.0, 200,
 																  255, 40);
@@ -1075,7 +1075,7 @@ void EV_FireGauss(event_args_t *args)
 						gEngfuncs.pEfxAPI->R_TempSprite(tr.endpos, Vector(0,0,0), 0.2, m_iGlow, kRenderGlow, kRenderFxNoDissipation, 200.0 / 255.0, 0.3, FTENT_FADEOUT);
 
 						{
-							vec3_t fwd;
+							Vector  fwd;
 							VectorAdd(tr.endpos, tr.plane.normal, fwd);
 							gEngfuncs.pEfxAPI->R_Sprite_Trail(TE_SPRITETRAIL, tr.endpos, fwd, m_iBalls, 8, 0.6, gEngfuncs.pfnRandomFloat(10, 20) / 100.0, 100,
 															  255, 200);
@@ -1102,7 +1102,7 @@ void EV_TrainPitchAdjust(event_args_t *args)
 	int stop;
 	int idx = args->entindex;
 
-	vec3_t origin;
+	Vector  origin;
 	VectorCopy(args->origin, origin);
 
 	us_params = (unsigned short)args->iparam1;
diff --git a/src/game/client/eventscripts.h b/src/game/client/eventscripts.h
index 73fded32..0fd02e45 100644
--- a/src/game/client/eventscripts.h
+++ b/src/game/client/eventscripts.h
@@ -3,12 +3,10 @@
 #define EVENTSCRIPTSH
 
 // defaults for clientinfo messages
-constexpr int DEFAULT_VIEWHEIGHT = 28;
-constexpr int VEC_DUCK_VIEW = 12;
+inline constexpr int DEFAULT_VIEWHEIGHT = 28;
+inline constexpr int VEC_DUCK_VIEW = 12;
+//inline constexpr int FTENT_FADEOUT = 0x00000080; already defines as enum in a different file.
 
-enum {
-	FTENT_FADEOUT = 0x00000080
-};
 
 enum {
 	DMG_GENERIC = 0,            // generic damage was done
diff --git a/src/game/client/hud_spectator.cpp b/src/game/client/hud_spectator.cpp
index e3105c8f..a43231e0 100644
--- a/src/game/client/hud_spectator.cpp
+++ b/src/game/client/hud_spectator.cpp
@@ -43,10 +43,10 @@ extern void V_ResetChaseCam();
 extern void V_GetChasePos(int target, float *cl_angles, float *origin, float *angles);
 extern float *GetClientColor(int clientIndex);
 
-extern vec3_t v_origin;	   // last view origin
-extern vec3_t v_angles;	   // last view angle
-extern vec3_t v_cl_angles; // last client/mouse angle
-extern vec3_t v_sim_org;   // last sim origin
+extern Vector  v_origin;	   // last view origin
+extern Vector  v_angles;	   // last view angle
+extern Vector  v_cl_angles; // last client/mouse angle
+extern Vector  v_sim_org;   // last sim origin
 
 void SpectatorMode(void)
 {
@@ -65,7 +65,7 @@ void SpectatorMode(void)
 
 void SpectatorSpray(void)
 {
-	vec3_t forward;
+	Vector  forward;
 	char string[128];
 
 	if (!gEngfuncs.IsSpectateOnly())
@@ -407,7 +407,7 @@ int CHudSpectator::Draw(float flTime)
 	// if user moves in map mode, change map origin
 	if ((m_moveDelta != 0.0f) && (g_iUser1 != OBS_ROAMING))
 	{
-		vec3_t right;
+		Vector  right;
 		AngleVectors(v_angles, NULL, &right, NULL);
 		VectorNormalize(right);
 		VectorScale(right, m_moveDelta, right);
@@ -1172,7 +1172,7 @@ void CHudSpectator::DrawOverviewEntities()
 {
 	int i, ir, ig, ib;
 	struct model_s *hSpriteModel;
-	vec3_t origin, angles, point, forward, right, left, up, world, screen, offset;
+	Vector  origin, angles, point, forward, right, left, up, world, screen, offset;
 	float x, y, z, r, g, b, sizeScale = 4.0f;
 	cl_entity_t *ent;
 	float rmatrix[3][4]; // transformation matrix
diff --git a/src/game/client/hud_spectator.h b/src/game/client/hud_spectator.h
index 850dc00c..cd00eb4e 100644
--- a/src/game/client/hud_spectator.h
+++ b/src/game/client/hud_spectator.h
@@ -31,7 +31,7 @@ constexpr int OVERVIEW_MAX_LAYERS = 1;
 typedef struct overviewInfo_s
 {
 	char map[64];  // cl.levelname or empty
-	vec3_t origin; // center of map
+	Vector  origin; // center of map
 	float zoom;	   // zoom of map images
 	int layers;	   // how may layers do we have
 	float layersHeights[OVERVIEW_MAX_LAYERS];
@@ -93,7 +93,7 @@ class CHudSpectator : public CHudBase
 	int m_iSpectatorNumber;
 
 	float m_mapZoom;	// zoom the user currently uses
-	vec3_t m_mapOrigin; // origin where user rotates around
+	Vector  m_mapOrigin; // origin where user rotates around
 	cvar_t *m_drawnames;
 	cvar_t *m_drawcone;
 	cvar_t *m_drawstatus;
@@ -102,11 +102,11 @@ class CHudSpectator : public CHudBase
 
 	qboolean m_chatEnabled;
 
-	vec3_t m_cameraOrigin; // a help camera
-	vec3_t m_cameraAngles; // and it's angles
+	Vector  m_cameraOrigin; // a help camera
+	Vector  m_cameraAngles; // and it's angles
 
 private:
-	vec3_t m_vPlayerPos[MAX_PLAYERS];
+	Vector  m_vPlayerPos[MAX_PLAYERS];
 	HLSPRITE m_hsprPlayerBlue;
 	HLSPRITE m_hsprPlayerRed;
 	HLSPRITE m_hsprPlayer;
diff --git a/src/game/client/hud_update.cpp b/src/game/client/hud_update.cpp
index 4cf8a0f0..290b52ad 100644
--- a/src/game/client/hud_update.cpp
+++ b/src/game/client/hud_update.cpp
@@ -31,8 +31,8 @@ extern void HUD_SetCmdBits(int bits);
 
 int CHud::UpdateClientData(client_data_t *cdata, float time)
 {
-	memcpy(m_vecOrigin, cdata->origin, sizeof(vec3_t));
-	memcpy(m_vecAngles, cdata->viewangles, sizeof(vec3_t));
+	memcpy(m_vecOrigin, cdata->origin, sizeof(Vector ));
+	memcpy(m_vecAngles, cdata->viewangles, sizeof(Vector ));
 
 	m_iKeyBits = CL_ButtonBits(0);
 	m_iWeaponBits = cdata->iWeaponBits;
diff --git a/src/game/client/in_camera.cpp b/src/game/client/in_camera.cpp
index 9ee1df09..c0f1784c 100644
--- a/src/game/client/in_camera.cpp
+++ b/src/game/client/in_camera.cpp
@@ -68,7 +68,7 @@ cvar_t *c_maxdistance;
 cvar_t *c_mindistance;
 
 // pitch, yaw, dist
-vec3_t cam_ofs;
+Vector  cam_ofs;
 
 // In third person
 int cam_mousemove; //true if we are moving the cam with the mouse, False if not
@@ -148,9 +148,9 @@ float MoveToward(float cur, float goal, float maxspeed)
 
 /*typedef struct
 {
-	vec3_t		boxmins, boxmaxs;// enclose the test object along entire move
+	Vector 		boxmins, boxmaxs;// enclose the test object along entire move
 	float		*mins, *maxs;	// size of the moving object
-	vec3_t		mins2, maxs2;	// size when clipping against mosnters
+	Vector 		mins2, maxs2;	// size when clipping against mosnters
 	float		*start, *end;
 	trace_t		trace;
 	int			type;
@@ -158,20 +158,20 @@ float MoveToward(float cur, float goal, float maxspeed)
 	qboolean	monsterclip;
 } moveclip_t;
 
-extern trace_t SV_ClipMoveToEntity (edict_t *ent, vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end);
+extern trace_t SV_ClipMoveToEntity (edict_t *ent, Vector  start, Vector  mins, Vector  maxs, Vector  end);
 */
 void DLLEXPORT CAM_Think(void)
 {
-	vec3_t origin;
-	vec3_t ext, pnt, camForward, camRight, camUp;
+	Vector  origin;
+	Vector  ext, pnt, camForward, camRight, camUp;
 	//moveclip_t	clip;
 	float dist;
-	vec3_t camAngles;
+	Vector  camAngles;
 	float flSensitivity;
 	/*#ifdef LATER
 	int i;
 #endif*/
-	vec3_t viewangles;
+	Vector  viewangles;
 
 	switch ((int)cam_command->value)
 	{
@@ -477,7 +477,7 @@ void CAM_OutUp(void) { KeyUp(&cam_out); }
 
 void CAM_ToThirdPerson(void)
 {
-	vec3_t viewangles;
+	Vector  viewangles;
 
 	Cam_SwitchingTo1StPerson = false;
 	gEngfuncs.GetViewAngles((float *)viewangles);
@@ -548,7 +548,7 @@ void CAM_Init(void)
 
 void CAM_ClearStates(void)
 {
-	vec3_t viewangles;
+	Vector  viewangles;
 
 	gEngfuncs.GetViewAngles((float *)viewangles);
 
diff --git a/src/game/client/input.cpp b/src/game/client/input.cpp
index 5229a540..2989d8df 100644
--- a/src/game/client/input.cpp
+++ b/src/game/client/input.cpp
@@ -749,12 +749,12 @@ if active == 1 then we are 1) not playing back demos ( where our commands are ig
 void DLLEXPORT CL_CreateMove(float frametime, struct usercmd_s *cmd, int active)
 {
 	float spd;
-	vec3_t viewangles;
-	static vec3_t oldangles;
+	Vector  viewangles;
+	static Vector  oldangles;
 
 	if (active)
 	{
-		//memset( viewangles, 0, sizeof( vec3_t ) );
+		//memset( viewangles, 0, sizeof( Vector  ) );
 		//viewangles[ 0 ] = viewangles[ 1 ] = viewangles[ 2 ] = 0.0;
 		gEngfuncs.GetViewAngles((float *)viewangles);
 
diff --git a/src/game/client/inputw32.cpp b/src/game/client/inputw32.cpp
index 47c05641..c6a95e11 100644
--- a/src/game/client/inputw32.cpp
+++ b/src/game/client/inputw32.cpp
@@ -165,7 +165,7 @@ Force_CenterView_f
 */
 void Force_CenterView_f(void)
 {
-	vec3_t viewangles;
+	Vector  viewangles;
 
 	if (!iMouseInUse)
 	{
@@ -463,7 +463,7 @@ IN_MouseMove
 void IN_MouseMove(float frametime, usercmd_t *cmd)
 {
 	int mx, my;
-	vec3_t viewangles;
+	Vector  viewangles;
 
 	gEngfuncs.GetViewAngles((float *)viewangles);
 
@@ -858,7 +858,7 @@ void IN_JoyMove(float frametime, usercmd_t *cmd)
 	float speed, aspeed;
 	float fAxisValue, fTemp;
 	int i;
-	vec3_t viewangles;
+	Vector  viewangles;
 
 	gEngfuncs.GetViewAngles((float *)viewangles);
 
diff --git a/src/game/client/ms/clplayer.cpp b/src/game/client/ms/clplayer.cpp
index b7362327..3c994aa4 100644
--- a/src/game/client/ms/clplayer.cpp
+++ b/src/game/client/ms/clplayer.cpp
@@ -438,7 +438,7 @@ For debugging, draw a box around a player made out of particles
 void UTIL_ParticleBox(CBasePlayer* player, float* mins, float* maxs, float life, unsigned char r, unsigned char g, unsigned char b)
 {
 	int i;
-	vec3_t mmin, mmax;
+	Vector  mmin, mmax;
 
 	for (i = 0; i < 3; i++)
 	{
@@ -461,7 +461,7 @@ void UTIL_ParticleBoxes(void)
 	int idx;
 	physent_t* pe;
 	cl_entity_t* player;
-	vec3_t mins, maxs;
+	Vector  mins, maxs;
 
 	gEngfuncs.pEventAPI->EV_SetUpPlayerPrediction(false, true);
 
diff --git a/src/game/client/ms/health.cpp b/src/game/client/ms/health.cpp
index 48c4cc5f..0be34492 100644
--- a/src/game/client/ms/health.cpp
+++ b/src/game/client/ms/health.cpp
@@ -153,7 +153,7 @@ int CHudHealth::MsgFunc_Damage(const char *pszName, int iSize, void *pbuf)
 	int damageTaken = READ_BYTE(); // health
 	long bitsDamage = READ_LONG(); // damage bits
 
-	vec3_t vecFrom;
+	Vector  vecFrom;
 
 	for (unsigned int i = 0; i < 3; i++)
 		vecFrom[i] = READ_COORD();
@@ -203,11 +203,11 @@ int CHudHealth::Draw(float flTime)
 	return 1;
 }
 
-void CHudHealth::CalcDamageDirection(vec3_t vecFrom)
+void CHudHealth::CalcDamageDirection(Vector  vecFrom)
 {
-	vec3_t forward, right, up;
+	Vector  forward, right, up;
 	float side, front;
-	vec3_t vecOrigin, vecAngles;
+	Vector  vecOrigin, vecAngles;
 
 	if (!vecFrom[0] && !vecFrom[1] && !vecFrom[2])
 	{
@@ -215,8 +215,8 @@ void CHudHealth::CalcDamageDirection(vec3_t vecFrom)
 		return;
 	}
 
-	memcpy(vecOrigin, gHUD.m_vecOrigin, sizeof(vec3_t));
-	memcpy(vecAngles, gHUD.m_vecAngles, sizeof(vec3_t));
+	memcpy(vecOrigin, gHUD.m_vecOrigin, sizeof(Vector ));
+	memcpy(vecAngles, gHUD.m_vecAngles, sizeof(Vector ));
 
 	VectorSubtract(vecFrom, vecOrigin, vecFrom);
 
diff --git a/src/game/client/ms/health.h b/src/game/client/ms/health.h
index 4442334e..83b6a36e 100644
--- a/src/game/client/ms/health.h
+++ b/src/game/client/ms/health.h
@@ -71,6 +71,6 @@ class CHudHealth : public CHudBase
 	int DrawPain(float fTime);
 	int DrawDamage(float fTime);
 	float m_fAttackFront, m_fAttackRear, m_fAttackLeft, m_fAttackRight;
-	void CalcDamageDirection(vec3_t vecFrom);
+	void CalcDamageDirection(Vector  vecFrom);
 	void UpdateTiles(float fTime, long bits);
 };
diff --git a/src/game/client/overview.cpp b/src/game/client/overview.cpp
index 5f2d2108..09019876 100644
--- a/src/game/client/overview.cpp
+++ b/src/game/client/overview.cpp
@@ -110,7 +110,7 @@ int CHudOverview::Draw(float flTime)
 			gEngfuncs.pTriAPI->Color4f(r, g, bc, 1.0f);
 
 			// calculate rotational matrix
-			vec3_t a, b, angles;
+			Vector  a, b, angles;
 			float rmatrix[3][4]; // transformation matrix
 			VectorCopy(pl->angles, angles);
 			angles[0] = 0.0f;
diff --git a/src/game/client/render/clrendermirror.cpp b/src/game/client/render/clrendermirror.cpp
index 6bc258db..cd3fe203 100644
--- a/src/game/client/render/clrendermirror.cpp
+++ b/src/game/client/render/clrendermirror.cpp
@@ -622,7 +622,7 @@ void CMirrorMgr::SetupNextView()
 #define PLANE_X 0
 #define PLANE_Y 1
 #define PLANE_Z 2
-//extern vec3_t v_origin, v_angles, v_cl_angles, v_sim_org, v_lastAngles;
+//extern Vector  v_origin, v_angles, v_cl_angles, v_sim_org, v_lastAngles;
 bool Mirror_TraverseVis(TraverseInfo_t &Info);
 void DrawVisLeafs(model_t *pModel, mleaf_t *pStartLeaf, TraverseInfo_t &Info);
 void rdrsky();
diff --git a/src/game/client/render/studiomodelrenderer.cpp b/src/game/client/render/studiomodelrenderer.cpp
index 234509f0..bf884269 100644
--- a/src/game/client/render/studiomodelrenderer.cpp
+++ b/src/game/client/render/studiomodelrenderer.cpp
@@ -49,7 +49,7 @@ void ViewModel_InactiveModelVisible(bool fVisible, const cl_entity_s* ActiveEnti
 {
 	ViewModel_ExclusiveViewHand = fVisible ? ActiveEntity->curstate.iuser2 : -1;
 }
-extern vec3_t v_origin, v_angles, v_cl_angles, v_sim_org, v_lastAngles;
+extern Vector  v_origin, v_angles, v_cl_angles, v_sim_org, v_lastAngles;
 //CStudioModelRenderer *g_StudioRender = NULL;
 
 cl_entity_t* DrawEnt = NULL;
@@ -216,7 +216,7 @@ void CStudioModelRenderer::StudioCalcBoneQuaterion(int frame, float s, mstudiobo
 {
 	int j, k;
 	vec4_t q1, q2;
-	vec3_t angle1, angle2;
+	Vector  angle1, angle2;
 	mstudioanimvalue_t* panimvalue;
 
 	for (j = 0; j < 3; j++)
@@ -520,8 +520,8 @@ Copies model origin and rotation into the transform matrix for rendering
 void CStudioModelRenderer::StudioSetUpTransform(int trivial_accept)
 {
 	int i;
-	vec3_t angles;
-	vec3_t modelpos;
+	Vector  angles;
+	Vector  modelpos;
 
 	cl_entity_t& Ent = *m_pCurrentEntity;
 
@@ -1607,7 +1607,7 @@ int CStudioModelRenderer::StudioDrawModel(int flags)
 				cl_entity_t* ent = gEngfuncs.GetEntityByIndex(m_pCurrentEntity->index);
 
 				if (ent)
-					memcpy(ent->attachment, m_pCurrentEntity->attachment, sizeof(vec3_t) * 4);
+					memcpy(ent->attachment, m_pCurrentEntity->attachment, sizeof(Vector ) * 4);
 			}
 		}
 
@@ -1647,7 +1647,7 @@ StudioEstimateGait
 void CStudioModelRenderer::StudioEstimateGait(entity_state_t* pplayer)
 {
 	float frametime = (m_clTime - m_clOldTime);
-	vec3_t est_velocity;
+	Vector  est_velocity;
 
 	if (frametime < 0)
 		frametime = 0;
@@ -1975,7 +1975,7 @@ int CStudioModelRenderer::StudioDrawPlayer(int flags, entity_state_t* pplayer)
 
 	if (pplayer->gaitsequence)
 	{
-		vec3_t orig_angles;
+		Vector  orig_angles;
 		m_pPlayerInfo = IEngineStudio.PlayerInfo(m_nPlayerIndex);
 
 		VectorCopy(m_pCurrentEntity->angles, orig_angles);
@@ -2035,7 +2035,7 @@ int CStudioModelRenderer::StudioDrawPlayer(int flags, entity_state_t* pplayer)
 		{
 			cl_entity_t* ent = gEngfuncs.GetEntityByIndex(m_pCurrentEntity->index);
 
-			memcpy(ent->attachment, m_pCurrentEntity->attachment, sizeof(vec3_t) * 4);
+			memcpy(ent->attachment, m_pCurrentEntity->attachment, sizeof(Vector ) * 4);
 		}
 	}
 
@@ -2182,7 +2182,7 @@ StudioRenderModel
 void CStudioModelRenderer::StudioRenderModel(void)
 {
 	alight_t lighting;
-	vec3_t lightdir;
+	Vector  lightdir;
 
 	gHUD.m_HUDScript->Effects_Render(*m_pCurrentEntity, CMirrorMgr::m_CurrentMirror.Enabled);
 
@@ -2480,8 +2480,8 @@ void CStudioModelRenderer::FlipModel( bool Enable )
 		index = index % pbodypart->nummodels;
 
 		mstudiomodel_t		*m_pmodel = (mstudiomodel_t *)((byte *)m_pStudioHeader + pbodypart->modelindex) + index;
-		vec3_t *pstudioverts = (vec3_t *)((byte *)m_pStudioHeader + m_pmodel->vertindex);
-		vec3_t *pstudionorms = (vec3_t *)((byte *)m_pStudioHeader + m_pmodel->normindex);
+		Vector  *pstudioverts = (Vector  *)((byte *)m_pStudioHeader + m_pmodel->vertindex);
+		Vector  *pstudionorms = (Vector  *)((byte *)m_pStudioHeader + m_pmodel->normindex);
 
 		for( int v = 0; v < m_pmodel->numverts; v++ )	pstudioverts[v][0] *= -1;	//Flip the vertices
 		for( int n = 0; n < m_pmodel->numnorms; n++)	pstudionorms[n][0] *= -1;	//Flip the normals
diff --git a/src/game/client/view.cpp b/src/game/client/view.cpp
index 346026f7..c584eae5 100644
--- a/src/game/client/view.cpp
+++ b/src/game/client/view.cpp
@@ -72,7 +72,7 @@ extern "C"
 
 float Distance(Vector a, Vector b)
 {
-	vec3_t d;
+	Vector  d;
 	VectorSubtract(b, a, d);
 	return Length(d);
 }
@@ -100,7 +100,7 @@ extern cvar_t *cl_vsmoothing;
 #define CAM_MODE_RELAX 1
 #define CAM_MODE_FOCUS 2
 
-vec3_t v_origin, v_angles, v_cl_angles, v_sim_org, v_lastAngles;
+Vector  v_origin, v_angles, v_cl_angles, v_sim_org, v_lastAngles;
 Vector g_ViewForward, g_ViewRight, g_ViewUp;
 float v_frametime, v_lastDistance;
 float v_cameraRelaxAngle = 5.0f;
@@ -109,7 +109,7 @@ int v_cameraMode = CAM_MODE_FOCUS;
 qboolean v_resetCamera = 1;
 float v_ViewDist = 4096;
 
-vec3_t ev_punchangle;
+Vector  ev_punchangle;
 
 cvar_t *scr_ofsx;
 cvar_t *scr_ofsy;
@@ -200,7 +200,7 @@ float V_CalcBob(struct ref_params_s *pparams)
 	static float bob;
 	float cycle;
 	static float lasttime;
-	vec3_t vel;
+	Vector  vel;
 
 	if (pparams->onground == -1 ||
 		pparams->time == lasttime)
@@ -242,12 +242,12 @@ V_CalcRoll
 Used by view and sv_user
 ===============
 */
-float V_CalcRoll(vec3_t angles, vec3_t velocity, float rollangle, float rollspeed)
+float V_CalcRoll(Vector  angles, Vector  velocity, float rollangle, float rollspeed)
 {
 	float sign;
 	float side;
 	float value;
-	vec3_t forward, right, up;
+	Vector  forward, right, up;
 
 	AngleVectors(angles, &forward, &right, &up);
 
@@ -514,14 +514,14 @@ void V_CalcNormalRefdef(struct ref_params_s *pparams)
 {
 	cl_entity_t *ent;
 	unsigned int i;
-	vec3_t angles;
+	Vector  angles;
 	float bob, waterOffset;
 	static viewinterp_t ViewInterp;
 
 	static float oldz = 0;
 	static float lasttime;
 
-	vec3_t camAngles, camForward, camRight, camUp;
+	Vector  camAngles, camForward, camRight, camUp;
 	cl_entity_t *pwater;
 
 	V_DriftPitch(pparams);
@@ -566,7 +566,7 @@ void V_CalcNormalRefdef(struct ref_params_s *pparams)
 	if (pparams->waterlevel >= 2)
 	{
 		int i, contents, waterDist, waterEntity;
-		vec3_t point;
+		Vector  point;
 		waterDist = cl_waterdist->value;
 
 		if (pparams->hardware)
@@ -640,7 +640,7 @@ void V_CalcNormalRefdef(struct ref_params_s *pparams)
 	// Treating cam_ofs[2] as the distance
 	if (MSCLGlobals::CamThirdPerson)
 	{
-		vec3_t ofs;
+		Vector  ofs;
 
 		ofs[0] = ofs[1] = ofs[2] = 0.0;
 
@@ -748,7 +748,7 @@ void V_CalcNormalRefdef(struct ref_params_s *pparams)
 
 	{
 		static float lastorg[3];
-		vec3_t delta;
+		Vector  delta;
 
 		VectorSubtract(pparams->simorg, lastorg, delta);
 
@@ -787,10 +787,10 @@ void V_CalcNormalRefdef(struct ref_params_s *pparams)
 		if (i < ORIGIN_MASK && ViewInterp.OriginTime[foundidx & ORIGIN_MASK] != 0.0)
 		{
 			// Interpolate
-			vec3_t delta;
+			Vector  delta;
 			double frac;
 			double dt;
-			vec3_t neworg;
+			Vector  neworg;
 
 			dt = ViewInterp.OriginTime[(foundidx + 1) & ORIGIN_MASK] - ViewInterp.OriginTime[foundidx & ORIGIN_MASK];
 			if (dt > 0.0)
@@ -942,9 +942,9 @@ void V_SmoothInterpolateAngles(float *startAngle, float *endAngle, float *finalA
 // Get the origin of the Observer based around the target's position and angles
 void V_GetChaseOrigin(float *angles, float *origin, float distance, float *returnvec)
 {
-	vec3_t vecEnd;
-	vec3_t forward;
-	vec3_t vecStart;
+	Vector  vecEnd;
+	Vector  forward;
+	Vector  vecStart;
 	pmtrace_t *trace = NULL;
 	int maxLoops = 8;
 
@@ -1367,8 +1367,8 @@ void V_GetInEyePos(int target, float *origin, float *angles)
 
 void V_GetMapFreePosition(float *cl_angles, float *origin, float *angles)
 {
-	vec3_t forward;
-	vec3_t zScaledTarget;
+	Vector  forward;
+	Vector  zScaledTarget;
 
 	VectorCopy(cl_angles, angles);
 
@@ -1388,7 +1388,7 @@ void V_GetMapFreePosition(float *cl_angles, float *origin, float *angles)
 
 void V_GetMapChasePosition(int target, float *cl_angles, float *origin, float *angles)
 {
-	vec3_t forward;
+	Vector  forward;
 
 	if (target)
 	{
@@ -1481,7 +1481,7 @@ V_CalcSpectatorRefdef
 */
 void V_CalcSpectatorRefdef(struct ref_params_s *pparams)
 {
-	static vec3_t velocity(0.0f, 0.0f, 0.0f);
+	static Vector  velocity(0.0f, 0.0f, 0.0f);
 
 	static int lastWeaponModelIndex = 0;
 	static int lastViewModelIndex = 0;
@@ -1505,7 +1505,7 @@ void V_CalcSpectatorRefdef(struct ref_params_s *pparams)
 
 		if (timeDiff > 0)
 		{
-			vec3_t distance;
+			Vector  distance;
 			VectorSubtract(ent->prevstate.origin, ent->curstate.origin, distance);
 			VectorScale(distance, 1 / timeDiff, distance);
 
@@ -1838,10 +1838,10 @@ void V_Move(int mx, int my)
 	float dx, dy;
 	float c_x, c_y;
 	float dX, dY;
-	vec3_t forward, up, right;
-	vec3_t newangles;
+	Vector  forward, up, right;
+	Vector  newangles;
 
-	vec3_t farpoint;
+	Vector  farpoint;
 	pmtrace_t tr;
 
 	fov = CalcFov(in_fov, (float)ScreenWidth, (float)ScreenHeight);
diff --git a/src/game/server/bmodels.cpp b/src/game/server/bmodels.cpp
index e66a1998..ed9c3a03 100644
--- a/src/game/server/bmodels.cpp
+++ b/src/game/server/bmodels.cpp
@@ -923,8 +923,8 @@ class CPendulum : public CScriptedEnt
 	float m_damp;
 	float m_maxSpeed;
 	float m_dampSpeed;
-	vec3_t m_center;
-	vec3_t m_start;
+	Vector  m_center;
+	Vector  m_start;
 };
 
 LINK_ENTITY_TO_CLASS(func_pendulum, CPendulum);
diff --git a/src/game/server/client.cpp b/src/game/server/client.cpp
index a9840a7b..d2e2e0a6 100644
--- a/src/game/server/client.cpp
+++ b/src/game/server/client.cpp
@@ -2601,7 +2601,7 @@ CreateBaseline
 Creates baselines used for network encoding, especially for player data since players are not spawned until connect time.
 ===================
 */
-void CreateBaseline(int player, int eindex, struct entity_state_s *baseline, struct edict_s *entity, int playermodelindex, vec3_t player_mins, vec3_t player_maxs)
+void CreateBaseline(int player, int eindex, struct entity_state_s *baseline, struct edict_s *entity, int playermodelindex, Vector  player_mins, Vector  player_maxs)
 {
 	baseline->origin = entity->v.origin;
 	baseline->angles = entity->v.angles;
diff --git a/src/game/server/hl/buttons.cpp b/src/game/server/hl/buttons.cpp
index abfac579..883a170f 100644
--- a/src/game/server/hl/buttons.cpp
+++ b/src/game/server/hl/buttons.cpp
@@ -991,8 +991,8 @@ class CMomentaryRotButton : public CBaseToggle
 	int m_lastUsed;
 	int m_direction;
 	float m_returnSpeed;
-	vec3_t m_start;
-	vec3_t m_end;
+	Vector  m_start;
+	Vector  m_end;
 	int m_sounds;
 };
 TYPEDESCRIPTION CMomentaryRotButton::m_SaveData[] =
diff --git a/src/game/server/hl/client.h b/src/game/server/hl/client.h
index 822c4d02..11a72bec 100644
--- a/src/game/server/hl/client.h
+++ b/src/game/server/hl/client.h
@@ -44,7 +44,7 @@ extern void Sys_Error(const char *error_string);
 extern void SetupVisibility(edict_t *pViewEntity, edict_t *pClient, unsigned char **pvs, unsigned char **pas);
 extern void UpdateClientData(const struct edict_s *ent, int sendweapons, struct clientdata_s *cd);
 extern int AddToFullPack(struct entity_state_s *state, int e, edict_t *ent, edict_t *host, int hostflags, int player, unsigned char *pSet);
-extern void CreateBaseline(int player, int eindex, struct entity_state_s *baseline, struct edict_s *entity, int playermodelindex, vec3_t player_mins, vec3_t player_maxs);
+extern void CreateBaseline(int player, int eindex, struct entity_state_s *baseline, struct edict_s *entity, int playermodelindex, Vector  player_mins, Vector  player_maxs);
 extern void RegisterEncoders(void);
 
 extern int GetWeaponData(struct edict_s *player, struct weapon_data_s *info);
diff --git a/src/game/shared/hl/vector.h b/src/game/shared/hl/vector.h
index 5a14ae2d..29e9826b 100644
--- a/src/game/shared/hl/vector.h
+++ b/src/game/shared/hl/vector.h
@@ -67,7 +67,7 @@ inline Vector2D operator*(float fl, const Vector2D &v) { return v * fl; }
 //=========================================================
 // 3D Vector
 //=========================================================
-class Vector // same data-layout as engine's vec3_t,
+class Vector // same data-layout as engine's Vector ,
 {			 //		which is a vec_t[3]
 public:
 	// Construction/destruction
@@ -149,6 +149,5 @@ inline float DotProduct(const Vector &a, const Vector &b) { return (a.x * b.x +
 
 inline Vector CrossProduct(const Vector &a, const Vector &b) { return Vector(a.y * b.z - a.z * b.y, a.z * b.x - a.x * b.z, a.x * b.y - a.y * b.x); }
 
-#define vec3_t Vector // temporary until we change all the files to use Vector.
 
 #endif
\ No newline at end of file
diff --git a/src/game/shared/movement/pm_debug.cpp b/src/game/shared/movement/pm_debug.cpp
index 218be7d1..96e55fe6 100644
--- a/src/game/shared/movement/pm_debug.cpp
+++ b/src/game/shared/movement/pm_debug.cpp
@@ -45,8 +45,8 @@ static int PM_boxpnt[6][4] =
 void PM_ShowClipBox()
 {
 #if defined(_DEBUG)
-	vec3_t org;
-	vec3_t offset = {0, 0, 0};
+	Vector  org;
+	Vector  offset = {0, 0, 0};
 
 	if (0 == pmove->runfuncs)
 		return;
@@ -97,13 +97,13 @@ PM_ParticleLine(Vector start, Vector end, int color, float life)
 
 ================
 */
-void PM_ParticleLine(vec3_t start, vec3_t end, int pcolor, float life, float vert)
+void PM_ParticleLine(Vector  start, Vector  end, int pcolor, float life, float vert)
 {
 	float linestep = 2.0f;
 	float curdist;
 	float len;
-	vec3_t curpos;
-	vec3_t diff;
+	Vector  curpos;
+	Vector  diff;
 	int i;
 	// Determine distance;
 
@@ -128,7 +128,7 @@ PM_DrawRectangle(Vector tl, Vector br)
 
 ================
 */
-void PM_DrawRectangle(vec3_t tl, vec3_t bl, vec3_t tr, vec3_t br, int pcolor, float life)
+void PM_DrawRectangle(Vector  tl, Vector  bl, Vector  tr, Vector  br, int pcolor, float life)
 {
 	PM_ParticleLine(tl, bl, pcolor, life, 0);
 	PM_ParticleLine(bl, br, pcolor, life, 0);
@@ -145,12 +145,12 @@ PM_DrawPhysEntBBox(int num)
 void PM_DrawPhysEntBBox(int num, int pcolor, float life)
 {
 	physent_t* pe;
-	vec3_t org;
+	Vector  org;
 	int j;
-	vec3_t tmp;
-	vec3_t p[8];
+	Vector  tmp;
+	Vector  p[8];
 	float gap = BOX_GAP;
-	vec3_t modelmins, modelmaxs;
+	Vector  modelmins, modelmaxs;
 
 	if (num >= pmove->numphysent ||
 		num <= 0)
@@ -175,7 +175,7 @@ void PM_DrawPhysEntBBox(int num, int pcolor, float life)
 		// If the bbox should be rotated, do that
 		if (pe->angles != g_vecZero)
 		{
-			vec3_t forward, right, up;
+			Vector  forward, right, up;
 
 			AngleVectorsTranspose(pe->angles, &forward, &right, &up);
 			for (j = 0; j < 8; j++)
@@ -231,12 +231,12 @@ PM_DrawBBox(Vector mins, Vector maxs, Vector origin, int pcolor, float life)
 
 ================
 */
-void PM_DrawBBox(vec3_t mins, vec3_t maxs, vec3_t origin, int pcolor, float life)
+void PM_DrawBBox(Vector  mins, Vector  maxs, Vector  origin, int pcolor, float life)
 {
 	int j;
 
-	vec3_t tmp;
-	vec3_t p[8];
+	Vector  tmp;
+	Vector  p[8];
 	float gap = BOX_GAP;
 
 	for (j = 0; j < 8; j++)
@@ -272,10 +272,10 @@ Tries to shoot a ray out by about 128 units.
 */
 void PM_ViewEntity()
 {
-	vec3_t forward, right, up;
+	Vector  forward, right, up;
 	float raydist = 256.0f;
-	vec3_t origin;
-	vec3_t end;
+	Vector  origin;
+	Vector  end;
 	int i;
 	pmtrace_t trace;
 	int pcolor = 77;
diff --git a/src/game/shared/movement/pm_debug.h b/src/game/shared/movement/pm_debug.h
index 7ab80d68..de42ae64 100644
--- a/src/game/shared/movement/pm_debug.h
+++ b/src/game/shared/movement/pm_debug.h
@@ -15,6 +15,6 @@
 #pragma once
 
 void PM_ViewEntity(void);
-void PM_DrawBBox(vec3_t mins, vec3_t maxs, vec3_t origin, int pcolor, float life);
-void PM_ParticleLine(vec3_t start, vec3_t end, int pcolor, float life, float vert);
+void PM_DrawBBox(Vector  mins, Vector  maxs, Vector  origin, int pcolor, float life);
+void PM_ParticleLine(Vector  start, Vector  end, int pcolor, float life, float vert);
 void PM_ShowClipBox(void);
diff --git a/src/game/shared/movement/pm_defs.h b/src/game/shared/movement/pm_defs.h
index ab855e56..7fac3eb7 100644
--- a/src/game/shared/movement/pm_defs.h
+++ b/src/game/shared/movement/pm_defs.h
@@ -45,12 +45,12 @@ typedef struct physent_s
 {
 	char name[32]; // Name of model, or "player" or "world".
 	int player;
-	vec3_t origin;				 // Model's origin in world coordinates.
+	Vector  origin;				 // Model's origin in world coordinates.
 	struct model_s *model;		 // only for bsp models
 	struct model_s *studiomodel; // SOLID_BBOX, but studio clip intersections.
-	vec3_t mins, maxs;			 // only for non-bsp models
+	Vector  mins, maxs;			 // only for non-bsp models
 	int info;					 // For client or server to use to identify (index into edicts or cl_entities)
-	vec3_t angles;				 // rotated entities need this info for hull testing to work.
+	Vector  angles;				 // rotated entities need this info for hull testing to work.
 
 	int solid;		// Triggers and func_door type WATER brushes are SOLID_NOT
 	int skin;		// BSP Contents for such things like fun_door water brushes.
@@ -77,10 +77,10 @@ typedef struct physent_s
 	float fuser2;
 	float fuser3;
 	float fuser4;
-	vec3_t vuser1;
-	vec3_t vuser2;
-	vec3_t vuser3;
-	vec3_t vuser4;
+	Vector  vuser1;
+	Vector  vuser2;
+	Vector  vuser3;
+	Vector  vuser4;
 } physent_t;
 
 typedef struct playermove_s
@@ -92,17 +92,17 @@ typedef struct playermove_s
 	float time;			  // realtime on host, for reckoning duck timing
 	float frametime;	  // Duration of this frame
 
-	vec3_t forward, right, up; // Vectors for angles
+	Vector  forward, right, up; // Vectors for angles
 	// player state
-	vec3_t origin;		 // Movement origin.
-	vec3_t angles;		 // Movement view angles.
-	vec3_t oldangles;	 // Angles before movement view angles were looked at.
-	vec3_t velocity;	 // Current movement direction.
-	vec3_t movedir;		 // For waterjumping, a forced forward velocity so we can fly over lip of ledge.
-	vec3_t basevelocity; // Velocity of the conveyor we are standing, e.g.
+	Vector  origin;		 // Movement origin.
+	Vector  angles;		 // Movement view angles.
+	Vector  oldangles;	 // Angles before movement view angles were looked at.
+	Vector  velocity;	 // Current movement direction.
+	Vector  movedir;		 // For waterjumping, a forced forward velocity so we can fly over lip of ledge.
+	Vector  basevelocity; // Velocity of the conveyor we are standing, e.g.
 
 	// For ducking/dead
-	vec3_t view_ofs;  // Our eye position.
+	Vector  view_ofs;  // Our eye position.
 	float flDuckTime; // Time we started duck
 	qboolean bInDuck; // In process of ducking or ducked already?
 
@@ -111,7 +111,7 @@ typedef struct playermove_s
 	int iStepLeft;
 
 	float flFallVelocity;
-	vec3_t punchangle;
+	Vector  punchangle;
 
 	float flSwimTime;
 
@@ -150,10 +150,10 @@ typedef struct playermove_s
 	float fuser2;
 	float fuser3;
 	float fuser4;
-	vec3_t vuser1;
-	vec3_t vuser2;
-	vec3_t vuser3;
-	vec3_t vuser4;
+	Vector  vuser1;
+	Vector  vuser2;
+	Vector  vuser3;
+	Vector  vuser4;
 	// world state
 	// Number of entities to clip against.
 	int numphysent;
@@ -177,8 +177,8 @@ typedef struct playermove_s
 	char physinfo[MAX_PHYSINFO_STRING]; // Physics info string
 
 	struct movevars_s *movevars;
-	vec3_t player_mins[4];
-	vec3_t player_maxs[4];
+	Vector  player_mins[4];
+	Vector  player_maxs[4];
 
 	// Common functions
 	const char *(*PM_Info_ValueForKey)(const char *s, const char *key);
diff --git a/src/game/shared/movement/pm_shared.cpp b/src/game/shared/movement/pm_shared.cpp
index f83badfb..807a339f 100644
--- a/src/game/shared/movement/pm_shared.cpp
+++ b/src/game/shared/movement/pm_shared.cpp
@@ -77,7 +77,7 @@ typedef struct
 
 typedef struct mplane_s
 {
-	vec3_t normal; // surface normal
+	Vector  normal; // surface normal
 	float dist;	   // closest appoach to origin
 	byte type;	   // for texture axis selection and fast side tests
 	byte signbits; // signx + signy<<1 + signz<<1
@@ -90,8 +90,8 @@ typedef struct hull_s
 	mplane_t *planes;
 	int firstclipnode;
 	int lastclipnode;
-	vec3_t clip_mins;
-	vec3_t clip_maxs;
+	Vector  clip_mins;
+	Vector  clip_maxs;
 } hull_t;
 
 // Ducking time
@@ -167,7 +167,7 @@ typedef struct hull_s
 
 Vector vec3_origin(0,0,0);
 
-static vec3_t rgv3tStuckTable[54];
+static Vector  rgv3tStuckTable[54];
 static int rgStuckLast[MAX_CLIENTS][2];
 
 // Texture names
@@ -366,7 +366,7 @@ void PM_PlayStepSound(int step, float fvol)
 {
 	static int iSkipStep = 0;
 	int irand;
-	vec3_t hvel;
+	Vector  hvel;
 
 	pmove->iStepLeft = !pmove->iStepLeft;
 
@@ -636,7 +636,7 @@ Determine texture info for the texture we are standing on.
 */
 void PM_CatagorizeTextureType(void)
 {
-	vec3_t start, end;
+	Vector  start, end;
 	const char *pTextureName;
 
 	VectorCopy(pmove->origin, start);
@@ -671,9 +671,9 @@ void PM_CatagorizeTextureType(void)
 void PM_UpdateStepSound(void)
 {
 	float fvol;
-	vec3_t knee;
-	vec3_t feet;
-	vec3_t center;
+	Vector  knee;
+	Vector  feet;
+	Vector  center;
 	float height;
 	float speed;
 	float velrun;
@@ -981,15 +981,15 @@ The basic solid body movement clip that slides along multiple planes
 int PM_FlyMove(void)
 {
 	int bumpcount, numbumps;
-	vec3_t dir;
+	Vector  dir;
 	float d;
 	int numplanes;
-	vec3_t planes[MAX_CLIP_PLANES];
-	vec3_t primal_velocity, original_velocity;
-	vec3_t new_velocity;
+	Vector  planes[MAX_CLIP_PLANES];
+	Vector  primal_velocity, original_velocity;
+	Vector  new_velocity;
 	int i, j;
 	pmtrace_t trace;
-	vec3_t end;
+	Vector  end;
 	float time_left, allFraction;
 	int blocked;
 
@@ -1220,15 +1220,15 @@ void PM_WalkMove()
 	int oldonground;
 	int i;
 
-	vec3_t wishvel;
+	Vector  wishvel;
 	float spd;
 	float fmove, smove;
-	vec3_t wishdir;
+	Vector  wishdir;
 	float wishspeed;
 
-	vec3_t dest, start;
-	vec3_t original, originalvel;
-	vec3_t down, downvel;
+	Vector  dest, start;
+	Vector  original, originalvel;
+	Vector  down, downvel;
 	float downdist, updist;
 
 	pmtrace_t trace;
@@ -1386,7 +1386,7 @@ void PM_Friction(void)
 	float speed, newspeed, control;
 	float friction;
 	float drop;
-	vec3_t newvel;
+	Vector  newvel;
 
 	// If we are in water jump cycle, don't apply friction
 	if (pmove->waterjumptime)
@@ -1409,7 +1409,7 @@ void PM_Friction(void)
 	// apply ground friction
 	if (pmove->onground != -1) // On an entity that is the ground
 	{
-		vec3_t start, stop;
+		Vector  start, stop;
 		pmtrace_t trace;
 
 		start[0] = stop[0] = pmove->origin[0] + vel[0] / speed * 16;
@@ -1501,11 +1501,11 @@ PM_WaterMove
 void PM_WaterMove(void)
 {
 	int i;
-	vec3_t wishvel;
+	Vector  wishvel;
 	float wishspeed;
-	vec3_t wishdir;
-	vec3_t start, dest;
-	vec3_t temp;
+	Vector  wishdir;
+	Vector  start, dest;
+	Vector  temp;
 	pmtrace_t trace;
 
 	float speed, newspeed, addspeed, accelspeed;
@@ -1596,9 +1596,9 @@ PM_AirMove
 void PM_AirMove(void)
 {
 	int i;
-	vec3_t wishvel;
+	Vector  wishvel;
 	float fmove, smove;
-	vec3_t wishdir;
+	Vector  wishdir;
 	float wishspeed;
 
 	// Copy movement amounts
@@ -1653,7 +1653,7 @@ Sets pmove->waterlevel and pmove->watertype values.
 */
 qboolean PM_CheckWater()
 {
-	vec3_t point;
+	Vector  point;
 	int cont;
 	int truecont;
 	float height;
@@ -1723,7 +1723,7 @@ PM_CatagorizePosition
 */
 void PM_CatagorizePosition(void)
 {
-	vec3_t point;
+	Vector  point;
 	pmtrace_t tr;
 
 	// if the player hull point one unit down is solid, the player
@@ -1843,9 +1843,9 @@ bool PM_TryToUnstuck(Vector base)
 
 bool PM_CheckStuck(void)
 {
-	vec3_t base;
-	vec3_t offset;
-	vec3_t test;
+	Vector  base;
+	Vector  offset;
+	Vector  test;
 	int hitent;
 	int i;
 	pmtrace_t traceresult;
@@ -1965,9 +1965,9 @@ void PM_SpectatorMove(void)
 	//float   accel;
 	float currentspeed, addspeed, accelspeed;
 	int i;
-	vec3_t wishvel;
+	Vector  wishvel;
 	float fmove, smove;
-	vec3_t wishdir;
+	Vector  wishdir;
 	float wishspeed;
 	// this routine keeps track of the spectators psoition
 	// there a two different main move types : track player or moce freely (OBS_ROAMING)
@@ -2126,7 +2126,7 @@ void PM_UnDuck(void)
 {
 	int i;
 	pmtrace_t trace;
-	vec3_t newOrigin;
+	Vector  newOrigin;
 
 	VectorCopy(pmove->origin, newOrigin);
 
@@ -2263,11 +2263,11 @@ void PM_Duck(void)
 
 void PM_LadderMove(physent_t *pLadder)
 {
-	vec3_t ladderCenter;
+	Vector  ladderCenter;
 	trace_t trace;
 	qboolean onFloor;
-	vec3_t floor;
-	vec3_t modelmins, modelmaxs;
+	Vector  floor;
+	Vector  modelmins, modelmaxs;
 
 	if (pmove->movetype == MOVETYPE_NOCLIP)
 		return;
@@ -2294,7 +2294,7 @@ void PM_LadderMove(physent_t *pLadder)
 	if (trace.fraction != 1.0)
 	{
 		float forward = 0, right = 0;
-		vec3_t vpn, v_right;
+		Vector  vpn, v_right;
 
 		AngleVectors(pmove->angles, &vpn, &v_right, NULL);
 		if (pmove->cmd.buttons & IN_BACK)
@@ -2315,7 +2315,7 @@ void PM_LadderMove(physent_t *pLadder)
 		{
 			if (forward != 0 || right != 0)
 			{
-				vec3_t velocity, perp, cross, lateral, tmp;
+				Vector  velocity, perp, cross, lateral, tmp;
 				float normal;
 
 				//ALERT(at_console, "pev %.2f %.2f %.2f - ",
@@ -2368,7 +2368,7 @@ physent_t *PM_Ladder(void)
 	physent_t *pe;
 	hull_t *hull;
 	int num;
-	vec3_t test;
+	Vector  test;
 
 	for (i = 0; i < pmove->nummoveent; i++)
 	{
@@ -2444,10 +2444,10 @@ PM_PushEntity
 Does not change the entities velocity at all
 ============
 */
-pmtrace_t PM_PushEntity(vec3_t push)
+pmtrace_t PM_PushEntity(Vector  push)
 {
 	pmtrace_t trace;
-	vec3_t end;
+	Vector  end;
 
 	VectorAdd(pmove->origin, push, end);
 
@@ -2475,7 +2475,7 @@ Dead player flying through air., e.g.
 void PM_Physics_Toss()
 {
 	pmtrace_t trace;
-	vec3_t move;
+	Vector  move;
 	float backoff;
 
 	PM_CheckWater();
@@ -2538,7 +2538,7 @@ void PM_Physics_Toss()
 	if (trace.plane.normal[2] > 0.7)
 	{
 		float vel;
-		vec3_t base;
+		Vector  base;
 
 		VectorClear(base);
 		if (pmove->velocity[2] < pmove->movevars->gravity * pmove->frametime)
@@ -2578,7 +2578,7 @@ PM_NoClip
 void PM_NoClip()
 {
 	int i;
-	vec3_t wishvel;
+	Vector  wishvel;
 	float fmove, smove;
 	//	float		currentspeed, addspeed, accelspeed;
 
@@ -2793,9 +2793,9 @@ PM_CheckWaterJump
 #define WJ_HEIGHT 8
 void PM_CheckWaterJump(void)
 {
-	vec3_t vecStart, vecEnd;
-	vec3_t flatforward;
-	vec3_t flatvelocity;
+	Vector  vecStart, vecEnd;
+	Vector  flatforward;
+	Vector  flatvelocity;
 	float curspeed;
 	pmtrace_t tr;
 	int savehull;
@@ -2970,12 +2970,12 @@ PM_CalcRoll
 
 ===============
 */
-float PM_CalcRoll(vec3_t angles, vec3_t velocity, float rollangle, float rollspeed)
+float PM_CalcRoll(Vector  angles, Vector  velocity, float rollangle, float rollspeed)
 {
 	float sign;
 	float side;
 	float value;
-	vec3_t forward, right, up;
+	Vector  forward, right, up;
 
 	AngleVectors(angles, &forward, &right, &up);
 
@@ -3025,7 +3025,7 @@ void PM_CheckParamters(void)
 {
 	float spd;
 	float maxspeed;
-	vec3_t v_angle;
+	Vector  v_angle;
 
 	spd = (pmove->cmd.forwardmove * pmove->cmd.forwardmove) +
 		  (pmove->cmd.sidemove * pmove->cmd.sidemove) +
@@ -3401,7 +3401,7 @@ void PM_CreateStuckTable(void)
 	int i;
 	float zi[3];
 
-	memset(rgv3tStuckTable, 0, 54 * sizeof(vec3_t));
+	memset(rgv3tStuckTable, 0, 54 * sizeof(Vector ));
 
 	idx = 0;
 	// Little Moves.
diff --git a/src/public/engine/eiface.h b/src/public/engine/eiface.h
index 2badee2d..3cbb32d8 100644
--- a/src/public/engine/eiface.h
+++ b/src/public/engine/eiface.h
@@ -76,9 +76,9 @@ typedef struct
 	int		fInOpen;
 	int		fInWater;
 	float	flFraction;			// time completed, 1.0 = didn't hit anything
-	vec3_t	vecEndPos;			// final position
+	Vector 	vecEndPos;			// final position
 	float	flPlaneDist;
-	vec3_t	vecPlaneNormal;		// surface normal at impact
+	Vector 	vecPlaneNormal;		// surface normal at impact
 	edict_t	*pHit;				// entity the surface is on
 	int		iHitgroup;			// 0 == generic, non zero is specific body part
 	} TraceResult;
@@ -281,7 +281,7 @@ typedef struct
 	char		mapName[ 32 ];
 	char		landmarkName[ 32 ];
 	edict_t	*pentLandmark;
-	vec3_t		vecLandmarkOrigin;
+	Vector 		vecLandmarkOrigin;
 } LEVELLIST;
 #define MAX_LEVEL_CONNECTIONS	16		// These are encoded in the lower 16bits of ENTITYTABLE->flags
 
@@ -325,7 +325,7 @@ struct saverestore_s
 	// smooth transition
 	int			fUseLandmark;
 	char		szLandmarkName[20];// landmark we'll spawn near in next level
-	vec3_t		vecLandmarkOffset;// for landmark transitions
+	Vector 		vecLandmarkOffset;// for landmark transitions
 	float		time;
 	char		szCurrentMapName[32];	// To check global entities
 
@@ -441,7 +441,7 @@ typedef struct
 	void			(*pfnSetupVisibility)( struct edict_s *pViewEntity, struct edict_s *pClient, unsigned char **pvs, unsigned char **pas );
 	void			(*pfnUpdateClientData) ( const struct edict_s *ent, int sendweapons, struct clientdata_s *cd );
 	int				(*pfnAddToFullPack)( struct entity_state_s *state, int e, edict_t *ent, edict_t *host, int hostflags, int player, unsigned char *pSet );
-	void			(*pfnCreateBaseline) ( int player, int eindex, struct entity_state_s *baseline, struct edict_s *entity, int playermodelindex, vec3_t player_mins, vec3_t player_maxs );
+	void			(*pfnCreateBaseline) ( int player, int eindex, struct entity_state_s *baseline, struct edict_s *entity, int playermodelindex, Vector  player_mins, Vector  player_maxs );
 	void			(*pfnRegisterEncoders)	( void );
 	int				(*pfnGetWeaponData)		( struct edict_s *player, struct weapon_data_s *info );
 
diff --git a/src/public/engine/progdefs.h b/src/public/engine/progdefs.h
index c8d9e548..12fe7994 100644
--- a/src/public/engine/progdefs.h
+++ b/src/public/engine/progdefs.h
@@ -30,14 +30,14 @@ typedef struct
 	float		teamplay;
 	float		serverflags;
 	float		found_secrets;
-	vec3_t		v_forward;
-	vec3_t		v_up;
-	vec3_t		v_right;
+	Vector 		v_forward;
+	Vector 		v_up;
+	Vector 		v_right;
 	float		trace_allsolid;
 	float		trace_startsolid;
 	float		trace_fraction;
-	vec3_t		trace_endpos;
-	vec3_t		trace_plane_normal;
+	Vector 		trace_endpos;
+	Vector 		trace_plane_normal;
 	float		trace_plane_dist;
 	edict_t		*trace_ent;
 	float		trace_inopen;
@@ -52,7 +52,7 @@ typedef struct
 	const char	*pStringBase;
 
 	void		*pSaveData;
-	vec3_t		vecLandmarkOffset;
+	Vector 		vecLandmarkOffset;
 } globalvars_t;
 
 
@@ -61,22 +61,22 @@ typedef struct entvars_s
 	string_t	classname;
 	string_t	globalname;
 
-	vec3_t		origin;
-	vec3_t		oldorigin;
-	vec3_t		velocity;
-	vec3_t		basevelocity;
-	vec3_t      clbasevelocity;  // Base velocity that was passed in to server physics so 
+	Vector 		origin;
+	Vector 		oldorigin;
+	Vector 		velocity;
+	Vector 		basevelocity;
+	Vector       clbasevelocity;  // Base velocity that was passed in to server physics so 
 							     //  client can predict conveyors correctly.  Server zeroes it, so we need to store here, too.
-	vec3_t		movedir;
+	Vector 		movedir;
 
-	vec3_t		angles;			// Model angles
-	vec3_t		avelocity;		// angle velocity (degrees per second)
-	vec3_t		punchangle;		// auto-decaying view angle adjustment
-	vec3_t		v_angle;		// Viewing angle (player only)
+	Vector 		angles;			// Model angles
+	Vector 		avelocity;		// angle velocity (degrees per second)
+	Vector 		punchangle;		// auto-decaying view angle adjustment
+	Vector 		v_angle;		// Viewing angle (player only)
 
 	// For parametric entities
-	vec3_t		endpos;
-	vec3_t		startpos;
+	Vector 		endpos;
+	Vector 		startpos;
 	float		impacttime;
 	float		starttime;
 
@@ -92,11 +92,11 @@ typedef struct entvars_s
 	int			viewmodel;		// player's viewmodel
 	int			weaponmodel;	// what other players see
 	
-	vec3_t		absmin;		// BB max translated to world coord
-	vec3_t		absmax;		// BB max translated to world coord
-	vec3_t		mins;		// local BB min
-	vec3_t		maxs;		// local BB max
-	vec3_t		size;		// maxs - mins
+	Vector 		absmin;		// BB max translated to world coord
+	Vector 		absmax;		// BB max translated to world coord
+	Vector 		mins;		// local BB min
+	Vector 		maxs;		// local BB max
+	Vector 		size;		// maxs - mins
 
 	float		ltime;
 	float		nextthink;
@@ -125,7 +125,7 @@ typedef struct entvars_s
 
 	int			rendermode;
 	float		renderamt;
-	vec3_t		rendercolor;
+	Vector 		rendercolor;
 	int			renderfx;
 
 	float		health;
@@ -134,7 +134,7 @@ typedef struct entvars_s
 	float		takedamage;
 
 	int			deadflag;
-	vec3_t		view_ofs;	// eye position
+	Vector 		view_ofs;	// eye position
 
 	int			button;
 	int			impulse;
@@ -211,10 +211,10 @@ typedef struct entvars_s
 	float		fuser2;
 	float		fuser3;
 	float		fuser4;
-	vec3_t		vuser1;
-	vec3_t		vuser2;
-	vec3_t		vuser3;
-	vec3_t		vuser4;
+	Vector 		vuser1;
+	Vector 		vuser2;
+	Vector 		vuser3;
+	Vector 		vuser4;
 	edict_t		*euser1;
 	edict_t		*euser2;
 	edict_t		*euser3;
diff --git a/src/public/engine/studio.h b/src/public/engine/studio.h
index f3059e4d..8bb15c0f 100644
--- a/src/public/engine/studio.h
+++ b/src/public/engine/studio.h
@@ -52,12 +52,12 @@ typedef struct
 	char				name[64];
 	int					length;
 
-	vec3_t				eyeposition;	// ideal eye position
-	vec3_t				min;			// ideal movement hull size
-	vec3_t				max;			
+	Vector 				eyeposition;	// ideal eye position
+	Vector 				min;			// ideal movement hull size
+	Vector 				max;			
 
-	vec3_t				bbmin;			// clipping bounding box
-	vec3_t				bbmax;		
+	Vector 				bbmin;			// clipping bounding box
+	Vector 				bbmax;		
 
 	int					flags;
 
@@ -137,8 +137,8 @@ typedef struct
 {
 	int					bone;
 	int					group;			// intersection group
-	vec3_t				bbmin;		// bounding box
-	vec3_t				bbmax;		
+	Vector 				bbmin;		// bounding box
+	Vector 				bbmax;		
 } mstudiobbox_t;
 
 #if !defined( CACHE_USER ) && !defined( QUAKEDEF_H )
@@ -179,12 +179,12 @@ typedef struct
 
 	int					motiontype;	
 	int					motionbone;
-	vec3_t				linearmovement;
+	Vector 				linearmovement;
 	int					automoveposindex;
 	int					automoveangleindex;
 
-	vec3_t				bbmin;		// per sequence bounding box
-	vec3_t				bbmax;		
+	Vector 				bbmin;		// per sequence bounding box
+	Vector 				bbmax;		
 
 	int					numblends;
 	int					animindex;		// mstudioanim_t pointer relative to start of sequence group data
@@ -219,7 +219,7 @@ typedef struct
 // pivots
 typedef struct 
 {
-	vec3_t				org;	// pivot point
+	Vector 				org;	// pivot point
 	int					start;
 	int					end;
 } mstudiopivot_t;
@@ -230,8 +230,8 @@ typedef struct
 	char				name[32];
 	int					type;
 	int					bone;
-	vec3_t				org;	// attachment point
-	vec3_t				vectors[3];
+	Vector 				org;	// attachment point
+	Vector 				vectors[3];
 } mstudioattachment_t;
 
 typedef struct
@@ -290,17 +290,17 @@ typedef struct
 
 	int					numverts;		// number of unique vertices
 	int					vertinfoindex;	// vertex bone info
-	int					vertindex;		// vertex vec3_t
+	int					vertindex;		// vertex Vector 
 	int					numnorms;		// number of unique surface normals
 	int					norminfoindex;	// normal bone info
-	int					normindex;		// normal vec3_t
+	int					normindex;		// normal Vector 
 
 	int					numgroups;		// deformation groups
 	int					groupindex;
 } mstudiomodel_t;
 
 
-// vec3_t	boundingbox[model][bone][2];	// complex intersection info
+// Vector 	boundingbox[model][bone][2];	// complex intersection info
 
 
 // meshes
@@ -310,7 +310,7 @@ typedef struct
 	int					triindex;
 	int					skinref;
 	int					numnorms;		// per mesh normals
-	int					normindex;		// normal vec3_t
+	int					normindex;		// normal Vector 
 } mstudiomesh_t;
 
 // triangles
diff --git a/utils/common/bspfile.c b/utils/common/bspfile.c
index 688f10da..fea7b37c 100644
--- a/utils/common/bspfile.c
+++ b/utils/common/bspfile.c
@@ -693,7 +693,7 @@ vec_t	FloatForKey (entity_t *ent, char *key)
 	return atof(k);
 }
 
-void 	GetVectorForKey (entity_t *ent, char *key, vec3_t vec)
+void 	GetVectorForKey (entity_t *ent, char *key, Vector  vec)
 {
 	char	*k;
 	double	v1, v2, v3;
diff --git a/utils/common/bspfile.h b/utils/common/bspfile.h
index 1804d77b..3942150c 100644
--- a/utils/common/bspfile.h
+++ b/utils/common/bspfile.h
@@ -308,7 +308,7 @@ typedef struct epair_s
 
 typedef struct
 {
-	vec3_t		origin;
+	Vector 		origin;
 	int			firstbrush;
 	int			numbrushes;
 	epair_t		*epairs;
@@ -325,7 +325,7 @@ char 	*ValueForKey (entity_t *ent, char *key);
 // will return "" if not present
 
 vec_t	FloatForKey (entity_t *ent, char *key);
-void 	GetVectorForKey (entity_t *ent, char *key, vec3_t vec);
+void 	GetVectorForKey (entity_t *ent, char *key, Vector  vec);
 
 epair_t *ParseEpair (void);
 
diff --git a/utils/common/bsplib.c b/utils/common/bsplib.c
index d2bc8a75..3c042c92 100644
--- a/utils/common/bsplib.c
+++ b/utils/common/bsplib.c
@@ -693,7 +693,7 @@ vec_t	FloatForKey (entity_t *ent, char *key)
 	return atof(k);
 }
 
-void 	GetVectorForKey (entity_t *ent, char *key, vec3_t vec)
+void 	GetVectorForKey (entity_t *ent, char *key, Vector  vec)
 {
 	char	*k;
 	double	v1, v2, v3;
diff --git a/utils/common/bsplib.h b/utils/common/bsplib.h
index 575829ff..31fe73e6 100644
--- a/utils/common/bsplib.h
+++ b/utils/common/bsplib.h
@@ -308,7 +308,7 @@ typedef struct epair_s
 
 typedef struct
 {
-	vec3_t		origin;
+	Vector 		origin;
 	int			firstbrush;
 	int			numbrushes;
 	epair_t		*epairs;
@@ -325,7 +325,7 @@ char 	*ValueForKey (entity_t *ent, char *key);
 // will return "" if not present
 
 vec_t	FloatForKey (entity_t *ent, char *key);
-void 	GetVectorForKey (entity_t *ent, char *key, vec3_t vec);
+void 	GetVectorForKey (entity_t *ent, char *key, Vector  vec);
 
 epair_t *ParseEpair (void);
 
diff --git a/utils/common/mathlib.c b/utils/common/mathlib.c
index f0c7f8fa..0e42b05b 100644
--- a/utils/common/mathlib.c
+++ b/utils/common/mathlib.c
@@ -17,10 +17,10 @@
 #include "cmdlib.h"
 #include "mathlib.h"
 
-vec3_t vec3_origin = {0,0,0};
+Vector  vec3_origin = {0,0,0};
 
 
-double VectorLength(vec3_t v)
+double VectorLength(Vector  v)
 {
 	int		i;
 	double	length;
@@ -34,7 +34,7 @@ double VectorLength(vec3_t v)
 }
 
 
-int VectorCompare (vec3_t v1, vec3_t v2)
+int VectorCompare (Vector  v1, Vector  v2)
 {
 	int		i;
 	
@@ -50,54 +50,54 @@ vec_t Q_rint (vec_t in)
 	return floor (in + 0.5);
 }
 
-void VectorMA (vec3_t va, double scale, vec3_t vb, vec3_t vc)
+void VectorMA (Vector  va, double scale, Vector  vb, Vector  vc)
 {
 	vc[0] = va[0] + scale*vb[0];
 	vc[1] = va[1] + scale*vb[1];
 	vc[2] = va[2] + scale*vb[2];
 }
 
-void CrossProduct (vec3_t v1, vec3_t v2, vec3_t cross)
+void CrossProduct (Vector  v1, Vector  v2, Vector  cross)
 {
 	cross[0] = v1[1]*v2[2] - v1[2]*v2[1];
 	cross[1] = v1[2]*v2[0] - v1[0]*v2[2];
 	cross[2] = v1[0]*v2[1] - v1[1]*v2[0];
 }
 
-vec_t _DotProduct (vec3_t v1, vec3_t v2)
+vec_t _DotProduct (Vector  v1, Vector  v2)
 {
 	return v1[0]*v2[0] + v1[1]*v2[1] + v1[2]*v2[2];
 }
 
-void _VectorSubtract (vec3_t va, vec3_t vb, vec3_t out)
+void _VectorSubtract (Vector  va, Vector  vb, Vector  out)
 {
 	out[0] = va[0]-vb[0];
 	out[1] = va[1]-vb[1];
 	out[2] = va[2]-vb[2];
 }
 
-void _VectorAdd (vec3_t va, vec3_t vb, vec3_t out)
+void _VectorAdd (Vector  va, Vector  vb, Vector  out)
 {
 	out[0] = va[0]+vb[0];
 	out[1] = va[1]+vb[1];
 	out[2] = va[2]+vb[2];
 }
 
-void _VectorCopy (vec3_t in, vec3_t out)
+void _VectorCopy (Vector  in, Vector  out)
 {
 	out[0] = in[0];
 	out[1] = in[1];
 	out[2] = in[2];
 }
 
-void _VectorScale (vec3_t v, vec_t scale, vec3_t out)
+void _VectorScale (Vector  v, vec_t scale, Vector  out)
 {
 	out[0] = v[0] * scale;
 	out[1] = v[1] * scale;
 	out[2] = v[2] * scale;
 }
 
-vec_t VectorNormalize (vec3_t v)
+vec_t VectorNormalize (Vector  v)
 {
 	int		i;
 	double	length;
@@ -118,20 +118,20 @@ i=1;
 	return length;
 }
 
-void VectorInverse (vec3_t v)
+void VectorInverse (Vector  v)
 {
 	v[0] = -v[0];
 	v[1] = -v[1];
 	v[2] = -v[2];
 }
 
-void ClearBounds (vec3_t mins, vec3_t maxs)
+void ClearBounds (Vector  mins, Vector  maxs)
 {
 	mins[0] = mins[1] = mins[2] = 99999;
 	maxs[0] = maxs[1] = maxs[2] = -99999;
 }
 
-void AddPointToBounds (vec3_t v, vec3_t mins, vec3_t maxs)
+void AddPointToBounds (Vector  v, Vector  mins, Vector  maxs)
 {
 	int		i;
 	vec_t	val;
@@ -146,7 +146,7 @@ void AddPointToBounds (vec3_t v, vec3_t mins, vec3_t maxs)
 	}
 }
 
-void AngleMatrix (const vec3_t angles, float (*matrix)[4] )
+void AngleMatrix (const Vector  angles, float (*matrix)[4] )
 {
 	float		angle;
 	float		sr, sp, sy, cr, cp, cy;
@@ -176,7 +176,7 @@ void AngleMatrix (const vec3_t angles, float (*matrix)[4] )
 	matrix[2][3] = 0.0;
 }
 
-void AngleIMatrix (const vec3_t angles, float matrix[3][4] )
+void AngleIMatrix (const Vector  angles, float matrix[3][4] )
 {
 	float		angle;
 	float		sr, sp, sy, cr, cp, cy;
@@ -236,7 +236,7 @@ void R_ConcatTransforms (const float in1[3][4], const float in2[3][4], float out
 
 
 
-void VectorRotate (const vec3_t in1, const float in2[3][4], vec3_t out)
+void VectorRotate (const Vector  in1, const float in2[3][4], Vector  out)
 {
 	out[0] = DotProduct(in1, in2[0]);
 	out[1] = DotProduct(in1, in2[1]);
@@ -245,7 +245,7 @@ void VectorRotate (const vec3_t in1, const float in2[3][4], vec3_t out)
 
 
 // rotate by the inverse of the matrix
-void VectorIRotate (const vec3_t in1, const float in2[3][4], vec3_t out)
+void VectorIRotate (const Vector  in1, const float in2[3][4], Vector  out)
 {
 	out[0] = in1[0]*in2[0][0] + in1[1]*in2[1][0] + in1[2]*in2[2][0];
 	out[1] = in1[0]*in2[0][1] + in1[1]*in2[1][1] + in1[2]*in2[2][1];
@@ -253,7 +253,7 @@ void VectorIRotate (const vec3_t in1, const float in2[3][4], vec3_t out)
 }
 
 
-void VectorTransform (const vec3_t in1, const float in2[3][4], vec3_t out)
+void VectorTransform (const Vector  in1, const float in2[3][4], Vector  out)
 {
 	out[0] = DotProduct(in1, in2[0]) + in2[0][3];
 	out[1] = DotProduct(in1, in2[1]) +	in2[1][3];
@@ -262,7 +262,7 @@ void VectorTransform (const vec3_t in1, const float in2[3][4], vec3_t out)
 
 
 
-void AngleQuaternion( const vec3_t angles, vec4_t quaternion )
+void AngleQuaternion( const Vector  angles, vec4_t quaternion )
 {
 	float		angle;
 	float		sr, sp, sy, cr, cp, cy;
diff --git a/utils/common/mathlib.h b/utils/common/mathlib.h
index 14861f1c..3873db26 100644
--- a/utils/common/mathlib.h
+++ b/utils/common/mathlib.h
@@ -24,7 +24,7 @@ typedef double vec_t;
 #else
 typedef float vec_t;
 #endif
-typedef vec_t vec3_t[3];	// x,y,z
+typedef vec_t Vector [3];	// x,y,z
 typedef vec_t vec4_t[4];	// x,y,z,w
 
 #define	SIDE_FRONT		0
@@ -34,13 +34,13 @@ typedef vec_t vec4_t[4];	// x,y,z,w
 
 #define	Q_PI	3.14159265358979323846
 
-extern vec3_t vec3_origin;
+extern Vector  vec3_origin;
 
 // Use this definition globally
 #define	ON_EPSILON		0.01
 #define	EQUAL_EPSILON	0.001
 
-int VectorCompare (vec3_t v1, vec3_t v2);
+int VectorCompare (Vector  v1, Vector  v2);
 
 #define DotProduct(x,y) ((x)[0]*(y)[0]+(x)[1]*(y)[1]+(x)[2]*(y)[2])
 #define VectorFill(a,b) { (a)[0]=(b); (a)[1]=(b); (a)[2]=(b);}
@@ -51,33 +51,33 @@ int VectorCompare (vec3_t v1, vec3_t v2);
 #define VectorScale(a,b,c) {(c)[0]=(b)*(a)[0];(c)[1]=(b)*(a)[1];(c)[2]=(b)*(a)[2];}
 
 vec_t Q_rint (vec_t in);
-vec_t _DotProduct (vec3_t v1, vec3_t v2);
-void _VectorSubtract (vec3_t va, vec3_t vb, vec3_t out);
-void _VectorAdd (vec3_t va, vec3_t vb, vec3_t out);
-void _VectorCopy (vec3_t in, vec3_t out);
-void _VectorScale (vec3_t v, vec_t scale, vec3_t out);
+vec_t _DotProduct (Vector  v1, Vector  v2);
+void _VectorSubtract (Vector  va, Vector  vb, Vector  out);
+void _VectorAdd (Vector  va, Vector  vb, Vector  out);
+void _VectorCopy (Vector  in, Vector  out);
+void _VectorScale (Vector  v, vec_t scale, Vector  out);
 
-double VectorLength(vec3_t v);
+double VectorLength(Vector  v);
 
-void VectorMA (vec3_t va, double scale, vec3_t vb, vec3_t vc);
+void VectorMA (Vector  va, double scale, Vector  vb, Vector  vc);
 
-void CrossProduct (vec3_t v1, vec3_t v2, vec3_t cross);
-vec_t VectorNormalize (vec3_t v);
-void VectorInverse (vec3_t v);
+void CrossProduct (Vector  v1, Vector  v2, Vector  cross);
+vec_t VectorNormalize (Vector  v);
+void VectorInverse (Vector  v);
 
-void ClearBounds (vec3_t mins, vec3_t maxs);
-void AddPointToBounds (vec3_t v, vec3_t mins, vec3_t maxs);
+void ClearBounds (Vector  mins, Vector  maxs);
+void AddPointToBounds (Vector  v, Vector  mins, Vector  maxs);
 
-void AngleMatrix (const vec3_t angles, float matrix[3][4] );
-void AngleIMatrix (const vec3_t angles, float matrix[3][4] );
+void AngleMatrix (const Vector  angles, float matrix[3][4] );
+void AngleIMatrix (const Vector  angles, float matrix[3][4] );
 void R_ConcatTransforms (const float in1[3][4], const float in2[3][4], float out[3][4]);
 
-void VectorIRotate (const vec3_t in1, const float in2[3][4], vec3_t out);
-void VectorRotate (const vec3_t in1, const float in2[3][4], vec3_t out);
+void VectorIRotate (const Vector  in1, const float in2[3][4], Vector  out);
+void VectorRotate (const Vector  in1, const float in2[3][4], Vector  out);
 
-void VectorTransform (const vec3_t in1, const float in2[3][4], vec3_t out);
+void VectorTransform (const Vector  in1, const float in2[3][4], Vector  out);
 
-void AngleQuaternion( const vec3_t angles, vec4_t quaternion );
+void AngleQuaternion( const Vector  angles, vec4_t quaternion );
 void QuaternionMatrix( const vec4_t quaternion, float (*matrix)[4] );
 void QuaternionSlerp( const vec4_t p, vec4_t q, float t, vec4_t qt );
 
diff --git a/utils/common/polylib.c b/utils/common/polylib.c
index 6420f5bc..61a7f56b 100644
--- a/utils/common/polylib.c
+++ b/utils/common/polylib.c
@@ -68,9 +68,9 @@ int	c_removed;
 void	RemoveColinearPoints (winding_t *w)
 {
 	int		i, j, k;
-	vec3_t	v1, v2;
+	Vector 	v1, v2;
 	int		nump;
-	vec3_t	p[MAX_POINTS_ON_WINDING];
+	Vector 	p[MAX_POINTS_ON_WINDING];
 
 	nump = 0;
 	for (i=0 ; i<w->numpoints ; i++)
@@ -101,9 +101,9 @@ void	RemoveColinearPoints (winding_t *w)
 WindingPlane
 ============
 */
-void WindingPlane (winding_t *w, vec3_t normal, vec_t *dist)
+void WindingPlane (winding_t *w, Vector  normal, vec_t *dist)
 {
-	vec3_t	v1, v2;
+	Vector 	v1, v2;
 
 	VectorSubtract (w->p[1], w->p[0], v1);
 	VectorSubtract (w->p[2], w->p[0], v2);
@@ -121,7 +121,7 @@ WindingArea
 vec_t	WindingArea (winding_t *w)
 {
 	int		i;
-	vec3_t	d1, d2, cross;
+	Vector 	d1, d2, cross;
 	vec_t	total;
 
 	total = 0;
@@ -135,7 +135,7 @@ vec_t	WindingArea (winding_t *w)
 	return total;
 }
 
-void	WindingBounds (winding_t *w, vec3_t mins, vec3_t maxs)
+void	WindingBounds (winding_t *w, Vector  mins, Vector  maxs)
 {
 	vec_t	v;
 	int		i,j;
@@ -161,10 +161,10 @@ void	WindingBounds (winding_t *w, vec3_t mins, vec3_t maxs)
 WindingCenter
 =============
 */
-void	WindingCenter (winding_t *w, vec3_t center)
+void	WindingCenter (winding_t *w, Vector  center)
 {
 	int		i;
-	vec3_t	d1, d2, cross;
+	Vector 	d1, d2, cross;
 	float	scale;
 
 	VectorCopy (vec3_origin, center);
@@ -180,11 +180,11 @@ void	WindingCenter (winding_t *w, vec3_t center)
 BaseWindingForPlane
 =================
 */
-winding_t *BaseWindingForPlane (vec3_t normal, float dist)
+winding_t *BaseWindingForPlane (Vector  normal, float dist)
 {
 	int		i, x;
 	vec_t	max, v;
-	vec3_t	org, vright, vup;
+	Vector 	org, vright, vup;
 	winding_t	*w;
 	
 // find the major axis
@@ -268,7 +268,7 @@ winding_t	*CopyWinding (winding_t *w)
 ClipWinding
 =============
 */
-void	ClipWinding (winding_t *in, vec3_t normal, vec_t dist,
+void	ClipWinding (winding_t *in, Vector  normal, vec_t dist,
 					 winding_t **front, winding_t **back)
 {
 	vec_t	dists[MAX_POINTS_ON_WINDING+4];
@@ -277,7 +277,7 @@ void	ClipWinding (winding_t *in, vec3_t normal, vec_t dist,
 	vec_t	dot;
 	int		i, j;
 	vec_t	*p1, *p2;
-	vec3_t	mid;
+	Vector 	mid;
 	winding_t	*f, *b;
 	int		maxpts;
 	
@@ -381,7 +381,7 @@ void	ClipWinding (winding_t *in, vec3_t normal, vec_t dist,
 ClipWindingNoCopy
 =============
 */
-void	ClipWindingNoCopy (winding_t *in, vec3_t normal, vec_t dist,
+void	ClipWindingNoCopy (winding_t *in, Vector  normal, vec_t dist,
 					 winding_t **front, winding_t **back)
 {
 	vec_t	dists[MAX_POINTS_ON_WINDING+4];
@@ -390,7 +390,7 @@ void	ClipWindingNoCopy (winding_t *in, vec3_t normal, vec_t dist,
 	vec_t	dot;
 	int		i, j;
 	vec_t	*p1, *p2;
-	vec3_t	mid;
+	Vector 	mid;
 	winding_t	*f, *b;
 	int		maxpts;
 	
@@ -493,7 +493,7 @@ void	ClipWindingNoCopy (winding_t *in, vec3_t normal, vec_t dist,
 ChopWindingNoFree
 =============
 */
-winding_t	*ChopWindingNoFree (winding_t *in, vec3_t normal, vec_t dist)
+winding_t	*ChopWindingNoFree (winding_t *in, Vector  normal, vec_t dist)
 {
 	vec_t	dists[MAX_POINTS_ON_WINDING+4];
 	int		sides[MAX_POINTS_ON_WINDING+4];
@@ -501,7 +501,7 @@ winding_t	*ChopWindingNoFree (winding_t *in, vec3_t normal, vec_t dist)
 	vec_t	dot;
 	int		i, j;
 	vec_t	*p1, *p2;
-	vec3_t	mid;
+	Vector 	mid;
 	winding_t	*f;
 	int		maxpts;
 
@@ -591,7 +591,7 @@ Returns the fragment of in that is on the front side
 of the cliping plane.  The original is freed.
 =================
 */
-winding_t	*ChopWinding (winding_t *in, vec3_t normal, vec_t dist)
+winding_t	*ChopWinding (winding_t *in, Vector  normal, vec_t dist)
 {
 	winding_t	*f, *b;
 
@@ -614,7 +614,7 @@ void CheckWinding (winding_t *w)
 	int		i, j;
 	vec_t	*p1, *p2;
 	vec_t	d, edgedist;
-	vec3_t	dir, edgenormal, facenormal;
+	Vector 	dir, edgenormal, facenormal;
 	vec_t	area;
 	vec_t	facedist;
 
@@ -672,7 +672,7 @@ void CheckWinding (winding_t *w)
 WindingOnPlaneSide
 ============
 */
-int		WindingOnPlaneSide (winding_t *w, vec3_t normal, vec_t dist)
+int		WindingOnPlaneSide (winding_t *w, Vector  normal, vec_t dist)
 {
 	qboolean	front, back;
 	int			i;
diff --git a/utils/common/polylib.h b/utils/common/polylib.h
index b8ccff85..6ec90e30 100644
--- a/utils/common/polylib.h
+++ b/utils/common/polylib.h
@@ -12,25 +12,25 @@
 typedef struct
 {
 	int		numpoints;
-	vec3_t	p[8];		// variable sized
+	Vector 	p[8];		// variable sized
 } winding_t;
 
 #define	MAX_POINTS_ON_WINDING	128
 
 winding_t	*AllocWinding (int points);
 vec_t	WindingArea (winding_t *w);
-void	WindingCenter (winding_t *w, vec3_t center);
-void	ClipWinding (winding_t *in, vec3_t normal, vec_t dist,
+void	WindingCenter (winding_t *w, Vector  center);
+void	ClipWinding (winding_t *in, Vector  normal, vec_t dist,
 					 winding_t **front, winding_t **back);
-void	ClipWindingNoCopy (winding_t *in, vec3_t normal, vec_t dist,
+void	ClipWindingNoCopy (winding_t *in, Vector  normal, vec_t dist,
 					 winding_t **front, winding_t **back);
-winding_t	*ChopWinding (winding_t *in, vec3_t normal, vec_t dist);
-winding_t	*ChopWindingNoFree (winding_t *in, vec3_t normal, vec_t dist);
+winding_t	*ChopWinding (winding_t *in, Vector  normal, vec_t dist);
+winding_t	*ChopWindingNoFree (winding_t *in, Vector  normal, vec_t dist);
 winding_t	*CopyWinding (winding_t *w);
-winding_t	*BaseWindingForPlane (vec3_t normal, float dist);
+winding_t	*BaseWindingForPlane (Vector  normal, float dist);
 void	CheckWinding (winding_t *w);
-void	WindingPlane (winding_t *w, vec3_t normal, vec_t *dist);
+void	WindingPlane (winding_t *w, Vector  normal, vec_t *dist);
 void	RemoveColinearPoints (winding_t *w);
-int		WindingOnPlaneSide (winding_t *w, vec3_t normal, vec_t dist);
+int		WindingOnPlaneSide (winding_t *w, Vector  normal, vec_t dist);
 void	FreeWinding (winding_t *w);
-void	WindingBounds (winding_t *w, vec3_t mins, vec3_t maxs);
\ No newline at end of file
+void	WindingBounds (winding_t *w, Vector  mins, Vector  maxs);
\ No newline at end of file
diff --git a/utils/common/trilib.h b/utils/common/trilib.h
index 2840c68d..ca0bdc78 100644
--- a/utils/common/trilib.h
+++ b/utils/common/trilib.h
@@ -14,7 +14,7 @@
 #define MAXTRIANGLES	2048
 
 typedef struct {
-	vec3_t	verts[3];
+	Vector 	verts[3];
 } triangle_t;
 
 void LoadTriangleList (char *filename, triangle_t **pptri, int *numtriangles);

From 1fa98e54a1339a80479a6ec4b41e535053b18a69 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Wed, 18 Mar 2026 19:10:54 -0400
Subject: [PATCH 111/291] Removed extra space from replace

---
 src/common/cl_entity.h                        |  14 +-
 src/common/com_model.h                        |  14 +-
 src/common/const.h                            |   4 +-
 src/common/dlight.h                           |   2 +-
 src/common/entity_state.h                     |  40 +++---
 .../client/angelscript/ASClientBindings.cpp   |  28 ++--
 src/game/client/cl_util.h                     |   2 +-
 src/game/client/com_weapons.cpp               |   4 +-
 src/game/client/entity.cpp                    |   8 +-
 src/game/client/ev_common.cpp                 |   6 +-
 src/game/client/ev_hldm.cpp                   | 132 +++++++++---------
 src/game/client/hud_spectator.cpp             |  14 +-
 src/game/client/hud_spectator.h               |  10 +-
 src/game/client/in_camera.cpp                 |  16 +--
 src/game/client/input.cpp                     |   6 +-
 src/game/client/inputw32.cpp                  |   6 +-
 src/game/client/ms/clplayer.cpp               |   4 +-
 src/game/client/ms/health.cpp                 |   8 +-
 src/game/client/ms/health.h                   |   2 +-
 src/game/client/render/clrendermirror.cpp     |   2 +-
 .../client/render/studiomodelrenderer.cpp     |  18 +--
 src/game/client/view.cpp                      |  48 +++----
 src/game/server/bmodels.cpp                   |   4 +-
 src/game/server/client.cpp                    |   2 +-
 src/game/server/hl/buttons.cpp                |   4 +-
 src/game/shared/movement/pm_defs.h            |  44 +++---
 src/game/shared/movement/pm_shared.cpp        | 104 +++++++-------
 src/game/shared/ms/findentities.h             |   2 +-
 src/game/shared/ms/script.cpp                 |   2 +-
 src/public/engine/progdefs.h                  |   2 +-
 30 files changed, 276 insertions(+), 276 deletions(-)

diff --git a/src/common/cl_entity.h b/src/common/cl_entity.h
index 1b04451e..447c3272 100644
--- a/src/common/cl_entity.h
+++ b/src/common/cl_entity.h
@@ -39,8 +39,8 @@ typedef struct
 	float prevanimtime;
 	float sequencetime;
 	byte prevseqblending[2];
-	Vector  prevorigin;
-	Vector  prevangles;
+	Vector prevorigin;
+	Vector prevangles;
 
 	unsigned int prevsequence;
 	float prevframe;
@@ -54,8 +54,8 @@ typedef struct
 	// Time stamp for this movement
 	float animtime;
 
-	Vector  origin;
-	Vector  angles;
+	Vector origin;
+	Vector angles;
 } position_history_t;
 
 typedef struct cl_entity_s cl_entity_t;
@@ -93,11 +93,11 @@ struct cl_entity_s
 	float lastmove;
 
 	// Actual render position and angles
-	Vector  origin;
-	Vector  angles;
+	Vector origin;
+	Vector angles;
 
 	// Attachment points
-	Vector  attachment[4];
+	Vector attachment[4];
 
 	// Other entity local information
 	int trivial_accept;
diff --git a/src/common/com_model.h b/src/common/com_model.h
index d66482ec..0110e972 100644
--- a/src/common/com_model.h
+++ b/src/common/com_model.h
@@ -88,7 +88,7 @@ typedef struct
 //  'model.h' and 'gl_model.h'
 typedef struct mplane_s
 {
-    Vector  normal; // surface normal
+    Vector normal; // surface normal
     float dist;    // closest appoach to origin
     byte type;     // for texture axis selection and fast side tests
     byte signbits; // signx + signy<<1 + signz<<1
@@ -97,7 +97,7 @@ typedef struct mplane_s
 
 typedef struct
 {
-    Vector  position;
+    Vector position;
 } mvertex_t;
 
 // 06/23/2002 MAH
@@ -388,8 +388,8 @@ typedef struct hull_s
     mplane_t *planes;
     int firstclipnode;
     int lastclipnode;
-    Vector  clip_mins;
-    Vector  clip_maxs;
+    Vector clip_mins;
+    Vector clip_maxs;
 } hull_t;
 
 #if !defined(CACHE_USER) && !defined(QUAKEDEF_H)
@@ -414,7 +414,7 @@ typedef struct model_s
     //
     // volume occupied by the model
     //
-    Vector  mins, maxs; // +0x054, +060
+    Vector mins, maxs; // +0x054, +060
     float radius;      // +0x06C
 
     //
@@ -479,7 +479,7 @@ typedef struct alight_s
 {
     int ambientlight; // clip at 128
     int shadelight;   // clip at 192 - ambientlight
-    Vector  color;
+    Vector color;
     float *plightvec;
 } alight_t;
 
@@ -524,7 +524,7 @@ typedef struct player_info_s
     unsigned int gaitsequence;
     float gaitframe;
     float gaityaw;
-    Vector  prevgaitorigin;
+    Vector prevgaitorigin;
 
     customization_t customdata;
 } player_info_t;
diff --git a/src/common/const.h b/src/common/const.h
index 84d83a98..8b1ac42d 100644
--- a/src/common/const.h
+++ b/src/common/const.h
@@ -801,7 +801,7 @@ typedef struct edict_s edict_t;
 
 typedef struct
 {
-	Vector  normal;
+	Vector normal;
 	float dist;
 } plane_t;
 
@@ -811,7 +811,7 @@ typedef struct
 	qboolean startsolid; // if true, the initial point was in a solid area
 	qboolean inopen, inwater;
 	float fraction; // time completed, 1.0 = didn't hit anything
-	Vector  endpos;	// final position
+	Vector endpos;	// final position
 	plane_t plane;	// surface normal at impact
 	edict_t *ent;	// entity the surface is on
 	int hitgroup;	// 0 == generic, non zero is specific body part
diff --git a/src/common/dlight.h b/src/common/dlight.h
index 7a8b1b5c..fc68eef7 100644
--- a/src/common/dlight.h
+++ b/src/common/dlight.h
@@ -20,7 +20,7 @@
 
 typedef struct dlight_s
 {
-	Vector  origin;
+	Vector origin;
 	float radius;
 	color24 color;
 	float die;		// stop lighting after this time
diff --git a/src/common/entity_state.h b/src/common/entity_state.h
index b3aa6c98..625c22d7 100644
--- a/src/common/entity_state.h
+++ b/src/common/entity_state.h
@@ -40,8 +40,8 @@ struct entity_state_s
 	int messagenum;
 
 	// Fields which can be transmitted and reconstructed over the network stream
-	Vector  origin;
-	Vector  angles;
+	Vector origin;
+	Vector angles;
 
 	int modelindex;
 	unsigned int sequence;
@@ -66,11 +66,11 @@ struct entity_state_s
 	int body;
 	byte controller[4];
 	byte blending[4];
-	Vector  velocity;
+	Vector velocity;
 
 	// Send bbox down to client for use during prediction.
-	Vector  mins;
-	Vector  maxs;
+	Vector mins;
+	Vector maxs;
 
 	int aiment;
 	// If owned by a player, the index of that player ( for projectiles ).
@@ -89,7 +89,7 @@ struct entity_state_s
 	int weaponmodel;
 	unsigned int gaitsequence;
 	// If standing on conveyor, e.g.
-	Vector  basevelocity;
+	Vector basevelocity;
 	// Use the crouched hull, or the regular player hull.
 	int usehull;
 	// Latched buttons last time state updated.
@@ -104,8 +104,8 @@ struct entity_state_s
 	int weaponanim;
 
 	// Parametric movement overrides
-	Vector  startpos;
-	Vector  endpos;
+	Vector startpos;
+	Vector endpos;
 	float impacttime; //MS - Used for model scale
 	float starttime;
 
@@ -118,25 +118,25 @@ struct entity_state_s
 	float fuser2;
 	float fuser3;
 	float fuser4;
-	Vector  vuser1;
-	Vector  vuser2;
-	Vector  vuser3;
-	Vector  vuser4; //MS - vuser4.x used to store idx of extra info (including all current bone positions)
+	Vector vuser1;
+	Vector vuser2;
+	Vector vuser3;
+	Vector vuser4; //MS - vuser4.x used to store idx of extra info (including all current bone positions)
 };
 
 #include "pm_info.h"
 
 typedef struct clientdata_s
 {
-	Vector  origin;
-	Vector  velocity;
+	Vector origin;
+	Vector velocity;
 
 	int viewmodel;
-	Vector  punchangle;
+	Vector punchangle;
 	int flags;
 	int waterlevel;
 	int watertype;
-	Vector  view_ofs;
+	Vector view_ofs;
 	float health;
 
 	int bInDuck;
@@ -177,10 +177,10 @@ typedef struct clientdata_s
 	float fuser2;
 	float fuser3;
 	float fuser4;
-	Vector  vuser1;
-	Vector  vuser2;
-	Vector  vuser3;
-	Vector  vuser4;
+	Vector vuser1;
+	Vector vuser2;
+	Vector vuser3;
+	Vector vuser4;
 } clientdata_t;
 
 #include "weaponinfo.h"
diff --git a/src/game/client/angelscript/ASClientBindings.cpp b/src/game/client/angelscript/ASClientBindings.cpp
index 29402620..522042c0 100644
--- a/src/game/client/angelscript/ASClientBindings.cpp
+++ b/src/game/client/angelscript/ASClientBindings.cpp
@@ -853,7 +853,7 @@ static CBeam* AS_CreateBeamEntPoint(int startIdx, int attachment, const Vector3&
 
 static void AS_CreateSpark(const Vector3& origin)
 {
-    Vector  pos = {origin.x, origin.y, origin.z};
+    Vector pos = {origin.x, origin.y, origin.z};
     gEngfuncs.pEfxAPI->R_SparkEffect(pos, 5, -200, 200);
 }
 
@@ -862,7 +862,7 @@ static void AS_CreateSparkOnModel(int entityIndex, int attachment)
     cl_entity_t* pEnt = gEngfuncs.GetEntityByIndex(entityIndex);
     if (pEnt)
     {
-        Vector  pos;
+        Vector pos;
         VectorCopy(pEnt->origin, pos);
         gEngfuncs.pEfxAPI->R_SparkEffect(pos, 5, -200, 200);
     }
@@ -956,7 +956,7 @@ class CClientSound
     
     void PlaySoundAtPosition(const Vector3& pos, const std::string& soundPath, float volume)
     {
-        Vector  position = {pos.x, pos.y, pos.z};
+        Vector position = {pos.x, pos.y, pos.z};
         gEngfuncs.pEfxAPI->R_RicochetSound((float*)&position);
     }
 };
@@ -975,8 +975,8 @@ static CClientSound* AS_GetClientSound()
 static Vector3 AS_GetGroundHeight(const Vector3& origin)
 {
     pmtrace_t trace;
-    Vector  start = {origin.x, origin.y, origin.z};
-    Vector  end = {origin.x, origin.y, origin.z - 8192.0f};
+    Vector start = {origin.x, origin.y, origin.z};
+    Vector end = {origin.x, origin.y, origin.z - 8192.0f};
     gEngfuncs.pEventAPI->EV_PlayerTrace(start, end, PM_WORLD_ONLY, -1, &trace);
     return Vector3(trace.endpos[0], trace.endpos[1], trace.endpos[2]);
 }
@@ -984,8 +984,8 @@ static Vector3 AS_GetGroundHeight(const Vector3& origin)
 static Vector3 AS_GetSkyHeight(const Vector3& origin)
 {
     pmtrace_t trace;
-    Vector  start = {origin.x, origin.y, origin.z};
-    Vector  end = {origin.x, origin.y, origin.z + 8192.0f};
+    Vector start = {origin.x, origin.y, origin.z};
+    Vector end = {origin.x, origin.y, origin.z + 8192.0f};
     gEngfuncs.pEventAPI->EV_PlayerTrace(start, end, PM_WORLD_ONLY, -1, &trace);
     return Vector3(trace.endpos[0], trace.endpos[1], trace.endpos[2]);
 }
@@ -993,8 +993,8 @@ static Vector3 AS_GetSkyHeight(const Vector3& origin)
 static bool AS_IsUnderSky(const Vector3& origin)
 {
     pmtrace_t trace;
-    Vector  start = {origin.x, origin.y, origin.z};
-    Vector  end = {origin.x, origin.y, origin.z + 8192.0f};
+    Vector start = {origin.x, origin.y, origin.z};
+    Vector end = {origin.x, origin.y, origin.z + 8192.0f};
     gEngfuncs.pEventAPI->EV_PlayerTrace(start, end, PM_WORLD_ONLY, -1, &trace);
     return trace.fraction >= 1.0f || trace.ent == 0;
 }
@@ -1002,8 +1002,8 @@ static bool AS_IsUnderSky(const Vector3& origin)
 static Vector3 AS_TraceLine(const Vector3& start, const Vector3& end, bool worldOnly)
 {
     pmtrace_t trace;
-    Vector  vStart = {start.x, start.y, start.z};
-    Vector  vEnd = {end.x, end.y, end.z};
+    Vector vStart = {start.x, start.y, start.z};
+    Vector vEnd = {end.x, end.y, end.z};
     gEngfuncs.pEventAPI->EV_PlayerTrace(vStart, vEnd, worldOnly ? PM_WORLD_ONLY : PM_NORMAL, -1, &trace);
     return Vector3(trace.endpos[0], trace.endpos[1], trace.endpos[2]);
 }
@@ -1011,15 +1011,15 @@ static Vector3 AS_TraceLine(const Vector3& start, const Vector3& end, bool world
 static int AS_TraceLineEntity(const Vector3& start, const Vector3& end)
 {
     pmtrace_t trace;
-    Vector  vStart = {start.x, start.y, start.z};
-    Vector  vEnd = {end.x, end.y, end.z};
+    Vector vStart = {start.x, start.y, start.z};
+    Vector vEnd = {end.x, end.y, end.z};
     gEngfuncs.pEventAPI->EV_PlayerTrace(vStart, vEnd, PM_NORMAL, -1, &trace);
     return trace.ent;
 }
 
 static int AS_GetContents(const Vector3& origin)
 {
-    Vector  pos = {origin.x, origin.y, origin.z};
+    Vector pos = {origin.x, origin.y, origin.z};
     return gEngfuncs.PM_PointContents(pos, nullptr);
 }
 
diff --git a/src/game/client/cl_util.h b/src/game/client/cl_util.h
index 0498f24d..fb6f3c5f 100644
--- a/src/game/client/cl_util.h
+++ b/src/game/client/cl_util.h
@@ -243,7 +243,7 @@ float DotProduct(Type* x, Type* y) {
 
 // ugh, some bits of the client code expect a float[3] while others expect a Vector, and there's a macro that pretends they're the same
 // handle the extern with the correct types in the places where it's required
-// extern Vector  vec3_origin;
+// extern Vector vec3_origin;
 
 // disable 'possible loss of data converting float to int' warning message
 //#pragma warning(disable : 4244)
diff --git a/src/game/client/com_weapons.cpp b/src/game/client/com_weapons.cpp
index 4b58d4ce..b16e3c33 100644
--- a/src/game/client/com_weapons.cpp
+++ b/src/game/client/com_weapons.cpp
@@ -130,8 +130,8 @@ Directly queue up an event on the client
 void HUD_PlaybackEvent(int flags, const edict_t *pInvoker, unsigned short eventindex, float delay,
 					   float *origin, float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2)
 {
-	Vector  org;
-	Vector  ang;
+	Vector org;
+	Vector ang;
 
 	if (!g_runfuncs || !g_finalstate)
 		return;
diff --git a/src/game/client/entity.cpp b/src/game/client/entity.cpp
index e3bc832a..31fc8b2f 100644
--- a/src/game/client/entity.cpp
+++ b/src/game/client/entity.cpp
@@ -464,7 +464,7 @@ void TempEnts( void )
 	TEMPENTITY *p;
 	int i, j;
 	struct model_s *mod;
-	Vector  origin;
+	Vector origin;
 	int index;
 
 	mod = gEngfuncs.CL_LoadModel( "sprites/laserdot.spr", &index );
@@ -920,7 +920,7 @@ const char* CScript::CLGetEntProp(cl_entity_t *pclEntity, msstringlist &Params)
 	else if (Prop.starts_with("viewangles"))
 	{
 		//MIB AUG2010_05
-		Vector  viewangles;
+		Vector viewangles;
 		gEngfuncs.GetViewAngles((float *)viewangles);
 		RETURN_ANGLE( Prop, "viewangles", viewangles);
 	}
@@ -928,7 +928,7 @@ const char* CScript::CLGetEntProp(cl_entity_t *pclEntity, msstringlist &Params)
 	else if ( Prop.starts_with("eyepos") )
 	{
 		//Thoth APR2012_05 - attempting to return eye position (fail)
-		Vector  eyepos = player.pev->view_ofs;
+		Vector eyepos = player.pev->view_ofs;
 		return RETURN_ANGLE(Prop, "eyepos", eyepos );
 	}
 	*/
@@ -2191,7 +2191,7 @@ void DLLEXPORT HUD_TempEntUpdate(
 
 				if (pTemp->flags & (FTENT_COLLIDEALL | FTENT_COLLIDEWORLD))
 				{
-					Vector  traceNormal;
+					Vector traceNormal;
 					float traceFraction = 1;
 
 					if (pTemp->flags & FTENT_COLLIDEALL)
diff --git a/src/game/client/ev_common.cpp b/src/game/client/ev_common.cpp
index 3d12d18c..bf4faff8 100644
--- a/src/game/client/ev_common.cpp
+++ b/src/game/client/ev_common.cpp
@@ -98,7 +98,7 @@ Figure out the height of the gun
 void EV_GetGunPosition(event_args_t *args, float *pos, float *origin)
 {
 	int idx;
-	Vector  view_ofs;
+	Vector view_ofs;
 
 	idx = args->entindex;
 
@@ -130,7 +130,7 @@ Bullet shell casings
 */
 void EV_EjectBrass(float *origin, float *velocity, float rotation, int model, int soundtype)
 {
-	Vector  endpos;
+	Vector endpos;
 	VectorClear(endpos);
 	endpos[1] = rotation;
 	gEngfuncs.pEfxAPI->R_TempModel(origin, velocity, endpos, 2.5, model, soundtype);
@@ -146,7 +146,7 @@ Determine where to eject shells from
 void EV_GetDefaultShellInfo(event_args_t *args, float *origin, float *velocity, float *ShellVelocity, float *ShellOrigin, float *forward, float *right, float *up, float forwardScale, float upScale, float rightScale)
 {
 	int i;
-	Vector  view_ofs;
+	Vector view_ofs;
 	float fR, fU;
 
 	int idx;
diff --git a/src/game/client/ev_hldm.cpp b/src/game/client/ev_hldm.cpp
index 13044326..6d709cc3 100644
--- a/src/game/client/ev_hldm.cpp
+++ b/src/game/client/ev_hldm.cpp
@@ -325,11 +325,11 @@ int EV_HLDM_CheckTracer(int idx, float *vecSrc, float *end, float *forward, floa
 
 	if (iTracerFreq != 0 && ((*tracerCount)++ % iTracerFreq) == 0)
 	{
-		Vector  vecTracerSrc;
+		Vector vecTracerSrc;
 
 		if (player)
 		{
-			Vector  offset(0, 0, -4);
+			Vector offset(0, 0, -4);
 
 			// adjust tracer position for player
 			for (i = 0; i < 3; i++)
@@ -372,7 +372,7 @@ void EV_HLDM_FireBullets(int idx, float *forward, float *right, float *up, int c
 	int i;
 	pmtrace_t tr;
 	int iShot;
-	Vector  vecRight, vecUp;
+	Vector vecRight, vecUp;
 	int tracer;
 
 	VectorCopy(right, vecRight);
@@ -380,10 +380,10 @@ void EV_HLDM_FireBullets(int idx, float *forward, float *right, float *up, int c
 
 	for (iShot = 1; iShot <= cShots; iShot++)
 	{
-		Vector  vecDir, vecEnd;
+		Vector vecDir, vecEnd;
 
 		// get circular gaussian spread
-		Vector  spread;
+		Vector spread;
 		do
 		{
 			spread[0] = gEngfuncs.pfnRandomFloat(-0.5, 0.5) + gEngfuncs.pfnRandomFloat(-0.5, 0.5);
@@ -453,18 +453,18 @@ void EV_HLDM_FireBullets(int idx, float *forward, float *right, float *up, int c
 void EV_FireGlock1(event_args_t *args)
 {
 	int idx;
-	Vector  origin;
-	Vector  angles;
-	Vector  velocity;
+	Vector origin;
+	Vector angles;
+	Vector velocity;
 	int empty;
 
 	int i;
-	Vector  ShellVelocity;
-	Vector  ShellOrigin;
+	Vector ShellVelocity;
+	Vector ShellOrigin;
 	int shell;
-	Vector  vecSrc, vecAiming;
-	Vector  vecSpread;
-	Vector  up, right, forward;
+	Vector vecSrc, vecAiming;
+	Vector vecSpread;
+	Vector up, right, forward;
 	float flSpread = 0.01;
 
 	idx = args->entindex;
@@ -509,17 +509,17 @@ void EV_FireGlock1(event_args_t *args)
 void EV_FireGlock2(event_args_t *args)
 {
 	int idx;
-	Vector  origin;
-	Vector  angles;
-	Vector  velocity;
+	Vector origin;
+	Vector angles;
+	Vector velocity;
 
 	int i;
-	Vector  ShellVelocity;
-	Vector  ShellOrigin;
+	Vector ShellVelocity;
+	Vector ShellOrigin;
 	int shell;
-	Vector  vecSrc, vecAiming;
-	Vector  vecSpread;
-	Vector  up, right, forward;
+	Vector vecSrc, vecAiming;
+	Vector vecSpread;
+	Vector up, right, forward;
 	float flSpread = 0.1;
 
 	idx = args->entindex;
@@ -564,17 +564,17 @@ void EV_FireGlock2(event_args_t *args)
 void EV_FireShotGunDouble(event_args_t *args)
 {
 	int idx;
-	Vector  origin;
-	Vector  angles;
-	Vector  velocity;
+	Vector origin;
+	Vector angles;
+	Vector velocity;
 
 	int i, j;
-	Vector  ShellVelocity;
-	Vector  ShellOrigin;
+	Vector ShellVelocity;
+	Vector ShellOrigin;
 	int shell;
-	Vector  vecSrc, vecAiming;
-	Vector  vecSpread;
-	Vector  up, right, forward;
+	Vector vecSrc, vecAiming;
+	Vector vecSpread;
+	Vector up, right, forward;
 	float flSpread = 0.01;
 
 	idx = args->entindex;
@@ -630,17 +630,17 @@ void EV_FireShotGunDouble(event_args_t *args)
 void EV_FireShotGunSingle(event_args_t *args)
 {
 	int idx;
-	Vector  origin;
-	Vector  angles;
-	Vector  velocity;
+	Vector origin;
+	Vector angles;
+	Vector velocity;
 
 	int i;
-	Vector  ShellVelocity;
-	Vector  ShellOrigin;
+	Vector ShellVelocity;
+	Vector ShellOrigin;
 	int shell;
-	Vector  vecSrc, vecAiming;
-	Vector  vecSpread;
-	Vector  up, right, forward;
+	Vector vecSrc, vecAiming;
+	Vector vecSpread;
+	Vector up, right, forward;
 	float flSpread = 0.01;
 
 	idx = args->entindex;
@@ -693,15 +693,15 @@ void EV_FireShotGunSingle(event_args_t *args)
 void EV_FireMP5(event_args_t *args)
 {
 	int idx;
-	Vector  origin;
-	Vector  angles;
-	Vector  velocity;
+	Vector origin;
+	Vector angles;
+	Vector velocity;
 
-	Vector  ShellVelocity;
-	Vector  ShellOrigin;
+	Vector ShellVelocity;
+	Vector ShellOrigin;
 	int shell;
-	Vector  vecSrc, vecAiming;
-	Vector  up, right, forward;
+	Vector vecSrc, vecAiming;
+	Vector up, right, forward;
 	float flSpread = 0.01;
 
 	idx = args->entindex;
@@ -755,12 +755,12 @@ void EV_FireMP5(event_args_t *args)
 void EV_FirePython(event_args_t *args)
 {
 	int idx;
-	Vector  origin;
-	Vector  angles;
-	Vector  velocity;
+	Vector origin;
+	Vector angles;
+	Vector velocity;
 
-	Vector  vecSrc, vecAiming;
-	Vector  up, right, forward;
+	Vector vecSrc, vecAiming;
+	Vector up, right, forward;
 	float flSpread = 0.01;
 
 	idx = args->entindex;
@@ -807,9 +807,9 @@ void EV_FirePython(event_args_t *args)
 void EV_SpinGauss(event_args_t *args)
 {
 	int idx;
-	Vector  origin;
-	Vector  angles;
-	Vector  velocity;
+	Vector origin;
+	Vector angles;
+	Vector velocity;
 	int iSoundState = 0;
 
 	int pitch;
@@ -830,16 +830,16 @@ void EV_SpinGauss(event_args_t *args)
 void EV_FireGauss(event_args_t *args)
 {
 	int idx;
-	Vector  origin;
-	Vector  angles;
-	Vector  velocity;
+	Vector origin;
+	Vector angles;
+	Vector velocity;
 	float flDamage = args->fparam1;
 	int primaryfire = args->bparam1;
 
 	int m_fPrimaryFire = args->bparam1;
 	int m_iWeaponVolume = GAUSS_PRIMARY_FIRE_VOLUME;
-	Vector  vecSrc;
-	Vector  vecDest;
+	Vector vecSrc;
+	Vector vecDest;
 	edict_t *pentIgnore;
 	pmtrace_t tr, beam_tr;
 	float flMaxFrac = 1.0;
@@ -849,7 +849,7 @@ void EV_FireGauss(event_args_t *args)
 	int nMaxHits = 10;
 	physent_t *pEntity;
 	int m_iBeam, m_iGlow, m_iBalls;
-	Vector  up, right, forward;
+	Vector up, right, forward;
 
 	idx = args->entindex;
 	VectorCopy(args->origin, origin);
@@ -956,7 +956,7 @@ void EV_FireGauss(event_args_t *args)
 			{
 				// ALERT( at_console, "reflect %f\n", n );
 				// reflect
-				Vector  r;
+				Vector r;
 
 				VectorMA(forward, 2.0 * n, tr.plane.normal, r);
 
@@ -970,7 +970,7 @@ void EV_FireGauss(event_args_t *args)
 				gEngfuncs.pEfxAPI->R_TempSprite(tr.endpos, Vector(0,0,0), 0.2, m_iGlow, kRenderGlow, kRenderFxNoDissipation, flDamage * n / 255.0, flDamage * n * 0.5 * 0.1, FTENT_FADEOUT);
 
 				{
-					Vector  fwd;
+					Vector fwd;
 					VectorAdd(tr.endpos, tr.plane.normal, fwd);
 					gEngfuncs.pEfxAPI->R_Sprite_Trail(TE_SPRITETRAIL, tr.endpos, fwd, m_iBalls, (int)(n * flDamage * 0.3), 0.1, gEngfuncs.pfnRandomFloat(10, 20) / 100.0, 100,
 													  255, 200);
@@ -1001,7 +1001,7 @@ void EV_FireGauss(event_args_t *args)
 				// try punching through wall if secondary attack (primary is incapable of breaking through)
 				if (!m_fPrimaryFire)
 				{
-					Vector  start;
+					Vector start;
 
 					VectorMA(tr.endpos, 8.0, forward, start);
 
@@ -1016,7 +1016,7 @@ void EV_FireGauss(event_args_t *args)
 
 					if (!beam_tr.allsolid)
 					{
-						Vector  delta;
+						Vector delta;
 						float n;
 
 						// trace backwards to find exit point
@@ -1035,7 +1035,7 @@ void EV_FireGauss(event_args_t *args)
 
 							// absorption balls
 							{
-								Vector  fwd;
+								Vector fwd;
 								VectorSubtract(tr.endpos, forward, fwd);
 								gEngfuncs.pEfxAPI->R_Sprite_Trail(TE_SPRITETRAIL, tr.endpos, fwd, m_iBalls, 3, 0.1, gEngfuncs.pfnRandomFloat(10, 20) / 100.0, 100,
 																  255, 100);
@@ -1050,7 +1050,7 @@ void EV_FireGauss(event_args_t *args)
 
 							// balls
 							{
-								Vector  fwd;
+								Vector fwd;
 								VectorSubtract(beam_tr.endpos, forward, fwd);
 								gEngfuncs.pEfxAPI->R_Sprite_Trail(TE_SPRITETRAIL, beam_tr.endpos, fwd, m_iBalls, (int)(flDamage * 0.3), 0.1, gEngfuncs.pfnRandomFloat(10, 20) / 100.0, 200,
 																  255, 40);
@@ -1075,7 +1075,7 @@ void EV_FireGauss(event_args_t *args)
 						gEngfuncs.pEfxAPI->R_TempSprite(tr.endpos, Vector(0,0,0), 0.2, m_iGlow, kRenderGlow, kRenderFxNoDissipation, 200.0 / 255.0, 0.3, FTENT_FADEOUT);
 
 						{
-							Vector  fwd;
+							Vector fwd;
 							VectorAdd(tr.endpos, tr.plane.normal, fwd);
 							gEngfuncs.pEfxAPI->R_Sprite_Trail(TE_SPRITETRAIL, tr.endpos, fwd, m_iBalls, 8, 0.6, gEngfuncs.pfnRandomFloat(10, 20) / 100.0, 100,
 															  255, 200);
@@ -1102,7 +1102,7 @@ void EV_TrainPitchAdjust(event_args_t *args)
 	int stop;
 	int idx = args->entindex;
 
-	Vector  origin;
+	Vector origin;
 	VectorCopy(args->origin, origin);
 
 	us_params = (unsigned short)args->iparam1;
diff --git a/src/game/client/hud_spectator.cpp b/src/game/client/hud_spectator.cpp
index a43231e0..5471ee92 100644
--- a/src/game/client/hud_spectator.cpp
+++ b/src/game/client/hud_spectator.cpp
@@ -43,10 +43,10 @@ extern void V_ResetChaseCam();
 extern void V_GetChasePos(int target, float *cl_angles, float *origin, float *angles);
 extern float *GetClientColor(int clientIndex);
 
-extern Vector  v_origin;	   // last view origin
-extern Vector  v_angles;	   // last view angle
-extern Vector  v_cl_angles; // last client/mouse angle
-extern Vector  v_sim_org;   // last sim origin
+extern Vector v_origin;	   // last view origin
+extern Vector v_angles;	   // last view angle
+extern Vector v_cl_angles; // last client/mouse angle
+extern Vector v_sim_org;   // last sim origin
 
 void SpectatorMode(void)
 {
@@ -65,7 +65,7 @@ void SpectatorMode(void)
 
 void SpectatorSpray(void)
 {
-	Vector  forward;
+	Vector forward;
 	char string[128];
 
 	if (!gEngfuncs.IsSpectateOnly())
@@ -407,7 +407,7 @@ int CHudSpectator::Draw(float flTime)
 	// if user moves in map mode, change map origin
 	if ((m_moveDelta != 0.0f) && (g_iUser1 != OBS_ROAMING))
 	{
-		Vector  right;
+		Vector right;
 		AngleVectors(v_angles, NULL, &right, NULL);
 		VectorNormalize(right);
 		VectorScale(right, m_moveDelta, right);
@@ -1172,7 +1172,7 @@ void CHudSpectator::DrawOverviewEntities()
 {
 	int i, ir, ig, ib;
 	struct model_s *hSpriteModel;
-	Vector  origin, angles, point, forward, right, left, up, world, screen, offset;
+	Vector origin, angles, point, forward, right, left, up, world, screen, offset;
 	float x, y, z, r, g, b, sizeScale = 4.0f;
 	cl_entity_t *ent;
 	float rmatrix[3][4]; // transformation matrix
diff --git a/src/game/client/hud_spectator.h b/src/game/client/hud_spectator.h
index cd00eb4e..6ca7a3af 100644
--- a/src/game/client/hud_spectator.h
+++ b/src/game/client/hud_spectator.h
@@ -31,7 +31,7 @@ constexpr int OVERVIEW_MAX_LAYERS = 1;
 typedef struct overviewInfo_s
 {
 	char map[64];  // cl.levelname or empty
-	Vector  origin; // center of map
+	Vector origin; // center of map
 	float zoom;	   // zoom of map images
 	int layers;	   // how may layers do we have
 	float layersHeights[OVERVIEW_MAX_LAYERS];
@@ -93,7 +93,7 @@ class CHudSpectator : public CHudBase
 	int m_iSpectatorNumber;
 
 	float m_mapZoom;	// zoom the user currently uses
-	Vector  m_mapOrigin; // origin where user rotates around
+	Vector m_mapOrigin; // origin where user rotates around
 	cvar_t *m_drawnames;
 	cvar_t *m_drawcone;
 	cvar_t *m_drawstatus;
@@ -102,11 +102,11 @@ class CHudSpectator : public CHudBase
 
 	qboolean m_chatEnabled;
 
-	Vector  m_cameraOrigin; // a help camera
-	Vector  m_cameraAngles; // and it's angles
+	Vector m_cameraOrigin; // a help camera
+	Vector m_cameraAngles; // and it's angles
 
 private:
-	Vector  m_vPlayerPos[MAX_PLAYERS];
+	Vector m_vPlayerPos[MAX_PLAYERS];
 	HLSPRITE m_hsprPlayerBlue;
 	HLSPRITE m_hsprPlayerRed;
 	HLSPRITE m_hsprPlayer;
diff --git a/src/game/client/in_camera.cpp b/src/game/client/in_camera.cpp
index c0f1784c..2a512b7f 100644
--- a/src/game/client/in_camera.cpp
+++ b/src/game/client/in_camera.cpp
@@ -68,7 +68,7 @@ cvar_t *c_maxdistance;
 cvar_t *c_mindistance;
 
 // pitch, yaw, dist
-Vector  cam_ofs;
+Vector cam_ofs;
 
 // In third person
 int cam_mousemove; //true if we are moving the cam with the mouse, False if not
@@ -158,20 +158,20 @@ float MoveToward(float cur, float goal, float maxspeed)
 	qboolean	monsterclip;
 } moveclip_t;
 
-extern trace_t SV_ClipMoveToEntity (edict_t *ent, Vector  start, Vector  mins, Vector  maxs, Vector  end);
+extern trace_t SV_ClipMoveToEntity (edict_t *ent, Vector start, Vector mins, Vector maxs, Vector end);
 */
 void DLLEXPORT CAM_Think(void)
 {
-	Vector  origin;
-	Vector  ext, pnt, camForward, camRight, camUp;
+	Vector origin;
+	Vector ext, pnt, camForward, camRight, camUp;
 	//moveclip_t	clip;
 	float dist;
-	Vector  camAngles;
+	Vector camAngles;
 	float flSensitivity;
 	/*#ifdef LATER
 	int i;
 #endif*/
-	Vector  viewangles;
+	Vector viewangles;
 
 	switch ((int)cam_command->value)
 	{
@@ -477,7 +477,7 @@ void CAM_OutUp(void) { KeyUp(&cam_out); }
 
 void CAM_ToThirdPerson(void)
 {
-	Vector  viewangles;
+	Vector viewangles;
 
 	Cam_SwitchingTo1StPerson = false;
 	gEngfuncs.GetViewAngles((float *)viewangles);
@@ -548,7 +548,7 @@ void CAM_Init(void)
 
 void CAM_ClearStates(void)
 {
-	Vector  viewangles;
+	Vector viewangles;
 
 	gEngfuncs.GetViewAngles((float *)viewangles);
 
diff --git a/src/game/client/input.cpp b/src/game/client/input.cpp
index 2989d8df..6aea64e2 100644
--- a/src/game/client/input.cpp
+++ b/src/game/client/input.cpp
@@ -749,12 +749,12 @@ if active == 1 then we are 1) not playing back demos ( where our commands are ig
 void DLLEXPORT CL_CreateMove(float frametime, struct usercmd_s *cmd, int active)
 {
 	float spd;
-	Vector  viewangles;
-	static Vector  oldangles;
+	Vector viewangles;
+	static Vector oldangles;
 
 	if (active)
 	{
-		//memset( viewangles, 0, sizeof( Vector  ) );
+		//memset( viewangles, 0, sizeof( Vector ) );
 		//viewangles[ 0 ] = viewangles[ 1 ] = viewangles[ 2 ] = 0.0;
 		gEngfuncs.GetViewAngles((float *)viewangles);
 
diff --git a/src/game/client/inputw32.cpp b/src/game/client/inputw32.cpp
index c6a95e11..4960721d 100644
--- a/src/game/client/inputw32.cpp
+++ b/src/game/client/inputw32.cpp
@@ -165,7 +165,7 @@ Force_CenterView_f
 */
 void Force_CenterView_f(void)
 {
-	Vector  viewangles;
+	Vector viewangles;
 
 	if (!iMouseInUse)
 	{
@@ -463,7 +463,7 @@ IN_MouseMove
 void IN_MouseMove(float frametime, usercmd_t *cmd)
 {
 	int mx, my;
-	Vector  viewangles;
+	Vector viewangles;
 
 	gEngfuncs.GetViewAngles((float *)viewangles);
 
@@ -858,7 +858,7 @@ void IN_JoyMove(float frametime, usercmd_t *cmd)
 	float speed, aspeed;
 	float fAxisValue, fTemp;
 	int i;
-	Vector  viewangles;
+	Vector viewangles;
 
 	gEngfuncs.GetViewAngles((float *)viewangles);
 
diff --git a/src/game/client/ms/clplayer.cpp b/src/game/client/ms/clplayer.cpp
index 3c994aa4..77cf544e 100644
--- a/src/game/client/ms/clplayer.cpp
+++ b/src/game/client/ms/clplayer.cpp
@@ -438,7 +438,7 @@ For debugging, draw a box around a player made out of particles
 void UTIL_ParticleBox(CBasePlayer* player, float* mins, float* maxs, float life, unsigned char r, unsigned char g, unsigned char b)
 {
 	int i;
-	Vector  mmin, mmax;
+	Vector mmin, mmax;
 
 	for (i = 0; i < 3; i++)
 	{
@@ -461,7 +461,7 @@ void UTIL_ParticleBoxes(void)
 	int idx;
 	physent_t* pe;
 	cl_entity_t* player;
-	Vector  mins, maxs;
+	Vector mins, maxs;
 
 	gEngfuncs.pEventAPI->EV_SetUpPlayerPrediction(false, true);
 
diff --git a/src/game/client/ms/health.cpp b/src/game/client/ms/health.cpp
index 0be34492..200ca683 100644
--- a/src/game/client/ms/health.cpp
+++ b/src/game/client/ms/health.cpp
@@ -153,7 +153,7 @@ int CHudHealth::MsgFunc_Damage(const char *pszName, int iSize, void *pbuf)
 	int damageTaken = READ_BYTE(); // health
 	long bitsDamage = READ_LONG(); // damage bits
 
-	Vector  vecFrom;
+	Vector vecFrom;
 
 	for (unsigned int i = 0; i < 3; i++)
 		vecFrom[i] = READ_COORD();
@@ -203,11 +203,11 @@ int CHudHealth::Draw(float flTime)
 	return 1;
 }
 
-void CHudHealth::CalcDamageDirection(Vector  vecFrom)
+void CHudHealth::CalcDamageDirection(Vector vecFrom)
 {
-	Vector  forward, right, up;
+	Vector forward, right, up;
 	float side, front;
-	Vector  vecOrigin, vecAngles;
+	Vector vecOrigin, vecAngles;
 
 	if (!vecFrom[0] && !vecFrom[1] && !vecFrom[2])
 	{
diff --git a/src/game/client/ms/health.h b/src/game/client/ms/health.h
index 83b6a36e..5a22bcd8 100644
--- a/src/game/client/ms/health.h
+++ b/src/game/client/ms/health.h
@@ -71,6 +71,6 @@ class CHudHealth : public CHudBase
 	int DrawPain(float fTime);
 	int DrawDamage(float fTime);
 	float m_fAttackFront, m_fAttackRear, m_fAttackLeft, m_fAttackRight;
-	void CalcDamageDirection(Vector  vecFrom);
+	void CalcDamageDirection(Vector vecFrom);
 	void UpdateTiles(float fTime, long bits);
 };
diff --git a/src/game/client/render/clrendermirror.cpp b/src/game/client/render/clrendermirror.cpp
index cd3fe203..feb02363 100644
--- a/src/game/client/render/clrendermirror.cpp
+++ b/src/game/client/render/clrendermirror.cpp
@@ -622,7 +622,7 @@ void CMirrorMgr::SetupNextView()
 #define PLANE_X 0
 #define PLANE_Y 1
 #define PLANE_Z 2
-//extern Vector  v_origin, v_angles, v_cl_angles, v_sim_org, v_lastAngles;
+//extern Vector v_origin, v_angles, v_cl_angles, v_sim_org, v_lastAngles;
 bool Mirror_TraverseVis(TraverseInfo_t &Info);
 void DrawVisLeafs(model_t *pModel, mleaf_t *pStartLeaf, TraverseInfo_t &Info);
 void rdrsky();
diff --git a/src/game/client/render/studiomodelrenderer.cpp b/src/game/client/render/studiomodelrenderer.cpp
index bf884269..402a7817 100644
--- a/src/game/client/render/studiomodelrenderer.cpp
+++ b/src/game/client/render/studiomodelrenderer.cpp
@@ -49,7 +49,7 @@ void ViewModel_InactiveModelVisible(bool fVisible, const cl_entity_s* ActiveEnti
 {
 	ViewModel_ExclusiveViewHand = fVisible ? ActiveEntity->curstate.iuser2 : -1;
 }
-extern Vector  v_origin, v_angles, v_cl_angles, v_sim_org, v_lastAngles;
+extern Vector v_origin, v_angles, v_cl_angles, v_sim_org, v_lastAngles;
 //CStudioModelRenderer *g_StudioRender = NULL;
 
 cl_entity_t* DrawEnt = NULL;
@@ -216,7 +216,7 @@ void CStudioModelRenderer::StudioCalcBoneQuaterion(int frame, float s, mstudiobo
 {
 	int j, k;
 	vec4_t q1, q2;
-	Vector  angle1, angle2;
+	Vector angle1, angle2;
 	mstudioanimvalue_t* panimvalue;
 
 	for (j = 0; j < 3; j++)
@@ -520,8 +520,8 @@ Copies model origin and rotation into the transform matrix for rendering
 void CStudioModelRenderer::StudioSetUpTransform(int trivial_accept)
 {
 	int i;
-	Vector  angles;
-	Vector  modelpos;
+	Vector angles;
+	Vector modelpos;
 
 	cl_entity_t& Ent = *m_pCurrentEntity;
 
@@ -1647,7 +1647,7 @@ StudioEstimateGait
 void CStudioModelRenderer::StudioEstimateGait(entity_state_t* pplayer)
 {
 	float frametime = (m_clTime - m_clOldTime);
-	Vector  est_velocity;
+	Vector est_velocity;
 
 	if (frametime < 0)
 		frametime = 0;
@@ -1975,7 +1975,7 @@ int CStudioModelRenderer::StudioDrawPlayer(int flags, entity_state_t* pplayer)
 
 	if (pplayer->gaitsequence)
 	{
-		Vector  orig_angles;
+		Vector orig_angles;
 		m_pPlayerInfo = IEngineStudio.PlayerInfo(m_nPlayerIndex);
 
 		VectorCopy(m_pCurrentEntity->angles, orig_angles);
@@ -2182,7 +2182,7 @@ StudioRenderModel
 void CStudioModelRenderer::StudioRenderModel(void)
 {
 	alight_t lighting;
-	Vector  lightdir;
+	Vector lightdir;
 
 	gHUD.m_HUDScript->Effects_Render(*m_pCurrentEntity, CMirrorMgr::m_CurrentMirror.Enabled);
 
@@ -2480,8 +2480,8 @@ void CStudioModelRenderer::FlipModel( bool Enable )
 		index = index % pbodypart->nummodels;
 
 		mstudiomodel_t		*m_pmodel = (mstudiomodel_t *)((byte *)m_pStudioHeader + pbodypart->modelindex) + index;
-		Vector  *pstudioverts = (Vector  *)((byte *)m_pStudioHeader + m_pmodel->vertindex);
-		Vector  *pstudionorms = (Vector  *)((byte *)m_pStudioHeader + m_pmodel->normindex);
+		Vector *pstudioverts = (Vector *)((byte *)m_pStudioHeader + m_pmodel->vertindex);
+		Vector *pstudionorms = (Vector *)((byte *)m_pStudioHeader + m_pmodel->normindex);
 
 		for( int v = 0; v < m_pmodel->numverts; v++ )	pstudioverts[v][0] *= -1;	//Flip the vertices
 		for( int n = 0; n < m_pmodel->numnorms; n++)	pstudionorms[n][0] *= -1;	//Flip the normals
diff --git a/src/game/client/view.cpp b/src/game/client/view.cpp
index c584eae5..969c361f 100644
--- a/src/game/client/view.cpp
+++ b/src/game/client/view.cpp
@@ -72,7 +72,7 @@ extern "C"
 
 float Distance(Vector a, Vector b)
 {
-	Vector  d;
+	Vector d;
 	VectorSubtract(b, a, d);
 	return Length(d);
 }
@@ -100,7 +100,7 @@ extern cvar_t *cl_vsmoothing;
 #define CAM_MODE_RELAX 1
 #define CAM_MODE_FOCUS 2
 
-Vector  v_origin, v_angles, v_cl_angles, v_sim_org, v_lastAngles;
+Vector v_origin, v_angles, v_cl_angles, v_sim_org, v_lastAngles;
 Vector g_ViewForward, g_ViewRight, g_ViewUp;
 float v_frametime, v_lastDistance;
 float v_cameraRelaxAngle = 5.0f;
@@ -109,7 +109,7 @@ int v_cameraMode = CAM_MODE_FOCUS;
 qboolean v_resetCamera = 1;
 float v_ViewDist = 4096;
 
-Vector  ev_punchangle;
+Vector ev_punchangle;
 
 cvar_t *scr_ofsx;
 cvar_t *scr_ofsy;
@@ -200,7 +200,7 @@ float V_CalcBob(struct ref_params_s *pparams)
 	static float bob;
 	float cycle;
 	static float lasttime;
-	Vector  vel;
+	Vector vel;
 
 	if (pparams->onground == -1 ||
 		pparams->time == lasttime)
@@ -242,12 +242,12 @@ V_CalcRoll
 Used by view and sv_user
 ===============
 */
-float V_CalcRoll(Vector  angles, Vector  velocity, float rollangle, float rollspeed)
+float V_CalcRoll(Vector angles, Vector velocity, float rollangle, float rollspeed)
 {
 	float sign;
 	float side;
 	float value;
-	Vector  forward, right, up;
+	Vector forward, right, up;
 
 	AngleVectors(angles, &forward, &right, &up);
 
@@ -514,14 +514,14 @@ void V_CalcNormalRefdef(struct ref_params_s *pparams)
 {
 	cl_entity_t *ent;
 	unsigned int i;
-	Vector  angles;
+	Vector angles;
 	float bob, waterOffset;
 	static viewinterp_t ViewInterp;
 
 	static float oldz = 0;
 	static float lasttime;
 
-	Vector  camAngles, camForward, camRight, camUp;
+	Vector camAngles, camForward, camRight, camUp;
 	cl_entity_t *pwater;
 
 	V_DriftPitch(pparams);
@@ -566,7 +566,7 @@ void V_CalcNormalRefdef(struct ref_params_s *pparams)
 	if (pparams->waterlevel >= 2)
 	{
 		int i, contents, waterDist, waterEntity;
-		Vector  point;
+		Vector point;
 		waterDist = cl_waterdist->value;
 
 		if (pparams->hardware)
@@ -640,7 +640,7 @@ void V_CalcNormalRefdef(struct ref_params_s *pparams)
 	// Treating cam_ofs[2] as the distance
 	if (MSCLGlobals::CamThirdPerson)
 	{
-		Vector  ofs;
+		Vector ofs;
 
 		ofs[0] = ofs[1] = ofs[2] = 0.0;
 
@@ -748,7 +748,7 @@ void V_CalcNormalRefdef(struct ref_params_s *pparams)
 
 	{
 		static float lastorg[3];
-		Vector  delta;
+		Vector delta;
 
 		VectorSubtract(pparams->simorg, lastorg, delta);
 
@@ -787,10 +787,10 @@ void V_CalcNormalRefdef(struct ref_params_s *pparams)
 		if (i < ORIGIN_MASK && ViewInterp.OriginTime[foundidx & ORIGIN_MASK] != 0.0)
 		{
 			// Interpolate
-			Vector  delta;
+			Vector delta;
 			double frac;
 			double dt;
-			Vector  neworg;
+			Vector neworg;
 
 			dt = ViewInterp.OriginTime[(foundidx + 1) & ORIGIN_MASK] - ViewInterp.OriginTime[foundidx & ORIGIN_MASK];
 			if (dt > 0.0)
@@ -942,9 +942,9 @@ void V_SmoothInterpolateAngles(float *startAngle, float *endAngle, float *finalA
 // Get the origin of the Observer based around the target's position and angles
 void V_GetChaseOrigin(float *angles, float *origin, float distance, float *returnvec)
 {
-	Vector  vecEnd;
-	Vector  forward;
-	Vector  vecStart;
+	Vector vecEnd;
+	Vector forward;
+	Vector vecStart;
 	pmtrace_t *trace = NULL;
 	int maxLoops = 8;
 
@@ -1367,8 +1367,8 @@ void V_GetInEyePos(int target, float *origin, float *angles)
 
 void V_GetMapFreePosition(float *cl_angles, float *origin, float *angles)
 {
-	Vector  forward;
-	Vector  zScaledTarget;
+	Vector forward;
+	Vector zScaledTarget;
 
 	VectorCopy(cl_angles, angles);
 
@@ -1388,7 +1388,7 @@ void V_GetMapFreePosition(float *cl_angles, float *origin, float *angles)
 
 void V_GetMapChasePosition(int target, float *cl_angles, float *origin, float *angles)
 {
-	Vector  forward;
+	Vector forward;
 
 	if (target)
 	{
@@ -1481,7 +1481,7 @@ V_CalcSpectatorRefdef
 */
 void V_CalcSpectatorRefdef(struct ref_params_s *pparams)
 {
-	static Vector  velocity(0.0f, 0.0f, 0.0f);
+	static Vector velocity(0.0f, 0.0f, 0.0f);
 
 	static int lastWeaponModelIndex = 0;
 	static int lastViewModelIndex = 0;
@@ -1505,7 +1505,7 @@ void V_CalcSpectatorRefdef(struct ref_params_s *pparams)
 
 		if (timeDiff > 0)
 		{
-			Vector  distance;
+			Vector distance;
 			VectorSubtract(ent->prevstate.origin, ent->curstate.origin, distance);
 			VectorScale(distance, 1 / timeDiff, distance);
 
@@ -1838,10 +1838,10 @@ void V_Move(int mx, int my)
 	float dx, dy;
 	float c_x, c_y;
 	float dX, dY;
-	Vector  forward, up, right;
-	Vector  newangles;
+	Vector forward, up, right;
+	Vector newangles;
 
-	Vector  farpoint;
+	Vector farpoint;
 	pmtrace_t tr;
 
 	fov = CalcFov(in_fov, (float)ScreenWidth, (float)ScreenHeight);
diff --git a/src/game/server/bmodels.cpp b/src/game/server/bmodels.cpp
index ed9c3a03..a118f362 100644
--- a/src/game/server/bmodels.cpp
+++ b/src/game/server/bmodels.cpp
@@ -923,8 +923,8 @@ class CPendulum : public CScriptedEnt
 	float m_damp;
 	float m_maxSpeed;
 	float m_dampSpeed;
-	Vector  m_center;
-	Vector  m_start;
+	Vector m_center;
+	Vector m_start;
 };
 
 LINK_ENTITY_TO_CLASS(func_pendulum, CPendulum);
diff --git a/src/game/server/client.cpp b/src/game/server/client.cpp
index d2e2e0a6..8bafbb70 100644
--- a/src/game/server/client.cpp
+++ b/src/game/server/client.cpp
@@ -2601,7 +2601,7 @@ CreateBaseline
 Creates baselines used for network encoding, especially for player data since players are not spawned until connect time.
 ===================
 */
-void CreateBaseline(int player, int eindex, struct entity_state_s *baseline, struct edict_s *entity, int playermodelindex, Vector  player_mins, Vector  player_maxs)
+void CreateBaseline(int player, int eindex, struct entity_state_s *baseline, struct edict_s *entity, int playermodelindex, Vector player_mins, Vector player_maxs)
 {
 	baseline->origin = entity->v.origin;
 	baseline->angles = entity->v.angles;
diff --git a/src/game/server/hl/buttons.cpp b/src/game/server/hl/buttons.cpp
index 883a170f..2ee68c70 100644
--- a/src/game/server/hl/buttons.cpp
+++ b/src/game/server/hl/buttons.cpp
@@ -991,8 +991,8 @@ class CMomentaryRotButton : public CBaseToggle
 	int m_lastUsed;
 	int m_direction;
 	float m_returnSpeed;
-	Vector  m_start;
-	Vector  m_end;
+	Vector m_start;
+	Vector m_end;
 	int m_sounds;
 };
 TYPEDESCRIPTION CMomentaryRotButton::m_SaveData[] =
diff --git a/src/game/shared/movement/pm_defs.h b/src/game/shared/movement/pm_defs.h
index 7fac3eb7..e2773b9e 100644
--- a/src/game/shared/movement/pm_defs.h
+++ b/src/game/shared/movement/pm_defs.h
@@ -45,12 +45,12 @@ typedef struct physent_s
 {
 	char name[32]; // Name of model, or "player" or "world".
 	int player;
-	Vector  origin;				 // Model's origin in world coordinates.
+	Vector origin;				 // Model's origin in world coordinates.
 	struct model_s *model;		 // only for bsp models
 	struct model_s *studiomodel; // SOLID_BBOX, but studio clip intersections.
-	Vector  mins, maxs;			 // only for non-bsp models
+	Vector mins, maxs;			 // only for non-bsp models
 	int info;					 // For client or server to use to identify (index into edicts or cl_entities)
-	Vector  angles;				 // rotated entities need this info for hull testing to work.
+	Vector angles;				 // rotated entities need this info for hull testing to work.
 
 	int solid;		// Triggers and func_door type WATER brushes are SOLID_NOT
 	int skin;		// BSP Contents for such things like fun_door water brushes.
@@ -77,10 +77,10 @@ typedef struct physent_s
 	float fuser2;
 	float fuser3;
 	float fuser4;
-	Vector  vuser1;
-	Vector  vuser2;
-	Vector  vuser3;
-	Vector  vuser4;
+	Vector vuser1;
+	Vector vuser2;
+	Vector vuser3;
+	Vector vuser4;
 } physent_t;
 
 typedef struct playermove_s
@@ -92,17 +92,17 @@ typedef struct playermove_s
 	float time;			  // realtime on host, for reckoning duck timing
 	float frametime;	  // Duration of this frame
 
-	Vector  forward, right, up; // Vectors for angles
+	Vector forward, right, up; // Vectors for angles
 	// player state
-	Vector  origin;		 // Movement origin.
-	Vector  angles;		 // Movement view angles.
-	Vector  oldangles;	 // Angles before movement view angles were looked at.
-	Vector  velocity;	 // Current movement direction.
-	Vector  movedir;		 // For waterjumping, a forced forward velocity so we can fly over lip of ledge.
-	Vector  basevelocity; // Velocity of the conveyor we are standing, e.g.
+	Vector origin;		 // Movement origin.
+	Vector angles;		 // Movement view angles.
+	Vector oldangles;	 // Angles before movement view angles were looked at.
+	Vector velocity;	 // Current movement direction.
+	Vector movedir;		 // For waterjumping, a forced forward velocity so we can fly over lip of ledge.
+	Vector basevelocity; // Velocity of the conveyor we are standing, e.g.
 
 	// For ducking/dead
-	Vector  view_ofs;  // Our eye position.
+	Vector view_ofs;  // Our eye position.
 	float flDuckTime; // Time we started duck
 	qboolean bInDuck; // In process of ducking or ducked already?
 
@@ -111,7 +111,7 @@ typedef struct playermove_s
 	int iStepLeft;
 
 	float flFallVelocity;
-	Vector  punchangle;
+	Vector punchangle;
 
 	float flSwimTime;
 
@@ -150,10 +150,10 @@ typedef struct playermove_s
 	float fuser2;
 	float fuser3;
 	float fuser4;
-	Vector  vuser1;
-	Vector  vuser2;
-	Vector  vuser3;
-	Vector  vuser4;
+	Vector vuser1;
+	Vector vuser2;
+	Vector vuser3;
+	Vector vuser4;
 	// world state
 	// Number of entities to clip against.
 	int numphysent;
@@ -177,8 +177,8 @@ typedef struct playermove_s
 	char physinfo[MAX_PHYSINFO_STRING]; // Physics info string
 
 	struct movevars_s *movevars;
-	Vector  player_mins[4];
-	Vector  player_maxs[4];
+	Vector player_mins[4];
+	Vector player_maxs[4];
 
 	// Common functions
 	const char *(*PM_Info_ValueForKey)(const char *s, const char *key);
diff --git a/src/game/shared/movement/pm_shared.cpp b/src/game/shared/movement/pm_shared.cpp
index 807a339f..57f8b5b7 100644
--- a/src/game/shared/movement/pm_shared.cpp
+++ b/src/game/shared/movement/pm_shared.cpp
@@ -77,7 +77,7 @@ typedef struct
 
 typedef struct mplane_s
 {
-	Vector  normal; // surface normal
+	Vector normal; // surface normal
 	float dist;	   // closest appoach to origin
 	byte type;	   // for texture axis selection and fast side tests
 	byte signbits; // signx + signy<<1 + signz<<1
@@ -90,8 +90,8 @@ typedef struct hull_s
 	mplane_t *planes;
 	int firstclipnode;
 	int lastclipnode;
-	Vector  clip_mins;
-	Vector  clip_maxs;
+	Vector clip_mins;
+	Vector clip_maxs;
 } hull_t;
 
 // Ducking time
@@ -167,7 +167,7 @@ typedef struct hull_s
 
 Vector vec3_origin(0,0,0);
 
-static Vector  rgv3tStuckTable[54];
+static Vector rgv3tStuckTable[54];
 static int rgStuckLast[MAX_CLIENTS][2];
 
 // Texture names
@@ -366,7 +366,7 @@ void PM_PlayStepSound(int step, float fvol)
 {
 	static int iSkipStep = 0;
 	int irand;
-	Vector  hvel;
+	Vector hvel;
 
 	pmove->iStepLeft = !pmove->iStepLeft;
 
@@ -636,7 +636,7 @@ Determine texture info for the texture we are standing on.
 */
 void PM_CatagorizeTextureType(void)
 {
-	Vector  start, end;
+	Vector start, end;
 	const char *pTextureName;
 
 	VectorCopy(pmove->origin, start);
@@ -671,9 +671,9 @@ void PM_CatagorizeTextureType(void)
 void PM_UpdateStepSound(void)
 {
 	float fvol;
-	Vector  knee;
-	Vector  feet;
-	Vector  center;
+	Vector knee;
+	Vector feet;
+	Vector center;
 	float height;
 	float speed;
 	float velrun;
@@ -981,15 +981,15 @@ The basic solid body movement clip that slides along multiple planes
 int PM_FlyMove(void)
 {
 	int bumpcount, numbumps;
-	Vector  dir;
+	Vector dir;
 	float d;
 	int numplanes;
-	Vector  planes[MAX_CLIP_PLANES];
-	Vector  primal_velocity, original_velocity;
-	Vector  new_velocity;
+	Vector planes[MAX_CLIP_PLANES];
+	Vector primal_velocity, original_velocity;
+	Vector new_velocity;
 	int i, j;
 	pmtrace_t trace;
-	Vector  end;
+	Vector end;
 	float time_left, allFraction;
 	int blocked;
 
@@ -1220,15 +1220,15 @@ void PM_WalkMove()
 	int oldonground;
 	int i;
 
-	Vector  wishvel;
+	Vector wishvel;
 	float spd;
 	float fmove, smove;
-	Vector  wishdir;
+	Vector wishdir;
 	float wishspeed;
 
-	Vector  dest, start;
-	Vector  original, originalvel;
-	Vector  down, downvel;
+	Vector dest, start;
+	Vector original, originalvel;
+	Vector down, downvel;
 	float downdist, updist;
 
 	pmtrace_t trace;
@@ -1386,7 +1386,7 @@ void PM_Friction(void)
 	float speed, newspeed, control;
 	float friction;
 	float drop;
-	Vector  newvel;
+	Vector newvel;
 
 	// If we are in water jump cycle, don't apply friction
 	if (pmove->waterjumptime)
@@ -1409,7 +1409,7 @@ void PM_Friction(void)
 	// apply ground friction
 	if (pmove->onground != -1) // On an entity that is the ground
 	{
-		Vector  start, stop;
+		Vector start, stop;
 		pmtrace_t trace;
 
 		start[0] = stop[0] = pmove->origin[0] + vel[0] / speed * 16;
@@ -1501,11 +1501,11 @@ PM_WaterMove
 void PM_WaterMove(void)
 {
 	int i;
-	Vector  wishvel;
+	Vector wishvel;
 	float wishspeed;
-	Vector  wishdir;
-	Vector  start, dest;
-	Vector  temp;
+	Vector wishdir;
+	Vector start, dest;
+	Vector temp;
 	pmtrace_t trace;
 
 	float speed, newspeed, addspeed, accelspeed;
@@ -1596,9 +1596,9 @@ PM_AirMove
 void PM_AirMove(void)
 {
 	int i;
-	Vector  wishvel;
+	Vector wishvel;
 	float fmove, smove;
-	Vector  wishdir;
+	Vector wishdir;
 	float wishspeed;
 
 	// Copy movement amounts
@@ -1653,7 +1653,7 @@ Sets pmove->waterlevel and pmove->watertype values.
 */
 qboolean PM_CheckWater()
 {
-	Vector  point;
+	Vector point;
 	int cont;
 	int truecont;
 	float height;
@@ -1723,7 +1723,7 @@ PM_CatagorizePosition
 */
 void PM_CatagorizePosition(void)
 {
-	Vector  point;
+	Vector point;
 	pmtrace_t tr;
 
 	// if the player hull point one unit down is solid, the player
@@ -1843,9 +1843,9 @@ bool PM_TryToUnstuck(Vector base)
 
 bool PM_CheckStuck(void)
 {
-	Vector  base;
-	Vector  offset;
-	Vector  test;
+	Vector base;
+	Vector offset;
+	Vector test;
 	int hitent;
 	int i;
 	pmtrace_t traceresult;
@@ -1965,9 +1965,9 @@ void PM_SpectatorMove(void)
 	//float   accel;
 	float currentspeed, addspeed, accelspeed;
 	int i;
-	Vector  wishvel;
+	Vector wishvel;
 	float fmove, smove;
-	Vector  wishdir;
+	Vector wishdir;
 	float wishspeed;
 	// this routine keeps track of the spectators psoition
 	// there a two different main move types : track player or moce freely (OBS_ROAMING)
@@ -2126,7 +2126,7 @@ void PM_UnDuck(void)
 {
 	int i;
 	pmtrace_t trace;
-	Vector  newOrigin;
+	Vector newOrigin;
 
 	VectorCopy(pmove->origin, newOrigin);
 
@@ -2263,11 +2263,11 @@ void PM_Duck(void)
 
 void PM_LadderMove(physent_t *pLadder)
 {
-	Vector  ladderCenter;
+	Vector ladderCenter;
 	trace_t trace;
 	qboolean onFloor;
-	Vector  floor;
-	Vector  modelmins, modelmaxs;
+	Vector floor;
+	Vector modelmins, modelmaxs;
 
 	if (pmove->movetype == MOVETYPE_NOCLIP)
 		return;
@@ -2294,7 +2294,7 @@ void PM_LadderMove(physent_t *pLadder)
 	if (trace.fraction != 1.0)
 	{
 		float forward = 0, right = 0;
-		Vector  vpn, v_right;
+		Vector vpn, v_right;
 
 		AngleVectors(pmove->angles, &vpn, &v_right, NULL);
 		if (pmove->cmd.buttons & IN_BACK)
@@ -2315,7 +2315,7 @@ void PM_LadderMove(physent_t *pLadder)
 		{
 			if (forward != 0 || right != 0)
 			{
-				Vector  velocity, perp, cross, lateral, tmp;
+				Vector velocity, perp, cross, lateral, tmp;
 				float normal;
 
 				//ALERT(at_console, "pev %.2f %.2f %.2f - ",
@@ -2368,7 +2368,7 @@ physent_t *PM_Ladder(void)
 	physent_t *pe;
 	hull_t *hull;
 	int num;
-	Vector  test;
+	Vector test;
 
 	for (i = 0; i < pmove->nummoveent; i++)
 	{
@@ -2444,10 +2444,10 @@ PM_PushEntity
 Does not change the entities velocity at all
 ============
 */
-pmtrace_t PM_PushEntity(Vector  push)
+pmtrace_t PM_PushEntity(Vector push)
 {
 	pmtrace_t trace;
-	Vector  end;
+	Vector end;
 
 	VectorAdd(pmove->origin, push, end);
 
@@ -2475,7 +2475,7 @@ Dead player flying through air., e.g.
 void PM_Physics_Toss()
 {
 	pmtrace_t trace;
-	Vector  move;
+	Vector move;
 	float backoff;
 
 	PM_CheckWater();
@@ -2538,7 +2538,7 @@ void PM_Physics_Toss()
 	if (trace.plane.normal[2] > 0.7)
 	{
 		float vel;
-		Vector  base;
+		Vector base;
 
 		VectorClear(base);
 		if (pmove->velocity[2] < pmove->movevars->gravity * pmove->frametime)
@@ -2578,7 +2578,7 @@ PM_NoClip
 void PM_NoClip()
 {
 	int i;
-	Vector  wishvel;
+	Vector wishvel;
 	float fmove, smove;
 	//	float		currentspeed, addspeed, accelspeed;
 
@@ -2793,9 +2793,9 @@ PM_CheckWaterJump
 #define WJ_HEIGHT 8
 void PM_CheckWaterJump(void)
 {
-	Vector  vecStart, vecEnd;
-	Vector  flatforward;
-	Vector  flatvelocity;
+	Vector vecStart, vecEnd;
+	Vector flatforward;
+	Vector flatvelocity;
 	float curspeed;
 	pmtrace_t tr;
 	int savehull;
@@ -2970,12 +2970,12 @@ PM_CalcRoll
 
 ===============
 */
-float PM_CalcRoll(Vector  angles, Vector  velocity, float rollangle, float rollspeed)
+float PM_CalcRoll(Vector angles, Vector velocity, float rollangle, float rollspeed)
 {
 	float sign;
 	float side;
 	float value;
-	Vector  forward, right, up;
+	Vector forward, right, up;
 
 	AngleVectors(angles, &forward, &right, &up);
 
@@ -3025,7 +3025,7 @@ void PM_CheckParamters(void)
 {
 	float spd;
 	float maxspeed;
-	Vector  v_angle;
+	Vector v_angle;
 
 	spd = (pmove->cmd.forwardmove * pmove->cmd.forwardmove) +
 		  (pmove->cmd.sidemove * pmove->cmd.sidemove) +
diff --git a/src/game/shared/ms/findentities.h b/src/game/shared/ms/findentities.h
index e6edc2af..6c2eae61 100644
--- a/src/game/shared/ms/findentities.h
+++ b/src/game/shared/ms/findentities.h
@@ -138,7 +138,7 @@ class CSphereFilter : public CShapeFilter
 //class CConeFilter : public CShapeFilter
 //{
 //protected:
-//    Vector                              mAngle;
+//    Vector                             mAngle;
 //    virtual void CreateStringCache(
 //        ) const;
 //public:
diff --git a/src/game/shared/ms/script.cpp b/src/game/shared/ms/script.cpp
index 02250765..d4563ae0 100644
--- a/src/game/shared/ms/script.cpp
+++ b/src/game/shared/ms/script.cpp
@@ -3713,7 +3713,7 @@ msstring CScript::ScriptGetter_ShapeSphere(
 {
 	if (Params.size() > 1)
 	{
-		Vector                          vOrigin = DetermineOrigin(Params[0]);
+		Vector                         vOrigin = DetermineOrigin(Params[0]);
 		float                           vRadius = atof(Params[1]);
 
 		CSphereFilter                   vFilter(vOrigin, vRadius);
diff --git a/src/public/engine/progdefs.h b/src/public/engine/progdefs.h
index 12fe7994..9205278e 100644
--- a/src/public/engine/progdefs.h
+++ b/src/public/engine/progdefs.h
@@ -65,7 +65,7 @@ typedef struct entvars_s
 	Vector 		oldorigin;
 	Vector 		velocity;
 	Vector 		basevelocity;
-	Vector       clbasevelocity;  // Base velocity that was passed in to server physics so 
+	Vector      clbasevelocity;  // Base velocity that was passed in to server physics so 
 							     //  client can predict conveyors correctly.  Server zeroes it, so we need to store here, too.
 	Vector 		movedir;
 

From 048bf208a9063afb82ffb3eda3736cae0c6e3cd7 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Wed, 18 Mar 2026 19:32:59 -0400
Subject: [PATCH 112/291] changed some defines to constexpr/enum

---
 src/game/client/ev_hldm.cpp             | 32 ++++++++++++++-----------
 src/game/client/ev_hldm.h               |  7 ++++--
 src/game/shared/movement/pm_defs.h      | 19 ++++++---------
 src/game/shared/movement/pm_info.h      |  2 +-
 src/game/shared/movement/pm_materials.h | 26 ++++++++++----------
 src/game/shared/ms/msdebug.h            | 13 ++++++----
 6 files changed, 53 insertions(+), 46 deletions(-)

diff --git a/src/game/client/ev_hldm.cpp b/src/game/client/ev_hldm.cpp
index 6d709cc3..c30baf22 100644
--- a/src/game/client/ev_hldm.cpp
+++ b/src/game/client/ev_hldm.cpp
@@ -52,18 +52,20 @@ extern "C"
 	void EV_TrainPitchAdjust(struct event_args_s *args);
 }
 
-#define VECTOR_CONE_1DEGREES Vector(0.00873, 0.00873, 0.00873)
-#define VECTOR_CONE_2DEGREES Vector(0.01745, 0.01745, 0.01745)
-#define VECTOR_CONE_3DEGREES Vector(0.02618, 0.02618, 0.02618)
-#define VECTOR_CONE_4DEGREES Vector(0.03490, 0.03490, 0.03490)
-#define VECTOR_CONE_5DEGREES Vector(0.04362, 0.04362, 0.04362)
-#define VECTOR_CONE_6DEGREES Vector(0.05234, 0.05234, 0.05234)
-#define VECTOR_CONE_7DEGREES Vector(0.06105, 0.06105, 0.06105)
-#define VECTOR_CONE_8DEGREES Vector(0.06976, 0.06976, 0.06976)
-#define VECTOR_CONE_9DEGREES Vector(0.07846, 0.07846, 0.07846)
-#define VECTOR_CONE_10DEGREES Vector(0.08716, 0.08716, 0.08716)
-#define VECTOR_CONE_15DEGREES Vector(0.13053, 0.13053, 0.13053)
-#define VECTOR_CONE_20DEGREES Vector(0.17365, 0.17365, 0.17365)
+
+
+constexpr Vector VECTOR_CONE_1DEGREES = Vector(0.00873, 0.00873, 0.00873);
+constexpr Vector VECTOR_CONE_2DEGREES = Vector(0.01745, 0.01745, 0.01745);
+constexpr Vector VECTOR_CONE_3DEGREES = Vector(0.02618, 0.02618, 0.02618);
+constexpr Vector VECTOR_CONE_4DEGREES = Vector(0.03490, 0.03490, 0.03490);
+constexpr Vector VECTOR_CONE_5DEGREES = Vector(0.04362, 0.04362, 0.04362);
+constexpr Vector VECTOR_CONE_6DEGREES = Vector(0.05234, 0.05234, 0.05234);
+constexpr Vector VECTOR_CONE_7DEGREES = Vector(0.06105, 0.06105, 0.06105);
+constexpr Vector VECTOR_CONE_8DEGREES = Vector(0.06976, 0.06976, 0.06976);
+constexpr Vector VECTOR_CONE_9DEGREES = Vector(0.07846, 0.07846, 0.07846);
+constexpr Vector VECTOR_CONE_10DEGREES = Vector(0.08716, 0.08716, 0.08716);
+constexpr Vector VECTOR_CONE_15DEGREES = Vector(0.13053, 0.13053, 0.13053);
+constexpr Vector VECTOR_CONE_20DEGREES = Vector(0.17365, 0.17365, 0.17365);
 
 // play a strike sound based on the texture that was hit by the attack traceline.  VecSrc/VecEnd are the
 // original traceline endpoints used by the attacker, iBulletType is the type of bullet that hit the texture.
@@ -367,7 +369,7 @@ FireBullets
 Go to the trouble of combining multiple pellets into a single damage call.
 ================
 */
-void EV_HLDM_FireBullets(int idx, float *forward, float *right, float *up, int cShots, float *vecSrc, float *vecDirShooting, float *vecSpread, float flDistance, int iBulletType, int iTracerFreq, int *tracerCount)
+void EV_HLDM_FireBullets(int idx, float *forward, float *right, float *up, int cShots, float *vecSrc, float *vecDirShooting, Vector vecSpread, float flDistance, int iBulletType, int iTracerFreq, int *tracerCount)
 {
 	int i;
 	pmtrace_t tr;
@@ -802,7 +804,9 @@ void EV_FirePython(event_args_t *args)
 	}
 }
 
-#define SND_CHANGE_PITCH (1 << 7) // duplicated in protocol.h change sound pitch
+enum {
+	SND_CHANGE_PITCH = (1 << 7) // duplicated in protocol.h change sound pitch
+};
 
 void EV_SpinGauss(event_args_t *args)
 {
diff --git a/src/game/client/ev_hldm.h b/src/game/client/ev_hldm.h
index fb3279ce..885f5ddc 100644
--- a/src/game/client/ev_hldm.h
+++ b/src/game/client/ev_hldm.h
@@ -68,9 +68,12 @@ enum python_e
 	PYTHON_IDLE3
 };
 
-#define GAUSS_PRIMARY_CHARGE_VOLUME 256 // how loud gauss is while charging
-#define GAUSS_PRIMARY_FIRE_VOLUME 450	// how loud gauss is when discharged
+enum {
 
+	GAUSS_PRIMARY_CHARGE_VOLUME = 256, // how loud gauss is while charging
+	GAUSS_PRIMARY_FIRE_VOLUME = 450	// how loud gauss is when discharged
+
+};
 enum gauss_e
 {
 	GAUSS_IDLE = 0,
diff --git a/src/game/shared/movement/pm_defs.h b/src/game/shared/movement/pm_defs.h
index e2773b9e..21e92939 100644
--- a/src/game/shared/movement/pm_defs.h
+++ b/src/game/shared/movement/pm_defs.h
@@ -17,19 +17,14 @@
 #define PM_DEFSH
 #pragma once
 
-#define MAX_PHYSENTS 600 // Must have room for all entities in the world.
-#define MAX_MOVEENTS 64
-#define MAX_CLIP_PLANES 5
-
-#define PM_NORMAL 0x00000000
-#define PM_STUDIO_IGNORE 0x00000001 // Skip studio models
-#define PM_STUDIO_BOX 0x00000002	// Use boxes for non-complex studio models (even in traceline)
-#define PM_GLASS_IGNORE 0x00000004	// Ignore entities with non-normal rendermode
-#define PM_WORLD_ONLY 0x00000008	// Only trace against the world
-
+constexpr int MAX_PHYSENTS = 600; // Must have room for all entities in the world.
+constexpr int MAX_MOVEENTS = 64;
+constexpr int MAX_CLIP_PLANES = 5;
 // Values for flags parameter of PM_TraceLine
-#define PM_TRACELINE_PHYSENTSONLY 0
-#define PM_TRACELINE_ANYVISIBLE 1
+enum {
+	PM_TRACELINE_PHYSENTSONLY = 0,
+	PM_TRACELINE_ANYVISIBLE = 1
+};
 
 #include "pm_info.h"
 
diff --git a/src/game/shared/movement/pm_info.h b/src/game/shared/movement/pm_info.h
index 56574950..f597a486 100644
--- a/src/game/shared/movement/pm_info.h
+++ b/src/game/shared/movement/pm_info.h
@@ -19,6 +19,6 @@
 #pragma once
 #endif
 
-#define MAX_PHYSINFO_STRING 256
+constexpr int MAX_PHYSINFO_STRING = 256;
 
 #endif // PM_INFOH
diff --git a/src/game/shared/movement/pm_materials.h b/src/game/shared/movement/pm_materials.h
index 640f9f30..327c87fd 100644
--- a/src/game/shared/movement/pm_materials.h
+++ b/src/game/shared/movement/pm_materials.h
@@ -16,18 +16,20 @@
 #define PM_MATERIALSH
 #pragma once
 
-#define CBTEXTURENAMEMAX 13 // only load first n chars of name
+inline constexpr int CBTEXTURENAMEMAX = 13; // only load first n chars of name
 
-#define CHAR_TEX_CONCRETE 'C' // texture types
-#define CHAR_TEX_METAL 'M'
-#define CHAR_TEX_DIRT 'D'
-#define CHAR_TEX_VENT 'V'
-#define CHAR_TEX_GRATE 'G'
-#define CHAR_TEX_TILE 'T'
-#define CHAR_TEX_SLOSH 'S'
-#define CHAR_TEX_WOOD 'W'
-#define CHAR_TEX_COMPUTER 'P'
-#define CHAR_TEX_GLASS 'Y'
-#define CHAR_TEX_FLESH 'F'
+enum {
+	CHAR_TEX_CONCRETE = 'C', // texture types
+	CHAR_TEX_METAL = 'M',
+	CHAR_TEX_DIRT = 'D',
+	CHAR_TEX_VENT = 'V',
+	CHAR_TEX_GRATE = 'G',
+	CHAR_TEX_TILE = 'T',
+	CHAR_TEX_SLOSH = 'S',
+	CHAR_TEX_WOOD = 'W',
+	CHAR_TEX_COMPUTER = 'P',
+	CHAR_TEX_GLASS = 'Y',
+	CHAR_TEX_FLESH = 'F'
+};
 
 #endif // !PM_MATERIALSH
diff --git a/src/game/shared/ms/msdebug.h b/src/game/shared/ms/msdebug.h
index 50e2d038..844ab78f 100644
--- a/src/game/shared/ms/msdebug.h
+++ b/src/game/shared/ms/msdebug.h
@@ -21,11 +21,14 @@ struct sharedtrace_t
 	Vector DeltaVelocity; // Change in player's velocity caused by impact. (client only)
 	int Hitgroup;
 };
-#define PM_NORMAL 0x00000000
-#define PM_STUDIO_IGNORE 0x00000001 // Skip studio models
-#define PM_STUDIO_BOX 0x00000002	// Use boxes for non-complex studio models (even in traceline)
-#define PM_GLASS_IGNORE 0x00000004	// Ignore entities with non-normal rendermode
-#define PM_WORLD_ONLY 0x00000008	// Only trace against the world
+
+enum {
+	PM_NORMAL = 0x00000000,
+	PM_STUDIO_IGNORE = 0x00000001,	// Skip studio models
+	PM_STUDIO_BOX = 0x00000002,		// Use boxes for non-complex studio models (even in traceline)
+	PM_GLASS_IGNORE = 0x00000004,	// Ignore entities with non-normal rendermode
+	PM_WORLD_ONLY = 0x00000008		// Only trace against the world
+};
 #endif
 
 //Engine functions shared between the client and server

From c80a03dfc8c6b9547846cd6932e628fd5b3247ed Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 19 Mar 2026 14:48:08 -0400
Subject: [PATCH 113/291] Removed macro. Changed classes to have buffer/name
 hard mentioned on class object.

---
 src/game/client/hud.cpp        | 23 ++++++++++-------------
 src/game/client/ms/action.h    |  2 +-
 src/game/client/ms/fatigue.h   |  1 +
 src/game/client/ms/health.h    |  1 +
 src/game/client/ms/hudid.h     |  2 +-
 src/game/client/ms/hudmagic.h  |  1 +
 src/game/client/ms/hudmisc.h   |  8 +++-----
 src/game/client/ms/hudmusic.h  |  1 +
 src/game/client/ms/hudscript.h |  2 ++
 src/game/client/ms/menu.h      |  1 +
 10 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/game/client/hud.cpp b/src/game/client/hud.cpp
index 2e216d46..399f3152 100644
--- a/src/game/client/hud.cpp
+++ b/src/game/client/hud.cpp
@@ -236,10 +236,7 @@ int __MsgFunc_ViewModel(const char *pszName, int iSize, void *pbuf)
 	return 1;
 }
 
-#define SetMSHUD(ptr, type) \
-	ptr = new (type);       \
-	strncpy(ptr->Name,  #type, 32 )
-	 
+	
 // This is called every time the DLL is loaded
 void CHud::Init(void)
 {
@@ -247,15 +244,15 @@ void CHud::Init(void)
 	//ClientCmd( "r_shadows 1" );
 	ClientCmd("cl_himodels 0");
 
-	SetMSHUD(m_Menu, CHudMenu);
-	SetMSHUD(m_Fatigue, CHudFatigue);
-	SetMSHUD(m_Magic, CHudMagic);
-	SetMSHUD(m_Music, CHudMusic);
-	SetMSHUD(m_Action, CHudAction);
-	SetMSHUD(m_Health, CHudHealth);
-	SetMSHUD(m_HUDScript, CHudScript);
-	SetMSHUD(m_Misc, CHudMisc);
-	SetMSHUD(m_HUDId, CHudID);
+	m_Menu = new(CHudMenu);
+	m_Fatigue = new(CHudFatigue);
+	m_Magic	= new(CHudMagic);
+	m_Music = new(CHudMusic);
+	m_Action = new(CHudAction);
+	m_Health = new(CHudHealth);
+	m_HUDScript	= new(CHudScript);
+	m_Misc = new(CHudMisc);
+	m_HUDId = new(CHudID);
 
 	//MS commands and messages
 	//HOOK_COMMAND( "use", PlayerUseItem );
diff --git a/src/game/client/ms/action.h b/src/game/client/ms/action.h
index 149c8870..0b1a47d1 100644
--- a/src/game/client/ms/action.h
+++ b/src/game/client/ms/action.h
@@ -16,7 +16,7 @@ class CHudAction : public CHudBase
 	int MsgFunc_Action(const char *pszName, int iSize, void *pbuf);
 	void UserCmd_Action(void);
 	void SelectMenuItem(int menu_item);
-
+	char Name[32] = "CHudAction";
 	mslist<playeraction_t> PlayerActions;
 };
 #endif //HUD_ACTION_H
diff --git a/src/game/client/ms/fatigue.h b/src/game/client/ms/fatigue.h
index 153d604b..8fa86c67 100644
--- a/src/game/client/ms/fatigue.h
+++ b/src/game/client/ms/fatigue.h
@@ -13,6 +13,7 @@ class CHudFatigue : public CHudBase
 	void InitHUDData(void);
 	int MsgFunc_Fatigue(const char *pszName, int iSize, void *pbuf);
 	void UserCmd_ToggleFatigue(void);
+	char Name[32] = "CHudFatigue";
 
 private:
 	float fBreatheTime;
diff --git a/src/game/client/ms/health.h b/src/game/client/ms/health.h
index 5a22bcd8..171efbb8 100644
--- a/src/game/client/ms/health.h
+++ b/src/game/client/ms/health.h
@@ -59,6 +59,7 @@ class CHudHealth : public CHudBase
 	int m_HUD_dmg_bio;
 	int m_HUD_cross;
 	float flChangeTime;
+	char Name[32] = "CHudHealth";
 
 private:
 	HLSPRITE m_hSprite;
diff --git a/src/game/client/ms/hudid.h b/src/game/client/ms/hudid.h
index cdc812b2..3c93fc1c 100644
--- a/src/game/client/ms/hudid.h
+++ b/src/game/client/ms/hudid.h
@@ -16,10 +16,10 @@ class CHudID : public CHudBase
 
 	void SearchThink(void);
 	entinfo_t *GetEntInFrontOfMe(float Range);
-
 	entinfo_t *pActiveInfo, *pDrawInfo;
 	float Alpha;
 	float TimeDecAlpha;
+	char Name[32] = "CHudID";
 };
 
 #endif //__HUDID
diff --git a/src/game/client/ms/hudmagic.h b/src/game/client/ms/hudmagic.h
index 2c02d36d..c70975b8 100644
--- a/src/game/client/ms/hudmagic.h
+++ b/src/game/client/ms/hudmagic.h
@@ -18,5 +18,6 @@ class CHudMagic : public CHudBase
 	void InitHUDData(void);
 
 	int SpellMenuIndex[256];
+	char Name[32] = "CHudMagic";
 };
 #endif //HUD_MAGIC_H
diff --git a/src/game/client/ms/hudmisc.h b/src/game/client/ms/hudmisc.h
index e89720a3..74c47099 100644
--- a/src/game/client/ms/hudmisc.h
+++ b/src/game/client/ms/hudmisc.h
@@ -3,8 +3,8 @@
 #include "hudbase.h"
 
 //typedef struct cl_entity_s cl_entity_t;
-#define MAX_ARROWS 5
-
+inline constexpr int MAX_ARROWS = 5;
+inline constexpr int MAX_GOLD_OFFER = 1000000;
 class CHudMisc : public CHudBase
 {
 public:
@@ -19,7 +19,7 @@ class CHudMisc : public CHudBase
 	void UserCmd_Accept(void);
 	//void UserCmd_ListSkills( void );
 	void SelectMenuItem(int menu_item, TCallbackMenu *pcbMenu);
-
+	char Name[32] = "CHudMisc";
 	entinfo_t m_OfferTarget;
 
 private:
@@ -29,8 +29,6 @@ class CHudMisc : public CHudBase
 	Rect m_rcCrosshair;
 
 	HLSPRITE GetCrosshairSprite(int type);
-#define MAX_GOLD_OFFER 1000000
-
 	struct offerinfo_t
 	{
 		bool GoldScreen; //Whether I'm currently determining an amount of gold to offer
diff --git a/src/game/client/ms/hudmusic.h b/src/game/client/ms/hudmusic.h
index edb1c3dc..0039c656 100644
--- a/src/game/client/ms/hudmusic.h
+++ b/src/game/client/ms/hudmusic.h
@@ -13,6 +13,7 @@ class CHudMusic : public CHudBase
 	void Shutdown(void);
 	void Reload(void);
 	int MsgFunc_Music(const char* pszName, int iSize, void* pbuf);
+	char Name[32] = "CHudMusic";
 
 private:
 	CMusicSystem m_MP3;
diff --git a/src/game/client/ms/hudscript.h b/src/game/client/ms/hudscript.h
index 55e44b3d..f0544dc9 100644
--- a/src/game/client/ms/hudscript.h
+++ b/src/game/client/ms/hudscript.h
@@ -34,6 +34,8 @@ class CHudScript : public CHudBase, public IScripted
 	void Effects_PreRender();
 	void Effects_Render(cl_entity_t &Ent, bool InMirror);
 	void Effects_DrawTransPararentTriangles();
+
+	char Name[32] = "CHudScript";
 };
 
 
diff --git a/src/game/client/ms/menu.h b/src/game/client/ms/menu.h
index cc6bf7d2..bc496b06 100644
--- a/src/game/client/ms/menu.h
+++ b/src/game/client/ms/menu.h
@@ -31,6 +31,7 @@ class CHudMenu : public CHudBase
 	float m_flShutoffTime;
 	int m_fWaitingForMore;
 	bool m_fOfferedNextMenu;
+	char Name[32] = "CHudMenu";
 
 	//Master Sword
 	TCallbackMenu m;

From 711181845665055cdc554dddb14e42f80cbed682 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 19 Mar 2026 17:54:54 -0400
Subject: [PATCH 114/291] Changed a few NULL to null ptr. changes Screen values

---
 src/game/client/cl_util.h | 4 ++--
 src/game/client/hud.cpp   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/game/client/cl_util.h b/src/game/client/cl_util.h
index fb6f3c5f..0004331c 100644
--- a/src/game/client/cl_util.h
+++ b/src/game/client/cl_util.h
@@ -27,9 +27,9 @@
 #endif
 
 // ScreenHeight returns the height of the screen, in pixels
-#define ScreenHeight (gHUD.m_scrinfo.iHeight)
+inline const int ScreenHeight = (gHUD.m_scrinfo.iHeight);
 // ScreenWidth returns the width of the screen, in pixels
-#define ScreenWidth (gHUD.m_scrinfo.iWidth)
+inline const int ScreenWidth = (gHUD.m_scrinfo.iWidth);
 
 //these must stay macros, or we need to make a msg function for every command.
 // Macros to hook function calls into the HUD object
diff --git a/src/game/client/hud.cpp b/src/game/client/hud.cpp
index 399f3152..01d87e30 100644
--- a/src/game/client/hud.cpp
+++ b/src/game/client/hud.cpp
@@ -51,7 +51,7 @@
 //-----------------
 extern client_sprite_t *GetSpriteList(client_sprite_t *pList, const char *psz, int iRes, int iCount);
 extern cvar_t *sensitivity;
-cvar_t *cl_lw = NULL;
+cvar_t *cl_lw = nullptr;
 
 void ShutdownInput(void);
 
@@ -355,7 +355,7 @@ void CHud::Init(void)
 	MSCLGlobals::Initialize();
 	//------------
 
-	MsgFunc_ResetHUD(0, 0, NULL);
+	MsgFunc_ResetHUD(0, 0, nullptr);
 }
 
 void CHud::Shutdown()

From afba219a6c7aefab1f235d4c0eb94e472317b1c4 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 19 Mar 2026 17:55:09 -0400
Subject: [PATCH 115/291] changed READ_BOOL to function

---
 src/game/client/parsemsg.cpp | 6 ++++++
 src/game/client/parsemsg.h   | 3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/game/client/parsemsg.cpp b/src/game/client/parsemsg.cpp
index ab8ce165..5739ed11 100644
--- a/src/game/client/parsemsg.cpp
+++ b/src/game/client/parsemsg.cpp
@@ -68,6 +68,12 @@ int READ_BYTE( void )
 	return c;
 }
 
+
+bool READ_BOOL( void ) {
+	return (READ_BYTE() == 1);
+}
+
+
 int READ_SHORT( void )
 {
 	int     c;
diff --git a/src/game/client/parsemsg.h b/src/game/client/parsemsg.h
index 72b3b3bf..e3cbe734 100644
--- a/src/game/client/parsemsg.h
+++ b/src/game/client/parsemsg.h
@@ -16,8 +16,7 @@
 //  parsemsg.h
 //
 
-#define READ_BOOL() ( READ_BYTE() == 1 )		// MIB FEB2019_23 [LOCAL_PANEL_IMAGE]
-
+bool READ_BOOL(void);// MIB FEB2019_23 [LOCAL_PANEL_IMAGE]
 void BEGIN_READ(void *buf, int size);
 int READ_CHAR(void);
 int READ_BYTE(void);

From d9512a01f0d82443c61c95f58a8f2043e5773bfd Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 19 Mar 2026 17:58:13 -0400
Subject: [PATCH 116/291] Changed define to constexpr

---
 src/game/client/hud_msg.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/client/hud_msg.cpp b/src/game/client/hud_msg.cpp
index c1e97b3f..00f6c5c7 100644
--- a/src/game/client/hud_msg.cpp
+++ b/src/game/client/hud_msg.cpp
@@ -49,7 +49,7 @@ int CHud ::MsgFunc_ResetHUD(const char *pszName, int iSize, void *pbuf)
 	return 1;
 }
 
-#define CLPERMENT_TOTALK 3
+constexpr unsigned int CLPERMENT_TOTALK = 3;
 
 void CHud ::MsgFunc_InitHUD(const char *pszName, int iSize, void *pbuf)
 {

From 30ea3685f2444805a027684c9cc60cd84630fd7c Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 19 Mar 2026 17:59:30 -0400
Subject: [PATCH 117/291] changed define to constexpr

---
 src/game/client/hud_redraw.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/client/hud_redraw.cpp b/src/game/client/hud_redraw.cpp
index a96f4a3e..1dba4ff7 100644
--- a/src/game/client/hud_redraw.cpp
+++ b/src/game/client/hud_redraw.cpp
@@ -26,7 +26,7 @@
 #include "clglobal.h"
 #include "sharedutil.h"
 
-#define MAX_LOGO_FRAMES 56
+constexpr unsigned int MAX_LOGO_FRAMES = 56;
 
 int grgLogoFrame[MAX_LOGO_FRAMES] =
 	{

From 7ff971106f6c404c2dd8e5252ff526cb8835479f Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 19 Mar 2026 18:26:03 -0400
Subject: [PATCH 118/291] changed to safe versions of strcpy and strncpy.
 ensured keyname was 0 terminated. changed NULL to nullptr in a few places.

---
 src/game/client/hud_spectator.cpp | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/game/client/hud_spectator.cpp b/src/game/client/hud_spectator.cpp
index 5471ee92..5f075be8 100644
--- a/src/game/client/hud_spectator.cpp
+++ b/src/game/client/hud_spectator.cpp
@@ -71,7 +71,7 @@ void SpectatorSpray(void)
 	if (!gEngfuncs.IsSpectateOnly())
 		return;
 
-	AngleVectors(v_angles, &forward, NULL, NULL);
+	AngleVectors(v_angles, &forward, nullptr, nullptr);
 	VectorScale(forward, 128, forward);
 	VectorAdd(forward, v_origin, forward);
 	pmtrace_t *trace = gEngfuncs.PM_TraceLine(v_origin, forward, PM_TRACELINE_PHYSENTSONLY, 2, -1);
@@ -174,16 +174,18 @@ int CHudSpectator::Init()
 
 void UTIL_StringToVector(float *pVector, const char *pString)
 {
-	char *pstr, *pfront, tempString[128];
+	
+	const unsigned int bufferLength = 128;
+	char* pstr, * pfront, tempString[bufferLength] = { 0 };
 	int j;
 
-	 strncpy(tempString,  pString, sizeof(tempString) );
-	pstr = pfront = tempString;
+	strcpy_s(tempString, sizeof(tempString), pString);
+	pstr = tempString;
+	pfront = tempString;
 
 	for (j = 0; j < 3; j++)
 	{
 		pVector[j] = atof(pfront);
-
 		while (*pstr && *pstr != ' ')
 			pstr++;
 		if (!*pstr)
@@ -249,7 +251,8 @@ int UTIL_FindEntityInMap(const char *name, float *origin, float *angle)
 				return 0;
 			};
 
-			 strncpy(keyname,  token, sizeof(keyname) );
+			 strncpy_s(keyname,  token, sizeof(keyname) );
+			 keyname[255] = '\0';
 
 			// another hack to fix keynames with trailing spaces
 			n = strlen(keyname);
@@ -386,7 +389,7 @@ int CHudSpectator::Draw(float flTime)
 	int lx;
 
 	char string[256];
-	float *color;
+	float *color = nullptr;
 
 	// draw only in spectator mode
 	if (!g_iUser1)
@@ -445,7 +448,7 @@ int CHudSpectator::Draw(float flTime)
 		color = GetClientColor(i + 1);
 
 		// draw the players name and health underneath
-		 _snprintf(string, sizeof(string),  "%s",  g_PlayerInfoList[i + 1].name );
+		 _snprintf_s(string, sizeof(string),  "%s",  g_PlayerInfoList[i + 1].name );
 
 		lx = strlen(string) * 3; // 3 is avg. character length :)
 
@@ -869,8 +872,8 @@ void CHudSpectator::SetModes(int iNewMainMode, int iNewInsetMode)
 		}
 
 		char string[128];
-		 _snprintf(string, sizeof(string),  "#Spec_Mode%d",  g_iUser1 );
-		 _snprintf(string, sizeof(string),  "%c%s",  HUD_PRINTCENTER,  CHudTextMessage::BufferedLocaliseTextString(string) );
+		 _snprintf_s(string, sizeof(string),  "#Spec_Mode%d",  g_iUser1 );
+		 _snprintf_s(string, sizeof(string),  "%c%s",  HUD_PRINTCENTER,  CHudTextMessage::BufferedLocaliseTextString(string) );
 		gHUD.m_TextMessage.MsgFunc_TextMsg(NULL, strlen(string) + 1, string);
 	}
 
@@ -1321,7 +1324,7 @@ void CHudSpectator::DrawOverviewEntities()
 		VectorCopy(v_cl_angles, angles);
 	}
 	else
-		V_GetChasePos(g_iUser2, NULL, origin, angles);
+		V_GetChasePos(g_iUser2, nullptr, origin, angles);
 
 	// draw camera sprite
 
@@ -1337,7 +1340,7 @@ void CHudSpectator::DrawOverviewEntities()
 
 	gEngfuncs.pTriAPI->Color4f(r, g, b, 1.0);
 
-	AngleVectors(angles, &forward, NULL, NULL);
+	AngleVectors(angles, &forward, nullptr, nullptr);
 	VectorScale(forward, 512.0f, forward);
 
 	offset[0] = 0.0f;

From 13d8db086de625b23b7b2d2a49375460f2b1497d Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 19 Mar 2026 18:27:37 -0400
Subject: [PATCH 119/291] fixed keyname not being zero terminated

---
 src/game/client/hud_spectator.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/client/hud_spectator.cpp b/src/game/client/hud_spectator.cpp
index 5f075be8..dc558bd7 100644
--- a/src/game/client/hud_spectator.cpp
+++ b/src/game/client/hud_spectator.cpp
@@ -251,7 +251,7 @@ int UTIL_FindEntityInMap(const char *name, float *origin, float *angle)
 				return 0;
 			};
 
-			 strncpy_s(keyname,  token, sizeof(keyname) );
+			 strncpy(keyname,  token, sizeof(keyname) );
 			 keyname[255] = '\0';
 
 			// another hack to fix keynames with trailing spaces

From 5ba3ce4841374a3d77280248fb174a13ef19f468 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 19 Mar 2026 18:28:31 -0400
Subject: [PATCH 120/291] Revert "Changed a few NULL to null ptr."

This reverts commit 711181845665055cdc554dddb14e42f80cbed682.
---
 src/game/client/cl_util.h | 4 ++--
 src/game/client/hud.cpp   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/game/client/cl_util.h b/src/game/client/cl_util.h
index 0004331c..fb6f3c5f 100644
--- a/src/game/client/cl_util.h
+++ b/src/game/client/cl_util.h
@@ -27,9 +27,9 @@
 #endif
 
 // ScreenHeight returns the height of the screen, in pixels
-inline const int ScreenHeight = (gHUD.m_scrinfo.iHeight);
+#define ScreenHeight (gHUD.m_scrinfo.iHeight)
 // ScreenWidth returns the width of the screen, in pixels
-inline const int ScreenWidth = (gHUD.m_scrinfo.iWidth);
+#define ScreenWidth (gHUD.m_scrinfo.iWidth)
 
 //these must stay macros, or we need to make a msg function for every command.
 // Macros to hook function calls into the HUD object
diff --git a/src/game/client/hud.cpp b/src/game/client/hud.cpp
index 01d87e30..399f3152 100644
--- a/src/game/client/hud.cpp
+++ b/src/game/client/hud.cpp
@@ -51,7 +51,7 @@
 //-----------------
 extern client_sprite_t *GetSpriteList(client_sprite_t *pList, const char *psz, int iRes, int iCount);
 extern cvar_t *sensitivity;
-cvar_t *cl_lw = nullptr;
+cvar_t *cl_lw = NULL;
 
 void ShutdownInput(void);
 
@@ -355,7 +355,7 @@ void CHud::Init(void)
 	MSCLGlobals::Initialize();
 	//------------
 
-	MsgFunc_ResetHUD(0, 0, nullptr);
+	MsgFunc_ResetHUD(0, 0, NULL);
 }
 
 void CHud::Shutdown()

From 802be95be17cf70adbf5c2007d9d1ba1a80176b7 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 19 Mar 2026 18:45:26 -0400
Subject: [PATCH 121/291] changed GAME_LEAP to function, changed NULL to
 nullptr changed defines to enum

---
 src/game/client/in_defs.h | 10 ++++++----
 src/game/client/input.cpp | 24 ++++++++++++++----------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/game/client/in_defs.h b/src/game/client/in_defs.h
index 102f8a3a..00f996a5 100644
--- a/src/game/client/in_defs.h
+++ b/src/game/client/in_defs.h
@@ -2,12 +2,14 @@
 #define IN_DEFSH
 #pragma once
 
-// up / down
-#define PITCH 0
+enum {
+	// up / down
+	PITCH = 0,
 // left / right
-#define YAW 1
+	YAW = 1,
 // fall over
-#define ROLL 2
+	ROLL = 2
+};
 
 #define DLLEXPORT EXPORT
 
diff --git a/src/game/client/input.cpp b/src/game/client/input.cpp
index 6aea64e2..5e93e02b 100644
--- a/src/game/client/input.cpp
+++ b/src/game/client/input.cpp
@@ -140,7 +140,7 @@ typedef struct kblist_s
 	char name[32];
 } kblist_t;
 
-kblist_t *g_kbkeys = NULL;
+kblist_t *g_kbkeys = nullptr;
 
 /*
 ============
@@ -163,7 +163,7 @@ int KB_ConvertString(char *in, char **ppout)
 	if (!ppout)
 		return 0;
 
-	*ppout = NULL;
+	*ppout = nullptr;
 	p = in;
 	pOut = sz;
 	while (*p)
@@ -178,7 +178,7 @@ int KB_ConvertString(char *in, char **ppout)
 
 			*pEnd = '\0';
 
-			pBinding = NULL;
+			pBinding = nullptr;
 			if (strlen(binding + 1) > 0)
 			{
 				// See if there is a binding for binding?
@@ -240,7 +240,7 @@ struct kbutton_s DLLEXPORT *KB_Find(const char *name)
 		p = p->next;
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 /*
@@ -279,7 +279,7 @@ Add kbutton_t definitions that the engine can query if needed
 */
 void KB_Init(void)
 {
-	g_kbkeys = NULL;
+	g_kbkeys = nullptr;
 
 	KB_Add("in_graph", &in_graph);
 	KB_Add("in_mlook", &in_mlook);
@@ -303,7 +303,7 @@ void KB_Shutdown(void)
 		free(p);
 		p = n;
 	}
-	g_kbkeys = NULL;
+	g_kbkeys = nullptr;
 }
 
 /*
@@ -442,7 +442,11 @@ void IN_ForwardUp(void)
 	gHUD.m_Spectator.HandleButtonsUp(IN_FORWARD);
 }
 
-#define GAME_LEAP(dir) ServerCmd(UTIL_VarArgs("game_leap %s %f", dir, player.Stamina))
+//#define GAME_LEAP(dir) ServerCmd(UTIL_VarArgs("game_leap %s %f", dir, player.Stamina))
+
+inline void GAME_LEAP(const char * dir, float& stamina){
+	ServerCmd(UTIL_VarArgs("game_leap %s %f", dir, stamina));
+}
 
 void IN_BackDown(void)
 {
@@ -452,7 +456,7 @@ void IN_BackDown(void)
 	float cvar_flDtapDelay = CVAR_GET_FLOAT("ms_doubletap_delay");
 
 	if ((!strcmp(CVAR_GET_STRING("ms_doubletapdodge"), "1") && lastMoveBackUp + cvar_flDtapDelay > gpGlobals->time))
-		GAME_LEAP("back");
+		GAME_LEAP("back", player.Stamina);
 }
 
 void IN_BackUp(void)
@@ -475,7 +479,7 @@ void IN_MoveleftDown(void)
 	float cvar_flDtapDelay = CVAR_GET_FLOAT("ms_doubletap_delay");
 
 	if ((!strcmp(CVAR_GET_STRING("ms_doubletapdodge"), "1") && lastMoveLeftUp + cvar_flDtapDelay > gpGlobals->time))
-		GAME_LEAP("left");
+		GAME_LEAP("left", player.Stamina);
 }
 
 void IN_MoveleftUp(void)
@@ -493,7 +497,7 @@ void IN_MoverightDown(void)
 	float cvar_flDtapDelay = CVAR_GET_FLOAT("ms_doubletap_delay");
 
 	if ((!strcmp(CVAR_GET_STRING("ms_doubletapdodge"), "1") && lastMoveRightUp + cvar_flDtapDelay > gpGlobals->time))
-		GAME_LEAP("right");
+		GAME_LEAP("right", player.Stamina);
 }
 
 void IN_MoverightUp(void)

From 8ed454e5279010df508dbda9528b678faaf0e388 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 19 Mar 2026 19:08:05 -0400
Subject: [PATCH 122/291] changed defines to costexpr or enums where applicable

---
 src/game/client/inputw32.cpp |  24 +++--
 src/public/keydefs.h         | 197 +++++++++++++++++------------------
 2 files changed, 112 insertions(+), 109 deletions(-)

diff --git a/src/game/client/inputw32.cpp b/src/game/client/inputw32.cpp
index 4960721d..a5bfd77b 100644
--- a/src/game/client/inputw32.cpp
+++ b/src/game/client/inputw32.cpp
@@ -27,7 +27,7 @@
 #include <SDL2/SDL_mouse.h>
 #include <SDL2/SDL_gamecontroller.h>
 
-#define MOUSE_BUTTON_COUNT 5
+constexpr int MOUSE_BUTTON_COUNT = 5;
 
 // Set this to 1 to show mouse cursor.  Experimental
 int g_iVisibleMouse = 0;
@@ -95,15 +95,18 @@ static bool g_ReceivedFirstMouseActivate = false;
 
 // joystick defines and variables
 // where should defines be moved?
-#define JOY_ABSOLUTE_AXIS 0x00000000 // control like a joystick
-#define JOY_RELATIVE_AXIS 0x00000010 // control like a mouse, spinner, trackball
-#define JOY_MAX_AXES 6				 // X, Y, Z, R, U, V
-#define JOY_AXIS_X 0
-#define JOY_AXIS_Y 1
-#define JOY_AXIS_Z 2
-#define JOY_AXIS_R 3
-#define JOY_AXIS_U 4
-#define JOY_AXIS_V 5
+
+enum {
+JOY_ABSOLUTE_AXIS = 0x00000000,	// control like a joystick
+JOY_RELATIVE_AXIS = 0x00000010,	// control like a mouse, spinner, trackball
+JOY_MAX_AXES = 6,				// X, Y, Z, R, U, V
+JOY_AXIS_X = 0,
+JOY_AXIS_Y = 1,
+JOY_AXIS_Z = 2,
+JOY_AXIS_R = 3,
+JOY_AXIS_U = 4,
+JOY_AXIS_V = 5
+};
 
 enum _ControlList
 {
@@ -317,6 +320,7 @@ void IN_Shutdown(void)
 
 	if (s_hMouseThread)
 	{
+
 		TerminateThread(s_hMouseThread, 0);
 		CloseHandle(s_hMouseThread);
 		s_hMouseThread = (HANDLE)0;
diff --git a/src/public/keydefs.h b/src/public/keydefs.h
index 590367b4..d5cc651c 100644
--- a/src/public/keydefs.h
+++ b/src/public/keydefs.h
@@ -5,120 +5,119 @@
 #pragma once
 #endif
 
-//
-// these are the key numbers that should be passed to Key_Event
-//
-#define	K_TAB			9
-#define	K_ENTER			13
-#define	K_ESCAPE		27
-#define	K_SPACE			32
-
-// normal keys should be passed as lowercased ascii
 
-#define	K_BACKSPACE		127
-#define	K_UPARROW		128
-#define	K_DOWNARROW		129
-#define	K_LEFTARROW		130
-#define	K_RIGHTARROW	131
+enum {
+	//
+	// these are the key numbers that should be passed to Key_Event
+	//
+	K_TAB			= 9,
+	K_ENTER			= 13,
+	K_ESCAPE		= 27,
+	K_SPACE			= 32,
 
-#define	K_ALT			132
-#define	K_CTRL			133
-#define	K_SHIFT			134
-#define	K_F1			135
-#define	K_F2			136
-#define	K_F3			137
-#define	K_F4			138
-#define	K_F5			139
-#define	K_F6			140
-#define	K_F7			141
-#define	K_F8			142
-#define	K_F9			143
-#define	K_F10			144
-#define	K_F11			145
-#define	K_F12			146
-#define	K_INS			147
-#define	K_DEL			148
-#define	K_PGDN			149
-#define	K_PGUP			150
-#define	K_HOME			151
-#define	K_END			152
+// normal keys should be passed as lowercased ascii
 
-#define K_KP_HOME		160
-#define K_KP_UPARROW	161
-#define K_KP_PGUP		162
-#define	K_KP_LEFTARROW	163
-#define K_KP_5			164
-#define K_KP_RIGHTARROW	165
-#define K_KP_END		166
-#define K_KP_DOWNARROW	167
-#define K_KP_PGDN		168
-#define	K_KP_ENTER		169
-#define K_KP_INS   		170
-#define	K_KP_DEL		171
-#define K_KP_SLASH		172
-#define K_KP_MINUS		173
-#define K_KP_PLUS		174
-#define K_CAPSLOCK		175
-#define K_KP_MUL		176
-#define K_WIN			177
+	K_BACKSPACE		= 127,
+	K_UPARROW		= 128,
+	K_DOWNARROW		= 129,
+	K_LEFTARROW		= 130,
+	K_RIGHTARROW	= 131,
+	K_ALT			= 132,
+	K_CTRL			= 133,
+	K_SHIFT			= 134,
+	K_F1			= 135,
+	K_F2			= 136,
+	K_F3			= 137,
+	K_F4			= 138,
+	K_F5			= 139,
+	K_F6			= 140,
+	K_F7			= 141,
+	K_F8			= 142,
+	K_F9			= 143,
+	K_F10			= 144,
+	K_F11			= 145,
+	K_F12			= 146,
+	K_INS			= 147,
+	K_DEL			= 148,
+	K_PGDN			= 149,
+	K_PGUP			= 150,
+	K_HOME			= 151,
+	K_END			= 152,
+	K_KP_HOME		= 160,
+	K_KP_UPARROW	= 161,
+	K_KP_PGUP		= 162,
+	K_KP_LEFTARROW	= 163,
+	K_KP_5			= 164,
+	K_KP_RIGHTARROW	= 165,
+	K_KP_END		= 166,
+	K_KP_DOWNARROW	= 167,
+	K_KP_PGDN		= 168,
+	K_KP_ENTER		= 169,
+	K_KP_INS   		= 170,
+	K_KP_DEL		= 171,
+	K_KP_SLASH		= 172,
+	K_KP_MINUS		= 173,
+	K_KP_PLUS		= 174,
+	K_CAPSLOCK		= 175,
+	K_KP_MUL		= 176,
+	K_WIN			= 177,
 
 
 //
 // joystick buttons
 //
-#define	K_JOY1			203
-#define	K_JOY2			204
-#define	K_JOY3			205
-#define	K_JOY4			206
+	K_JOY1			= 203,
+	K_JOY2			= 204,
+	K_JOY3			= 205,
+	K_JOY4			= 206,
 
 //
 // aux keys are for multi-buttoned joysticks to generate so they can use
 // the normal binding process
 //
-#define	K_AUX1			207
-#define	K_AUX2			208
-#define	K_AUX3			209
-#define	K_AUX4			210
-#define	K_AUX5			211
-#define	K_AUX6			212
-#define	K_AUX7			213
-#define	K_AUX8			214
-#define	K_AUX9			215
-#define	K_AUX10			216
-#define	K_AUX11			217
-#define	K_AUX12			218
-#define	K_AUX13			219
-#define	K_AUX14			220
-#define	K_AUX15			221
-#define	K_AUX16			222
-#define	K_AUX17			223
-#define	K_AUX18			224
-#define	K_AUX19			225
-#define	K_AUX20			226
-#define	K_AUX21			227
-#define	K_AUX22			228
-#define	K_AUX23			229
-#define	K_AUX24			230
-#define	K_AUX25			231
-#define	K_AUX26			232
-#define	K_AUX27			233
-#define	K_AUX28			234
-#define	K_AUX29			235
-#define	K_AUX30			236
-#define	K_AUX31			237
-#define	K_AUX32			238
-#define K_MWHEELDOWN	239
-#define K_MWHEELUP		240
-
-#define K_PAUSE			255
+	K_AUX1			= 207,
+	K_AUX2			= 208,
+	K_AUX3			= 209,
+	K_AUX4			= 210,
+	K_AUX5			= 211,
+	K_AUX6			= 212,
+	K_AUX7			= 213,
+	K_AUX8			= 214,
+	K_AUX9			= 215,
+	K_AUX10			= 216,
+	K_AUX11			= 217,
+	K_AUX12			= 218,
+	K_AUX13			= 219,
+	K_AUX14			= 220,
+	K_AUX15			= 221,
+	K_AUX16			= 222,
+	K_AUX17			= 223,
+	K_AUX18			= 224,
+	K_AUX19			= 225,
+	K_AUX20			= 226,
+	K_AUX21			= 227,
+	K_AUX22			= 228,
+	K_AUX23			= 229,
+	K_AUX24			= 230,
+	K_AUX25			= 231,
+	K_AUX26			= 232,
+	K_AUX27			= 233,
+	K_AUX28			= 234,
+	K_AUX29			= 235,
+	K_AUX30			= 236,
+	K_AUX31			= 237,
+	K_AUX32			= 238,
+	K_MWHEELDOWN	= 239,
+	K_MWHEELUP		= 240,
+	K_PAUSE			= 255,
 
 //
 // mouse buttons generate virtual keys
 //
-#define	K_MOUSE1		241
-#define	K_MOUSE2		242
-#define	K_MOUSE3		243
-#define K_MOUSE4		244
-#define K_MOUSE5		245
-
+	K_MOUSE1		= 241,
+	K_MOUSE2		= 242,
+	K_MOUSE3		= 243,
+	K_MOUSE4		= 244,
+	K_MOUSE5		= 245
+};
 #endif // KEYDEFS_H
\ No newline at end of file

From 92d94dadca693d2e65b8aa4a416bcd18f173a17c Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 19 Mar 2026 19:08:37 -0400
Subject: [PATCH 123/291] fixed tabbing

---
 src/game/client/inputw32.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/game/client/inputw32.cpp b/src/game/client/inputw32.cpp
index a5bfd77b..aa4cd265 100644
--- a/src/game/client/inputw32.cpp
+++ b/src/game/client/inputw32.cpp
@@ -97,15 +97,15 @@ static bool g_ReceivedFirstMouseActivate = false;
 // where should defines be moved?
 
 enum {
-JOY_ABSOLUTE_AXIS = 0x00000000,	// control like a joystick
-JOY_RELATIVE_AXIS = 0x00000010,	// control like a mouse, spinner, trackball
-JOY_MAX_AXES = 6,				// X, Y, Z, R, U, V
-JOY_AXIS_X = 0,
-JOY_AXIS_Y = 1,
-JOY_AXIS_Z = 2,
-JOY_AXIS_R = 3,
-JOY_AXIS_U = 4,
-JOY_AXIS_V = 5
+	JOY_ABSOLUTE_AXIS = 0x00000000,	// control like a joystick
+	JOY_RELATIVE_AXIS = 0x00000010,	// control like a mouse, spinner, trackball
+	JOY_MAX_AXES = 6,				// X, Y, Z, R, U, V
+	JOY_AXIS_X = 0,
+	JOY_AXIS_Y = 1,
+	JOY_AXIS_Z = 2,
+	JOY_AXIS_R = 3,
+	JOY_AXIS_U = 4,
+	JOY_AXIS_V = 5
 };
 
 enum _ControlList

From f6dff22e4738ab9b16e265fb06c6ce27dda9cb30 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 19 Mar 2026 19:10:50 -0400
Subject: [PATCH 124/291] changed define to constexpr

---
 src/game/client/in_camera.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/game/client/in_camera.cpp b/src/game/client/in_camera.cpp
index 2a512b7f..dfd67acc 100644
--- a/src/game/client/in_camera.cpp
+++ b/src/game/client/in_camera.cpp
@@ -33,16 +33,16 @@ extern cl_enginefunc_t gEngfuncs;
 
 //-------------------------------------------------- Constants
 
-#define CAM_DIST_DELTA 1.0
-#define CAM_ANGLE_DELTA 2.5
-#define CAM_ANGLE_SPEED 2.5
-#define CAM_MIN_DIST 30.0
-#define CAM_ANGLE_MOVE .5
-#define MAX_ANGLE_DIFF 10.0
-#define PITCH_MAX 90.0
-#define PITCH_MIN 0
-#define YAW_MAX 135.0
-#define YAW_MIN -135.0
+constexpr float CAM_DIST_DELTA = 1.0;
+constexpr float CAM_ANGLE_DELTA = 2.5;
+constexpr float CAM_ANGLE_SPEED = 2.5;
+constexpr float CAM_MIN_DIST = 30.0;
+constexpr float CAM_ANGLE_MOVE = .5;
+constexpr float MAX_ANGLE_DIFF = 10.0;
+constexpr float PITCH_MAX = 90.0;
+constexpr float PITCH_MIN = 0;
+constexpr float YAW_MAX = 135.0;
+constexpr float YAW_MIN = -135.0;
 
 enum ECAM_Command
 {

From 5430d8b688a239971f6575f9f9e8bf1fcd054435 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 19 Mar 2026 19:31:34 -0400
Subject: [PATCH 125/291] Changed ScreenHeight/ScreenWidth defines to
 functions.

---
 src/game/client/ammo_secondary.cpp            |  4 +--
 src/game/client/ammohistory.cpp               | 14 ++++----
 src/game/client/cl_util.h                     | 34 ++++++++++++-------
 src/game/client/death.cpp                     |  2 +-
 src/game/client/hud.cpp                       |  4 +--
 src/game/client/message.cpp                   | 24 ++++++-------
 src/game/client/ms/fatigue.cpp                |  4 +--
 src/game/client/ms/health.cpp                 | 18 +++++-----
 src/game/client/ms/hudid.cpp                  |  6 ++--
 src/game/client/ms/hudmisc.cpp                |  2 +-
 src/game/client/ms/menu.cpp                   |  2 +-
 src/game/client/render/clrendermirror.cpp     | 16 ++++-----
 src/game/client/render/opengl/clopengl.cpp    |  2 +-
 src/game/client/saytext.cpp                   |  8 ++---
 src/game/client/status_icons.cpp              |  2 +-
 src/game/client/statusbar.cpp                 | 10 +++---
 src/game/client/train.cpp                     |  4 +--
 .../client/ui/ms/vgui_choosecharacter.cpp     |  2 +-
 src/game/client/ui/ms/vgui_container.cpp      |  2 +-
 src/game/client/ui/ms/vgui_container.h        |  2 +-
 src/game/client/ui/ms/vgui_health.h           |  6 ++--
 src/game/client/ui/ms/vgui_healthretro.h      |  4 +--
 src/game/client/ui/ms/vgui_hud.cpp            |  2 +-
 src/game/client/ui/ms/vgui_localizedpanel.cpp | 10 +++---
 src/game/client/ui/ms/vgui_menu_interact.h    |  2 +-
 src/game/client/ui/ms/vgui_menubase.cpp       |  2 +-
 src/game/client/ui/ms/vgui_quickslot.h        |  2 +-
 src/game/client/ui/ms/vgui_spawn.cpp          |  2 +-
 src/game/client/ui/ms/vgui_stats.cpp          |  2 +-
 src/game/client/ui/ms/vgui_vote.h             |  2 +-
 src/game/client/ui/vgui_customobjects.cpp     |  2 +-
 src/game/client/ui/vgui_scorepanel.cpp        | 14 ++++----
 src/game/client/ui/vgui_spectatorpanel.cpp    | 20 +++++------
 src/game/client/ui/vgui_status.h              | 14 ++++----
 .../client/ui/vgui_teamfortressviewport.cpp   | 30 ++++++++--------
 .../client/ui/vgui_teamfortressviewport.h     | 12 +++----
 src/game/client/ui/vgui_voice_tweakdlg.cpp    |  6 ++--
 src/game/client/util.cpp                      |  2 +-
 src/game/client/view.cpp                      |  6 ++--
 src/game/shared/voice_status.cpp              | 12 +++----
 40 files changed, 162 insertions(+), 152 deletions(-)

diff --git a/src/game/client/ammo_secondary.cpp b/src/game/client/ammo_secondary.cpp
index 2f14d1a3..81e80dff 100644
--- a/src/game/client/ammo_secondary.cpp
+++ b/src/game/client/ammo_secondary.cpp
@@ -68,8 +68,8 @@ int CHudAmmoSecondary ::Draw(float flTime)
 
 	AmmoWidth = gHUD.GetSpriteRect(gHUD.m_HUD_number_0).right - gHUD.GetSpriteRect(gHUD.m_HUD_number_0).left;
 
-	y = ScreenHeight - (gHUD.m_iFontHeight * 4); // this is one font height higher than the weapon ammo values
-	x = ScreenWidth - AmmoWidth;
+	y = ScreenHeight() - (gHUD.m_iFontHeight * 4); // this is one font height higher than the weapon ammo values
+	x = ScreenWidth() - AmmoWidth;
 
 	if (m_HUD_ammoicon)
 	{
diff --git a/src/game/client/ammohistory.cpp b/src/game/client/ammohistory.cpp
index b9403817..d3daf501 100644
--- a/src/game/client/ammohistory.cpp
+++ b/src/game/client/ammohistory.cpp
@@ -29,7 +29,7 @@ HistoryResource gHR;
 
 #define AMMO_PICKUP_GAP (gHR.iHistoryGap + 5)
 #define AMMO_PICKUP_PICK_HEIGHT (32 + (gHR.iHistoryGap * 2))
-#define AMMO_PICKUP_HEIGHT_MAX (ScreenHeight - 100)
+#define AMMO_PICKUP_HEIGHT_MAX (ScreenHeight() - 100)
 
 #define MAX_ITEM_NAME 32
 int HISTORY_DRAW_TIME = 5;
@@ -127,8 +127,8 @@ int HistoryResource ::DrawAmmoHistory(float flTime)
 				ScaleColors(r, g, b, min(scale, 255) );
 
 				// Draw the pic
-				int ypos = ScreenHeight - (AMMO_PICKUP_PICK_HEIGHT + (AMMO_PICKUP_GAP * i));
-				int xpos = ScreenWidth - 24;
+				int ypos = ScreenHeight() - (AMMO_PICKUP_PICK_HEIGHT + (AMMO_PICKUP_GAP * i));
+				int xpos = ScreenWidth() - 24;
 				if ( spr && *spr )    // weapon isn't loaded yet so just don't draw the pic
 				{ // the dll has to make sure it has sent info the weapons you need
 					SPR_Set( *spr, r, g, b );
@@ -154,8 +154,8 @@ int HistoryResource ::DrawAmmoHistory(float flTime)
 				float scale = (rgAmmoHistory[i].DisplayTime - flTime) * 80;
 				ScaleColors(r, g, b, min(scale, 255) );
 
-				int ypos = ScreenHeight - (AMMO_PICKUP_PICK_HEIGHT + (AMMO_PICKUP_GAP * i));
-				int xpos = ScreenWidth - (weap->rcInactive.right - weap->rcInactive.left);
+				int ypos = ScreenHeight() - (AMMO_PICKUP_PICK_HEIGHT + (AMMO_PICKUP_GAP * i));
+				int xpos = ScreenWidth() - (weap->rcInactive.right - weap->rcInactive.left);
 				SPR_Set( weap->hInactive, r, g, b );
 				SPR_DrawAdditive( 0, xpos, ypos, &weap->rcInactive );
 			}
@@ -172,8 +172,8 @@ int HistoryResource ::DrawAmmoHistory(float flTime)
 				float scale = (rgAmmoHistory[i].DisplayTime - flTime) * 80;
 				ScaleColors(r, g, b, min(scale, 255) );
 
-				int ypos = ScreenHeight - (AMMO_PICKUP_PICK_HEIGHT + (AMMO_PICKUP_GAP * i));
-				int xpos = ScreenWidth - (rect.right - rect.left) - 10;
+				int ypos = ScreenHeight() - (AMMO_PICKUP_PICK_HEIGHT + (AMMO_PICKUP_GAP * i));
+				int xpos = ScreenWidth() - (rect.right - rect.left) - 10;
 
 				SPR_Set( gHUD.GetSprite( rgAmmoHistory[i].iId ), r, g, b );
 				SPR_DrawAdditive( 0, xpos, ypos, &rect );
diff --git a/src/game/client/cl_util.h b/src/game/client/cl_util.h
index fb6f3c5f..57c365d9 100644
--- a/src/game/client/cl_util.h
+++ b/src/game/client/cl_util.h
@@ -26,10 +26,20 @@
 #define FALSE 0
 #endif
 
-// ScreenHeight returns the height of the screen, in pixels
-#define ScreenHeight (gHUD.m_scrinfo.iHeight)
-// ScreenWidth returns the width of the screen, in pixels
-#define ScreenWidth (gHUD.m_scrinfo.iWidth)
+// ScreenHeight() returns the height of the screen, in pixels
+
+inline int ScreenHeight(void) {
+	return gHUD.m_scrinfo.iHeight;
+}
+
+inline int ScreenWidth(void){
+	return gHUD.m_scrinfo.iWidth;
+}
+
+
+//#define ScreenHeight() (gHUD.m_scrinfo.iHeight)
+// ScreenWidth() returns the width of the screen, in pixels
+//#define ScreenWidth() (gHUD.m_scrinfo.iWidth)
 
 //these must stay macros, or we need to make a msg function for every command.
 // Macros to hook function calls into the HUD object
@@ -93,12 +103,12 @@ inline struct cvar_s *CVAR_CREATE(const char *cv, const char *val, const int fla
 //#define FillRGBA (*gEngfuncs.pfnFillRGBA)
 
 // Use this to set any co-ords in 640x480 space
-//#define XRES(x) ((int)(float(x) * ((float)ScreenWidth / 640.0f) + 0.5f))
-//#define YRES(y) ((int)(float(y) * ((float)ScreenHeight / 480.0f) + 0.5f))
+//#define XRES(x) ((int)(float(x) * ((float)ScreenWidth() / 640.0f) + 0.5f))
+//#define YRES(y) ((int)(float(y) * ((float)ScreenHeight() / 480.0f) + 0.5f))
 
 // use this to project world coordinates to screen coordinates
-//#define XPROJECT(x) ((1.0f + (x)) * ScreenWidth * 0.5f)
-//#define YPROJECT(y) ((1.0f - (y)) * ScreenHeight * 0.5f)
+//#define XPROJECT(x) ((1.0f + (x)) * ScreenWidth() * 0.5f)
+//#define YPROJECT(y) ((1.0f - (y)) * ScreenHeight() * 0.5f)
 
 //#define GetScreenInfo (*gEngfuncs.pfnGetScreenInfo)
 //#define ServerCmd (*gEngfuncs.pfnServerCmd)
@@ -151,19 +161,19 @@ inline void FillRGBA(const int x, const int y, const int width, const int height
 
 
 inline int XRES(const int x) {
-	return (int)(float(x) * ((float)ScreenWidth / 640.0f) + 0.5f);
+	return (int)(float(x) * ((float)ScreenWidth() / 640.0f) + 0.5f);
 }
 
 inline int YRES(const int y) {
-	return (int)(float(y) * ((float)ScreenHeight / 480.0f) + 0.5f);
+	return (int)(float(y) * ((float)ScreenHeight() / 480.0f) + 0.5f);
 }
 
 inline float XPROJECT(const float x) {
-	return (float)(1.0f + x) * ScreenWidth * 0.5f;
+	return (float)(1.0f + x) * ScreenWidth() * 0.5f;
 }
 
 inline float YPROJECT(const float y) {
-	return (float)(1.0f - y) * ScreenHeight * 0.5f;
+	return (float)(1.0f - y) * ScreenHeight() * 0.5f;
 }
 
 inline int GetScreenInfo(SCREENINFO_s * psScreenInfo) {
diff --git a/src/game/client/death.cpp b/src/game/client/death.cpp
index 5437ddb6..41755d92 100644
--- a/src/game/client/death.cpp
+++ b/src/game/client/death.cpp
@@ -112,7 +112,7 @@ int CHudDeathNotice ::Draw(float flTime)
 			y = DEATHNOTICE_TOP + (20 * i); //!!!
 
 			int id = (rgDeathNoticeList[i].iId == -1) ? m_HUD_d_skull : rgDeathNoticeList[i].iId;
-			x = ScreenWidth - ConsoleStringLen(rgDeathNoticeList[i].szVictim) - (gHUD.GetSpriteRect(id).right - gHUD.GetSpriteRect(id).left);
+			x = ScreenWidth() - ConsoleStringLen(rgDeathNoticeList[i].szVictim) - (gHUD.GetSpriteRect(id).right - gHUD.GetSpriteRect(id).left);
 
 			if (!rgDeathNoticeList[i].iSuicide)
 			{
diff --git a/src/game/client/hud.cpp b/src/game/client/hud.cpp
index 399f3152..4d734579 100644
--- a/src/game/client/hud.cpp
+++ b/src/game/client/hud.cpp
@@ -463,7 +463,7 @@ int CHud::Redraw(float flTime, int intermission)
 	// 	SPR_Set(m_hsprLogo, 250, 250, 250);
 
 	// 	x = SPR_Width(m_hsprLogo, 0);
-	// 	x = ScreenWidth - x;
+	// 	x = ScreenWidth() - x;
 	// 	y = SPR_Height(m_hsprLogo, 0) / 2;
 
 	// 	// Draw the logo at 20 fps
@@ -563,7 +563,7 @@ void CHud::VidInit(void)
 	m_hsprLogo = 0;
 	m_hsprCursor = 0;
 
-	if (ScreenWidth < 640)
+	if (ScreenWidth() < 640)
 		m_iRes = 320;
 	else
 		m_iRes = 640;
diff --git a/src/game/client/message.cpp b/src/game/client/message.cpp
index 105eefdc..4fc34fe7 100644
--- a/src/game/client/message.cpp
+++ b/src/game/client/message.cpp
@@ -88,18 +88,18 @@ int CHudMessage::XPosition(float x, int width, int totalWidth)
 
 	if (x == -1)
 	{
-		xPos = (ScreenWidth - width) / 2;
+		xPos = (ScreenWidth() - width) / 2;
 	}
 	else
 	{
 		if (x < 0)
-			xPos = (1.0 + x) * ScreenWidth - totalWidth; // Alight right
+			xPos = (1.0 + x) * ScreenWidth() - totalWidth; // Alight right
 		else
-			xPos = x * ScreenWidth;
+			xPos = x * ScreenWidth();
 	}
 
-	if (xPos + width > ScreenWidth)
-		xPos = ScreenWidth - width;
+	if (xPos + width > ScreenWidth())
+		xPos = ScreenWidth() - width;
 	else if (xPos < 0)
 		xPos = 0;
 
@@ -111,18 +111,18 @@ int CHudMessage::YPosition(float y, int height)
 	int yPos;
 
 	if (y == -1) // Centered?
-		yPos = (ScreenHeight - height) * 0.5;
+		yPos = (ScreenHeight() - height) * 0.5;
 	else
 	{
 		// Alight bottom?
 		if (y < 0)
-			yPos = (1.0 + y) * ScreenHeight - height; // Alight bottom
+			yPos = (1.0 + y) * ScreenHeight() - height; // Alight bottom
 		else										  // align top
-			yPos = y * ScreenHeight;
+			yPos = y * ScreenHeight();
 	}
 
-	if (yPos + height > ScreenHeight)
-		yPos = ScreenHeight - height;
+	if (yPos + height > ScreenHeight())
+		yPos = ScreenHeight() - height;
 	else if (yPos < 0)
 		yPos = 0;
 
@@ -187,7 +187,7 @@ void CHudMessage::MessageScanNextChar(void)
 
 	if (m_parms.pMessage->effect == 1 && m_parms.charTime != 0)
 	{
-		if (m_parms.x >= 0 && m_parms.y >= 0 && (m_parms.x + gHUD.m_scrinfo.charWidths[m_parms.text]) <= ScreenWidth)
+		if (m_parms.x >= 0 && m_parms.y >= 0 && (m_parms.x + gHUD.m_scrinfo.charWidths[m_parms.text]) <= ScreenWidth())
 			TextMessageDrawChar(m_parms.x, m_parms.y, m_parms.text, m_parms.pMessage->r2, m_parms.pMessage->g2, m_parms.pMessage->b2);
 	}
 }
@@ -292,7 +292,7 @@ void CHudMessage::MessageDrawScan(client_textmessage_t *pMessage, float time)
 			int next = m_parms.x + gHUD.m_scrinfo.charWidths[m_parms.text];
 			MessageScanNextChar();
 
-			if (m_parms.x >= 0 && m_parms.y >= 0 && next <= ScreenWidth)
+			if (m_parms.x >= 0 && m_parms.y >= 0 && next <= ScreenWidth())
 				TextMessageDrawChar(m_parms.x, m_parms.y, m_parms.text, m_parms.r, m_parms.g, m_parms.b);
 			m_parms.x = next;
 		}
diff --git a/src/game/client/ms/fatigue.cpp b/src/game/client/ms/fatigue.cpp
index 710b642b..e1113408 100644
--- a/src/game/client/ms/fatigue.cpp
+++ b/src/game/client/ms/fatigue.cpp
@@ -47,8 +47,8 @@ int CHudFatigue::Draw(float flTime)
 {
 	if (m_DrawFatigue)
 	{
-		gHUD.DrawHudNumberSML(ScreenWidth - 40, ScreenHeight - 40, NULL, player.Stamina, 255, 255, 255);
-		gHUD.DrawHudNumberSML(ScreenWidth - 20, ScreenHeight - 40, NULL, player.MaxStamina(), 255, 255, 255);
+		gHUD.DrawHudNumberSML(ScreenWidth() - 40, ScreenHeight() - 40, NULL, player.Stamina, 255, 255, 255);
+		gHUD.DrawHudNumberSML(ScreenWidth() - 20, ScreenHeight() - 40, NULL, player.MaxStamina(), 255, 255, 255);
 	}
 	return 1;
 }
diff --git a/src/game/client/ms/health.cpp b/src/game/client/ms/health.cpp
index 200ca683..eea96b4a 100644
--- a/src/game/client/ms/health.cpp
+++ b/src/game/client/ms/health.cpp
@@ -281,8 +281,8 @@ int CHudHealth::DrawPain(float flTime)
 		ScaleColors(r, g, b, shade);
 		SPR_Set(m_hSprite, r, g, b);
 
-		x = ScreenWidth / 2 - SPR_Width(m_hSprite, 0) / 2;
-		y = ScreenHeight / 2 - SPR_Height(m_hSprite, 0) * 3;
+		x = ScreenWidth() / 2 - SPR_Width(m_hSprite, 0) / 2;
+		y = ScreenHeight() / 2 - SPR_Height(m_hSprite, 0) * 3;
 		SPR_DrawAdditive(0, x, y, NULL);
 		m_fAttackFront = V_max(0, m_fAttackFront - fFade);
 	}
@@ -296,8 +296,8 @@ int CHudHealth::DrawPain(float flTime)
 		ScaleColors(r, g, b, shade);
 		SPR_Set(m_hSprite, r, g, b);
 
-		x = ScreenWidth / 2 + SPR_Width(m_hSprite, 1) * 2;
-		y = ScreenHeight / 2 - SPR_Height(m_hSprite, 1) / 2;
+		x = ScreenWidth() / 2 + SPR_Width(m_hSprite, 1) * 2;
+		y = ScreenHeight() / 2 - SPR_Height(m_hSprite, 1) / 2;
 		SPR_DrawAdditive(1, x, y, NULL);
 		m_fAttackRight = V_max(0, m_fAttackRight - fFade);
 	}
@@ -311,8 +311,8 @@ int CHudHealth::DrawPain(float flTime)
 		ScaleColors(r, g, b, shade);
 		SPR_Set(m_hSprite, r, g, b);
 
-		x = ScreenWidth / 2 - SPR_Width(m_hSprite, 2) / 2;
-		y = ScreenHeight / 2 + SPR_Height(m_hSprite, 2) * 2;
+		x = ScreenWidth() / 2 - SPR_Width(m_hSprite, 2) / 2;
+		y = ScreenHeight() / 2 + SPR_Height(m_hSprite, 2) * 2;
 		SPR_DrawAdditive(2, x, y, NULL);
 		m_fAttackRear = V_max(0, m_fAttackRear - fFade);
 	}
@@ -326,8 +326,8 @@ int CHudHealth::DrawPain(float flTime)
 		ScaleColors(r, g, b, shade);
 		SPR_Set(m_hSprite, r, g, b);
 
-		x = ScreenWidth / 2 - SPR_Width(m_hSprite, 3) * 3;
-		y = ScreenHeight / 2 - SPR_Height(m_hSprite, 3) / 2;
+		x = ScreenWidth() / 2 - SPR_Width(m_hSprite, 3) * 3;
+		y = ScreenHeight() / 2 - SPR_Height(m_hSprite, 3) / 2;
 		SPR_DrawAdditive(3, x, y, NULL);
 
 		m_fAttackLeft = V_max(0, m_fAttackLeft - fFade);
@@ -362,7 +362,7 @@ void CHudHealth::UpdateTiles(float flTime, long bitsDamage)
 		{
 			// put this one at the bottom
 			pdmg->x = giDmgWidth / 8;
-			pdmg->y = ScreenHeight - giDmgHeight * 2;
+			pdmg->y = ScreenHeight() - giDmgHeight * 2;
 			pdmg->fExpire = flTime + static_cast<float>(DMG_IMAGE_LIFE);
 
 			// move everyone else up
diff --git a/src/game/client/ms/hudid.cpp b/src/game/client/ms/hudid.cpp
index b760180b..a8c149bf 100644
--- a/src/game/client/ms/hudid.cpp
+++ b/src/game/client/ms/hudid.cpp
@@ -81,10 +81,10 @@ int CHudID::Draw(float flTime)
 	GetConsoleStringSize( pDrawInfo->Name, &TextWidth, &TextHeight );
 
 	int Y_START;
-	if ( ScreenHeight >= 480 )
-		Y_START = ScreenHeight - 128;
+	if ( ScreenHeight() >= 480 )
+		Y_START = ScreenHeight() - 128;
 	else
-		Y_START = ScreenHeight - 64;
+		Y_START = ScreenHeight() - 64;
 
 	int x = 5;
 	int y = Y_START - TextHeight; // draw along bottom of screen
diff --git a/src/game/client/ms/hudmisc.cpp b/src/game/client/ms/hudmisc.cpp
index 2095a559..61971aef 100644
--- a/src/game/client/ms/hudmisc.cpp
+++ b/src/game/client/ms/hudmisc.cpp
@@ -113,7 +113,7 @@ int CHudMisc::Draw(float flTime)
 	}
 
 	SPR_Set(gHUD.GetSprite(SpriteIndex), 255, 255, 255 );
-	SPR_DrawAdditive( 0, ScreenWidth - 70, ScreenHeight - 70, &gHUD.GetSpriteRect(SpriteIndex));*/
+	SPR_DrawAdditive( 0, ScreenWidth() - 70, ScreenHeight() - 70, &gHUD.GetSpriteRect(SpriteIndex));*/
 
 	return 1;
 }
diff --git a/src/game/client/ms/menu.cpp b/src/game/client/ms/menu.cpp
index c70aa768..737534dd 100644
--- a/src/game/client/ms/menu.cpp
+++ b/src/game/client/ms/menu.cpp
@@ -101,7 +101,7 @@ int CHudMenu ::Draw(float flTime)
 	}
 
 	// center it
-	int y = (ScreenHeight / 2) - ((nlc / 2) * 12) - 40; // make sure it is above the say text
+	int y = (ScreenHeight() / 2) - ((nlc / 2) * 12) - 40; // make sure it is above the say text
 	int x = 20;
 	int i = 0;
 
diff --git a/src/game/client/render/clrendermirror.cpp b/src/game/client/render/clrendermirror.cpp
index feb02363..76ab32f7 100644
--- a/src/game/client/render/clrendermirror.cpp
+++ b/src/game/client/render/clrendermirror.cpp
@@ -273,7 +273,7 @@ bool CheckSurface(TraverseInfo_t &Info, msurface_t *pSurface)
 			pUseMirror->m_OnWorld = !Info.pEntity->index ? true : false;
 			//Surface.texinfo->texture->gl_texturenum = 0;
 			//The texture must have dimensions 2^X
-			float Power = logf(ScreenWidth) / logf(2); //Use ScreenHeight because it's smaller than width
+			float Power = logf(ScreenWidth()) / logf(2); //Use ScreenHeight() because it's smaller than width
 			int IntPower = (int)Power;
 			if (Power > IntPower)
 				IntPower++; //Screen Width is in-between standardized texure sizes.  Use the next highest size
@@ -287,7 +287,7 @@ bool CheckSurface(TraverseInfo_t &Info, msurface_t *pSurface)
 
 			pUseMirror->TexSize.x = pUseMirror->TexSize.y = TexSize;
 
-			//logfile	<< "Mirror #" << CMirrorMgr::m_LevelMirrors.size() << " - Screen: " << ScreenWidth << "x" << ScreenHeight << " Power: " << Power << " (" << IntPower << ")" << endl;
+			//logfile	<< "Mirror #" << CMirrorMgr::m_LevelMirrors.size() << " - Screen: " << ScreenWidth() << "x" << ScreenHeight() << " Power: " << Power << " (" << IntPower << ")" << endl;
 			//logfile	<< "Mirror #" << CMirrorMgr::m_LevelMirrors.size() << " - Size: " << pUseMirror->TexSize.x << "x" << pUseMirror->TexSize.y << " Max: " << TexSizeMax << "x" << TexSizeMax << endl;
 
 			pUseMirror->CreateMatrix();
@@ -564,13 +564,13 @@ void CMirrorMgr::SetupNormalView()
 		//Only use a portion of the screen, so I can see what the mirror sees in the top left
 		Params.viewport[0] = MIRRORTEX_W;
 		Params.viewport[1] = MIRRORTEX_H;
-		Params.viewport[2] = ScreenWidth - MIRRORTEX_W;
- 		Params.viewport[3] = ScreenHeight - MIRRORTEX_H;
+		Params.viewport[2] = ScreenWidth() - MIRRORTEX_W;
+ 		Params.viewport[3] = ScreenHeight() - MIRRORTEX_H;
 	#else*/
 	Params.viewport[0] = 0;
 	Params.viewport[1] = 0;
-	Params.viewport[2] = ScreenWidth;
-	Params.viewport[3] = ScreenHeight;
+	Params.viewport[2] = ScreenWidth();
+	Params.viewport[3] = ScreenHeight();
 	//#endif
 	m_CurrentMirror.Enabled = false;
 }
@@ -1392,8 +1392,8 @@ void CMirror::Draw(int Flags)
 		//have extra space (For compatibility, I force them to be 2^x, but I dont use all the space).
 		//So below is the modified equation
 
-		float RatioW = (float)ScreenWidth / TexSize.x;
-		float RatioH = (float)ScreenHeight / TexSize.y;
+		float RatioW = (float)ScreenWidth() / TexSize.x;
+		float RatioH = (float)ScreenHeight() / TexSize.y;
 		//glTranslatef( 0.5f * RatioW, 0.5f * (1-(1-RatioH)), 0.0f );
 		glTranslatef(0.5f * RatioW, 0.5f * RatioH, 0.0f);
 		glScalef(0.5f * RatioW, 0.5f * RatioH, 1);
diff --git a/src/game/client/render/opengl/clopengl.cpp b/src/game/client/render/opengl/clopengl.cpp
index 9eb76b33..10a1e662 100644
--- a/src/game/client/render/opengl/clopengl.cpp
+++ b/src/game/client/render/opengl/clopengl.cpp
@@ -347,7 +347,7 @@ bool CMirrorMgr::InitMirrors()
 	// Create the p-buffer...
 	//
 
-	GetCompatibleTextureSize(ScreenWidth * CRender::m_RT_SizeRatio, ScreenHeight * CRender::m_RT_SizeRatio, CRender::m_RT_Width, CRender::m_RT_Height, CRender::m_RT_TexU, CRender::m_RT_TexV);
+	GetCompatibleTextureSize(ScreenWidth() * CRender::m_RT_SizeRatio, ScreenHeight() * CRender::m_RT_SizeRatio, CRender::m_RT_Width, CRender::m_RT_Height, CRender::m_RT_TexU, CRender::m_RT_TexV);
 
 	g_pbuffer.hPBuffer = wglCreatePbufferARB(OldhDC, pixelFormat, CRender::m_RT_Width, CRender::m_RT_Height, pb_attr);
 	g_pbuffer.hDC = wglGetPbufferDCARB(g_pbuffer.hPBuffer);
diff --git a/src/game/client/saytext.cpp b/src/game/client/saytext.cpp
index d4ec5aca..fb63e25f 100644
--- a/src/game/client/saytext.cpp
+++ b/src/game/client/saytext.cpp
@@ -33,7 +33,7 @@ extern float *GetClientColor( int clientIndex );
 #define MAX_CHARS_PER_LINE	256  /* it can be less than this, depending on char size */
 
 // allow 20 pixels on either side of the text
-#define MAX_LINE_WIDTH  ( ScreenWidth - 40 )
+#define MAX_LINE_WIDTH  ( ScreenWidth() - 40 )
 #define LINE_START  10
 static float SCROLL_SPEED = 5;
 
@@ -42,7 +42,7 @@ static float *g_pflNameColors[ MAX_LINES + 1 ];
 static int g_iNameLengths[ MAX_LINES + 1 ];
 static float flScrollTime = 0;  // the time at which the lines next scroll up
 
-#define SAYTEXT_START_Y  ( ScreenHeight - YRES(160) )
+#define SAYTEXT_START_Y  ( ScreenHeight() - YRES(160) )
 static int Y_START = 0; //varies
 static int line_height = 0;
 
@@ -239,10 +239,10 @@ void CHudSayText :: SayTextPrint( const char *pszBuf, int iBufSize, int clientIn
 	m_iFlags |= HUD_ACTIVE;
 	PlaySound( "misc/talk.wav", 1 );
 
-	//if ( ScreenHeight >= 480 )
+	//if ( ScreenHeight() >= 480 )
 		Y_START = SAYTEXT_START_Y;
 	//else
-	//	Y_START = ScreenHeight - 45;
+	//	Y_START = ScreenHeight() - 45;
 	Y_START -= (line_height * (MAX_LINES+1));
 
 }
diff --git a/src/game/client/status_icons.cpp b/src/game/client/status_icons.cpp
index 81338703..2469f093 100644
--- a/src/game/client/status_icons.cpp
+++ b/src/game/client/status_icons.cpp
@@ -54,7 +54,7 @@ int CHudStatusIcons::Draw(float flTime)
 {
 	// find starting position to draw from, along right-hand side of screen
 	int x = 5;
-	int y = ScreenHeight / 2;
+	int y = ScreenHeight() / 2;
 
 	// loop through icon list, and draw any valid icons drawing up from the middle of screen
 	for (unsigned int i = 0; i < MAX_ICONSPRITES; i++)
diff --git a/src/game/client/statusbar.cpp b/src/game/client/statusbar.cpp
index 00c15125..e28e5794 100644
--- a/src/game/client/statusbar.cpp
+++ b/src/game/client/statusbar.cpp
@@ -178,10 +178,10 @@ int CHudStatusBar ::Draw(float fTime)
 		GetConsoleStringSize(m_szStatusBar[i], &TextWidth, &TextHeight);
 
 		int Y_START;
-		if (ScreenHeight >= 480)
-			Y_START = ScreenHeight - 55;
+		if (ScreenHeight() >= 480)
+			Y_START = ScreenHeight() - 55;
 		else
-			Y_START = ScreenHeight - 45;
+			Y_START = ScreenHeight() - 45;
 
 		int x = 5;
 		int y = Y_START - (TextHeight * i); // draw along bottom of screen
@@ -189,8 +189,8 @@ int CHudStatusBar ::Draw(float fTime)
 		// let user set status ID bar centering
 		if ((i == STATUSBAR_ID_LINE) && CVAR_GET_FLOAT("hud_centerid"))
 		{
-			x = V_max(0, V_max(2, (ScreenWidth - TextWidth)) / 2);
-			y = (ScreenHeight / 2) + (TextHeight * CVAR_GET_FLOAT("hud_centerid"));
+			x = V_max(0, V_max(2, (ScreenWidth() - TextWidth)) / 2);
+			y = (ScreenHeight() / 2) + (TextHeight * CVAR_GET_FLOAT("hud_centerid"));
 		}
 
 		DrawConsoleString(x, y, m_szStatusBar[i]);
diff --git a/src/game/client/train.cpp b/src/game/client/train.cpp
index 0bf0e8a7..b0b81e78 100644
--- a/src/game/client/train.cpp
+++ b/src/game/client/train.cpp
@@ -58,8 +58,8 @@ int CHudTrain::Draw(float fTime)
 		SPR_Set(m_hSprite, r, g, b );
 
 		// This should show up to the right and part way up the armor number
-		y = ScreenHeight - SPR_Height(m_hSprite,0) - gHUD.m_iFontHeight;
-		x = ScreenWidth/3 + SPR_Width(m_hSprite,0)/4;
+		y = ScreenHeight() - SPR_Height(m_hSprite,0) - gHUD.m_iFontHeight;
+		x = ScreenWidth()/3 + SPR_Width(m_hSprite,0)/4;
 
 		SPR_DrawAdditive( m_iPos - 1,  x, y, NULL);
 
diff --git a/src/game/client/ui/ms/vgui_choosecharacter.cpp b/src/game/client/ui/ms/vgui_choosecharacter.cpp
index 679ffb8b..9706bc08 100644
--- a/src/game/client/ui/ms/vgui_choosecharacter.cpp
+++ b/src/game/client/ui/ms/vgui_choosecharacter.cpp
@@ -400,7 +400,7 @@ int GetCenteredItemX( int WorkSpaceSizeX, int ItemSizeX, int Items, int SpaceBew
 // Creation
 CMenuPanel *CreateNewCharacterPanel( )
 {
-	return new CNewCharacterPanel( 1, true, 0, 0, ScreenWidth, ScreenHeight);
+	return new CNewCharacterPanel( 1, true, 0, 0, ScreenWidth(), ScreenHeight());
 }
 CNewCharacterPanel::CNewCharacterPanel( int iTrans, int iRemoveMe, int x, int y, int wide,int tall ) : CMenuPanel( 0, TRUE, x, y, wide, tall )
 {
diff --git a/src/game/client/ui/ms/vgui_container.cpp b/src/game/client/ui/ms/vgui_container.cpp
index 841155f0..c29f40ee 100644
--- a/src/game/client/ui/ms/vgui_container.cpp
+++ b/src/game/client/ui/ms/vgui_container.cpp
@@ -343,7 +343,7 @@ void VGUI_ItemInfoPanel::Update(containeritem_t &Item)
 }
 
 // Creation
-VGUI_ContainerPanel::VGUI_ContainerPanel() : CMenuPanel(100, FALSE, 0, 0, ScreenWidth, ScreenHeight), VGUI_ItemCallbackPanel()
+VGUI_ContainerPanel::VGUI_ContainerPanel() : CMenuPanel(100, FALSE, 0, 0, ScreenWidth(), ScreenHeight()), VGUI_ItemCallbackPanel()
 {
 	COLOR Color_TitleText = COLOR(255, 100, 100, 0),
 		  Color_SubtitleText = COLOR(160, 160, 160, 0),
diff --git a/src/game/client/ui/ms/vgui_container.h b/src/game/client/ui/ms/vgui_container.h
index ac639e9d..c97627e8 100644
--- a/src/game/client/ui/ms/vgui_container.h
+++ b/src/game/client/ui/ms/vgui_container.h
@@ -16,7 +16,7 @@
 
 #define ITEM_CONTAINER_X (GEARPNL_X + GEARPNL_SIZE_X) + CONTAINERMENU_SPACER_X
 #define ITEM_CONTAINER_Y GEARPNL_Y
-#define ITEM_CONTAINER_SIZE_X (ScreenWidth - (ITEM_CONTAINER_X + CONTAINERMENU_SPACER_X))
+#define ITEM_CONTAINER_SIZE_X (ScreenWidth() - (ITEM_CONTAINER_X + CONTAINERMENU_SPACER_X))
 #define ITEM_CONTAINER_SIZE_Y YRES(340)
 
 #define ACTBTN_SIZE_X XRES(130)
diff --git a/src/game/client/ui/ms/vgui_health.h b/src/game/client/ui/ms/vgui_health.h
index 87636034..eb23611d 100644
--- a/src/game/client/ui/ms/vgui_health.h
+++ b/src/game/client/ui/ms/vgui_health.h
@@ -6,7 +6,7 @@
 #include "vgui_ihud.h"
 
 //Scales flasks down to only 40% wide of the screen if sprites are too big
-#define BAR_SCALE (1.0f - ((730 - (ScreenWidth * 0.40f)) / ScreenHeight))
+#define BAR_SCALE (1.0f - ((730 - (ScreenWidth() * 0.40f)) / ScreenHeight()))
 #define BAR_W (320 * BAR_SCALE)
 #define BAR_H (40 * BAR_SCALE)
 
@@ -144,7 +144,7 @@ namespace PrimaryHUD
 
 	public:
 		//Main HUD Image
-		VGUI_Health(Panel* pParent) : Panel(0, 0, ScreenWidth, ScreenHeight)
+		VGUI_Health(Panel* pParent) : Panel(0, 0, ScreenWidth(), ScreenHeight())
 		{
 			CHARGE_W = XRES(30);
 			CHARGE_H = YRES(6);
@@ -157,7 +157,7 @@ namespace PrimaryHUD
 			float coords[2];
 
 			coords[0] = 10; //x
-			coords[1] = (ScreenHeight - (2 * BAR_H) - YRES(10)); //y, from the bottom of the screen, as high as the sprites are
+			coords[1] = (ScreenHeight() - (2 * BAR_H) - YRES(10)); //y, from the bottom of the screen, as high as the sprites are
 
 			//	Status Bars
 			
diff --git a/src/game/client/ui/ms/vgui_healthretro.h b/src/game/client/ui/ms/vgui_healthretro.h
index c705a561..7d5bb1e9 100644
--- a/src/game/client/ui/ms/vgui_healthretro.h
+++ b/src/game/client/ui/ms/vgui_healthretro.h
@@ -136,7 +136,7 @@ namespace RetroHUD
 		VGUI_Image3D m_HUDImage;
 
 	public:
-		VGUI_Health(Panel *pParent) : Panel(0, 0, ScreenWidth, ScreenHeight)
+		VGUI_Health(Panel *pParent) : Panel(0, 0, ScreenWidth(), ScreenHeight())
 		{
 			FLASK_SPACER = XRES(10);
 
@@ -165,7 +165,7 @@ namespace RetroHUD
 			// m_HUDImage.LoadImg("hud_main3", true, false);
 			// m_HUDImage.setFgColor(255, 255, 255, 255);
 			// m_HUDImage.setSize(256, 256);
-			// m_HUDImage.setPos(0, ScreenHeight - 256);
+			// m_HUDImage.setPos(0, ScreenHeight() - 256);
 
 			//Health and mana flasks
 			m_Flask[0] = new VGUI_Flask(this, 0, FLASK_START_X, FLASK_START_Y);
diff --git a/src/game/client/ui/ms/vgui_hud.cpp b/src/game/client/ui/ms/vgui_hud.cpp
index 400884f7..9d4df689 100644
--- a/src/game/client/ui/ms/vgui_hud.cpp
+++ b/src/game/client/ui/ms/vgui_hud.cpp
@@ -151,7 +151,7 @@ class CHUDPanel : public VGUI_MainPanel
 
 VGUI_MainPanel* CreateHUDPanel(Panel* pParent) { return new CHUDPanel(pParent); }
 
-CHUDPanel::CHUDPanel(Panel* pParent) : VGUI_MainPanel(0, 0, 0, ScreenWidth, ScreenHeight)
+CHUDPanel::CHUDPanel(Panel* pParent) : VGUI_MainPanel(0, 0, 0, ScreenWidth(), ScreenHeight())
 {
 	setParent(pParent);
 
diff --git a/src/game/client/ui/ms/vgui_localizedpanel.cpp b/src/game/client/ui/ms/vgui_localizedpanel.cpp
index 1075e4bf..807802ea 100644
--- a/src/game/client/ui/ms/vgui_localizedpanel.cpp
+++ b/src/game/client/ui/ms/vgui_localizedpanel.cpp
@@ -16,8 +16,8 @@
 
 #define LOCAL_TRANSPARENCY 60
 #define LOCAL_MAINPANEL_RATIO (.875)
-#define LOCAL_MAINPANEL_WIDTH (LOCAL_MAINPANEL_RATIO * ScreenWidth)
-#define LOCAL_MAINPANEL_HEIGHT (LOCAL_MAINPANEL_RATIO * ScreenHeight)
+#define LOCAL_MAINPANEL_WIDTH (LOCAL_MAINPANEL_RATIO * ScreenWidth())
+#define LOCAL_MAINPANEL_HEIGHT (LOCAL_MAINPANEL_RATIO * ScreenHeight())
 
 #define LOCAL_SCROLLPANEL_X_SPACE_L XRES(10)
 #define LOCAL_SCROLLPANEL_X_SPACE_R LOCAL_SCROLLPANEL_X_SPACE_L
@@ -49,7 +49,7 @@ bool LocalExists(msstring title)
 }
 
 CLocalizedPanel::CLocalizedPanel(Panel *pParent)
-	: CMenuPanel(LOCAL_TRANSPARENCY, false, 0, 0, ScreenWidth, ScreenHeight)
+	: CMenuPanel(LOCAL_TRANSPARENCY, false, 0, 0, ScreenWidth(), ScreenHeight())
 {
 	setParent(pParent);
 	m_Name = LOCAL_MENU_NAME;
@@ -59,8 +59,8 @@ CLocalizedPanel::CLocalizedPanel(Panel *pParent)
 	m_iButtonTotal = 0;
 	m_iSubPanelTotal = 0;
 
-	int xMainPanel = GetCenteredItem(ScreenWidth, LOCAL_MAINPANEL_WIDTH, 1, 0);
-	int yMainPanel = GetCenteredItem(ScreenHeight, LOCAL_MAINPANEL_HEIGHT, 1, 0);
+	int xMainPanel = GetCenteredItem(ScreenWidth(), LOCAL_MAINPANEL_WIDTH, 1, 0);
+	int yMainPanel = GetCenteredItem(ScreenHeight(), LOCAL_MAINPANEL_HEIGHT, 1, 0);
 	m_pMainPanel = new CTransparentPanel(LOCAL_TRANSPARENCY, xMainPanel, yMainPanel, LOCAL_MAINPANEL_WIDTH, LOCAL_MAINPANEL_HEIGHT);
 	m_pMainPanel->setParent(this);
 	m_pMainPanel->setVisible(true);
diff --git a/src/game/client/ui/ms/vgui_menu_interact.h b/src/game/client/ui/ms/vgui_menu_interact.h
index d362d005..6087c3df 100644
--- a/src/game/client/ui/ms/vgui_menu_interact.h
+++ b/src/game/client/ui/ms/vgui_menu_interact.h
@@ -42,7 +42,7 @@ class VGUI_MenuInteract : public VGUI_MenuBase
 
 		int w, h;
 		m_pMainPanel->getPos(w, h);
-		m_pMainPanel->setPos(ScreenWidth - m_pMainPanel->getWide() - XRES(80), h); //Thothie JAN2008a was  XRES(20)
+		m_pMainPanel->setPos(ScreenWidth() - m_pMainPanel->getWide() - XRES(80), h); //Thothie JAN2008a was  XRES(20)
 
 		m_ButtonY = BTN_START_Y;
 
diff --git a/src/game/client/ui/ms/vgui_menubase.cpp b/src/game/client/ui/ms/vgui_menubase.cpp
index 38401ddd..2c2f23fc 100644
--- a/src/game/client/ui/ms/vgui_menubase.cpp
+++ b/src/game/client/ui/ms/vgui_menubase.cpp
@@ -90,7 +90,7 @@ void CAction_SelectMainOption::actionPerformed(Panel *panel)
 int GetCenteredItemX(int WorkSpaceSizeX, int ItemSizeX, int Items, int SpaceBewteenItems);
 
 // Creation
-VGUI_MenuBase::VGUI_MenuBase(Panel *myParent) : CMenuPanel(255, 0, 0, 0, ScreenWidth, ScreenHeight)
+VGUI_MenuBase::VGUI_MenuBase(Panel *myParent) : CMenuPanel(255, 0, 0, 0, ScreenWidth(), ScreenHeight())
 {
 	m_AllowKeys = true; // MiB NOV2014_25, block number shortcuts: NpcInteractMenus.rft
 	setParent(myParent);
diff --git a/src/game/client/ui/ms/vgui_quickslot.h b/src/game/client/ui/ms/vgui_quickslot.h
index f73b82b7..b1ab31a4 100644
--- a/src/game/client/ui/ms/vgui_quickslot.h
+++ b/src/game/client/ui/ms/vgui_quickslot.h
@@ -46,7 +46,7 @@ class VGUI_QuickSlot : public Panel, public IHUD
 
 #define QUICKSLOT_H YRES(14)
 
-	VGUI_QuickSlot(Panel *pParent) : Panel(XRES(170), ScreenHeight - QUICKSLOT_H, ScreenWidth, QUICKSLOT_H)
+	VGUI_QuickSlot(Panel *pParent) : Panel(XRES(170), ScreenHeight() - QUICKSLOT_H, ScreenWidth(), QUICKSLOT_H)
 	{
 		setParent(pParent);
 		SetBGColorRGB(Color_Transparent);
diff --git a/src/game/client/ui/ms/vgui_spawn.cpp b/src/game/client/ui/ms/vgui_spawn.cpp
index 9d583f2c..a9fe4ffa 100644
--- a/src/game/client/ui/ms/vgui_spawn.cpp
+++ b/src/game/client/ui/ms/vgui_spawn.cpp
@@ -76,7 +76,7 @@
 #define MSG_H YRES(60)
 
 // Creation
-CSpawnPanel::CSpawnPanel(Panel *pParent) : CMenuPanel(1, false, 0, 0, ScreenWidth, ScreenHeight)
+CSpawnPanel::CSpawnPanel(Panel *pParent) : CMenuPanel(1, false, 0, 0, ScreenWidth(), ScreenHeight())
 {
 	// Get the scheme used for the Titles
 	CSchemeManager *pSchemes = gViewPort->GetSchemeManager();
diff --git a/src/game/client/ui/ms/vgui_stats.cpp b/src/game/client/ui/ms/vgui_stats.cpp
index e61bd625..15a386e7 100644
--- a/src/game/client/ui/ms/vgui_stats.cpp
+++ b/src/game/client/ui/ms/vgui_stats.cpp
@@ -64,7 +64,7 @@ static COLOR Color_TitleText = COLOR(255, 255, 255, 0),
 			 Color_TransparentText = COLOR(0, 0, 0, 255);
 
 // Creation
-CStatPanel::CStatPanel(Panel *pParent) : CMenuPanel(0, false, 0, 0, ScreenWidth, ScreenHeight)
+CStatPanel::CStatPanel(Panel *pParent) : CMenuPanel(0, false, 0, 0, ScreenWidth(), ScreenHeight())
 {
 	setParent(pParent);
 	setVisible(false);
diff --git a/src/game/client/ui/ms/vgui_vote.h b/src/game/client/ui/ms/vgui_vote.h
index 267ec1e8..b224b5a9 100644
--- a/src/game/client/ui/ms/vgui_vote.h
+++ b/src/game/client/ui/ms/vgui_vote.h
@@ -14,7 +14,7 @@ class VGUI_VoteInfo : public Panel, public IHUD
 		*m_pVoteDesc;
 	TextPanel *m_YesVotes;
 
-	VGUI_VoteInfo(Panel *pParent) : Panel(0, 0, ScreenWidth, ScreenHeight)
+	VGUI_VoteInfo(Panel *pParent) : Panel(0, 0, ScreenWidth(), ScreenHeight())
 	{
 		setParent(pParent);
 		setBgColor(0, 0, 0, 255);
diff --git a/src/game/client/ui/vgui_customobjects.cpp b/src/game/client/ui/vgui_customobjects.cpp
index 739a1f25..af23b5b4 100644
--- a/src/game/client/ui/vgui_customobjects.cpp
+++ b/src/game/client/ui/vgui_customobjects.cpp
@@ -54,7 +54,7 @@ char *GetTGANameForRes(const char *pszName)
 	static char gd[256];
 
 	int i = 640;
-	if (ScreenWidth < 640)
+	if (ScreenWidth() < 640)
 		i = 320;
 
 	snprintf(sz, sizeof(sz), pszName, i);
diff --git a/src/game/client/ui/vgui_scorepanel.cpp b/src/game/client/ui/vgui_scorepanel.cpp
index 1337f29f..9b1ab69f 100644
--- a/src/game/client/ui/vgui_scorepanel.cpp
+++ b/src/game/client/ui/vgui_scorepanel.cpp
@@ -120,7 +120,7 @@ ScorePanel::ScorePanel(int x, int y, int wide, int tall) : Panel(x, y, wide, tal
 	setPaintBorderEnabled(true);
 
 	int xpos = g_ColumnInfo[0].m_Width + 3;
-	if (ScreenWidth >= 640)
+	if (ScreenWidth() >= 640)
 	{
 		// only expand column size for res greater than 640
 		xpos = XRES(xpos);
@@ -141,11 +141,11 @@ ScorePanel::ScorePanel(int x, int y, int wide, int tall) : Panel(x, y, wide, tal
 			m_HeaderLabels[i].setText(g_ColumnInfo[i].m_pTitle);
 
 		int xwide = g_ColumnInfo[i].m_Width;
-		if (ScreenWidth >= 640)
+		if (ScreenWidth() >= 640)
 		{
 			xwide = XRES(xwide);
 		}
-		else if (ScreenWidth == 400)
+		else if (ScreenWidth() == 400)
 		{
 			// hack to make 400x300 resolution scoreboard fit
 			if (i == 1)
@@ -168,7 +168,7 @@ ScorePanel::ScorePanel(int x, int y, int wide, int tall) : Panel(x, y, wide, tal
 		m_HeaderLabels[i].setContentAlignment(g_ColumnInfo[i].m_Alignment);
 
 		int yres = 12;
-		if (ScreenHeight >= 480)
+		if (ScreenHeight() >= 480)
 		{
 			yres = YRES(yres);
 		}
@@ -573,7 +573,7 @@ void ScorePanel::FillGrid()
 			pLabel->setTextOffset(0, 0);
 
 			int rowheight = 13;
-			if (ScreenHeight > 480)
+			if (ScreenHeight() > 480)
 			{
 				rowheight = YRES(rowheight);
 			}
@@ -608,7 +608,7 @@ void ScorePanel::FillGrid()
 
 				// different height for team header rows
 				rowheight = 20;
-				if (ScreenHeight >= 480)
+				if (ScreenHeight() >= 480)
 				{
 					rowheight = YRES(rowheight);
 				}
@@ -630,7 +630,7 @@ void ScorePanel::FillGrid()
 
 				// different height for team header rows
 				rowheight = 20;
-				if (ScreenHeight >= 480)
+				if (ScreenHeight() >= 480)
 				{
 					rowheight = YRES(rowheight);
 				}
diff --git a/src/game/client/ui/vgui_spectatorpanel.cpp b/src/game/client/ui/vgui_spectatorpanel.cpp
index 98e139d6..55a179cb 100644
--- a/src/game/client/ui/vgui_spectatorpanel.cpp
+++ b/src/game/client/ui/vgui_spectatorpanel.cpp
@@ -87,10 +87,10 @@ void SpectatorPanel::Initialize()
 
 	SchemeHandle_t hSmallScheme = pSchemes->getSchemeHandle("Team Info Text");
 
-	m_TopBorder = new CTransparentPanel(64, 0, 0, ScreenWidth, YRES(PANEL_HEIGHT));
+	m_TopBorder = new CTransparentPanel(64, 0, 0, ScreenWidth(), YRES(PANEL_HEIGHT));
 	m_TopBorder->setParent(this);
 
-	m_BottomBorder = new CTransparentPanel(64, 0, ScreenHeight - YRES(32), ScreenWidth, YRES(PANEL_HEIGHT));
+	m_BottomBorder = new CTransparentPanel(64, 0, ScreenHeight() - YRES(32), ScreenWidth(), YRES(PANEL_HEIGHT));
 	m_BottomBorder->setParent(this);
 
 	setPaintBackgroundEnabled(false);
@@ -143,7 +143,7 @@ void SpectatorPanel::Initialize()
 	m_OptionButton->setUnArmedColor(143, 143, 54, 0);
 	m_OptionButton->setArmedColor(194, 202, 54, 0);
 
-	m_CamButton = new ColorButton(CHudTextMessage::BufferedLocaliseTextString("#CAM_OPTIONS"), ScreenWidth - (XRES(CAMOPTIONS_BUTTON_X) + 15), YRES(6), XRES(CAMOPTIONS_BUTTON_X), YRES(20), false, false);
+	m_CamButton = new ColorButton(CHudTextMessage::BufferedLocaliseTextString("#CAM_OPTIONS"), ScreenWidth() - (XRES(CAMOPTIONS_BUTTON_X) + 15), YRES(6), XRES(CAMOPTIONS_BUTTON_X), YRES(20), false, false);
 	m_CamButton->setParent(m_BottomBorder);
 	m_CamButton->setContentAlignment(vgui::Label::a_center);
 	m_CamButton->setBoundKey((char)255); // special no bound to avoid leading spaces in name
@@ -163,7 +163,7 @@ void SpectatorPanel::Initialize()
 	m_PrevPlayerButton->setUnArmedColor(143, 143, 54, 0);
 	m_PrevPlayerButton->setArmedColor(194, 202, 54, 0);
 
-	m_NextPlayerButton = new ColorButton(">", (ScreenWidth - (XRES(CAMOPTIONS_BUTTON_X) + 15)) - XRES(24 + 15), YRES(6), XRES(24), YRES(20), false, false);
+	m_NextPlayerButton = new ColorButton(">", (ScreenWidth() - (XRES(CAMOPTIONS_BUTTON_X) + 15)) - XRES(24 + 15), YRES(6), XRES(24), YRES(20), false, false);
 	m_NextPlayerButton->setParent(m_BottomBorder);
 	m_NextPlayerButton->setContentAlignment(vgui::Label::a_center);
 	m_NextPlayerButton->setBoundKey((char)255); // special no bound to avoid leading spaces in name
@@ -175,7 +175,7 @@ void SpectatorPanel::Initialize()
 
 	// Initialize the bottom title.
 
-	float flLabelSize = ((ScreenWidth - (XRES(CAMOPTIONS_BUTTON_X) + 15)) - XRES(24 + 15)) - XRES((15 + OPTIONS_BUTTON_X + 15) + 38);
+	float flLabelSize = ((ScreenWidth() - (XRES(CAMOPTIONS_BUTTON_X) + 15)) - XRES(24 + 15)) - XRES((15 + OPTIONS_BUTTON_X + 15) + 38);
 
 	m_BottomMainLabel = new Label("Spectator Bottom", XRES((15 + OPTIONS_BUTTON_X + 15) + 31), YRES(6), flLabelSize, YRES(20));
 	m_BottomMainLabel->setParent(m_BottomBorder);
@@ -222,7 +222,7 @@ void SpectatorPanel::ShowMenu(bool isVisible)
 	{
 		int iLabelSizeX, iLabelSizeY;
 		m_BottomMainLabel->getSize(iLabelSizeX, iLabelSizeY);
-		m_BottomMainLabel->setPos((ScreenWidth / 2) - (iLabelSizeX / 2), YRES(6));
+		m_BottomMainLabel->setPos((ScreenWidth() / 2) - (iLabelSizeX / 2), YRES(6));
 	}
 	else
 		m_BottomMainLabel->setPos(XRES((15 + OPTIONS_BUTTON_X + 15) + 31), YRES(6));
@@ -315,7 +315,7 @@ void SpectatorPanel::EnableInsetView(bool isEnabled)
 		else
 			m_TopBanner->setVisible(false);
 
-		m_TopBorder->setBounds(0, 0, ScreenWidth, YRES(PANEL_HEIGHT));
+		m_TopBorder->setBounds(0, 0, ScreenWidth(), YRES(PANEL_HEIGHT));
 
 		m_InsetViewButton->setVisible(false);
 	}
@@ -360,7 +360,7 @@ void SpectatorPanel::Update()
 	if (iTimeWidth > iTextWidth)
 		iTextWidth = iTimeWidth;
 
-	int xPos = ScreenWidth - (iTextWidth + XRES(4 + offset));
+	int xPos = ScreenWidth() - (iTextWidth + XRES(4 + offset));
 
 	m_ExtraInfo->setBounds(xPos, YRES(1), iTextWidth, iTextHeight);
 
@@ -368,7 +368,7 @@ void SpectatorPanel::Update()
 
 	m_CurrentTime->setBounds(xPos + XRES(14 + 1), YRES(2) + iTextHeight, iTimeWidth, iTimeHeight);
 
-	m_Separator->setPos(ScreenWidth - (iTextWidth + XRES(4 + 2 + 4 + offset)), YRES(1));
+	m_Separator->setPos(ScreenWidth() - (iTextWidth + XRES(4 + 2 + 4 + offset)), YRES(1));
 	m_Separator->setSize(XRES(4), YRES(PANEL_HEIGHT - 2));
 
 	for (j = 0; j < TEAM_NUMBER; j++)
@@ -376,6 +376,6 @@ void SpectatorPanel::Update()
 		int iwidth, iheight;
 
 		m_TeamScores[j]->getTextSize(iwidth, iheight);
-		m_TeamScores[j]->setBounds(ScreenWidth - (iTextWidth + XRES(4 + 2 + 4 + 2 + offset) + iwidth), YRES(1) + (iheight * j), iwidth, iheight);
+		m_TeamScores[j]->setBounds(ScreenWidth() - (iTextWidth + XRES(4 + 2 + 4 + 2 + offset) + iwidth), YRES(1) + (iheight * j), iwidth, iheight);
 	}
 }
diff --git a/src/game/client/ui/vgui_status.h b/src/game/client/ui/vgui_status.h
index c5265d68..ee4f618e 100644
--- a/src/game/client/ui/vgui_status.h
+++ b/src/game/client/ui/vgui_status.h
@@ -133,8 +133,8 @@ class VGUI_ImgIcon : public Panel
 		//thothie messes JAN2010_29 - sloppy but works
 		//moved to side that calls this
 		/*
-		float fimgsize_w = ScreenWidth * (w*0.01); 
-		float fimgsize_h = ScreenHeight * (h*0.01);
+		float fimgsize_w = ScreenWidth() * (w*0.01); 
+		float fimgsize_h = ScreenHeight() * (h*0.01);
 		int imgsize_w = (int)fimgsize_w;
 		int imgsize_h = (int)fimgsize_h;
 		*/
@@ -186,7 +186,7 @@ class VGUI_Status : public Panel, public IHUD
 	CImageDelayed m_FN;
 	bool m_bFN;
 
-	VGUI_Status(Panel *pParent) : Panel(0, 0, ScreenWidth, ScreenHeight)
+	VGUI_Status(Panel *pParent) : Panel(0, 0, ScreenWidth(), ScreenHeight())
 	{
 		StatusIcons = this;
 
@@ -287,13 +287,13 @@ static void AddImg(const char *Img, const char *Name,
 	if (!found)
 	{
 		//Thothie JAN2010_29 - convert x/y/h/w coords to % of screen
-		float fimg_x = ScreenWidth * (x * 0.01);
-		float fimg_y = ScreenHeight * (y * 0.01);
+		float fimg_x = ScreenWidth() * (x * 0.01);
+		float fimg_y = ScreenHeight() * (y * 0.01);
 		int img_x = (int)fimg_x;
 		int img_y = (int)fimg_y;
 
-		float fimg_w = ScreenWidth * (w * 0.01);
-		float fimg_h = ScreenHeight * (h * 0.01);
+		float fimg_w = ScreenWidth() * (w * 0.01);
+		float fimg_h = ScreenHeight() * (h * 0.01);
 		int img_w = (int)fimg_w;
 		int img_h = (int)fimg_h;
 
diff --git a/src/game/client/ui/vgui_teamfortressviewport.cpp b/src/game/client/ui/vgui_teamfortressviewport.cpp
index b46e30d9..286ee06f 100644
--- a/src/game/client/ui/vgui_teamfortressviewport.cpp
+++ b/src/game/client/ui/vgui_teamfortressviewport.cpp
@@ -343,10 +343,10 @@ void CCommandMenu::RecalculatePositions(int iYOffset)
 
 	// Calculate if this is going to fit onscreen, and shuffle it up if it won't
 	int iBottom = iNewYPos + _size[1];
-	if (iBottom > ScreenHeight)
+	if (iBottom > ScreenHeight())
 	{
 		// Move in increments of button sizes
-		while (iAdjust < (iBottom - ScreenHeight))
+		while (iAdjust < (iBottom - ScreenHeight()))
 		{
 			iAdjust += BUTTON_SIZE_Y - 1;
 		}
@@ -568,7 +568,7 @@ TeamFortressViewport::TeamFortressViewport(int x, int y, int wide, int tall) : P
 	//CreateCommandMenu();
 
 	// Create the spectator Panel
-	m_pSpectatorPanel = new SpectatorPanel(0, 0, ScreenWidth, ScreenHeight);
+	m_pSpectatorPanel = new SpectatorPanel(0, 0, ScreenWidth(), ScreenHeight());
 	m_pSpectatorPanel->setParent(this);
 	m_pSpectatorPanel->setVisible(false);
 
@@ -1180,18 +1180,18 @@ void TeamFortressViewport::UpdateSpectatorPanel()
 void TeamFortressViewport::CreateScoreBoard(void)
 {
 	int xdent = SBOARD_INDENT_X, ydent = SBOARD_INDENT_Y;
-	if (ScreenWidth == 512)
+	if (ScreenWidth() == 512)
 	{
 		xdent = SBOARD_INDENT_X_512;
 		ydent = SBOARD_INDENT_Y_512;
 	}
-	else if (ScreenWidth == 400)
+	else if (ScreenWidth() == 400)
 	{
 		xdent = SBOARD_INDENT_X_400;
 		ydent = SBOARD_INDENT_Y_400;
 	}
 
-	m_pScoreBoard = new ScorePanel(xdent, ydent, ScreenWidth - (xdent * 2), ScreenHeight - (ydent * 2));
+	m_pScoreBoard = new ScorePanel(xdent, ydent, ScreenWidth() - (xdent * 2), ScreenHeight() - (ydent * 2));
 	m_pScoreBoard->setParent(this);
 	m_pScoreBoard->setVisible(false);
 
@@ -1322,7 +1322,7 @@ CMenuPanel *TeamFortressViewport::CreateTextWindow(int iTextToShow)
 	}*/
 
 	// if we're in the game (ie. have selected a class), flag the menu to be only grayed in the dialog box, instead of full screen
-	CMenuPanel *pMOTDPanel = CMessageWindowPanel_Create(cText, cTitle, g_iPlayerClass == PC_UNDEFINED, false, 0, 0, ScreenWidth, ScreenHeight);
+	CMenuPanel *pMOTDPanel = CMessageWindowPanel_Create(cText, cTitle, g_iPlayerClass == PC_UNDEFINED, false, 0, 0, ScreenWidth(), ScreenHeight());
 	pMOTDPanel->setParent(this);
 
 	if (pfile)
@@ -1510,7 +1510,7 @@ bool TeamFortressViewport::AllowedToPrintText(void)
 void TeamFortressViewport::CreateTeamMenu()
 {
 	// Create the panel
-	m_pTeamMenu = new CTeamMenuPanel(100, false, 0, 0, ScreenWidth, ScreenHeight);
+	m_pTeamMenu = new CTeamMenuPanel(100, false, 0, 0, ScreenWidth(), ScreenHeight());
 	m_pTeamMenu->setParent( this );
 	m_pTeamMenu->setVisible( false );
 }*/
@@ -1558,12 +1558,12 @@ void TeamFortressViewport::CreateStoreMenu()
 	if (m_pStoreMenu)
 		return;
 	// Create the panel
-	m_pStoreMenu = new CStoreMenuPanel(100, false, 0, 0, ScreenWidth, ScreenHeight);
+	m_pStoreMenu = new CStoreMenuPanel(100, false, 0, 0, ScreenWidth(), ScreenHeight());
 	m_pStoreMenu->setParent(this);
 	m_pStoreMenu->setVisible(false);
 
 	// Create the buy panel
-	m_pStoreBuyMenu = new CStoreBuyPanel(100, false, 0, 0, ScreenWidth, ScreenHeight);
+	m_pStoreBuyMenu = new CStoreBuyPanel(100, false, 0, 0, ScreenWidth(), ScreenHeight());
 	m_pStoreBuyMenu->setParent(this);
 
 	// Create the sell panel
@@ -1573,7 +1573,7 @@ void TeamFortressViewport::CreateStoreMenu()
 	m_pStoreStorageMenu = new CStoragePanel(this);
 
 	// Create the container panel
-	m_pContainerMenu = new CContainerPanel(100, false, 0, 0, ScreenWidth, ScreenHeight);
+	m_pContainerMenu = new CContainerPanel(100, false, 0, 0, ScreenWidth(), ScreenHeight());
 	m_pContainerMenu->setParent(this);
 	m_pContainerMenu->setVisible(false);
 }
@@ -1601,7 +1601,7 @@ void TeamFortressViewport::CreateVGUIMenus()
 /*void TeamFortressViewport::CreateSpectatorMenu()
 {
 	// Create the Panel
-	m_pSpectatorMenu = new CTransparentPanel(100, 0, ScreenHeight - YRES(60), ScreenWidth, YRES(60));
+	m_pSpectatorMenu = new CTransparentPanel(100, 0, ScreenHeight() - YRES(60), ScreenWidth(), YRES(60));
 	m_pSpectatorMenu->setParent(this);
 	m_pSpectatorMenu->setVisible(false);
 
@@ -1616,7 +1616,7 @@ void TeamFortressViewport::CreateVGUIMenus()
 	int r, g, b, a;
 
 	// Create the title
-	m_pSpectatorLabel = new Label( "Spectator", 0, 0, ScreenWidth, YRES(25) );
+	m_pSpectatorLabel = new Label( "Spectator", 0, 0, ScreenWidth(), YRES(25) );
 	m_pSpectatorLabel->setParent( m_pSpectatorMenu );
 	m_pSpectatorLabel->setFont( pSchemes->getFont(hTitleScheme) );
 	pSchemes->getFgColor( hTitleScheme, r, g, b, a );
@@ -1626,7 +1626,7 @@ void TeamFortressViewport::CreateVGUIMenus()
 	m_pSpectatorLabel->setContentAlignment( vgui::Label::a_north );
 
 	// Create the Help
-	Label *pLabel = new Label( CHudTextMessage::BufferedLocaliseTextString( "#Spec_Help" ), 0, YRES(25), ScreenWidth, YRES(15) );
+	Label *pLabel = new Label( CHudTextMessage::BufferedLocaliseTextString( "#Spec_Help" ), 0, YRES(25), ScreenWidth(), YRES(15) );
 	pLabel->setParent( m_pSpectatorMenu );
 	pLabel->setFont( pSchemes->getFont(hHelpText) );
 	pSchemes->getFgColor( hHelpText, r, g, b, a );
@@ -1635,7 +1635,7 @@ void TeamFortressViewport::CreateVGUIMenus()
 	pLabel->setBgColor( r, g, b, 255 );
 	pLabel->setContentAlignment( vgui::Label::a_north );
 
-	pLabel = new Label( CHudTextMessage::BufferedLocaliseTextString( "#Spec_Help2" ), 0, YRES(40), ScreenWidth, YRES(20) );
+	pLabel = new Label( CHudTextMessage::BufferedLocaliseTextString( "#Spec_Help2" ), 0, YRES(40), ScreenWidth(), YRES(20) );
 	pLabel->setParent( m_pSpectatorMenu );
 	pLabel->setFont( pSchemes->getFont(hHelpText) );
 	pSchemes->getFgColor( hHelpText, r, g, b, a );
diff --git a/src/game/client/ui/vgui_teamfortressviewport.h b/src/game/client/ui/vgui_teamfortressviewport.h
index 9070fe1d..d736559e 100644
--- a/src/game/client/ui/vgui_teamfortressviewport.h
+++ b/src/game/client/ui/vgui_teamfortressviewport.h
@@ -97,20 +97,20 @@ extern int iTeamColors[5][3];
 #define MAPBRIEF_INDENT 30
 
 // Team Menu
-#define TMENU_INDENT_X (30 * ((float)ScreenHeight / 640))
+#define TMENU_INDENT_X (30 * ((float)ScreenHeight() / 640))
 #define TMENU_HEADER 100
-#define TMENU_SIZE_X (ScreenWidth - (TMENU_INDENT_X * 2))
+#define TMENU_SIZE_X (ScreenWidth() - (TMENU_INDENT_X * 2))
 #define TMENU_SIZE_Y (TMENU_HEADER + BUTTON_SIZE_Y * 7)
 #define TMENU_PLAYER_INDENT (((float)TMENU_SIZE_X / 3) * 2)
-#define TMENU_INDENT_Y (((float)ScreenHeight - TMENU_SIZE_Y) / 2)
+#define TMENU_INDENT_Y (((float)ScreenHeight() - TMENU_SIZE_Y) / 2)
 
 // Class Menu
-#define CLMENU_INDENT_X (30 * ((float)ScreenHeight / 640))
+#define CLMENU_INDENT_X (30 * ((float)ScreenHeight() / 640))
 #define CLMENU_HEADER 100
-#define CLMENU_SIZE_X (ScreenWidth - (CLMENU_INDENT_X * 2))
+#define CLMENU_SIZE_X (ScreenWidth() - (CLMENU_INDENT_X * 2))
 #define CLMENU_SIZE_Y (CLMENU_HEADER + BUTTON_SIZE_Y * 11)
 #define CLMENU_PLAYER_INDENT (((float)CLMENU_SIZE_X / 3) * 2)
-#define CLMENU_INDENT_Y (((float)ScreenHeight - CLMENU_SIZE_Y) / 2)
+#define CLMENU_INDENT_Y (((float)ScreenHeight() - CLMENU_SIZE_Y) / 2)
 
 // Arrows
 enum
diff --git a/src/game/client/ui/vgui_voice_tweakdlg.cpp b/src/game/client/ui/vgui_voice_tweakdlg.cpp
index d59d9ecb..b4636fb4 100644
--- a/src/game/client/ui/vgui_voice_tweakdlg.cpp
+++ b/src/game/client/ui/vgui_voice_tweakdlg.cpp
@@ -175,8 +175,8 @@ void CVoiceVGUITweakDlg::Open()
 
 	g_bTweakDlgOpen = true;
 
-	m_DlgWidth = ScreenWidth;
-	m_DlgHeight = ScreenHeight;
+	m_DlgWidth = ScreenWidth();
+	m_DlgHeight = ScreenHeight();
 
 	m_pVoiceTweak = gEngfuncs.pVoiceTweak;
 
@@ -184,7 +184,7 @@ void CVoiceVGUITweakDlg::Open()
 	m_pVoiceTweak->StartVoiceTweakMode();
 
 	// Set our size.
-	setPos((ScreenWidth - m_DlgWidth) / 2, (ScreenHeight - m_DlgHeight) / 2);
+	setPos((ScreenWidth() - m_DlgWidth) / 2, (ScreenHeight() - m_DlgHeight) / 2);
 	setSize(m_DlgWidth, m_DlgHeight);
 
 	int curY = ITEM_BORDER;
diff --git a/src/game/client/util.cpp b/src/game/client/util.cpp
index 71af8638..81062d5f 100644
--- a/src/game/client/util.cpp
+++ b/src/game/client/util.cpp
@@ -30,7 +30,7 @@ HLSPRITE LoadSprite(const char *pszName)
 	int i;
 	char sz[256];
 
-	if (ScreenWidth < 640)
+	if (ScreenWidth() < 640)
 		i = 320;
 	else
 		i = 640;
diff --git a/src/game/client/view.cpp b/src/game/client/view.cpp
index 969c361f..17ef190d 100644
--- a/src/game/client/view.cpp
+++ b/src/game/client/view.cpp
@@ -1844,10 +1844,10 @@ void V_Move(int mx, int my)
 	Vector farpoint;
 	pmtrace_t tr;
 
-	fov = CalcFov(in_fov, (float)ScreenWidth, (float)ScreenHeight);
+	fov = CalcFov(in_fov, (float)ScreenWidth(), (float)ScreenHeight());
 
-	c_x = (float)ScreenWidth / 2.0;
-	c_y = (float)ScreenHeight / 2.0;
+	c_x = (float)ScreenWidth() / 2.0;
+	c_y = (float)ScreenHeight() / 2.0;
 
 	dx = (float)mx - c_x;
 	dy = (float)my - c_y;
diff --git a/src/game/shared/voice_status.cpp b/src/game/shared/voice_status.cpp
index 2ac178c1..b364e2f9 100644
--- a/src/game/shared/voice_status.cpp
+++ b/src/game/shared/voice_status.cpp
@@ -673,7 +673,7 @@ CVoiceLabel* CVoiceStatus::GetFreeVoiceLabel()
 void CVoiceStatus::RepositionLabels()
 {
 	// find starting position to draw from, along right-hand side of screen
-	int y = ScreenHeight / 2;
+	int y = ScreenHeight() / 2;
 
 	int iconWide = 8, iconTall = 8;
 	if (m_pSpeakerLabelIcon)
@@ -698,14 +698,14 @@ void CVoiceStatus::RepositionLabels()
 		pLabel->m_pLabel->getContentSize(textWide, textTall);
 
 		// Don't let it stretch too far across their screen.
-		if (textWide > (ScreenWidth * 2) / 3)
-			textWide = (ScreenWidth * 2) / 3;
+		if (textWide > (ScreenWidth() * 2) / 3)
+			textWide = (ScreenWidth() * 2) / 3;
 
 		// Setup the background label to fit everything in.
 		int border = 2;
 		int bgWide = textWide + iconWide + border * 3;
 		int bgTall = V_max(textTall, iconTall) + border * 2;
-		pLabel->m_pBackground->setBounds(ScreenWidth - bgWide - 8, y, bgWide, bgTall);
+		pLabel->m_pBackground->setBounds(ScreenWidth() - bgWide - 8, y, bgWide, bgTall);
 
 		// Put the text at the left.
 		pLabel->m_pLabel->setBounds(border, (bgTall - textTall) / 2, textWide, textTall);
@@ -735,7 +735,7 @@ void CVoiceStatus::RepositionLabels()
 		int sizeX, sizeY;
 		m_pLocalBitmap->getSize(sizeX, sizeY);
 
-		int local_xPos = ScreenWidth - sizeX - 10;
+		int local_xPos = ScreenWidth() - sizeX - 10;
 		int local_yPos = m_pHelper->GetAckIconHeight() - sizeY;
 
 		m_pLocalLabel->setPos(local_xPos, local_yPos);
@@ -878,7 +878,7 @@ void CHLVoiceStatusHelper::UpdateCursorState()
 
 int	CHLVoiceStatusHelper::GetAckIconHeight()
 {
-	return ScreenHeight - gHUD.m_iFontHeight * 3 - 6;
+	return ScreenHeight() - gHUD.m_iFontHeight * 3 - 6;
 }
 
 bool CHLVoiceStatusHelper::CanShowSpeakerLabels()

From 284efe0facdb21957792a2adb05d4b8dc59166ad Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 19 Mar 2026 19:38:50 -0400
Subject: [PATCH 126/291] chasnged NULL to nullptr

---
 src/game/client/message.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/client/message.cpp b/src/game/client/message.cpp
index 4fc34fe7..7add57e7 100644
--- a/src/game/client/message.cpp
+++ b/src/game/client/message.cpp
@@ -456,7 +456,7 @@ int CHudMessage::MsgFunc_HudText(const char *pszName, int iSize, void *pbuf)
 int CHudMessage::MsgFunc_GameTitle(const char *pszName, int iSize, void *pbuf)
 {
 	m_pGameTitle = TextMessageGet("GAMETITLE");
-	if (m_pGameTitle != NULL)
+	if (m_pGameTitle != nullptr)
 	{
 		m_gameTitleTime = gHUD.m_flTime;
 

From 140818c15eb0aa816737d59baaaa245c6f8e8dcb Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 19 Mar 2026 19:46:57 -0400
Subject: [PATCH 127/291] changed TRUE to true and FALSE to false. Removed
 redefinition of true keyword.

---
 src/game/client/cl_util.h                     |   4 -
 src/game/client/death.cpp                     |   8 +-
 src/game/client/hl/hl_baseentity.cpp          | 118 +++++------
 src/game/client/hud.h                         |   2 +-
 src/game/client/hud_spectator.cpp             |   2 +-
 src/game/client/inputw32.cpp                  |   4 +-
 src/game/client/ms/clglobal.cpp               |   4 +-
 src/game/client/ms/clplayer.cpp               |   2 +-
 src/game/client/ms/fatigue.cpp                |   2 +-
 src/game/client/ms/menu.cpp                   |   8 +-
 src/game/client/parsemsg.cpp                  |   2 +-
 src/game/client/render/opengl/clopengl.cpp    |   8 +-
 src/game/client/saytext.cpp                   |   4 +-
 src/game/client/status_icons.cpp              |   2 +-
 src/game/client/statusbar.cpp                 |   6 +-
 src/game/client/text_message.cpp              |   2 +-
 .../client/ui/ms/vgui_choosecharacter.cpp     |   2 +-
 src/game/client/ui/ms/vgui_container.cpp      |   2 +-
 src/game/client/ui/ms/vgui_store.cpp          |   2 +-
 src/game/client/ui/ms/vgui_storemainwin.cpp   |   2 +-
 src/game/client/ui/vgui_scorepanel.cpp        |   8 +-
 .../client/ui/vgui_teamfortressviewport.cpp   |  10 +-
 src/game/server/basemonster.h                 |  18 +-
 src/game/server/bmodels.cpp                   |  28 +--
 src/game/server/client.cpp                    |   4 +-
 src/game/server/effects.cpp                   |  84 ++++----
 src/game/server/effects/mseffects.cpp         |   6 +-
 src/game/server/func_break.cpp                |  26 +--
 src/game/server/gamerules/gamerules.cpp       |  10 +-
 src/game/server/gamerules/gamerules.h         |  18 +-
 .../server/gamerules/multiplay_gamerules.cpp  | 134 ++++++------
 src/game/server/gamerules/team.cpp            |  18 +-
 src/game/server/ggrenade.cpp                  |   4 +-
 src/game/server/h_export.cpp                  |   2 +-
 src/game/server/hl/animating.cpp              |   8 +-
 src/game/server/hl/buttons.cpp                |  44 ++--
 src/game/server/hl/cbase.cpp                  |  40 ++--
 src/game/server/hl/cbase.h                    |  16 +-
 src/game/server/hl/doors.cpp                  |  34 +--
 src/game/server/hl/explode.cpp                |   2 +-
 src/game/server/hl/extdll.h                   |   2 -
 src/game/server/hl/func_tank.cpp              |  90 ++++----
 src/game/server/hl/lights.cpp                 |   8 +-
 src/game/server/hl/monsters.cpp               | 198 +++++++++---------
 src/game/server/hl/nodes.cpp                  | 112 +++++-----
 src/game/server/hl/pathcorner.cpp             |   4 +-
 src/game/server/hl/plane.cpp                  |  10 +-
 src/game/server/hl/plats.cpp                  |  72 +++----
 src/game/server/hl/schedule.cpp               |  24 +--
 src/game/server/hl/scripted.cpp               | 100 ++++-----
 src/game/server/hl/sound.cpp                  |  66 +++---
 src/game/server/hl/soundent.cpp               |  16 +-
 src/game/server/hl/spectator.cpp              |   6 +-
 src/game/server/hl/subs.cpp                   |  26 +--
 src/game/server/hl/util.cpp                   |  26 +--
 src/game/server/monsters/combat.cpp           |  64 +++---
 src/game/server/monsters/corpse.cpp           |   2 +-
 src/game/server/monsters/corpse.h             |   4 +-
 src/game/server/monsters/monsteranimation.cpp |  24 +--
 src/game/server/monsters/msmonster.h          |   8 +-
 src/game/server/monsters/msmonsterserver.cpp  |  48 ++---
 src/game/server/monsters/npcact.cpp           |  18 +-
 src/game/server/msgamerules.h                 |   4 +-
 src/game/server/msmapents.cpp                 |  98 ++++-----
 src/game/server/player/player.cpp             | 116 +++++-----
 src/game/server/player/player.h               |  24 +--
 src/game/server/player/playershared.cpp       |   8 +-
 src/game/server/triggers.cpp                  |  78 +++----
 src/game/server/vehicle.cpp                   |  22 +-
 src/game/server/world.cpp                     |  28 +--
 src/game/shared/filesystem_shared.cpp         |   2 +-
 src/game/shared/ms/global.cpp                 |   4 +-
 src/game/shared/ms/iscript.h                  |   4 +-
 src/game/shared/ms/script.cpp                 |   4 +-
 src/game/shared/weapons/genericitem.cpp       |  10 +-
 src/game/shared/weapons/giattack.cpp          |  10 +-
 src/game/shared/weapons/gispawn.cpp           |   6 +-
 src/game/shared/weapons/weapons.cpp           |  28 +--
 src/game/shared/weapons/weapons.h             |   6 +-
 thirdparty/angelscript/as_thread.cpp          |   4 +-
 80 files changed, 1039 insertions(+), 1045 deletions(-)

diff --git a/src/game/client/cl_util.h b/src/game/client/cl_util.h
index 57c365d9..18d22fa8 100644
--- a/src/game/client/cl_util.h
+++ b/src/game/client/cl_util.h
@@ -21,10 +21,6 @@
 
 #include "cvardef.h"
 
-#ifndef TRUE
-#define TRUE 1
-#define FALSE 0
-#endif
 
 // ScreenHeight() returns the height of the screen, in pixels
 
diff --git a/src/game/client/death.cpp b/src/game/client/death.cpp
index 41755d92..9e8b6443 100644
--- a/src/game/client/death.cpp
+++ b/src/game/client/death.cpp
@@ -141,7 +141,7 @@ int CHudDeathNotice ::Draw(float flTime)
 			x += (gHUD.GetSpriteRect(id).right - gHUD.GetSpriteRect(id).left);
 
 			// Draw victims name (if it was a player that was killed)
-			if (rgDeathNoticeList[i].iNonPlayerKill == FALSE)
+			if (rgDeathNoticeList[i].iNonPlayerKill == false)
 			{
 				if (rgDeathNoticeList[i].VictimColor)
 					gEngfuncs.pfnDrawSetTextColor(rgDeathNoticeList[i].VictimColor[0], rgDeathNoticeList[i].VictimColor[1], rgDeathNoticeList[i].VictimColor[2]);
@@ -221,7 +221,7 @@ int CHudDeathNotice ::MsgFunc_DeathMsg(const char *pszName, int iSize, void *pbu
 	// Is it a non-player object kill?
 	if (((char)victim) == -1)
 	{
-		rgDeathNoticeList[i].iNonPlayerKill = TRUE;
+		rgDeathNoticeList[i].iNonPlayerKill = true;
 
 		// Store the object's name in the Victim slot (skip the d_ bit)
 		strncpy(rgDeathNoticeList[i].szVictim, killedwith + 2, MAX_PLAYER_NAME_LENGTH);
@@ -229,10 +229,10 @@ int CHudDeathNotice ::MsgFunc_DeathMsg(const char *pszName, int iSize, void *pbu
 	else
 	{
 		if (killer == victim || killer == 0)
-			rgDeathNoticeList[i].iSuicide = TRUE;
+			rgDeathNoticeList[i].iSuicide = true;
 
 		if (!strcmp(killedwith, "d_teammate"))
-			rgDeathNoticeList[i].iTeamKill = TRUE;
+			rgDeathNoticeList[i].iTeamKill = true;
 	}
 
 	// Find the sprite in the list
diff --git a/src/game/client/hl/hl_baseentity.cpp b/src/game/client/hl/hl_baseentity.cpp
index a44f5100..f073ee53 100644
--- a/src/game/client/hl/hl_baseentity.cpp
+++ b/src/game/client/hl/hl_baseentity.cpp
@@ -62,7 +62,7 @@ void CBaseEntity::SetObjectCollisionBox(void) {}
 int CBaseEntity ::Intersects(CBaseEntity *pOther) { return NULL; }
 void CBaseEntity ::MakeDormant(void) {}
 int CBaseEntity ::IsDormant(void) { return NULL; }
-BOOL CBaseEntity ::IsInWorld(void) { return TRUE; }
+BOOL CBaseEntity ::IsInWorld(void) { return true; }
 int CBaseEntity::ShouldToggle(USE_TYPE useType, BOOL currentState) { return NULL; }
 int CBaseEntity ::DamageDecal(int bitsDamageType) { return NEG_REF; }
 CBaseEntity *CBaseEntity::Create(const char *szName, const Vector &vecOrigin, const Vector &vecAngles, edict_t *pentOwner) { return NULL; }
@@ -77,13 +77,13 @@ void CBaseEntity::CounterEffect(CBaseEntity *pInflictor, int iEffect, void *pExt
 
 // CBaseDelay Stubs
 void CBaseDelay ::KeyValue(struct KeyValueData_s *) {}
-int CBaseDelay::Restore(class CRestore &) { return TRUE; }
-int CBaseDelay::Save(class CSave &) { return TRUE; }
+int CBaseDelay::Restore(class CRestore &) { return true; }
+int CBaseDelay::Save(class CSave &) { return true; }
 CBaseEntity *CBaseDelay::GetSelf() { return this; }
 
 // CBaseAnimating Stubs
-int CBaseAnimating::Restore(class CRestore &) { return TRUE; }
-int CBaseAnimating::Save(class CSave &) { return TRUE; }
+int CBaseAnimating::Restore(class CRestore &) { return true; }
+int CBaseAnimating::Save(class CSave &) { return true; }
 
 // DEBUG Stubs
 edict_t *DBG_EntOfVars(const entvars_t *pev) { return NULL; }
@@ -95,9 +95,9 @@ void UTIL_BloodDrips(const Vector &origin, const Vector &direction, int color, i
 void UTIL_DecalTrace(TraceResult *pTrace, int decalNumber) {}
 void UTIL_GunshotDecalTrace(TraceResult *pTrace, int decalNumber) {}
 void UTIL_MakeVectors(const Vector &vecAngles) {}
-BOOL UTIL_IsValidEntity(edict_t *pent) { return TRUE; }
+BOOL UTIL_IsValidEntity(edict_t *pent) { return true; }
 void UTIL_SetOrigin(entvars_t *, const Vector &org) {}
-BOOL UTIL_GetNextBestWeapon(CBasePlayer *pPlayer, CBasePlayerItem *pCurrentWeapon) { return TRUE; }
+BOOL UTIL_GetNextBestWeapon(CBasePlayer *pPlayer, CBasePlayerItem *pCurrentWeapon) { return true; }
 void UTIL_LogPrintf(const char *, ...) {}
 void UTIL_ClientPrintAll(int, char const *, char const *, char const *, char const *, char const *) {}
 void PrintNotifyMsg(char *pszmsg);
@@ -108,8 +108,8 @@ void ClientPrint(entvars_t *client, int msg_dest, const char *msg_name, const ch
 }
 
 // CBaseToggle Stubs
-int CBaseToggle::Restore(class CRestore &) { return TRUE; }
-int CBaseToggle::Save(class CSave &) { return TRUE; }
+int CBaseToggle::Restore(class CRestore &) { return true; }
+int CBaseToggle::Save(class CSave &) { return true; }
 void CBaseToggle ::KeyValue(struct KeyValueData_s *) {}
 
 // CGrenade Stubs
@@ -121,12 +121,12 @@ void CGrenade::Spawn(void) {}
 
 CBaseEntity *CBaseMonster ::CheckTraceHullAttack(float flDist, int iDamage, int iDmgType) { return NULL; }
 void CBaseMonster ::Eat(float flFullDuration) {}
-BOOL CBaseMonster ::FShouldEat(void) { return TRUE; }
+BOOL CBaseMonster ::FShouldEat(void) { return true; }
 void CBaseMonster ::BarnacleVictimBitten(entvars_t *pevBarnacle) {}
 void CBaseMonster ::BarnacleVictimReleased(void) {}
 void CBaseMonster ::Listen(void) {}
 float CBaseMonster::FLSoundVolume(CSound* pSound) { return NULL; }
-BOOL CBaseMonster ::FValidateHintType(short sHint) { return FALSE; }
+BOOL CBaseMonster ::FValidateHintType(short sHint) { return false; }
 void CBaseMonster ::Look(int iDistance) {}
 int CBaseMonster ::ISoundMask(void) { return NULL; }
 CSound *CBaseMonster ::PBestSound(void) { return NULL; }
@@ -137,51 +137,51 @@ void CBaseMonster ::MonsterUse(CBaseEntity *pActivator, CBaseEntity *pCaller, US
 int CBaseMonster ::IgnoreConditions(void) { return NULL; }
 void CBaseMonster ::RouteClear(void) {}
 void CBaseMonster ::RouteNew(void) {}
-BOOL CBaseMonster ::FRouteClear(void) { return FALSE; }
-BOOL CBaseMonster ::FRefreshRoute(void) { return FALSE; }
-BOOL CBaseMonster::MoveToEnemy(Activity movementAct, float waitTime) { return FALSE; }
-BOOL CBaseMonster::MoveToLocation(Activity movementAct, float waitTime, const Vector &goal) { return FALSE; }
-BOOL CBaseMonster::MoveToTarget(Activity movementAct, float waitTime) { return FALSE; }
-BOOL CBaseMonster::MoveToNode(Activity movementAct, float waitTime, const Vector &goal) { return FALSE; }
-int ShouldSimplify(int routeType) { return TRUE; }
+BOOL CBaseMonster ::FRouteClear(void) { return false; }
+BOOL CBaseMonster ::FRefreshRoute(void) { return false; }
+BOOL CBaseMonster::MoveToEnemy(Activity movementAct, float waitTime) { return false; }
+BOOL CBaseMonster::MoveToLocation(Activity movementAct, float waitTime, const Vector &goal) { return false; }
+BOOL CBaseMonster::MoveToTarget(Activity movementAct, float waitTime) { return false; }
+BOOL CBaseMonster::MoveToNode(Activity movementAct, float waitTime, const Vector &goal) { return false; }
+int ShouldSimplify(int routeType) { return true; }
 void CBaseMonster ::RouteSimplify(CBaseEntity *pTargetEnt) {}
-BOOL CBaseMonster ::FBecomeProne(void) { return TRUE; }
-BOOL CBaseMonster ::CheckRangeAttack1(float flDot, float flDist) { return FALSE; }
-BOOL CBaseMonster ::CheckRangeAttack2(float flDot, float flDist) { return FALSE; }
-BOOL CBaseMonster ::CheckMeleeAttack1(float flDot, float flDist) { return FALSE; }
-BOOL CBaseMonster ::CheckMeleeAttack2(float flDot, float flDist) { return FALSE; }
+BOOL CBaseMonster ::FBecomeProne(void) { return true; }
+BOOL CBaseMonster ::CheckRangeAttack1(float flDot, float flDist) { return false; }
+BOOL CBaseMonster ::CheckRangeAttack2(float flDot, float flDist) { return false; }
+BOOL CBaseMonster ::CheckMeleeAttack1(float flDot, float flDist) { return false; }
+BOOL CBaseMonster ::CheckMeleeAttack2(float flDot, float flDist) { return false; }
 void CBaseMonster ::CheckAttacks(CBaseEntity *pTarget, float flDist) {}
-BOOL CBaseMonster ::FCanCheckAttacks(void) { return FALSE; }
-int CBaseMonster ::CheckEnemy(CBaseEntity *pEnemy) { return FALSE; }
+BOOL CBaseMonster ::FCanCheckAttacks(void) { return false; }
+int CBaseMonster ::CheckEnemy(CBaseEntity *pEnemy) { return false; }
 void CBaseMonster ::PushEnemy(CBaseEntity *pEnemy, Vector &vecLastKnownPos) {}
-BOOL CBaseMonster ::PopEnemy() { return FALSE; }
+BOOL CBaseMonster ::PopEnemy() { return false; }
 void CBaseMonster ::SetActivity(Activity NewActivity) {}
 void CBaseMonster ::SetSequenceByName(char *szSequence) {}
 int CBaseMonster ::CheckLocalMove(const Vector &vecStart, const Vector &vecEnd, CBaseEntity *pTarget, float *pflDist) { return NULL; }
 float CBaseMonster::OpenDoorAndWait(entvars_t* pevDoor) { return NULL; }
 void CBaseMonster ::AdvanceRoute(float distance) {}
 int CBaseMonster::RouteClassify(int iMoveFlag) { return NULL; }
-BOOL CBaseMonster ::BuildRoute(const Vector &vecGoal, int iMoveFlag, CBaseEntity *pTarget) { return FALSE; }
+BOOL CBaseMonster ::BuildRoute(const Vector &vecGoal, int iMoveFlag, CBaseEntity *pTarget) { return false; }
 void CBaseMonster ::InsertWaypoint(Vector vecLocation, int afMoveFlags) {}
-BOOL CBaseMonster ::FTriangulate(const Vector &vecStart, const Vector &vecEnd, float flDist, CBaseEntity *pTargetEnt, Vector *pApex) { return FALSE; }
+BOOL CBaseMonster ::FTriangulate(const Vector &vecStart, const Vector &vecEnd, float flDist, CBaseEntity *pTargetEnt, Vector *pApex) { return false; }
 void CBaseMonster ::Move(float flInterval) {}
-BOOL CBaseMonster::ShouldAdvanceRoute(float flWaypointDist) { return FALSE; }
+BOOL CBaseMonster::ShouldAdvanceRoute(float flWaypointDist) { return false; }
 void CBaseMonster::MoveExecute(CBaseEntity *pTargetEnt, const Vector &vecDir, float flInterval) {}
 void CBaseMonster ::MonsterInit(void) {}
 void CBaseMonster ::MonsterInitThink(void) {}
 void CBaseMonster ::StartMonster(void) {}
 void CBaseMonster ::MovementComplete(void) {}
-int CBaseMonster::TaskIsRunning(void) { return FALSE; }
+int CBaseMonster::TaskIsRunning(void) { return false; }
 int CBaseMonster::IRelationship(CBaseEntity *pTarget) { return NULL; }
-BOOL CBaseMonster ::FindCover(Vector vecThreat, Vector vecViewOffset, float flMinDist, float flMaxDist) { return FALSE; }
-BOOL CBaseMonster ::BuildNearestRoute(Vector vecThreat, Vector vecViewOffset, float flMinDist, float flMaxDist) { return FALSE; }
+BOOL CBaseMonster ::FindCover(Vector vecThreat, Vector vecViewOffset, float flMinDist, float flMaxDist) { return false; }
+BOOL CBaseMonster ::BuildNearestRoute(Vector vecThreat, Vector vecViewOffset, float flMinDist, float flMaxDist) { return false; }
 CBaseEntity *CBaseMonster ::BestVisibleEnemy(void) { return NULL; }
-bool CBaseMonster ::FInViewCone(CBaseEntity *pEntity) { return FALSE; }
-bool CBaseMonster ::FInViewCone(Vector &Origin) { return FALSE; }
-BOOL CBaseEntity ::FVisible(CBaseEntity *pEntity) { return FALSE; }
-BOOL CBaseEntity ::FVisible(const Vector &vecOrigin) { return FALSE; }
-BOOL CBaseEntity ::FMVisible(CBaseEntity *pEntity) { return FALSE; }
-BOOL CBaseEntity ::FMVisible(const Vector &vecOrigin) { return FALSE; }
+bool CBaseMonster ::FInViewCone(CBaseEntity *pEntity) { return false; }
+bool CBaseMonster ::FInViewCone(Vector &Origin) { return false; }
+BOOL CBaseEntity ::FVisible(CBaseEntity *pEntity) { return false; }
+BOOL CBaseEntity ::FVisible(const Vector &vecOrigin) { return false; }
+BOOL CBaseEntity ::FMVisible(CBaseEntity *pEntity) { return false; }
+BOOL CBaseEntity ::FMVisible(const Vector &vecOrigin) { return false; }
 void CBaseMonster ::MakeIdealYaw(Vector vecTarget) {}
 float CBaseMonster::FlYawDiff(void) { return NULL; }
 float CBaseMonster::ChangeYaw(int yawSpeed) { return NULL; }
@@ -191,7 +191,7 @@ int CBaseAnimating ::LookupActivityHeaviest(int activity) { return NULL; }
 void CBaseMonster ::SetEyePosition(void) {}
 int CBaseAnimating ::LookupSequence(const char *label) { return NULL; }
 void CBaseAnimating ::ResetSequenceInfo() {}
-BOOL CBaseAnimating ::GetSequenceFlags() { return FALSE; }
+BOOL CBaseAnimating ::GetSequenceFlags() { return false; }
 void CBaseAnimating ::DispatchAnimEvents(float flInterval) {}
 void CBaseMonster ::HandleAnimEvent(MonsterEvent_t *pEvent) {}
 float CBaseAnimating::SetBoneController(int iController, float flValue) { return NULL; }
@@ -207,32 +207,32 @@ Vector CBaseMonster ::GetGunPosition(void) { return g_vecZero; }
 void CBaseEntity::FireBullets(unsigned long cShots, Vector vecSrc, Vector vecDirShooting, Vector vecSpread, float flDistance, int iBulletType, int iTracerFreq, int iDamage, entvars_t *pevAttacker) {}
 void CBaseEntity ::TraceBleed(float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType) {}
 void CBaseMonster ::MakeDamageBloodDecal(int cCount, float flNoise, TraceResult *ptr, const Vector &vecDir) {}
-BOOL CBaseMonster ::FGetNodeRoute(Vector vecDest) { return TRUE; }
+BOOL CBaseMonster ::FGetNodeRoute(Vector vecDest) { return true; }
 int CBaseMonster ::FindHintNode(void) { return NO_NODE; }
 void CBaseMonster::ReportAIState(void) {}
 void CBaseMonster ::KeyValue(KeyValueData *pkvd) {}
-BOOL CBaseMonster ::FCheckAITrigger(void) { return FALSE; }
-int CBaseMonster ::CanPlaySequence(BOOL fDisregardMonsterState, int interruptLevel) { return FALSE; }
-BOOL CBaseMonster ::FindLateralCover(const Vector &vecThreat, const Vector &vecViewOffset) { return FALSE; }
+BOOL CBaseMonster ::FCheckAITrigger(void) { return false; }
+int CBaseMonster ::CanPlaySequence(BOOL fDisregardMonsterState, int interruptLevel) { return false; }
+BOOL CBaseMonster ::FindLateralCover(const Vector &vecThreat, const Vector &vecViewOffset) { return false; }
 Vector CBaseMonster ::ShootAtEnemy(const Vector &shootOrigin) { return g_vecZero; }
-BOOL CBaseMonster ::FacingIdeal(void) { return FALSE; }
-BOOL CBaseMonster ::FCanActiveIdle(void) { return FALSE; }
+BOOL CBaseMonster ::FacingIdeal(void) { return false; }
+BOOL CBaseMonster ::FCanActiveIdle(void) { return false; }
 void CBaseMonster::PlaySentence(const char *pszSentence, float duration, float volume, float attenuation) {}
 void CBaseMonster::PlayScriptedSentence(const char *pszSentence, float duration, float volume, float attenuation, BOOL bConcurrent, CBaseEntity *pListener) {}
 void CBaseMonster::SentenceStop(void) {}
 void CBaseMonster::CorpseFallThink(void) {}
 void CBaseMonster ::MonsterInitDead(void) {}
-BOOL CBaseMonster ::BBoxFlat(void) { return TRUE; }
-BOOL CBaseMonster ::GetEnemy(void) { return FALSE; }
+BOOL CBaseMonster ::BBoxFlat(void) { return true; }
+BOOL CBaseMonster ::GetEnemy(void) { return false; }
 void CBaseMonster ::TraceAttack(entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType) {}
 CBaseEntity *CBaseMonster ::DropItem(char *pszItemName, const Vector &vecPos, const Vector &vecAng) { return NULL; }
-BOOL CBaseMonster ::ShouldFadeOnDeath(void) { return FALSE; }
+BOOL CBaseMonster ::ShouldFadeOnDeath(void) { return false; }
 void CBaseMonster ::RadiusDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int iClassIgnore, int bitsDamageType) {}
 void CBaseMonster ::RadiusDamage(Vector vecSrc, entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int iClassIgnore, int bitsDamageType) {}
 void CBaseMonster::FadeMonster(void) {}
 void CBaseMonster ::GibMonster(void) {}
-BOOL CBaseMonster ::HasHumanGibs(void) { return FALSE; }
-BOOL CBaseMonster ::HasAlienGibs(void) { return FALSE; }
+BOOL CBaseMonster ::HasHumanGibs(void) { return false; }
+BOOL CBaseMonster ::HasAlienGibs(void) { return false; }
 Activity CBaseMonster ::GetDeathActivity(void) { return ACT_DIE_HEADSHOT; }
 MONSTERSTATE CBaseMonster ::GetIdealState(void) { return MONSTERSTATE_ALERT; }
 Schedule_t *CBaseMonster ::GetScheduleOfType(int Type) { return NULL; }
@@ -245,8 +245,8 @@ void CBaseMonster ::RunAI(void) {}
 void CBaseMonster ::Killed(entvars_t *pevAttacker, int iGib) {}
 int CBaseMonster ::TakeHealth(float flHealth, int bitsDamageType) { return NULL; }
 int CBaseMonster::TakeDamage(entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType) {return NULL;}
-int CBaseMonster::Restore(class CRestore &) { return TRUE; }
-int CBaseMonster::Save(class CSave &) { return TRUE; }
+int CBaseMonster::Restore(class CRestore &) { return true; }
+int CBaseMonster::Save(class CSave &) { return true; }
 
 int TrainSpeed(int iSpeed, int iMax) { return NULL; }
 
@@ -255,8 +255,8 @@ void CBasePlayer::PainSound() {}
 void CBasePlayer::TakeDamageEffect(CBaseEntity *pInflictor, CBaseEntity *pAttacker, float flDamage, int bitsDamageType) {}
 int CBasePlayer::IRelationship(CBaseEntity *pTarget) { return NULL; }
 
-int CBasePlayerWeapon::Restore(class CRestore &) { return TRUE; }
-int CBasePlayerWeapon::Save(class CSave &) { return TRUE; }
+int CBasePlayerWeapon::Restore(class CRestore &) { return true; }
+int CBasePlayerWeapon::Save(class CSave &) { return true; }
 
 void CBasePlayer::StruckSound(CBaseEntity *pInflicter, CBaseEntity *pAttacker, float flDamage, TraceResult *ptr, int bitsDamageType) {}
 void CBasePlayer::DeathSound(void) {}
@@ -264,7 +264,7 @@ int CBasePlayer::TakeHealth(float flHealth, int bitsDamageType) { return NULL; }
 int CBasePlayer::TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType) { return NULL; }
 void CBasePlayer::PackDeadPlayerItems(void) {}
 void CBasePlayer::WaterMove() {}
-BOOL CBasePlayer::IsOnLadder(void) { return FALSE; }
+BOOL CBasePlayer::IsOnLadder(void) { return false; }
 void CBasePlayer::PlayerDeathThink(void) {}
 void CBasePlayer::StartDeathCam(void) {}
 void CBasePlayer::StartObserver(Vector vecPosition, Vector vecViewAngle) {}
@@ -284,10 +284,10 @@ int CBasePlayer::Save(CSave &save) { return NULL; }
 void CBasePlayer::RenewItems(void) {}
 int CBasePlayer::Restore(CRestore &restore) { return NULL; }
 void CBasePlayer::SelectNextItem(int iItem) {}
-BOOL CBasePlayer::HasWeapons(void) { return FALSE; }
+BOOL CBasePlayer::HasWeapons(void) { return false; }
 void CBasePlayer::SelectPrevItem(int iItem) {}
 CBaseEntity *FindEntityForward(CBaseEntity *pMe) { return NULL; }
-//BOOL CBasePlayer :: FlashlightIsOn( void ) { return FALSE; }
+//BOOL CBasePlayer :: FlashlightIsOn( void ) { return false; }
 //void CBasePlayer :: FlashlightTurnOn( void ) { }
 //void CBasePlayer :: FlashlightTurnOff( void ) { }
 //void CBasePlayer :: ForceClientDllUpdate( void ) { }
@@ -298,7 +298,7 @@ void CBasePlayer::ItemPostFrame() {}
 int CBasePlayer::AmmoInventory(int iAmmoIndex) { return NEG_REF; }
 //Master Sword
 void CBasePlayer ::UpdateClientData(void) {}
-BOOL CBasePlayer ::FBecomeProne(void) { return TRUE; }
+BOOL CBasePlayer ::FBecomeProne(void) { return true; }
 void CBasePlayer ::BarnacleVictimBitten(entvars_t *pevBarnacle) {}
 void CBasePlayer ::BarnacleVictimReleased(void) {}
 int CBasePlayer ::Illumination(void) { return NULL; }
@@ -313,7 +313,7 @@ Vector CBasePlayer ::GetGunPosition(void) { return g_vecZero; }
 void CBasePlayer::Trade() {}
 bool CBasePlayer::AcceptOffer() { return false; }
 tradeinfo_t *CBasePlayer::TradeItem(tradeinfo_t *ptiTradeInfo) { return NULL; }
-BOOL CBasePlayer::SkinMonster(CMSMonster *pDeadMonster) { return FALSE; }
+BOOL CBasePlayer::SkinMonster(CMSMonster *pDeadMonster) { return false; }
 void CBasePlayer::AddNoise(float flNoiseAmt) {}
 void CBasePlayer::Attacked(CBaseEntity *pAttacker, float flDamage, int bitsDamageType) {}
 void CBasePlayer::Seen(CMSMonster *pMonster) {}
diff --git a/src/game/client/hud.h b/src/game/client/hud.h
index 16519531..82f6b356 100644
--- a/src/game/client/hud.h
+++ b/src/game/client/hud.h
@@ -218,7 +218,7 @@ class CHudStatusBar : public CHudBase
 	char m_szStatusBar[MAX_STATUSBAR_LINES][MAX_STATUSTEXT_LENGTH];	 // the constructed bar that is drawn
 	int m_iStatusValues[MAX_STATUSBAR_VALUES];						 // an array of values for use in the status bar
 
-	int m_bReparseString; // set to TRUE whenever the m_szStatusBar needs to be recalculated
+	int m_bReparseString; // set to true whenever the m_szStatusBar needs to be recalculated
 };
 
 extern int g_IsSpectator[MAX_PLAYERS + 1];
diff --git a/src/game/client/hud_spectator.cpp b/src/game/client/hud_spectator.cpp
index dc558bd7..31ee8cd7 100644
--- a/src/game/client/hud_spectator.cpp
+++ b/src/game/client/hud_spectator.cpp
@@ -1057,7 +1057,7 @@ void CHudSpectator::DrawOverviewLayer()
 	float screenaspect, xs, ys, xStep, yStep, x, y, z;
 	int ix, iy, i, xTiles, yTiles, frame;
 
-	qboolean hasMapImage = m_MapSprite ? TRUE : FALSE;
+	qboolean hasMapImage = m_MapSprite ? true : false;
 	model_t *dummySprite = (struct model_s *)gEngfuncs.GetSpritePointer(m_hsprUnkownMap);
 
 	if (hasMapImage)
diff --git a/src/game/client/inputw32.cpp b/src/game/client/inputw32.cpp
index aa4cd265..c80d25dd 100644
--- a/src/game/client/inputw32.cpp
+++ b/src/game/client/inputw32.cpp
@@ -190,7 +190,7 @@ long ThreadInterlockedExchange(long *pDest, long value)
 
 DWORD WINAPI MousePos_ThreadFunction(LPVOID p)
 {
-	s_hMouseDoneQuitEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
+	s_hMouseDoneQuitEvent = CreateEvent(NULL, false, false, NULL);
 
 	while (1)
 	{
@@ -1096,7 +1096,7 @@ void IN_Init(void)
 	{
 		s_mouseDeltaX = s_mouseDeltaY = 0;
 
-		s_hMouseQuitEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
+		s_hMouseQuitEvent = CreateEvent(NULL, false, false, NULL);
 		if (s_hMouseQuitEvent)
 		{
 			s_hMouseThread = CreateThread(NULL, 0, MousePos_ThreadFunction, NULL, 0, &s_hMouseThreadId);
diff --git a/src/game/client/ms/clglobal.cpp b/src/game/client/ms/clglobal.cpp
index b1ba96d3..2922ff9f 100644
--- a/src/game/client/ms/clglobal.cpp
+++ b/src/game/client/ms/clglobal.cpp
@@ -87,7 +87,7 @@ void MSCLGlobals::InitializePlayer()
 	player.Gear.clear();
 	player.m_HP = player.m_MP = 0;
 
-	player.m_fGameHUDInitialized = TRUE;
+	player.m_fGameHUDInitialized = true;
 	//player.pbs.fMaxForwardPressTime = 0;
 	player.m_SprintDelay = gpGlobals->time;
 	player.m_Initialized = false;
@@ -333,6 +333,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 		DLLAttach(hinstDLL);
 	else if (fdwReason == DLL_PROCESS_DETACH)
 		DLLDetach();
-	return TRUE;
+	return true;
 }
 #endif
diff --git a/src/game/client/ms/clplayer.cpp b/src/game/client/ms/clplayer.cpp
index 77cf544e..28db02dd 100644
--- a/src/game/client/ms/clplayer.cpp
+++ b/src/game/client/ms/clplayer.cpp
@@ -1381,7 +1381,7 @@ int __MsgFunc_CLDllFunc(const char* pszName, int iSize, void* pbuf)
 			//Set up a variable to switch back
 			if (g_SwitchToHand == -1)
 				g_SwitchToHand = player.m_CurrentHand;
-			if (player.SwitchHands(iHand, FALSE))
+			if (player.SwitchHands(iHand, false))
 				player.BlockButton(IN_ATTACK);
 			else
 				g_SwitchToHand = -1;
diff --git a/src/game/client/ms/fatigue.cpp b/src/game/client/ms/fatigue.cpp
index e1113408..89bee72c 100644
--- a/src/game/client/ms/fatigue.cpp
+++ b/src/game/client/ms/fatigue.cpp
@@ -31,7 +31,7 @@ MS_DECLARE_MESSAGE(m_Fatigue, Fatigue);
 
 int CHudFatigue::Init(void)
 {
-	m_DrawFatigue = FALSE;
+	m_DrawFatigue = false;
 
 	HOOK_MESSAGE(Fatigue);
 	//HOOK_COMMAND("fatigue", ToggleFatigue);
diff --git a/src/game/client/ms/menu.cpp b/src/game/client/ms/menu.cpp
index 737534dd..77f1a9ae 100644
--- a/src/game/client/ms/menu.cpp
+++ b/src/game/client/ms/menu.cpp
@@ -65,7 +65,7 @@ void CHudMenu ::InitHUDData(void)
 void CHudMenu ::Reset(void)
 {
 	g_szPrelocalisedMenuString[0] = 0;
-	m_fWaitingForMore = FALSE;
+	m_fWaitingForMore = false;
 }
 
 int CHudMenu ::VidInit(void)
@@ -144,7 +144,7 @@ void Menu_ServerMenuCallback(int idx, struct TCallbackMenu *pcbMenu)
 // takes four values:
 //		short: a bitfield of keys that are valid input
 //		char : the duration, in seconds, the menu should stay up. -1 means is stays until something is chosen.
-//		byte : a boolean, TRUE if there is more string yet to be received before displaying the menu, FALSE if it's the last string
+//		byte : a boolean, true if there is more string yet to be received before displaying the menu, false if it's the last string
 //		string: menu string to display
 // if this message is never received, then scores will simply be the combined totals of the players.
 int CHudMenu ::MsgFunc_ShowMenu(const char *pszName, int iSize, void *pbuf)
@@ -203,7 +203,7 @@ int CHudMenu ::MsgFunc_ShowMenu(const char *pszName, int iSize, void *pbuf)
 }
 int CHudMenu ::ShowMenu(int bitsValidSlots, const char *pcMenuText, MenuCallback CallBack, MenuType mtMenuType, float ShutOffTime)
 {
-	//	if( !pcMenuText ) return FALSE;
+	//	if( !pcMenuText ) return false;
 	m_fOfferedNextMenu = true;
 	m_bitsValidSlots = bitsValidSlots;
 	 strncpy(m.cMenuText,  pcMenuText, sizeof(m.cMenuText) );
@@ -212,7 +212,7 @@ int CHudMenu ::ShowMenu(int bitsValidSlots, const char *pcMenuText, MenuCallback
 	m_flShutoffTime = ShutOffTime;
 	m_fMenuDisplayed = 1;
 	m_iFlags |= HUD_ACTIVE;
-	return TRUE;
+	return true;
 }
 
 //Hides a certain menu only if that menu is open
diff --git a/src/game/client/parsemsg.cpp b/src/game/client/parsemsg.cpp
index 5739ed11..659f8523 100644
--- a/src/game/client/parsemsg.cpp
+++ b/src/game/client/parsemsg.cpp
@@ -16,7 +16,7 @@
 //  parsemsg.cpp
 //
 typedef unsigned char byte;
-#define true 1
+
 
 static byte *gpBuf;
 static int giSize;
diff --git a/src/game/client/render/opengl/clopengl.cpp b/src/game/client/render/opengl/clopengl.cpp
index 10a1e662..8a79a67e 100644
--- a/src/game/client/render/opengl/clopengl.cpp
+++ b/src/game/client/render/opengl/clopengl.cpp
@@ -308,15 +308,15 @@ bool CMirrorMgr::InitMirrors()
 
 	int pf_attr[] =
 		{
-			WGL_SUPPORT_OPENGL_ARB, TRUE,		// P-buffer will be used with OpenGL
-			WGL_DRAW_TO_PBUFFER_ARB, TRUE,		// Enable render to p-buffer
-			WGL_BIND_TO_TEXTURE_RGBA_ARB, TRUE, // P-buffer will be used as a texture
+			WGL_SUPPORT_OPENGL_ARB, true,		// P-buffer will be used with OpenGL
+			WGL_DRAW_TO_PBUFFER_ARB, true,		// Enable render to p-buffer
+			WGL_BIND_TO_TEXTURE_RGBA_ARB, true, // P-buffer will be used as a texture
 			WGL_RED_BITS_ARB, 8,				// At least 8 bits for RED channel
 			WGL_GREEN_BITS_ARB, 8,				// At least 8 bits for GREEN channel
 			WGL_BLUE_BITS_ARB, 8,				// At least 8 bits for BLUE channel
 			WGL_ALPHA_BITS_ARB, 8,				// At least 8 bits for ALPHA channel
 			WGL_DEPTH_BITS_ARB, 16,				// At least 16 bits for depth buffer
-			WGL_DOUBLE_BUFFER_ARB, FALSE,		// We don't require double buffering
+			WGL_DOUBLE_BUFFER_ARB, false,		// We don't require double buffering
 			0									// Zero terminates the list
 		};
 
diff --git a/src/game/client/saytext.cpp b/src/game/client/saytext.cpp
index fb63e25f..424fc315 100644
--- a/src/game/client/saytext.cpp
+++ b/src/game/client/saytext.cpp
@@ -99,7 +99,7 @@ int CHudSayText :: Draw( float flTime )
 {
 	int y = Y_START;
 
-	if ( ( gViewPort && gViewPort->AllowedToPrintText() == FALSE) || !m_HUD_saytext->value )
+	if ( ( gViewPort && gViewPort->AllowedToPrintText() == false) || !m_HUD_saytext->value )
 		return 1;
 
 	// make sure the scrolltime is within reasonable bounds,  to guard against the clock being reset
@@ -184,7 +184,7 @@ int CHudSayText :: MsgFunc_SayText( const char *pszName, int iSize, void *pbuf )
 void CHudSayText :: SayTextPrint( const char *pszBuf, int iBufSize, int clientIndex )
 {
 	ConsolePrint( pszBuf );
-	if ( gViewPort && gViewPort->AllowedToPrintText() == FALSE )
+	if ( gViewPort && gViewPort->AllowedToPrintText() == false )
 	{
 		// Print it straight to the console
 		return;
diff --git a/src/game/client/status_icons.cpp b/src/game/client/status_icons.cpp
index 2469f093..6255b5da 100644
--- a/src/game/client/status_icons.cpp
+++ b/src/game/client/status_icons.cpp
@@ -73,7 +73,7 @@ int CHudStatusIcons::Draw(float flTime)
 
 // Message handler for StatusIcon message
 // accepts five values:
-//		byte   : TRUE = ENABLE icon, FALSE = DISABLE icon
+//		byte   : true = ENABLE icon, false = DISABLE icon
 //		string : the sprite name to display
 //		byte   : red
 //		byte   : green
diff --git a/src/game/client/statusbar.cpp b/src/game/client/statusbar.cpp
index e28e5794..0fa06298 100644
--- a/src/game/client/statusbar.cpp
+++ b/src/game/client/statusbar.cpp
@@ -168,7 +168,7 @@ int CHudStatusBar ::Draw(float fTime)
 	{
 		for (unsigned int i = 0; i < MAX_STATUSBAR_LINES; i++)
 			ParseStatusString(i);
-		m_bReparseString = FALSE;
+		m_bReparseString = false;
 	}
 
 	// Draw the status bar lines
@@ -228,7 +228,7 @@ int CHudStatusBar ::MsgFunc_StatusText(const char *pszName, int iSize, void *pbu
 	else
 		m_iFlags |= HUD_ACTIVE; // we have status text, so turn on the status bar
 
-	m_bReparseString = TRUE;
+	m_bReparseString = true;
 
 	return 1;
 }
@@ -247,7 +247,7 @@ int CHudStatusBar ::MsgFunc_StatusValue(const char *pszName, int iSize, void *pb
 
 	m_iStatusValues[index] = READ_SHORT();
 
-	m_bReparseString = TRUE;
+	m_bReparseString = true;
 
 	return 1;
 }
\ No newline at end of file
diff --git a/src/game/client/text_message.cpp b/src/game/client/text_message.cpp
index 5de0cf34..52ffe1bb 100644
--- a/src/game/client/text_message.cpp
+++ b/src/game/client/text_message.cpp
@@ -190,7 +190,7 @@ int CHudTextMessage::MsgFunc_TextMsg(const char *pszName, int iSize, void *pbuf)
 	StripEndNewlineFromString(sstr4);
 	char* psz = szBuf[5];
 
-	if (gViewPort && gViewPort->AllowedToPrintText() == FALSE)
+	if (gViewPort && gViewPort->AllowedToPrintText() == false)
 		return 1;
 
 	switch (msg_dest)
diff --git a/src/game/client/ui/ms/vgui_choosecharacter.cpp b/src/game/client/ui/ms/vgui_choosecharacter.cpp
index 9706bc08..472294b4 100644
--- a/src/game/client/ui/ms/vgui_choosecharacter.cpp
+++ b/src/game/client/ui/ms/vgui_choosecharacter.cpp
@@ -402,7 +402,7 @@ CMenuPanel *CreateNewCharacterPanel( )
 {
 	return new CNewCharacterPanel( 1, true, 0, 0, ScreenWidth(), ScreenHeight());
 }
-CNewCharacterPanel::CNewCharacterPanel( int iTrans, int iRemoveMe, int x, int y, int wide,int tall ) : CMenuPanel( 0, TRUE, x, y, wide, tall )
+CNewCharacterPanel::CNewCharacterPanel( int iTrans, int iRemoveMe, int x, int y, int wide,int tall ) : CMenuPanel( 0, true, x, y, wide, tall )
 {
 	SetBits( m_Flags, MENUFLAG_TRAPNUMINPUT );
 
diff --git a/src/game/client/ui/ms/vgui_container.cpp b/src/game/client/ui/ms/vgui_container.cpp
index c29f40ee..3a5c1919 100644
--- a/src/game/client/ui/ms/vgui_container.cpp
+++ b/src/game/client/ui/ms/vgui_container.cpp
@@ -343,7 +343,7 @@ void VGUI_ItemInfoPanel::Update(containeritem_t &Item)
 }
 
 // Creation
-VGUI_ContainerPanel::VGUI_ContainerPanel() : CMenuPanel(100, FALSE, 0, 0, ScreenWidth(), ScreenHeight()), VGUI_ItemCallbackPanel()
+VGUI_ContainerPanel::VGUI_ContainerPanel() : CMenuPanel(100, false, 0, 0, ScreenWidth(), ScreenHeight()), VGUI_ItemCallbackPanel()
 {
 	COLOR Color_TitleText = COLOR(255, 100, 100, 0),
 		  Color_SubtitleText = COLOR(160, 160, 160, 0),
diff --git a/src/game/client/ui/ms/vgui_store.cpp b/src/game/client/ui/ms/vgui_store.cpp
index 1538011b..cb79334b 100644
--- a/src/game/client/ui/ms/vgui_store.cpp
+++ b/src/game/client/ui/ms/vgui_store.cpp
@@ -154,7 +154,7 @@ CStoreMenuPanel::CStoreMenuPanel(int iTrans, int iRemoveMe, int x,int y,int wide
 
 		m_pButtons[i]->setContentAlignment( vgui::Label::a_west );
 		if( i != 2 ) m_pButtons[i]->addActionSignal( new CStoreBtn(iMenuToShow[i]) );
-		else m_pButtons[i]->addActionSignal( new CMenuHandler_StringCommand( "trade sell 0", TRUE ) );
+		else m_pButtons[i]->addActionSignal( new CMenuHandler_StringCommand( "trade sell 0", true ) );
 		m_pButtons[i]->addInputSignal( new CHandler_MenuButtonOver(this, i) );
 		m_pButtons[i]->setParent( this );
 
diff --git a/src/game/client/ui/ms/vgui_storemainwin.cpp b/src/game/client/ui/ms/vgui_storemainwin.cpp
index 86c7cecb..9cdbd369 100644
--- a/src/game/client/ui/ms/vgui_storemainwin.cpp
+++ b/src/game/client/ui/ms/vgui_storemainwin.cpp
@@ -56,7 +56,7 @@ CStorePanel::CStorePanel() : VGUI_ContainerPanel()
 	m_SaleLabel->setText("Selling 0 Items (0 Gold)");
 
 	//Set up the cancel button
-	m_pCancelButton->addActionSignal(new CMenuHandler_StringCommand("trade stop", TRUE));
+	m_pCancelButton->addActionSignal(new CMenuHandler_StringCommand("trade stop", true));
 	m_pCancelButton->setText(Localized("#CLOSE"));
 
 	Text_StoreGold = "GOLD";
diff --git a/src/game/client/ui/vgui_scorepanel.cpp b/src/game/client/ui/vgui_scorepanel.cpp
index 9b1ab69f..46b075af 100644
--- a/src/game/client/ui/vgui_scorepanel.cpp
+++ b/src/game/client/ui/vgui_scorepanel.cpp
@@ -341,9 +341,9 @@ void ScorePanel::SortTeams()
 		g_TeamInfo[j].packetloss += g_PlayerInfoList[i].packetloss;
 
 		if (g_PlayerInfoList[i].thisplayer)
-			g_TeamInfo[j].ownteam = TRUE;
+			g_TeamInfo[j].ownteam = true;
 		else
-			g_TeamInfo[j].ownteam = FALSE;
+			g_TeamInfo[j].ownteam = false;
 
 		// Set the team's number (used for team colors)
 		g_TeamInfo[j].teamnumber = g_PlayerExtraInfo[i].teamnumber;
@@ -352,7 +352,7 @@ void ScorePanel::SortTeams()
 	// find team ping/packetloss averages
 	for (i = 1; i <= m_iNumTeams; i++)
 	{
-		g_TeamInfo[i].already_drawn = FALSE;
+		g_TeamInfo[i].already_drawn = false;
 
 		if (g_TeamInfo[i].players > 0)
 		{
@@ -391,7 +391,7 @@ void ScorePanel::SortTeams()
 		// Put this team in the sorted list
 		m_iSortedRows[m_iRows] = best_team;
 		m_iIsATeam[m_iRows] = TEAM_YES;
-		g_TeamInfo[best_team].already_drawn = TRUE; // set the already_drawn to be TRUE, so this team won't get sorted again
+		g_TeamInfo[best_team].already_drawn = true; // set the already_drawn to be true, so this team won't get sorted again
 		m_iRows++;
 
 		// Now sort all the players on this team
diff --git a/src/game/client/ui/vgui_teamfortressviewport.cpp b/src/game/client/ui/vgui_teamfortressviewport.cpp
index 286ee06f..3507464a 100644
--- a/src/game/client/ui/vgui_teamfortressviewport.cpp
+++ b/src/game/client/ui/vgui_teamfortressviewport.cpp
@@ -1478,7 +1478,7 @@ void TeamFortressViewport::HideTopMenu()
 	UpdateCursorState();
 }
 
-// Return TRUE if the HUD's allowed to print text messages
+// Return true if the HUD's allowed to print text messages
 bool TeamFortressViewport::AllowedToPrintText(void)
 {
 	// Prevent text messages when fullscreen menus are up
@@ -1488,10 +1488,10 @@ bool TeamFortressViewport::AllowedToPrintText(void)
 	{
 		int iId = m_pCurrentMenu->GetMenuID();
 		if ( iId == MENU_SPAWN || iId == MENU_NEWCHARACTER )
-			return FALSE;
+			return false;
 	}*/
 
-	return TRUE;
+	return true;
 }
 
 //======================================================================================
@@ -1803,7 +1803,7 @@ bool TeamFortressViewport::SlotInput(int iSlot)
 	if (m_pCurrentMenu)
 		return m_pCurrentMenu->SlotInput(iSlot);
 
-	return FALSE;
+	return false;
 }
 
 // Direct Key Input
@@ -2075,7 +2075,7 @@ int TeamFortressViewport::MsgFunc_TeamScore(const char *pszName, int iSize, void
 		return 1;
 
 	// use this new score data instead of combined player scoresw
-	g_TeamInfo[i].scores_overriden = TRUE;
+	g_TeamInfo[i].scores_overriden = true;
 	g_TeamInfo[i].frags = READ_SHORT();
 	g_TeamInfo[i].deaths = READ_SHORT();
 
diff --git a/src/game/server/basemonster.h b/src/game/server/basemonster.h
index eeb652f0..1aa3ec6a 100644
--- a/src/game/server/basemonster.h
+++ b/src/game/server/basemonster.h
@@ -235,7 +235,7 @@ class CBaseMonster : public CBaseToggle
 
 	BOOL FindLateralCover(const Vector &vecThreat, const Vector &vecViewOffset);
 	virtual BOOL FindCover(Vector vecThreat, Vector vecViewOffset, float flMinDist, float flMaxDist);
-	virtual BOOL FValidateCover(const Vector &vecCoverLocation) { return TRUE; };
+	virtual BOOL FValidateCover(const Vector &vecCoverLocation) { return true; };
 	virtual float CoverRadius(void) { return 784; } // Default cover radius
 
 	virtual BOOL FCanCheckAttacks(void);
@@ -247,14 +247,14 @@ class CBaseMonster : public CBaseToggle
 	inline BOOL HasConditions(int iConditions)
 	{
 		if (m_afConditions & iConditions)
-			return TRUE;
-		return FALSE;
+			return true;
+		return false;
 	}
 	inline BOOL HasAllConditions(int iConditions)
 	{
 		if ((m_afConditions & iConditions) == iConditions)
-			return TRUE;
-		return FALSE;
+			return true;
+		return false;
 	}
 
 	virtual BOOL FValidateHintType(short sHint);
@@ -340,14 +340,14 @@ class CBaseMonster : public CBaseToggle
 	inline BOOL HasMemory(int iMemory)
 	{
 		if (m_afMemory & iMemory)
-			return TRUE;
-		return FALSE;
+			return true;
+		return false;
 	}
 	inline BOOL HasAllMemories(int iMemory)
 	{
 		if ((m_afMemory & iMemory) == iMemory)
-			return TRUE;
-		return FALSE;
+			return true;
+		return false;
 	}
 
 	BOOL ExitScriptedSequence();
diff --git a/src/game/server/bmodels.cpp b/src/game/server/bmodels.cpp
index a118f362..7612ff0d 100644
--- a/src/game/server/bmodels.cpp
+++ b/src/game/server/bmodels.cpp
@@ -117,8 +117,8 @@ void CFuncWallToggle ::TurnOn(void)
 BOOL CFuncWallToggle ::IsOn(void)
 {
 	if (pev->solid == SOLID_NOT)
-		return FALSE;
-	return TRUE;
+		return false;
+	return true;
 }
 
 void CFuncWallToggle ::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value)
@@ -241,7 +241,7 @@ void CFuncIllusionary ::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "skin")) //skin is used for content type
 	{
 		pev->skin = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CBaseToggle::KeyValue(pkvd);
@@ -338,9 +338,9 @@ void CFuncMonsterClip::TurnOn(void)
 BOOL CFuncMonsterClip::IsOn(void)
 {
 	if (pev->flags & FL_MONSTERCLIP)
-		return TRUE;
+		return true;
 	else
-		return FALSE;
+		return false;
 }
 
 // -------------------------------------------------------------------------------
@@ -426,9 +426,9 @@ void CMSFuncPlayerClip::TurnOn(void)
 BOOL CMSFuncPlayerClip::IsOn(void)
 {
 	if (pev->solid & SOLID_TRIGGER)
-		return TRUE;
+		return true;
 	else
-		return FALSE;
+		return false;
 }
 
 // -------------------------------------------------------------------------------
@@ -500,7 +500,7 @@ void CFuncRotating ::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "fanfriction"))
 	{
 		m_flFanFriction = atof(pkvd->szValue) / 100;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "volume"))
 	{
@@ -510,7 +510,7 @@ void CFuncRotating ::KeyValue(KeyValueData *pkvd)
 			m_flVolume = 1.0;
 		if (m_flVolume < 0.0)
 			m_flVolume = 0.0;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "spawnorigin"))
 	{
@@ -522,7 +522,7 @@ void CFuncRotating ::KeyValue(KeyValueData *pkvd)
 	else if (FStrEq(pkvd->szKeyName, "sounds"))
 	{
 		m_sounds = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		BaseClass::KeyValue(pkvd);
@@ -787,7 +787,7 @@ void CFuncRotating ::SpinUp(void)
 	}
 	else
 	{
-		RampPitchVol(TRUE);
+		RampPitchVol(true);
 	}
 }
 
@@ -828,7 +828,7 @@ void CFuncRotating ::SpinDown(void)
 	}
 	else
 	{
-		RampPitchVol(FALSE);
+		RampPitchVol(false);
 	}
 }
 
@@ -948,12 +948,12 @@ void CPendulum ::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "distance"))
 	{
 		m_distance = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "damp"))
 	{
 		m_damp = atof(pkvd->szValue) * 0.001;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CScriptedEnt::KeyValue(pkvd);
diff --git a/src/game/server/client.cpp b/src/game/server/client.cpp
index 8bafbb70..28c3d21d 100644
--- a/src/game/server/client.cpp
+++ b/src/game/server/client.cpp
@@ -1511,7 +1511,7 @@ void ClientCommand2(edict_t *pEntity)
 		//#else
 		/*if( IsGM(GETPLAYERWONID(pPlayer->edict())) )
 					pPlayer->m_fIsElite = !pPlayer->m_fIsElite;
-				else return FALSE;*/
+				else return false;*/
 		//	pPlayer->m_fIsElite = true;
 		//#endif
 
@@ -1732,7 +1732,7 @@ void ClientCommand2(edict_t *pEntity)
 				}
 				break;
 			case 1:
-				//pPlayer->RemoveAllItems( FALSE, TRUE );
+				//pPlayer->RemoveAllItems( false, true );
 				MESSAGE_BEGIN(MSG_ONE, gmsgHideWeapon, NULL, pPlayer->pev);
 				WRITE_BYTE(HIDEHUD_ALL);
 				MESSAGE_END();
diff --git a/src/game/server/effects.cpp b/src/game/server/effects.cpp
index f4b8a2c8..88ced1c9 100644
--- a/src/game/server/effects.cpp
+++ b/src/game/server/effects.cpp
@@ -116,17 +116,17 @@ void CBubbling::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "density"))
 	{
 		m_density = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "frequency"))
 	{
 		m_frequency = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "current"))
 	{
 		pev->speed = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CBaseEntity::KeyValue(pkvd);
@@ -365,8 +365,8 @@ class CLightning : public CBeam
 	inline BOOL ServerSide(void)
 	{
 		if (m_life == 0 && !(pev->spawnflags & SF_BEAM_RING))
-			return TRUE;
-		return FALSE;
+			return true;
+		return false;
 	}
 
 	virtual int Save(CSave &save);
@@ -496,57 +496,57 @@ void CLightning::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "LightningStart"))
 	{
 		m_iszStartEntity = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "LightningEnd"))
 	{
 		m_iszEndEntity = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "life"))
 	{
 		m_life = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "BoltWidth"))
 	{
 		m_boltWidth = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "NoiseAmplitude"))
 	{
 		m_noiseAmplitude = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "TextureScroll"))
 	{
 		m_speed = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "StrikeTime"))
 	{
 		m_restrike = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "texture"))
 	{
 		m_iszSpriteName = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "framestart"))
 	{
 		m_frameStart = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "Radius"))
 	{
 		m_radius = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "damage"))
 	{
 		pev->dmg = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CBeam::KeyValue(pkvd);
@@ -933,7 +933,7 @@ void CLaser::Spawn(void)
 	PointsInit(pev->origin, pev->origin);
 
 	if (!m_pSprite && m_iszSpriteName)
-		m_pSprite = CSprite::SpriteCreate(STRING(m_iszSpriteName), pev->origin, TRUE);
+		m_pSprite = CSprite::SpriteCreate(STRING(m_iszSpriteName), pev->origin, true);
 	else
 		m_pSprite = NULL;
 
@@ -958,42 +958,42 @@ void CLaser::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "LaserTarget"))
 	{
 		pev->message = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "width"))
 	{
 		SetWidth(atof(pkvd->szValue));
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "NoiseAmplitude"))
 	{
 		SetNoise(atoi(pkvd->szValue));
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "TextureScroll"))
 	{
 		SetScrollRate(atoi(pkvd->szValue));
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "texture"))
 	{
 		pev->model = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "EndSprite"))
 	{
 		m_iszSpriteName = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "framestart"))
 	{
 		pev->frame = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "damage"))
 	{
 		pev->dmg = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CBeam::KeyValue(pkvd);
@@ -1352,22 +1352,22 @@ void CGibShooter::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "m_iGibs"))
 	{
 		m_iGibs = m_iGibCapacity = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "m_flVelocity"))
 	{
 		m_flGibVelocity = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "m_flVariance"))
 	{
 		m_flVariance = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "m_flGibLife"))
 	{
 		m_flGibLife = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 	{
@@ -1488,12 +1488,12 @@ void CEnvShooter ::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "shootmodel"))
 	{
 		pev->model = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "shootsounds"))
 	{
 		int iNoise = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 		switch (iNoise)
 		{
 		case 0:
@@ -1707,12 +1707,12 @@ void CBlood::KeyValue(KeyValueData *pkvd)
 			break;
 		}
 
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "amount"))
 	{
 		SetBloodAmount(atof(pkvd->szValue));
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CPointEntity::KeyValue(pkvd);
@@ -1815,22 +1815,22 @@ void CShake::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "amplitude"))
 	{
 		SetAmplitude(atof(pkvd->szValue));
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "frequency"))
 	{
 		SetFrequency(atof(pkvd->szValue));
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "duration"))
 	{
 		SetDuration(atof(pkvd->szValue));
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "radius"))
 	{
 		SetRadius(atof(pkvd->szValue));
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CPointEntity::KeyValue(pkvd);
@@ -1878,12 +1878,12 @@ void CFade::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "duration"))
 	{
 		SetDuration(atof(pkvd->szValue));
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "holdtime"))
 	{
 		SetHoldTime(atof(pkvd->szValue));
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CPointEntity::KeyValue(pkvd);
@@ -1970,17 +1970,17 @@ void CMessage::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "messagesound"))
 	{
 		pev->noise = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "messagevolume"))
 	{
 		pev->scale = atof(pkvd->szValue) * 0.1;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "messageattenuation"))
 	{
 		pev->impulse = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CPointEntity::KeyValue(pkvd);
diff --git a/src/game/server/effects/mseffects.cpp b/src/game/server/effects/mseffects.cpp
index 289f0b9d..acf4ada8 100644
--- a/src/game/server/effects/mseffects.cpp
+++ b/src/game/server/effects/mseffects.cpp
@@ -293,7 +293,7 @@ void CChangePlayerSpeed ::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "duration"))
 	{
 		m_Duration = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CBaseEntity::KeyValue(pkvd);
@@ -445,12 +445,12 @@ class CMSChangeLevel : public CBaseEntity
 		if (FStrEq(pkvd->szKeyName, "destmap"))
 		{
 			sDestMap = ALLOC_STRING(pkvd->szValue);
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 		else if (FStrEq(pkvd->szKeyName, "desttrans"))
 		{
 			sDestTrans = ALLOC_STRING(pkvd->szValue);
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 		else
 			CBaseEntity::KeyValue(pkvd);
diff --git a/src/game/server/func_break.cpp b/src/game/server/func_break.cpp
index 2b2a5b70..0f55d343 100644
--- a/src/game/server/func_break.cpp
+++ b/src/game/server/func_break.cpp
@@ -64,12 +64,12 @@ void CBreakable::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "scriptevent"))
 	{
 		m_scriptevent = pkvd->szValue;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "killtarget"))
 	{
 		m_iszKillTarget = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 
 	// UNDONE_WC: explicitly ignoring these fields, but they shouldn't be in the map file!
@@ -82,7 +82,7 @@ void CBreakable::KeyValue(KeyValueData *pkvd)
 		else
 			m_Explosion = expRandom;
 
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "material"))
 	{
@@ -95,21 +95,21 @@ void CBreakable::KeyValue(KeyValueData *pkvd)
 		else
 			m_Material = (Materials)i;
 
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "deadmodel"))
 	{
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "shards"))
 	{
 		//			m_iShards = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "gibmodel"))
 	{
 		m_iszGibModel = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "spawnobject"))
 	{
@@ -117,16 +117,16 @@ void CBreakable::KeyValue(KeyValueData *pkvd)
 		//if ( object > 0 && object < ARRAYSIZE(pSpawnObjects) )
 		//	m_iszSpawnObject = MAKE_STRING( pSpawnObjects[object] );
 
-		//pkvd->fHandled = TRUE;
+		//pkvd->fHandled = true;
 		CBaseDelay::KeyValue(pkvd);
 	}
 	else if (FStrEq(pkvd->szKeyName, "explodemagnitude"))
 	{
 		ExplosionSetMagnitude(atoi(pkvd->szValue));
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "lip"))
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	else
 		CBaseDelay::KeyValue(pkvd);
 }
@@ -826,7 +826,7 @@ void CBreakable::Die(void)
 
 	if (Explodable())
 	{
-		ExplosionCreate(Center(), pev->angles, edict(), ExplosionMagnitude(), TRUE);
+		ExplosionCreate(Center(), pev->angles, edict(), ExplosionMagnitude(), true);
 	}
 }
 
@@ -927,7 +927,7 @@ void CPushable ::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "size"))
 	{
 		int bbox = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 
 		switch (bbox)
 		{
@@ -952,7 +952,7 @@ void CPushable ::KeyValue(KeyValueData *pkvd)
 	else if (FStrEq(pkvd->szKeyName, "buoyancy"))
 	{
 		pev->skin = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CBreakable::KeyValue(pkvd);
diff --git a/src/game/server/gamerules/gamerules.cpp b/src/game/server/gamerules/gamerules.cpp
index c10a19c5..91101ddf 100644
--- a/src/game/server/gamerules/gamerules.cpp
+++ b/src/game/server/gamerules/gamerules.cpp
@@ -35,7 +35,7 @@ extern int gmsgMOTD;
 //=========================================================
 BOOL CGameRules::CanHaveAmmo(CBasePlayer *pPlayer, const char *pszAmmoName, int iMaxCarry)
 {
-	return FALSE;
+	return false;
 }
 
 //=========================================================
@@ -51,7 +51,7 @@ edict_t *CGameRules ::GetPlayerSpawnSpot(CBasePlayer *pPlayer)
 {
 	// only living players can have items
 	if ( pPlayer->pev->deadflag != DEAD_NO )
-		return FALSE;
+		return false;
 
 	if ( pWeapon->pszAmmo1() )
 	{
@@ -61,7 +61,7 @@ edict_t *CGameRules ::GetPlayerSpawnSpot(CBasePlayer *pPlayer)
 			// have the gun if we aren't already carrying one of this type
 			if ( pPlayer->HasPlayerItem( pWeapon ) )
 			{
-				return FALSE;
+				return false;
 			}
 		}
 	}
@@ -70,12 +70,12 @@ edict_t *CGameRules ::GetPlayerSpawnSpot(CBasePlayer *pPlayer)
 		// weapon doesn't use ammo, don't take another if you already have it.
 		if ( pPlayer->HasPlayerItem( pWeapon ) )
 		{
-			return FALSE;
+			return false;
 		}
 	}
 
 	// note: will fall through to here if GetItemInfo doesn't fill the struct!
-	return TRUE;
+	return true;
 }*/
 
 //=========================================================
diff --git a/src/game/server/gamerules/gamerules.h b/src/game/server/gamerules/gamerules.h
index 40eb1cce..3ce7856e 100644
--- a/src/game/server/gamerules/gamerules.h
+++ b/src/game/server/gamerules/gamerules.h
@@ -70,7 +70,7 @@ class CGameRules
 	// Functions to verify the single/multiplayer status of a game
 	virtual BOOL IsMultiplayer(void) = 0;								 // is this a multiplayer game? (either coop or deathmatch)
 	virtual BOOL IsDeathmatch(void) = 0;								 //is this a deathmatch game?
-	virtual BOOL IsTeamplay(void) { return FALSE; };					 // is this deathmatch game being played with team rules?
+	virtual BOOL IsTeamplay(void) { return false; };					 // is this deathmatch game being played with team rules?
 	virtual BOOL IsCoOp(void) = 0;										 // is this a coop game?
 	virtual const char *GetGameDescription(void) { return "Half-Life"; } // this is the game name that gets seen in the server browser
 
@@ -82,8 +82,8 @@ class CGameRules
 
 	// Client damage rules
 	virtual float FlPlayerFallDamage(CBasePlayer *pPlayer) = 0;										  // this client just hit the ground after a fall. How much damage?
-	virtual BOOL FPlayerCanTakeDamage(CBasePlayer *pPlayer, CBaseEntity *pAttacker) { return TRUE; }; // can this player take damage from this attacker?
-	virtual BOOL ShouldAutoAim(CBasePlayer *pPlayer, edict_t *target) { return TRUE; }
+	virtual BOOL FPlayerCanTakeDamage(CBasePlayer *pPlayer, CBaseEntity *pAttacker) { return true; }; // can this player take damage from this attacker?
+	virtual BOOL ShouldAutoAim(CBasePlayer *pPlayer, edict_t *target) { return true; }
 
 	// Client spawn/respawn control
 	virtual void PlayerSpawn(CBasePlayer *pPlayer) = 0;		   // called by CBasePlayer::Spawn just before releasing player into the game
@@ -92,8 +92,8 @@ class CGameRules
 	virtual float FlPlayerSpawnTime(CBasePlayer *pPlayer) = 0; // When in the future will this player be able to spawn?
 	virtual edict_t *GetPlayerSpawnSpot(CBasePlayer *pPlayer); // Place this player on their spawnspot and face them the proper direction.
 
-	virtual BOOL AllowAutoTargetCrosshair(void) { return TRUE; };
-	virtual BOOL ClientCommand(CBasePlayer *pPlayer, const char *pcmd) { return FALSE; }; // handles the user commands;  returns TRUE if command handled properly
+	virtual BOOL AllowAutoTargetCrosshair(void) { return true; };
+	virtual BOOL ClientCommand(CBasePlayer *pPlayer, const char *pcmd) { return false; }; // handles the user commands;  returns true if command handled properly
 	virtual void ClientUserInfoChanged(CBasePlayer *pPlayer, char *infobuffer) {}		  // the player has changed userinfo;  can change it now
 
 	// Client kills/scoring
@@ -144,13 +144,13 @@ class CGameRules
 	virtual int PlayerRelationship(CBaseEntity *pPlayer, CBaseEntity *pTarget) = 0; // What is the player's relationship with this entity?
 	virtual int GetTeamIndex(const char *pTeamName) { return -1; }
 	virtual const char *GetIndexedTeamName(int teamIndex) { return ""; }
-	virtual BOOL IsValidTeam(const char *pTeamName) { return TRUE; }
+	virtual BOOL IsValidTeam(const char *pTeamName) { return true; }
 	virtual void ChangePlayerTeam(CBasePlayer *pPlayer, const char *pTeamName, BOOL bKill, BOOL bGib) {}
 	virtual const char *SetDefaultPlayerTeam(CBasePlayer *pPlayer) { return ""; }
 
 	// Sounds
-	virtual BOOL PlayTextureSounds(void) { return TRUE; }
-	virtual BOOL PlayFootstepSounds(CBasePlayer *pl, float fvol) { return TRUE; }
+	virtual BOOL PlayTextureSounds(void) { return true; }
+	virtual BOOL PlayFootstepSounds(CBasePlayer *pl, float fvol) { return true; }
 
 	// Monsters
 	virtual BOOL FAllowMonsters(void) = 0; //are monsters allowed
@@ -173,7 +173,7 @@ class CHalfLifeRules : public CGameRules
 	// GR_Think
 	virtual void Think(void);
 	virtual BOOL IsAllowedToSpawn(CBaseEntity *pEntity);
-	virtual BOOL FAllowFlashlight(void) { return TRUE; };
+	virtual BOOL FAllowFlashlight(void) { return true; };
 
 	virtual BOOL FShouldSwitchWeapon(CBasePlayer *pPlayer, CBasePlayerItem *pWeapon);
 	virtual BOOL GetNextBestWeapon(CBasePlayer *pPlayer, CBasePlayerItem *pCurrentWeapon);
diff --git a/src/game/server/gamerules/multiplay_gamerules.cpp b/src/game/server/gamerules/multiplay_gamerules.cpp
index 3bbb95a6..071ca4e3 100644
--- a/src/game/server/gamerules/multiplay_gamerules.cpp
+++ b/src/game/server/gamerules/multiplay_gamerules.cpp
@@ -261,14 +261,14 @@ bool CHalfLifeMultiplay::IsAnyPlayerAllowedInMap()
 //=========================================================
 BOOL CHalfLifeMultiplay::IsMultiplayer( void )
 {
-	return TRUE;
+	return true;
 }
 
 //=========================================================
 //=========================================================
 BOOL CHalfLifeMultiplay::IsDeathmatch( void )
 {
-	return TRUE;
+	return true;
 }
 
 //=========================================================
@@ -285,33 +285,33 @@ BOOL CHalfLifeMultiplay::FShouldSwitchWeapon( CBasePlayer *pPlayer, CBasePlayerI
 	if ( !pWeapon->CanDeploy() )
 	{
 		// that weapon can't deploy anyway.
-		return FALSE;
+		return false;
 	}
 
 	if ( !pPlayer->m_pActiveItem )
 	{
 		// player doesn't have an active item!
-		return TRUE;
+		return true;
 	}
 
 	if ( !pPlayer->m_pActiveItem->CanHolster() )
 	{
 		// can't put away the active item.
-		return FALSE;
+		return false;
 	}
 
 	if ( pWeapon->iWeight() > pPlayer->m_pActiveItem->iWeight() )
 	{
-		return TRUE;
+		return true;
 	}
 
-	return FALSE;
+	return false;
 }
 
 BOOL CHalfLifeMultiplay::GetNextBestWeapon( CBasePlayer *pPlayer, CBasePlayerItem *pCurrentWeapon )
 {
 	//Function unused
-	return FALSE;
+	return false;
 }
 
 //=========================================================
@@ -326,12 +326,12 @@ BOOL CHalfLifeMultiplay::ClientConnected(edict_t *pEntity, const char *pszName,
 	if( CheckBanned( AuthID ) )
 	{
 		strncpy(szRejectReason, "You are BANNED\n", 128);
-		return FALSE;
+		return false;
 	}
 
 	g_ServerResetTimer = NULL;
 
-	return TRUE;
+	return true;
 }
 
 extern int gmsgSayText;
@@ -487,7 +487,7 @@ float CHalfLifeMultiplay::FlPlayerFallDamage( CBasePlayer *pPlayer )
 //=========================================================
 BOOL CHalfLifeMultiplay::FPlayerCanTakeDamage( CBasePlayer *pPlayer, CBaseEntity *pAttacker )
 {
-	return TRUE;
+	return true;
 }
 
 //=========================================================
@@ -498,7 +498,7 @@ void CHalfLifeMultiplay::PlayerThink( CBasePlayer *pPlayer )
 	{
 		// check for button presses
 		if ( pPlayer->m_afButtonPressed & ( IN_DUCK | IN_ATTACK | IN_ATTACK2 | IN_USE | IN_JUMP ) )
-			m_iEndIntermissionButtonHit = TRUE;
+			m_iEndIntermissionButtonHit = true;
 
 		// clear attack/use commands from player
 		pPlayer->m_afButtonPressed = 0;
@@ -518,7 +518,7 @@ void CHalfLifeMultiplay::PlayerSpawn( CBasePlayer *pPlayer )
 //=========================================================
 BOOL CHalfLifeMultiplay::FPlayerCanRespawn( CBasePlayer *pPlayer )
 {
-	return TRUE;
+	return true;
 }
 
 //=========================================================
@@ -530,7 +530,7 @@ float CHalfLifeMultiplay::FlPlayerSpawnTime( CBasePlayer *pPlayer )
 
 BOOL CHalfLifeMultiplay::AllowAutoTargetCrosshair( void )
 {
-	return FALSE;
+	return false;
 }
 
 //=========================================================
@@ -817,7 +817,7 @@ int CHalfLifeMultiplay::WeaponShouldRespawn( CBasePlayerItem *pWeapon )
 }
 
 //=========================================================
-// CanHaveWeapon - returns FALSE if the player is not allowed
+// CanHaveWeapon - returns false if the player is not allowed
 // to pick up this weapon
 //=========================================================
 /*BOOL CHalfLifeMultiplay::CanHavePlayerItem( CBasePlayer *pPlayer, CBasePlayerItem *pItem )
@@ -836,7 +836,7 @@ int CHalfLifeMultiplay::WeaponShouldRespawn( CBasePlayerItem *pWeapon )
 			{
 				if ( it->m_iId == pItem->m_iId )
 				{
-					return FALSE;
+					return false;
 				}
 
 				it = it->m_pNext;
@@ -851,7 +851,7 @@ int CHalfLifeMultiplay::WeaponShouldRespawn( CBasePlayerItem *pWeapon )
 //=========================================================
 BOOL CHalfLifeMultiplay::CanHaveItem( CBasePlayer *pPlayer, CItem *pItem )
 {
-	return TRUE;
+	return true;
 }
 
 //=========================================================
@@ -900,7 +900,7 @@ void CHalfLifeMultiplay::PlayerGotAmmo( CBasePlayer *pPlayer, char *szName, int
 //=========================================================
 BOOL CHalfLifeMultiplay::IsAllowedToSpawn( CBaseEntity *pEntity )
 {
-	return TRUE;
+	return true;
 }
 
 //=========================================================
@@ -973,24 +973,24 @@ int CHalfLifeMultiplay::PlayerRelationship( CBaseEntity *pPlayer, CBaseEntity *p
 BOOL CHalfLifeMultiplay::PlayFootstepSounds( CBasePlayer *pl, float fvol )
 {
 	if ( g_footsteps && g_footsteps->value == 0 )
-		return FALSE;
+		return false;
 
 	if ( pl->IsOnLadder() || pl->pev->velocity.Length2D() > 220 )
-		return TRUE;  // only make step sounds in multiplayer if the player is moving fast enough
+		return true;  // only make step sounds in multiplayer if the player is moving fast enough
 
-	return FALSE;
+	return false;
 }
 
 BOOL CHalfLifeMultiplay::FAllowFlashlight( void ) 
 { 
-	return FALSE; 
+	return false; 
 }
 
 //=========================================================
 //=========================================================
 BOOL CHalfLifeMultiplay::FAllowMonsters( void )
 {
-	return TRUE;
+	return true;
 	//return ( CVAR_GET_FLOAT( "mp_allowmonsters" ) != 0 );
 }
 
@@ -1007,8 +1007,8 @@ void CHalfLifeMultiplay::GoToIntermission( void )
 	MESSAGE_END();
 
 	m_flIntermissionEndTime = gpGlobals->time + INTERMISSION_TIME;
-	g_fGameOver = TRUE;
-	m_iEndIntermissionButtonHit = FALSE;
+	g_fGameOver = true;
+	m_iEndIntermissionButtonHit = false;
 }
 
 #define MAX_RULE_BUFFER 1024
@@ -1419,7 +1419,7 @@ void CHalfLifeMultiplay :: ChangeLevel( void )
 	strncpy(szFirstMapInList, "edana", sizeof(szFirstMapInList));  // the absolute default level is edana
 
 	unsigned int curplayers;
-	BOOL do_cycle = TRUE;
+	BOOL do_cycle = true;
 
 	// find the map to change to
 	char *mapcfile = (char*)CVAR_GET_STRING( "mapcyclefile" );
@@ -1440,14 +1440,14 @@ void CHalfLifeMultiplay :: ChangeLevel( void )
 		if ( !ReloadMapCycleFile( mapcfile, &mapcycle ) || ( !mapcycle.items ) )
 		{
 			ALERT( at_console, "Unable to load map cycle file %s\n", mapcfile );
-			do_cycle = FALSE;
+			do_cycle = false;
 		}
 	}
 
 	if ( do_cycle && mapcycle.items )
 	{
-		BOOL keeplooking = FALSE;
-		BOOL found = FALSE;
+		BOOL keeplooking = false;
+		BOOL found = false;
 		mapcycle_item_s *item;
 
 		// Assume current map
@@ -1457,7 +1457,7 @@ void CHalfLifeMultiplay :: ChangeLevel( void )
 		// Traverse list
 		for ( item = mapcycle.next_item; item->next != mapcycle.next_item; item = item->next )
 		{
-			keeplooking = FALSE;
+			keeplooking = false;
 
 			ASSERT( item != NULL );
 
@@ -1465,12 +1465,12 @@ void CHalfLifeMultiplay :: ChangeLevel( void )
 			{
 				if ( curplayers >= item->minplayers )
 				{
-					found = TRUE;
+					found = true;
 					minplayers = item->minplayers;
 				}
 				else
 				{
-					keeplooking = TRUE;
+					keeplooking = true;
 				}
 			}
 
@@ -1478,19 +1478,19 @@ void CHalfLifeMultiplay :: ChangeLevel( void )
 			{
 				if ( curplayers <= item->maxplayers )
 				{
-					found = TRUE;
+					found = true;
 					maxplayers = item->maxplayers;
 				}
 				else
 				{
-					keeplooking = TRUE;
+					keeplooking = true;
 				}
 			}
 
 			if ( keeplooking )
 				continue;
 
-			found = TRUE;
+			found = true;
 			break;
 		}
 
@@ -1514,7 +1514,7 @@ void CHalfLifeMultiplay :: ChangeLevel( void )
 		 strncpy(szNextMap,  szFirstMapInList, sizeof(szNextMap) );
 	}
 
-	g_fGameOver = TRUE;
+	g_fGameOver = true;
 
 	ALERT( at_console, "CHANGE LEVEL: %s\n", szNextMap );
 	if ( minplayers || maxplayers )
@@ -1572,7 +1572,7 @@ void CHalfLifeMultiplay :: SendMOTDToClient( edict_t *client )
 			*pFileList = 0;
 
 		MESSAGE_BEGIN( MSG_ONE, gmsgMOTD, NULL, client );
-			WRITE_BYTE( *pFileList ? FALSE : TRUE );	// FALSE means there is still more message to come
+			WRITE_BYTE( *pFileList ? false : true );	// false means there is still more message to come
 			WRITE_STRING_LIMIT(chunk, sizeof(chunk));
 		MESSAGE_END();
 	}
@@ -1588,13 +1588,13 @@ void CHalfLifeMultiplay :: SendMOTDToClient( edict_t *client )
 BOOL CHalfLifeMultiplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd )
 {
 	if(g_VoiceGameMgr.ClientCommand(pPlayer, pcmd))
-		return TRUE;
+		return true;
 
 	int OldMenu;
 	if( FStrEq( pcmd, "menuselect" ) )
 	{
 		if ( CMD_ARGC() < 2 )
-			return FALSE;
+			return false;
 
 		int slot = atoi( CMD_ARGV(1) );//Starts at 1
 
@@ -1603,7 +1603,7 @@ BOOL CHalfLifeMultiplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd
 		//Check if you've set a different menu first
 		if( pPlayer->CurrentMenu == OldMenu
 			&& !pPlayer->CurrentCallbackMenu ) pPlayer->CurrentMenu = NULL;
-		return TRUE;
+		return true;
 	}
 	else if( FStrEq( pcmd, "forgive" ) )
 	{
@@ -1629,7 +1629,7 @@ BOOL CHalfLifeMultiplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd
 		else {
 			pPlayer->SendInfoMsg( "Forgive: Use this command to remove your accidental death from the killer's record\n" );
 		}
-		return TRUE;
+		return true;
 	}
 	else if( FStrEq( pcmd, "joinparty" ) )
 	{
@@ -1638,7 +1638,7 @@ BOOL CHalfLifeMultiplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd
 			if( pPlayer->m_pTeam )
 			{
 				pPlayer->SendInfoMsg( "You are already in a party!  Type 'leaveparty' to leave it\n" );
-				return TRUE;
+				return true;
 			}
 			//Get the party name
 			char Name[MAX_TEAMNAME_LEN+1];
@@ -1687,7 +1687,7 @@ BOOL CHalfLifeMultiplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd
 				pPlayer->SetTeam( pTeam );
 			}
 		}
-		return TRUE;
+		return true;
 	}
 	else if( FStrEq( pcmd, "leaveparty" ) )
 	{
@@ -1714,7 +1714,7 @@ BOOL CHalfLifeMultiplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd
 		else {
 			pPlayer->SendInfoMsg( "You aren't in a party!\n" );
 		}
-		return TRUE;
+		return true;
 	}
 	else if (FStrEq(pcmd, "startvote") && CMD_ARGC() >= 3 )
 	{
@@ -1732,13 +1732,13 @@ BOOL CHalfLifeMultiplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd
 			else 
 				pPlayer->SendInfoMsg( "This server doesn't allow time voting\n" );
 		}
-		else return FALSE;
-		return TRUE;
+		else return false;
+		return true;
 	}
 	else if (FStrEq(pcmd, "vote") && CMD_ARGV(1))
 	{
 		TallyVote( pPlayer, atoi(CMD_ARGV(1)) ? true : false );
-		return TRUE;
+		return true;
 	}
 	else if( FStrEq( pcmd, "accept" ) )
 	{
@@ -1801,7 +1801,7 @@ BOOL CHalfLifeMultiplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd
 				AcceptType = 3;
 			}
 		}
-		return TRUE;
+		return true;
 	}
 	else if( FStrEq( pcmd, "as_reload_scripts" ) )
 	{
@@ -1814,7 +1814,7 @@ BOOL CHalfLifeMultiplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd
 			{
 				pPlayer->SendInfoMsg("Error: This command requires developer permissions.");
 				ALERT(at_console, "as_reload_scripts: Permission denied for %s (Steam ID: %s)\n", pPlayer->DisplayName(), pszSteamID ? pszSteamID : "Unknown");
-				return TRUE;
+				return true;
 			}
 		}
 		
@@ -1823,7 +1823,7 @@ BOOL CHalfLifeMultiplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd
 		{
 			pPlayer->SendInfoMsg("Error: Development mode must be enabled (ms_dev_mode 1).");
 			ALERT(at_console, "as_reload_scripts: Development mode not enabled\n");
-			return TRUE;
+			return true;
 		}
 		
 		pPlayer->SendInfoMsg("Initiating script hot-reload...");
@@ -1862,13 +1862,13 @@ BOOL CHalfLifeMultiplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd
 			ALERT(at_console, "as_reload_scripts: Module system not available\n");
 		}
 		
-		return TRUE;
+		return true;
 	}
 	else if( FStrEq( pcmd, "as_pak_status" ) )
 	{
 		// Console command to check PAK file status
 		if( !pPlayer )
-			return TRUE;
+			return true;
 		
 		// Check developer permissions
 		msstring steamid = pPlayer->AuthID();
@@ -1877,7 +1877,7 @@ BOOL CHalfLifeMultiplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd
 		if( !( szSteamID && ( FStrEq( szSteamID, "STEAM_0:1:630973602" ) || pPlayer->IsElite() ) ) )
 		{
 			pPlayer->SendInfoMsg("Access denied. Developer permissions required.");
-			return TRUE;
+			return true;
 		}
 		
 		// Display PAK file diagnostic information
@@ -1929,13 +1929,13 @@ BOOL CHalfLifeMultiplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd
 			ALERT(at_console, "Module System: NOT AVAILABLE\n");
 		}
 		
-		return TRUE;
+		return true;
 	}
 	else if( FStrEq( pcmd, "as_pak_test" ) )
 	{
 		// Console command to test PAK file access
 		if( !pPlayer )
-			return TRUE;
+			return true;
 		
 		// Check developer permissions
 		msstring steamid = pPlayer->AuthID();
@@ -1944,7 +1944,7 @@ BOOL CHalfLifeMultiplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd
 		if( !( szSteamID && ( FStrEq( szSteamID, "STEAM_0:1:630973602" ) || pPlayer->IsElite() ) ) )
 		{
 			pPlayer->SendInfoMsg("Access denied. Developer permissions required.");
-			return TRUE;
+			return true;
 		}
 		
 		pPlayer->SendInfoMsg("Testing PAK file refresh...");
@@ -1972,7 +1972,7 @@ BOOL CHalfLifeMultiplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd
 			ALERT(at_console, "as_pak_test: Module system not available\n");
 		}
 		
-		return TRUE;
+		return true;
 	}
 	else if( FStrEq( pcmd, "say" ) )
 	{
@@ -1983,7 +1983,7 @@ BOOL CHalfLifeMultiplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd
 		if( !pszText )
 		{
 			ALERT( at_console, "Say command: CMD_ARGS() returned NULL pointer\n" );
-			return FALSE; // Let default handling continue
+			return false; // Let default handling continue
 		}
 		
 		// Additional memory validation - check if pointer is in valid memory range
@@ -1991,14 +1991,14 @@ BOOL CHalfLifeMultiplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd
 		/*if( IsBadReadPtr( pszText, 1 ) )
 		{
 			ALERT( at_console, "Say command: CMD_ARGS() returned invalid memory pointer\n" );
-			return FALSE;
+			return false;
 		}*/
 		
 		// Check for empty string
 		if( !*pszText )
 		{
 			// Empty text - let default handling continue
-			return FALSE;
+			return false;
 		}
 		
 		// Safe length calculation with additional bounds checking
@@ -2015,21 +2015,21 @@ BOOL CHalfLifeMultiplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd
 		
 		if( textLen == 0 )
 		{
-			return FALSE; // Empty text
+			return false; // Empty text
 		}
 		
 		if( textLen >= MAX_SAFE_LENGTH )
 		{
 			ALERT( at_console, "Say command: Text length exceeds safety limit (%zu >= %zu)\n", textLen, MAX_SAFE_LENGTH );
 			ClientPrint( pPlayer->pev, HUD_PRINTCENTER, "Message too long" );
-			return TRUE; // Block this command
+			return true; // Block this command
 		}
 		
 		if( textLen > 256 )
 		{
 			// Reject excessively long messages
 			ClientPrint( pPlayer->pev, HUD_PRINTCENTER, "Message too long" );
-			return TRUE; // Block this command
+			return true; // Block this command
 		}
 		
 		// Create a safe copy of the text for further processing
@@ -2046,7 +2046,7 @@ BOOL CHalfLifeMultiplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd
 		else
 		{
 			ALERT( at_console, "Say command: Text length invalid for safe copy (%zu)\n", textLen );
-			return FALSE;
+			return false;
 		}
 		
 		// Use the safe copy for all further operations
@@ -2112,13 +2112,13 @@ BOOL CHalfLifeMultiplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd
 		if( isVoteCommand )
 		{
 			// Block the normal chat message since this is a command
-			return TRUE;
+			return true;
 		}
 		
 		// Let normal chat messages continue through default handling
-		return FALSE;
+		return false;
 	}
-	return FALSE;
+	return false;
 }
 
 //=========================================================
diff --git a/src/game/server/gamerules/team.cpp b/src/game/server/gamerules/team.cpp
index a96f1f67..f2f541c8 100644
--- a/src/game/server/gamerules/team.cpp
+++ b/src/game/server/gamerules/team.cpp
@@ -121,12 +121,12 @@ void CTeam ::RemoveFromTeam(CBasePlayer *pPlayer)
 BOOL CTeam ::ExistsInList(CBasePlayer *pPlayer)
 {
 	if (!pPlayer)
-		return FALSE;
+		return false;
 	ValidateUnits();
 	for (unsigned int i = 0; i < MemberList.size(); i++)
 		if (MemberList[i].idx == pPlayer->entindex() && MemberList[i].ID == (ulong)pPlayer)
-			return TRUE;
-	return FALSE;
+			return true;
+	return false;
 }
 CTeam::~CTeam()
 {
@@ -160,15 +160,15 @@ void CTeam ::SetSolidMembers(BOOL fSolid)
 BOOL SameTeam(CBaseEntity *pObject1, CBaseEntity *pObject2)
 {
 	//Original:
-	/*if( !pObject1->TeamID()[0] || !pObject2->TeamID()[0] ) return FALSE;
-	if( pObject1->TeamID() == pObject2->TeamID() ) return TRUE;
-	return FALSE;*/
+	/*if( !pObject1->TeamID()[0] || !pObject2->TeamID()[0] ) return false;
+	if( pObject1->TeamID() == pObject2->TeamID() ) return true;
+	return false;*/
 
 	if (!pObject1->TeamID()[0] || !pObject2->TeamID()[0])
-		return FALSE;
+		return false;
 	if (strcmp(pObject1->TeamID(), pObject2->TeamID()) == 0)
-		return TRUE; //MiB AUG2007a: Comparing with == is bad. Bad, Dogg. Bad.
-	return FALSE;
+		return true; //MiB AUG2007a: Comparing with == is bad. Bad, Dogg. Bad.
+	return false;
 }
 /*int CBaseEntity::TeamID( void ) { return m_pTeam ? m_pTeam->TeamID() : -1; }
 void CBaseEntity::SetTeam( CTeam *pTeam ) {
diff --git a/src/game/server/ggrenade.cpp b/src/game/server/ggrenade.cpp
index 2d30d306..ebed187e 100644
--- a/src/game/server/ggrenade.cpp
+++ b/src/game/server/ggrenade.cpp
@@ -250,7 +250,7 @@ void CGrenade::BounceTouch(CBaseEntity *pOther)
 
 		// register a radius louder than the explosion, so we make sure everyone gets out of the way
 		CSoundEnt::InsertSound(bits_SOUND_DANGER, pev->origin, pev->dmg / 0.4, 0.3);
-		m_fRegisteredSound = TRUE;
+		m_fRegisteredSound = true;
 	}
 
 	if (pev->flags & FL_ONGROUND)
@@ -351,7 +351,7 @@ void CGrenade::Spawn(void)
 	UTIL_SetSize(pev, Vector(0, 0, 0), Vector(0, 0, 0));
 
 	pev->dmg = 100;
-	m_fRegisteredSound = FALSE;
+	m_fRegisteredSound = false;
 }
 
 CGrenade *CGrenade::ShootContact(entvars_t *pevOwner, Vector vecStart, Vector vecVelocity)
diff --git a/src/game/server/h_export.cpp b/src/game/server/h_export.cpp
index 78ecb7a6..2dea9b62 100644
--- a/src/game/server/h_export.cpp
+++ b/src/game/server/h_export.cpp
@@ -57,7 +57,7 @@ BOOL WINAPI DllMain(
 	else if (fdwReason == DLL_PROCESS_DETACH)
 		MSGlobals::DLLDetach();
 
-	return TRUE;
+	return true;
 }
 #endif
 
diff --git a/src/game/server/hl/animating.cpp b/src/game/server/hl/animating.cpp
index 4b904cfa..05dfe444 100644
--- a/src/game/server/hl/animating.cpp
+++ b/src/game/server/hl/animating.cpp
@@ -64,7 +64,7 @@ float CBaseAnimating ::StudioFrameAdvance(float flInterval)
 			pev->frame -= (int)(pev->frame / 256.0) * 256.0;
 		else
 			pev->frame = (pev->frame < 0.0) ? 0 : 255;
-		m_fSequenceFinished = TRUE; // just in case it wasn't caught in GetEvents
+		m_fSequenceFinished = true; // just in case it wasn't caught in GetEvents
 	}
 
 	return flInterval;
@@ -113,7 +113,7 @@ void CBaseAnimating ::ResetSequenceInfo()
 	m_fSequenceLoops = ((GetSequenceFlags() & STUDIO_LOOPING) != 0);
 	pev->animtime = gpGlobals->time;
 	pev->framerate = 1.0;
-	m_fSequenceFinished = FALSE;
+	m_fSequenceFinished = false;
 	m_flLastEventCheck = gpGlobals->time;
 }
 
@@ -154,9 +154,9 @@ void CBaseAnimating ::DispatchAnimEvents(float flInterval)
 	float flEnd = pev->frame + flInterval * m_flFrameRate * pev->framerate;
 	m_flLastEventCheck = pev->animtime + flInterval;
 
-	m_fSequenceFinished = FALSE;
+	m_fSequenceFinished = false;
 	if (flEnd >= 256 || flEnd <= 0.0)
-		m_fSequenceFinished = TRUE;
+		m_fSequenceFinished = true;
 
 	int index = 0;
 
diff --git a/src/game/server/hl/buttons.cpp b/src/game/server/hl/buttons.cpp
index 2ee68c70..1b97e9ab 100644
--- a/src/game/server/hl/buttons.cpp
+++ b/src/game/server/hl/buttons.cpp
@@ -62,7 +62,7 @@ LINK_ENTITY_TO_CLASS(env_global, CEnvGlobal);
 
 void CEnvGlobal::KeyValue(KeyValueData *pkvd)
 {
-	pkvd->fHandled = TRUE;
+	pkvd->fHandled = true;
 
 	if (FStrEq(pkvd->szKeyName, "globalstate")) // State name
 		m_globalstate = ALLOC_STRING(pkvd->szValue);
@@ -147,11 +147,11 @@ void CMultiSource::KeyValue(KeyValueData *pkvd)
 		FStrEq(pkvd->szKeyName, "value1") ||
 		FStrEq(pkvd->szKeyName, "value2") ||
 		FStrEq(pkvd->szKeyName, "value3"))
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	else if (FStrEq(pkvd->szKeyName, "globalstate"))
 	{
 		m_globalstate = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CPointEntity::KeyValue(pkvd);
@@ -402,32 +402,32 @@ void CBaseButton::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "changetarget"))
 	{
 		m_strChangeTarget = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "locked_sound"))
 	{
 		m_bLockedSound = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "locked_sentence"))
 	{
 		m_bLockedSentence = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "unlocked_sound"))
 	{
 		m_bUnlockedSound = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "unlocked_sentence"))
 	{
 		m_bUnlockedSentence = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "sounds"))
 	{
 		m_sounds = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CBaseToggle::KeyValue(pkvd);
@@ -531,8 +531,8 @@ void CBaseButton::Spawn()
 	if (((m_vecPosition2 - m_vecPosition1).Length() < 1) || (pev->spawnflags & SF_BUTTON_DONTMOVE))
 		m_vecPosition2 = m_vecPosition1;
 
-	m_fStayPushed = (m_flWait == -1 ? TRUE : FALSE);
-	m_fRotating = FALSE;
+	m_fStayPushed = (m_flWait == -1 ? true : false);
+	m_fRotating = false;
 
 	// if the button is flagged for USE button activation only, take away it's touch function and add a use function
 
@@ -736,7 +736,7 @@ void CBaseButton::ButtonTouch(CBaseEntity *pOther)
 	if (!UTIL_IsMasterTriggered(m_sMaster, pOther))
 	{
 		// play button locked sound
-		PlayLockSounds(pev, &m_ls, TRUE, TRUE);
+		PlayLockSounds(pev, &m_ls, true, true);
 		return;
 	}
 
@@ -763,13 +763,13 @@ void CBaseButton::ButtonActivate()
 	if (!UTIL_IsMasterTriggered(m_sMaster, m_hActivator))
 	{
 		// button is locked, play locked sound
-		PlayLockSounds(pev, &m_ls, TRUE, TRUE);
+		PlayLockSounds(pev, &m_ls, true, true);
 		return;
 	}
 	else
 	{
 		// button is unlocked, play unlocked sound
-		PlayLockSounds(pev, &m_ls, FALSE, TRUE);
+		PlayLockSounds(pev, &m_ls, false, true);
 	}
 
 	ASSERT(m_toggle_state == TS_AT_BOTTOM);
@@ -939,8 +939,8 @@ void CRotButton::Spawn(void)
 	m_vecAngle2 = pev->angles + pev->movedir * m_flMoveDistance;
 	ASSERTSZ(m_vecAngle1 != m_vecAngle2, "rotating button start/end positions are equal");
 
-	m_fStayPushed = (m_flWait == -1 ? TRUE : FALSE);
-	m_fRotating = TRUE;
+	m_fStayPushed = (m_flWait == -1 ? true : false);
+	m_fRotating = true;
 
 	// if the button is flagged for USE button activation only, take away it's touch function and add a use function
 	if (!FBitSet(pev->spawnflags, SF_BUTTON_TOUCH_ONLY))
@@ -1050,12 +1050,12 @@ void CMomentaryRotButton::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "returnspeed"))
 	{
 		m_returnSpeed = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "sounds"))
 	{
 		m_sounds = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CBaseToggle::KeyValue(pkvd);
@@ -1104,11 +1104,11 @@ void CMomentaryRotButton::UpdateAllButtons(float value, int start)
 
 void CMomentaryRotButton::UpdateSelf(float value)
 {
-	BOOL fplaysound = FALSE;
+	BOOL fplaysound = false;
 
 	if (!m_lastUsed)
 	{
-		fplaysound = TRUE;
+		fplaysound = true;
 		m_direction = -m_direction;
 	}
 	m_lastUsed = 1;
@@ -1271,7 +1271,7 @@ void CEnvSpark::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "MaxDelay"))
 	{
 		m_flDelay = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "style") ||
 			 FStrEq(pkvd->szKeyName, "height") ||
@@ -1279,7 +1279,7 @@ void CEnvSpark::KeyValue(KeyValueData *pkvd)
 			 FStrEq(pkvd->szKeyName, "value1") ||
 			 FStrEq(pkvd->szKeyName, "value2") ||
 			 FStrEq(pkvd->szKeyName, "value3"))
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	else
 		CBaseEntity::KeyValue(pkvd);
 }
diff --git a/src/game/server/hl/cbase.cpp b/src/game/server/hl/cbase.cpp
index c9e88996..48dead1e 100644
--- a/src/game/server/hl/cbase.cpp
+++ b/src/game/server/hl/cbase.cpp
@@ -109,11 +109,11 @@ extern "C" {
 	{
 		if (!pFunctionTable || interfaceVersion != INTERFACE_VERSION)
 		{
-			return FALSE;
+			return false;
 		}
 
 		memcpy(pFunctionTable, &gFunctionTable, sizeof(DLL_FUNCTIONS));
-		return TRUE;
+		return true;
 	}
 
 	int GetEntityAPI2(DLL_FUNCTIONS* pFunctionTable, int* interfaceVersion)
@@ -122,11 +122,11 @@ extern "C" {
 		{
 			// Tell engine what version we had, so it can figure out who is out of date.
 			*interfaceVersion = INTERFACE_VERSION;
-			return FALSE;
+			return false;
 		}
 
 		memcpy(pFunctionTable, &gFunctionTable, sizeof(DLL_FUNCTIONS));
-		return TRUE;
+		return true;
 	}
 
 	int GetNewDLLFunctions(NEW_DLL_FUNCTIONS* pFunctionTable, int* interfaceVersion)
@@ -134,11 +134,11 @@ extern "C" {
 		if (!pFunctionTable || *interfaceVersion != NEW_DLL_FUNCTIONS_VERSION)
 		{
 			*interfaceVersion = NEW_DLL_FUNCTIONS_VERSION;
-			return FALSE;
+			return false;
 		}
 
 		memcpy(pFunctionTable, &gNewDLLFunctions, sizeof(gNewDLLFunctions));
-		return TRUE;
+		return true;
 	}
 }
 
@@ -228,7 +228,7 @@ void DispatchKeyValue(edict_t *pentKeyvalue, KeyValueData *pkvd)
 
 // HACKHACK -- this is a hack to keep the node graph entity from "touching" things (like triggers)
 // while it builds the graph
-BOOL gTouchDisabled = FALSE;
+BOOL gTouchDisabled = false;
 
 void DispatchTouch(edict_t *pentTouched, edict_t *pentOther)
 {
@@ -761,32 +761,32 @@ BOOL CBaseEntity ::IsInWorld(void)
 {
 	// position
 	if (pev->origin.x >= 4096)
-		return FALSE;
+		return false;
 	if (pev->origin.y >= 4096)
-		return FALSE;
+		return false;
 	if (pev->origin.z >= 4096)
-		return FALSE;
+		return false;
 	if (pev->origin.x <= -4096)
-		return FALSE;
+		return false;
 	if (pev->origin.y <= -4096)
-		return FALSE;
+		return false;
 	if (pev->origin.z <= -4096)
-		return FALSE;
+		return false;
 	// speed
 	if (pev->velocity.x >= 2000)
-		return FALSE;
+		return false;
 	if (pev->velocity.y >= 2000)
-		return FALSE;
+		return false;
 	if (pev->velocity.z >= 2000)
-		return FALSE;
+		return false;
 	if (pev->velocity.x <= -2000)
-		return FALSE;
+		return false;
 	if (pev->velocity.y <= -2000)
-		return FALSE;
+		return false;
 	if (pev->velocity.z <= -2000)
-		return FALSE;
+		return false;
 
-	return TRUE;
+	return true;
 }
 
 int CBaseEntity::ShouldToggle(USE_TYPE useType, BOOL currentState)
diff --git a/src/game/server/hl/cbase.h b/src/game/server/hl/cbase.h
index 2534cd58..73e6cae5 100644
--- a/src/game/server/hl/cbase.h
+++ b/src/game/server/hl/cbase.h
@@ -397,7 +397,7 @@ class CBaseEntity
 	// initialization functions
 	virtual void Spawn(void) {}
 	virtual void Precache(void) { return; }
-	virtual void KeyValue(KeyValueData *pkvd) { pkvd->fHandled = FALSE; }
+	virtual void KeyValue(KeyValueData *pkvd) { pkvd->fHandled = false; }
 	virtual int Save(CSave &save);
 	virtual int Restore(CRestore &restore);
 
@@ -421,7 +421,7 @@ class CBaseEntity
 	virtual void Killed(entvars_t *pevAttacker, int iGib);
 	virtual int BloodColor(void) { return DONT_BLEED; }
 	virtual void TraceBleed(float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType);
-	virtual BOOL IsTriggered(CBaseEntity *pActivator) { return TRUE; }
+	virtual BOOL IsTriggered(CBaseEntity *pActivator) { return true; }
 	virtual CBaseMonster *MyMonsterPointer(void) { return NULL; }
 	virtual CSquadMonster *MySquadMonsterPointer(void) { return NULL; }
 	virtual bool IsMSMonster(void) { return false; }
@@ -437,15 +437,15 @@ class CBaseEntity
 	virtual void SetToggleState(int state) {}
 	virtual void StartSneaking(void) {}
 	virtual void StopSneaking(void) {}
-	virtual BOOL OnControls(entvars_t *pev) { return FALSE; }
-	virtual BOOL IsSneaking(void) { return FALSE; }
+	virtual BOOL OnControls(entvars_t *pev) { return false; }
+	virtual BOOL IsSneaking(void) { return false; }
 	virtual BOOL IsAlive(void) { return (pev->deadflag == DEAD_NO) && pev->health > 0; }
 	virtual BOOL IsBSPModel(void) { return pev->solid == SOLID_BSP || pev->movetype == MOVETYPE_PUSHSTEP; }
 	virtual BOOL ReflectGauss(void) { return (IsBSPModel() && !pev->takedamage); }
 	virtual BOOL HasTarget(string_t targetname) { return FStrEq(STRING(targetname), STRING(pev->targetname)); }
 	virtual BOOL IsInWorld(void);
-	virtual BOOL IsPlayer(void) { return FALSE; }
-	virtual BOOL IsNetClient(void) { return FALSE; }
+	virtual BOOL IsPlayer(void) { return false; }
+	virtual BOOL IsNetClient(void) { return false; }
 	virtual const char *TeamID(void) { return ""; }
 
 	//	virtual void	SetActivator( CBaseEntity *pActivator ) {}
@@ -516,7 +516,7 @@ class CBaseEntity
 	int Intersects(CBaseEntity *pOther);
 	void MakeDormant(void);
 	int IsDormant(void);
-	BOOL IsLockedByMaster(void) { return FALSE; }
+	BOOL IsLockedByMaster(void) { return false; }
 
 	static CBaseEntity *Instance(edict_t *pent)
 	{
@@ -592,7 +592,7 @@ class CBaseEntity
 	//
 	static CBaseEntity *Create(const char *szName, const Vector &vecOrigin, const Vector &vecAngles, edict_t *pentOwner = NULL);
 
-	virtual BOOL FBecomeProne(void) { return FALSE; };
+	virtual BOOL FBecomeProne(void) { return false; };
 	edict_t *edict()
 	{ //Master Sword... Client has no edict_t !
 #ifdef VALVE_DLL
diff --git a/src/game/server/hl/doors.cpp b/src/game/server/hl/doors.cpp
index 5c7110a0..a8efc437 100644
--- a/src/game/server/hl/doors.cpp
+++ b/src/game/server/hl/doors.cpp
@@ -138,7 +138,7 @@ void PlayLockSounds(entvars_t *pev, locksound_t *pls, int flocked, int fbutton)
 			int iprev = pls->iLockedSentence;
 
 			pls->iLockedSentence = SENTENCEG_PlaySequentialSz(ENT(pev), STRING(pls->sLockedSentence),
-															  0.85, ATTN_NORM, 0, 100, pls->iLockedSentence, FALSE);
+															  0.85, ATTN_NORM, 0, 100, pls->iLockedSentence, false);
 			pls->iUnlockedSentence = 0;
 
 			// make sure we don't keep calling last sentence in list
@@ -174,7 +174,7 @@ void PlayLockSounds(entvars_t *pev, locksound_t *pls, int flocked, int fbutton)
 			int iprev = pls->iUnlockedSentence;
 
 			pls->iUnlockedSentence = SENTENCEG_PlaySequentialSz(ENT(pev), STRING(pls->sUnlockedSentence),
-																0.85, ATTN_NORM, 0, 100, pls->iUnlockedSentence, FALSE);
+																0.85, ATTN_NORM, 0, 100, pls->iUnlockedSentence, false);
 			pls->iLockedSentence = 0;
 
 			// make sure we don't keep calling last sentence in list
@@ -194,47 +194,47 @@ void CBaseDoor::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "skin")) //skin is used for content type
 	{
 		pev->skin = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "movesnd"))
 	{
 		m_bMoveSnd = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "stopsnd"))
 	{
 		m_bStopSnd = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "healthvalue"))
 	{
 		m_bHealthValue = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "locked_sound"))
 	{
 		m_bLockedSound = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "locked_sentence"))
 	{
 		m_bLockedSentence = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "unlocked_sound"))
 	{
 		m_bUnlockedSound = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "unlocked_sentence"))
 	{
 		m_bUnlockedSentence = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "WaveHeight"))
 	{
 		pev->scale = atof(pkvd->szValue) * (1.0 / 8.0);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CBaseToggle::KeyValue(pkvd);
@@ -525,7 +525,7 @@ void CBaseDoor::DoorTouch(CBaseEntity *pOther)
 	// play 'locked' sound
 
 	if (m_sMaster && !UTIL_IsMasterTriggered(m_sMaster, pOther))
-		PlayLockSounds(pev, &m_ls, TRUE, FALSE);
+		PlayLockSounds(pev, &m_ls, true, false);
 
 	// If door is somebody's target, then touching does nothing.
 	// You have to activate the owner (e.g. button).
@@ -533,7 +533,7 @@ void CBaseDoor::DoorTouch(CBaseEntity *pOther)
 	if (!FStringNull(pev->targetname))
 	{
 		// play locked sound
-		PlayLockSounds(pev, &m_ls, TRUE, FALSE);
+		PlayLockSounds(pev, &m_ls, true, false);
 		return;
 	}
 
@@ -577,7 +577,7 @@ int CBaseDoor::DoorActivate()
 		}
 
 		// play door unlock sounds
-		PlayLockSounds(pev, &m_ls, FALSE, FALSE);
+		PlayLockSounds(pev, &m_ls, false, false);
 
 		DoorGoUp();
 	}
@@ -1022,17 +1022,17 @@ void CMomentaryDoor::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "movesnd"))
 	{
 		m_bMoveSnd = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "stopsnd"))
 	{
 		//		m_bStopSnd = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "healthvalue"))
 	{
 		//		m_bHealthValue = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CBaseToggle::KeyValue(pkvd);
diff --git a/src/game/server/hl/explode.cpp b/src/game/server/hl/explode.cpp
index a7195bfb..ff5504db 100644
--- a/src/game/server/hl/explode.cpp
+++ b/src/game/server/hl/explode.cpp
@@ -115,7 +115,7 @@ void CEnvExplosion::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "iMagnitude"))
 	{
 		m_iMagnitude = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CBaseEntity::KeyValue(pkvd);
diff --git a/src/game/server/hl/extdll.h b/src/game/server/hl/extdll.h
index b144e690..20faf64e 100644
--- a/src/game/server/hl/extdll.h
+++ b/src/game/server/hl/extdll.h
@@ -25,8 +25,6 @@
 #ifdef _WIN32
 #include "PlatformWin.h"
 #else // _WIN32
-#define FALSE 0
-#define TRUE 1
 
 typedef unsigned int uint;
 typedef int BOOL;
diff --git a/src/game/server/hl/func_tank.cpp b/src/game/server/hl/func_tank.cpp
index d7a529d9..0b0f65ff 100644
--- a/src/game/server/hl/func_tank.cpp
+++ b/src/game/server/hl/func_tank.cpp
@@ -64,7 +64,7 @@ class CFuncTank : public CBaseEntity
 	// Bmodels don't go across transitions
 	virtual int ObjectCaps(void) { return CBaseEntity ::ObjectCaps() & ~FCAP_ACROSS_TRANSITION; }
 
-	inline BOOL IsActive(void) { return (pev->spawnflags & SF_TANK_ACTIVE) ? TRUE : FALSE; }
+	inline BOOL IsActive(void) { return (pev->spawnflags & SF_TANK_ACTIVE) ? true : false; }
 	inline void TankActivate(void)
 	{
 		pev->spawnflags |= SF_TANK_ACTIVE;
@@ -220,107 +220,107 @@ void CFuncTank ::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "yawrate"))
 	{
 		m_yawRate = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "yawrange"))
 	{
 		m_yawRange = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "yawtolerance"))
 	{
 		m_yawTolerance = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "pitchrange"))
 	{
 		m_pitchRange = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "pitchrate"))
 	{
 		m_pitchRate = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "pitchtolerance"))
 	{
 		m_pitchTolerance = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "firerate"))
 	{
 		m_fireRate = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "barrel"))
 	{
 		m_barrelPos.x = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "barrely"))
 	{
 		m_barrelPos.y = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "barrelz"))
 	{
 		m_barrelPos.z = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "spritescale"))
 	{
 		m_spriteScale = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "spritesmoke"))
 	{
 		m_iszSpriteSmoke = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "spriteflash"))
 	{
 		m_iszSpriteFlash = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "rotatesound"))
 	{
 		pev->noise = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "persistence"))
 	{
 		m_persist = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "bullet"))
 	{
 		m_bulletType = (TANKBULLET)atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "bullet_damage"))
 	{
 		m_iBulletDamage = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "firespread"))
 	{
 		m_spread = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "minRange"))
 	{
 		m_minRange = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "maxRange"))
 	{
 		m_maxRange = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "master"))
 	{
 		m_iszMaster = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CBaseEntity::KeyValue(pkvd);
@@ -333,26 +333,26 @@ void CFuncTank ::KeyValue(KeyValueData *pkvd)
 BOOL CFuncTank ::OnControls(entvars_t *pevTest)
 {
 	if (!(pev->spawnflags & SF_TANK_CANCONTROL))
-		return FALSE;
+		return false;
 
 	Vector offset = pevTest->origin - pev->origin;
 
 	if ((m_vecControllerUsePos - pevTest->origin).Length() < 30)
-		return TRUE;
+		return true;
 
-	return FALSE;
+	return false;
 }
 
 BOOL CFuncTank ::StartControl(CBasePlayer *pController)
 {
 	if (m_pController != NULL)
-		return FALSE;
+		return false;
 
 	// Team only or disabled?
 	if (m_iszMaster)
 	{
 		if (!UTIL_IsMasterTriggered(m_iszMaster, pController))
-			return FALSE;
+			return false;
 	}
 
 	ALERT(at_console, "using TANK!\n");
@@ -370,7 +370,7 @@ BOOL CFuncTank ::StartControl(CBasePlayer *pController)
 
 	pev->nextthink = pev->ltime + 0.1;
 
-	return TRUE;
+	return true;
 }
 
 void CFuncTank ::StopControl()
@@ -461,11 +461,11 @@ edict_t *CFuncTank ::FindTarget(edict_t *pPlayer)
 BOOL CFuncTank ::InRange(float range)
 {
 	if (range < m_minRange)
-		return FALSE;
+		return false;
 	if (m_maxRange > 0 && range > m_maxRange)
-		return FALSE;
+		return false;
 
-	return TRUE;
+	return true;
 }
 
 void CFuncTank ::Think(void)
@@ -483,7 +483,7 @@ void CFuncTank::TrackTarget(void)
 {
 	TraceResult tr;
 	edict_t *pPlayer = FIND_CLIENT_IN_PVS(edict());
-	BOOL updateTime = FALSE, lineOfSight;
+	BOOL updateTime = false, lineOfSight;
 	Vector angles, direction, targetPosition, barrelEnd;
 	edict_t *pTarget = NULL;
 
@@ -522,16 +522,16 @@ void CFuncTank::TrackTarget(void)
 
 		UTIL_TraceLine(barrelEnd, targetPosition, dont_ignore_monsters, edict(), &tr);
 
-		lineOfSight = FALSE;
+		lineOfSight = false;
 		// No line of sight, don't track
 		if (tr.flFraction == 1.0 || tr.pHit == pTarget)
 		{
-			lineOfSight = TRUE;
+			lineOfSight = true;
 
 			CBaseEntity *pInstance = CBaseEntity::Instance(pTarget);
 			if (InRange(range) && pInstance && pInstance->IsAlive())
 			{
-				updateTime = TRUE;
+				updateTime = true;
 				m_sightOrigin = UpdateTargetPosition(pInstance);
 			}
 		}
@@ -557,12 +557,12 @@ void CFuncTank::TrackTarget(void)
 	if (angles.y > m_yawCenter + m_yawRange)
 	{
 		angles.y = m_yawCenter + m_yawRange;
-		updateTime = FALSE; // Don't update if you saw the player, but out of range
+		updateTime = false; // Don't update if you saw the player, but out of range
 	}
 	else if (angles.y < (m_yawCenter - m_yawRange))
 	{
 		angles.y = (m_yawCenter - m_yawRange);
-		updateTime = FALSE; // Don't update if you saw the player, but out of range
+		updateTime = false; // Don't update if you saw the player, but out of range
 	}
 
 	if (updateTime)
@@ -596,7 +596,7 @@ void CFuncTank::TrackTarget(void)
 
 	if (CanFire() && ((fabs(distX) < m_pitchTolerance && fabs(distY) < m_yawTolerance) || (pev->spawnflags & SF_TANK_LINEOFSIGHT)))
 	{
-		BOOL fire = FALSE;
+		BOOL fire = false;
 		Vector forward;
 		UTIL_MakeVectorsPrivate(pev->angles, forward, NULL, NULL);
 
@@ -605,10 +605,10 @@ void CFuncTank::TrackTarget(void)
 			float length = direction.Length();
 			UTIL_TraceLine(barrelEnd, barrelEnd + forward * length, dont_ignore_monsters, edict(), &tr);
 			if (tr.pHit == pTarget)
-				fire = TRUE;
+				fire = true;
 		}
 		else
-			fire = TRUE;
+			fire = true;
 
 		if (fire)
 		{
@@ -650,7 +650,7 @@ void CFuncTank::Fire(const Vector &barrelEnd, const Vector &forward, entvars_t *
 	{
 		if (m_iszSpriteSmoke)
 		{
-			CSprite *pSprite = CSprite::SpriteCreate(STRING(m_iszSpriteSmoke), barrelEnd, TRUE);
+			CSprite *pSprite = CSprite::SpriteCreate(STRING(m_iszSpriteSmoke), barrelEnd, true);
 			pSprite->AnimateAndDie(RANDOM_FLOAT(15.0, 20.0));
 			pSprite->SetTransparency(kRenderTransAlpha, pev->rendercolor.x, pev->rendercolor.y, pev->rendercolor.z, 255, kRenderFxNone);
 			pSprite->pev->velocity.z = RANDOM_FLOAT(40, 80);
@@ -658,7 +658,7 @@ void CFuncTank::Fire(const Vector &barrelEnd, const Vector &forward, entvars_t *
 		}
 		if (m_iszSpriteFlash)
 		{
-			CSprite *pSprite = CSprite::SpriteCreate(STRING(m_iszSpriteFlash), barrelEnd, TRUE);
+			CSprite *pSprite = CSprite::SpriteCreate(STRING(m_iszSpriteFlash), barrelEnd, true);
 			pSprite->AnimateAndDie(60);
 			pSprite->SetTransparency(kRenderTransAdd, 255, 255, 255, 255, kRenderFxNoDissipation);
 			pSprite->SetScale(m_spriteScale);
@@ -797,7 +797,7 @@ void CFuncTankLaser::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "laserentity"))
 	{
 		pev->message = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CFuncTank::KeyValue(pkvd);
@@ -914,7 +914,7 @@ void CFuncTankMortar::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "iMagnitude"))
 	{
 		pev->impulse = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CFuncTank::KeyValue(pkvd);
@@ -935,7 +935,7 @@ void CFuncTankMortar::Fire(const Vector &barrelEnd, const Vector &forward, entva
 
 			TankTrace(barrelEnd, forward, gTankSpread[m_spread], tr);
 
-			ExplosionCreate(tr.vecEndPos, pev->angles, edict(), pev->impulse, TRUE);
+			ExplosionCreate(tr.vecEndPos, pev->angles, edict(), pev->impulse, true);
 
 			CFuncTank::Fire(barrelEnd, forward, pev);
 		}
diff --git a/src/game/server/hl/lights.cpp b/src/game/server/hl/lights.cpp
index 1edf4c46..050f14e1 100644
--- a/src/game/server/hl/lights.cpp
+++ b/src/game/server/hl/lights.cpp
@@ -58,17 +58,17 @@ void CLight ::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "style"))
 	{
 		m_iStyle = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "pitch"))
 	{
 		pev->angles.x = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "pattern"))
 	{
 		m_iszPattern = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 	{
@@ -163,7 +163,7 @@ void CEnvLight::KeyValue(KeyValueData *pkvd)
 		g = pow(g / 114.0, 0.6) * 264;
 		b = pow(b / 114.0, 0.6) * 264;
 
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 		 _snprintf(szColor, sizeof(szColor),  "%d",  r );
 		CVAR_SET_STRING("sv_skycolor_r", szColor);
 		 _snprintf(szColor, sizeof(szColor),  "%d",  g );
diff --git a/src/game/server/hl/monsters.cpp b/src/game/server/hl/monsters.cpp
index a6034588..fb7d0896 100644
--- a/src/game/server/hl/monsters.cpp
+++ b/src/game/server/hl/monsters.cpp
@@ -153,10 +153,10 @@ BOOL CBaseMonster ::FShouldEat(void)
 {
 	if (m_flHungryTime > gpGlobals->time)
 	{
-		return FALSE;
+		return false;
 	}
 
-	return TRUE;
+	return true;
 }
 
 //=========================================================
@@ -286,7 +286,7 @@ float CBaseMonster ::FLSoundVolume(CSound *pSound)
 //=========================================================
 BOOL CBaseMonster ::FValidateHintType(short sHint)
 {
-	return FALSE;
+	return false;
 }
 
 //=========================================================
@@ -626,15 +626,15 @@ void CBaseMonster ::RouteNew(void)
 }
 
 //=========================================================
-// FRouteClear - returns TRUE is the Route is cleared out
+// FRouteClear - returns true is the Route is cleared out
 // ( invalid )
 //=========================================================
 BOOL CBaseMonster ::FRouteClear(void)
 {
 	if (m_Route[m_iRouteIndex].iType == 0 || m_movementGoal == MOVEGOAL_NONE)
-		return TRUE;
+		return true;
 
-	return FALSE;
+	return false;
 }
 
 //=========================================================
@@ -650,7 +650,7 @@ BOOL CBaseMonster ::FRefreshRoute(void)
 
 	RouteNew();
 
-	returnCode = FALSE;
+	returnCode = false;
 
 	switch (m_movementGoal)
 	{
@@ -674,7 +674,7 @@ BOOL CBaseMonster ::FRefreshRoute(void)
 			i++;
 		}
 	}
-		returnCode = TRUE;
+		returnCode = true;
 		break;
 
 	case MOVEGOAL_ENEMY:
@@ -812,8 +812,8 @@ int ShouldSimplify(int routeType)
 	routeType &= ~bits_MF_IS_GOAL;
 
 	if ((routeType == bits_MF_TO_PATHCORNER) || (routeType & bits_MF_DONT_SIMPLIFY))
-		return FALSE;
-	return TRUE;
+		return false;
+	return true;
 }
 
 //=========================================================
@@ -937,7 +937,7 @@ BOOL CBaseMonster ::FBecomeProne(void)
 	}
 
 	m_IdealMonsterState = MONSTERSTATE_PRONE;
-	return TRUE;
+	return true;
 }
 
 //=========================================================
@@ -947,9 +947,9 @@ BOOL CBaseMonster ::CheckRangeAttack1(float flDot, float flDist)
 {
 	if (flDist > 64 && flDist <= 784 && flDot >= 0.5)
 	{
-		return TRUE;
+		return true;
 	}
-	return FALSE;
+	return false;
 }
 
 //=========================================================
@@ -959,9 +959,9 @@ BOOL CBaseMonster ::CheckRangeAttack2(float flDot, float flDist)
 {
 	if (flDist > 64 && flDist <= 512 && flDot >= 0.5)
 	{
-		return TRUE;
+		return true;
 	}
-	return FALSE;
+	return false;
 }
 
 //=========================================================
@@ -972,9 +972,9 @@ BOOL CBaseMonster ::CheckMeleeAttack1(float flDot, float flDist)
 	// Decent fix to keep folks from kicking/punching hornets and snarks is to check the onground flag(sjb)
 	if (flDist <= 64 && flDot >= 0.7 && m_hEnemy != NULL && FBitSet(m_hEnemy->pev->flags, FL_ONGROUND))
 	{
-		return TRUE;
+		return true;
 	}
-	return FALSE;
+	return false;
 }
 
 //=========================================================
@@ -984,9 +984,9 @@ BOOL CBaseMonster ::CheckMeleeAttack2(float flDot, float flDist)
 {
 	if (flDist <= 64 && flDot >= 0.7)
 	{
-		return TRUE;
+		return true;
 	}
-	return FALSE;
+	return false;
 }
 
 //=========================================================
@@ -1042,23 +1042,23 @@ BOOL CBaseMonster ::FCanCheckAttacks(void)
 {
 	if (HasConditions(bits_COND_SEE_ENEMY) && !HasConditions(bits_COND_ENEMY_TOOFAR))
 	{
-		return TRUE;
+		return true;
 	}
 
-	return FALSE;
+	return false;
 }
 
 //=========================================================
 // CheckEnemy - part of the Condition collection process,
 // gets and stores data and conditions pertaining to a monster's
-// enemy. Returns TRUE if Enemy LKP was updated.
+// enemy. Returns true if Enemy LKP was updated.
 //=========================================================
 int CBaseMonster ::CheckEnemy(CBaseEntity *pEnemy)
 {
 	float flDistToEnemy;
-	int iUpdatedLKP; // set this to TRUE if you update the EnemyLKP in this function.
+	int iUpdatedLKP; // set this to true if you update the EnemyLKP in this function.
 
-	iUpdatedLKP = FALSE;
+	iUpdatedLKP = false;
 	ClearConditions(bits_COND_ENEMY_FACING_ME);
 
 	if (!FVisible(pEnemy))
@@ -1073,7 +1073,7 @@ int CBaseMonster ::CheckEnemy(CBaseEntity *pEnemy)
 	{
 		SetConditions(bits_COND_ENEMY_DEAD);
 		ClearConditions(bits_COND_SEE_ENEMY | bits_COND_ENEMY_OCCLUDED);
-		return FALSE;
+		return false;
 	}
 
 	Vector vecEnemyPos = pEnemy->pev->origin;
@@ -1097,7 +1097,7 @@ int CBaseMonster ::CheckEnemy(CBaseEntity *pEnemy)
 	{
 		CBaseMonster *pEnemyMonster;
 
-		iUpdatedLKP = TRUE;
+		iUpdatedLKP = true;
 		m_vecEnemyLKP = pEnemy->pev->origin;
 
 		pEnemyMonster = pEnemy->MyMonsterPointer();
@@ -1127,7 +1127,7 @@ int CBaseMonster ::CheckEnemy(CBaseEntity *pEnemy)
 		// if the enemy is not occluded, and unseen, that means it is behind or beside the monster.
 		// if the enemy is near enough the monster, we go ahead and let the monster know where the
 		// enemy is.
-		iUpdatedLKP = TRUE;
+		iUpdatedLKP = true;
 		m_vecEnemyLKP = pEnemy->pev->origin;
 	}
 
@@ -1204,7 +1204,7 @@ BOOL CBaseMonster ::PopEnemy()
 				m_hEnemy = m_hOldEnemy[i];
 				m_vecEnemyLKP = m_vecOldEnemy[i];
 				// ALERT( at_console, "remembering\n");
-				return TRUE;
+				return true;
 			}
 			else
 			{
@@ -1212,7 +1212,7 @@ BOOL CBaseMonster ::PopEnemy()
 			}
 		}
 	}
-	return FALSE;
+	return false;
 }
 
 //=========================================================
@@ -1281,7 +1281,7 @@ void CBaseMonster ::SetSequenceByName(char *szSequence)
 }
 
 //=========================================================
-// CheckLocalMove - returns TRUE if the caller can walk a
+// CheckLocalMove - returns true if the caller can walk a
 // straight line from its current origin to the given
 // location. If so, don't use the node graph!
 //
@@ -1329,7 +1329,7 @@ int CBaseMonster ::CheckLocalMove(const Vector &vecStart, const Vector &vecEnd,
 
 		// since we've actually moved the monster during the check, undo the move.
 		pev->origin = vecStartPos;
-		return FALSE;
+		return false;
 	}
 */
 	// this loop takes single steps to the goal.
@@ -1359,7 +1359,7 @@ int CBaseMonster ::CheckLocalMove(const Vector &vecStart, const Vector &vecEnd,
 			{
 				// If we're going toward an entity, and we're almost getting there, it's OK.
 				//				if ( pTarget && fabs( flDist - iStep ) < LOCAL_STEP_SIZE )
-				//					fReturn = TRUE;
+				//					fReturn = true;
 				//				else
 				iReturn = LOCALMOVE_INVALID;
 				break;
@@ -1552,7 +1552,7 @@ BOOL CBaseMonster ::BuildRoute(const Vector &vecGoal, int iMoveFlag, CBaseEntity
 	if (iLocalMove == LOCALMOVE_VALID)
 	{
 		// monster can walk straight there!
-		return TRUE;
+		return true;
 	}
 	// try to triangulate around any obstacles.
 	else if (iLocalMove != LOCALMOVE_INVALID_DONT_TRIANGULATE && FTriangulate(pev->origin, vecGoal, flDist, pTarget, &vecApex))
@@ -1576,7 +1576,7 @@ BOOL CBaseMonster ::BuildRoute(const Vector &vecGoal, int iMoveFlag, CBaseEntity
 			*/
 
 		RouteSimplify(pTarget);
-		return TRUE;
+		return true;
 	}
 
 	// last ditch, try nodes
@@ -1585,11 +1585,11 @@ BOOL CBaseMonster ::BuildRoute(const Vector &vecGoal, int iMoveFlag, CBaseEntity
 		//		ALERT ( at_console, "Can get there on nodes\n" );
 		m_vecMoveGoal = vecGoal;
 		RouteSimplify(pTarget);
-		return TRUE;
+		return true;
 	}
 
 	// b0rk
-	return FALSE;
+	return false;
 }
 
 //=========================================================
@@ -1729,7 +1729,7 @@ BOOL CBaseMonster ::FTriangulate(const Vector &vecStart, const Vector &vecEnd, f
 					*pApex = vecRight;
 				}
 
-				return TRUE;
+				return true;
 			}
 		}
 		if (CheckLocalMove(pev->origin, vecLeft, pTargetEnt, NULL) == LOCALMOVE_VALID)
@@ -1741,7 +1741,7 @@ BOOL CBaseMonster ::FTriangulate(const Vector &vecStart, const Vector &vecEnd, f
 					*pApex = vecLeft;
 				}
 
-				return TRUE;
+				return true;
 			}
 		}
 
@@ -1757,7 +1757,7 @@ BOOL CBaseMonster ::FTriangulate(const Vector &vecStart, const Vector &vecEnd, f
 						//ALERT(at_aiconsole, "triangulate over\n");
 					}
 
-					return TRUE;
+					return true;
 				}
 			}
 #if 1
@@ -1771,7 +1771,7 @@ BOOL CBaseMonster ::FTriangulate(const Vector &vecStart, const Vector &vecEnd, f
 						//ALERT(at_aiconsole, "triangulate under\n");
 					}
 
-					return TRUE;
+					return true;
 				}
 			}
 #endif
@@ -1786,7 +1786,7 @@ BOOL CBaseMonster ::FTriangulate(const Vector &vecStart, const Vector &vecEnd, f
 		}
 	}
 
-	return FALSE;
+	return false;
 }
 
 //=========================================================
@@ -1968,10 +1968,10 @@ BOOL CBaseMonster::ShouldAdvanceRoute(float flWaypointDist)
 	if (flWaypointDist <= MONSTER_CUT_CORNER_DIST)
 	{
 		// ALERT( at_console, "cut %f\n", flWaypointDist );
-		return TRUE;
+		return true;
 	}
 
-	return FALSE;
+	return false;
 }
 
 void CBaseMonster::MoveExecute(CBaseEntity *pTargetEnt, const Vector &vecDir, float flInterval)
@@ -2255,7 +2255,7 @@ BOOL CBaseMonster ::FindCover(Vector vecThreat, Vector vecViewOffset, float flMi
 	if (!WorldGraph.m_fGraphPresent || !WorldGraph.m_fGraphPointersSet)
 	{
 		ALERT(at_aiconsole, "Graph not ready for findcover!\n");
-		return FALSE;
+		return false;
 	}
 
 	iMyNode = WorldGraph.FindNearestNode(pev->origin, this);
@@ -2265,13 +2265,13 @@ BOOL CBaseMonster ::FindCover(Vector vecThreat, Vector vecViewOffset, float flMi
 	if (iMyNode == NO_NODE)
 	{
 		ALERT(at_aiconsole, "FindCover() - %s has no nearest node!\n", STRING(pev->classname));
-		return FALSE;
+		return false;
 	}
 	if (iThreatNode == NO_NODE)
 	{
 		// ALERT ( at_aiconsole, "FindCover() - Threat has no nearest node!\n" );
 		iThreatNode = iMyNode;
-		// return FALSE;
+		// return false;
 	}
 
 	vecLookersOffset = vecThreat + vecViewOffset; // calculate location of enemy's eyes
@@ -2315,13 +2315,13 @@ BOOL CBaseMonster ::FindCover(Vector vecThreat, Vector vecViewOffset, float flMi
 						MESSAGE_END();
 						*/
 
-						return TRUE;
+						return true;
 					}
 				}
 			}
 		}
 	}
-	return FALSE;
+	return false;
 }
 
 //=========================================================
@@ -2359,7 +2359,7 @@ BOOL CBaseMonster ::BuildNearestRoute(Vector vecThreat, Vector vecViewOffset, fl
 	if (!WorldGraph.m_fGraphPresent || !WorldGraph.m_fGraphPointersSet)
 	{
 		ALERT(at_aiconsole, "Graph not ready for BuildNearestRoute!\n");
-		return FALSE;
+		return false;
 	}
 
 	iMyNode = WorldGraph.FindNearestNode(pev->origin, this);
@@ -2368,7 +2368,7 @@ BOOL CBaseMonster ::BuildNearestRoute(Vector vecThreat, Vector vecViewOffset, fl
 	if (iMyNode == NO_NODE)
 	{
 		ALERT(at_aiconsole, "BuildNearestRoute() - %s has no nearest node!\n", STRING(pev->classname));
-		return FALSE;
+		return false;
 	}
 
 	vecLookersOffset = vecThreat + vecViewOffset; // calculate location of enemy's eyes
@@ -2399,14 +2399,14 @@ BOOL CBaseMonster ::BuildNearestRoute(Vector vecThreat, Vector vecViewOffset, fl
 					{
 						flMaxDist = flDist;
 						m_vecMoveGoal = node.m_vecOrigin;
-						return TRUE; // UNDONE: keep looking for something closer!
+						return true; // UNDONE: keep looking for something closer!
 					}
 				}
 			}
 		}
 	}
 
-	return FALSE;
+	return false;
 }
 
 //=========================================================
@@ -2656,12 +2656,12 @@ void CBaseMonster ::HandleAnimEvent(MonsterEvent_t *pEvent)
 
 	case SCRIPT_EVENT_NOINTERRUPT: // Can't be interrupted from now on
 		if (m_pCine)
-			m_pCine->AllowInterrupt(FALSE);
+			m_pCine->AllowInterrupt(false);
 		break;
 
 	case SCRIPT_EVENT_CANINTERRUPT: // OK to interrupt now
 		if (m_pCine)
-			m_pCine->AllowInterrupt(TRUE);
+			m_pCine->AllowInterrupt(true);
 		break;
 
 #if 0
@@ -2733,8 +2733,8 @@ Vector CBaseMonster ::GetGunPosition()
 // FGetNodeRoute - tries to build an entire node path from
 // the callers origin to the passed vector. If this is
 // possible, ROUTE_SIZE waypoints will be copied into the
-// callers m_Route. TRUE is returned if the operation
-// succeeds (path is valid) or FALSE if failed (no path
+// callers m_Route. true is returned if the operation
+// succeeds (path is valid) or false if failed (no path
 // exists )
 //=========================================================
 BOOL CBaseMonster ::FGetNodeRoute(Vector vecDest)
@@ -2752,13 +2752,13 @@ BOOL CBaseMonster ::FGetNodeRoute(Vector vecDest)
 	{
 		// no node nearest self
 		//		ALERT ( at_aiconsole, "FGetNodeRoute: No valid node near self!\n" );
-		return FALSE;
+		return false;
 	}
 	else if (iDestNode == -1)
 	{
 		// no node nearest target
 		//		ALERT ( at_aiconsole, "FGetNodeRoute: No valid node near target!\n" );
-		return FALSE;
+		return false;
 	}
 
 	// valid src and dest nodes were found, so it's safe to proceed with
@@ -2770,16 +2770,16 @@ BOOL CBaseMonster ::FGetNodeRoute(Vector vecDest)
 	{
 #if 1
 		ALERT(at_aiconsole, "No Path from %d to %d!\n", iSrcNode, iDestNode);
-		return FALSE;
+		return false;
 #else
 		BOOL bRoutingSave = WorldGraph.m_fRoutingComplete;
-		WorldGraph.m_fRoutingComplete = FALSE;
+		WorldGraph.m_fRoutingComplete = false;
 		iResult = WorldGraph.FindShortestPath(iPath, iSrcNode, iDestNode, iNodeHull, m_afCapability);
 		WorldGraph.m_fRoutingComplete = bRoutingSave;
 		if (!iResult)
 		{
 			ALERT(at_aiconsole, "No Path from %d to %d!\n", iSrcNode, iDestNode);
-			return FALSE;
+			return false;
 		}
 		else
 		{
@@ -2814,7 +2814,7 @@ BOOL CBaseMonster ::FGetNodeRoute(Vector vecDest)
 		m_Route[iNumToCopy].iType |= bits_MF_IS_GOAL;
 	}
 
-	return TRUE;
+	return true;
 }
 
 //=========================================================
@@ -2953,12 +2953,12 @@ void CBaseMonster ::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "TriggerTarget"))
 	{
 		m_iszTriggerTarget = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "TriggerCondition"))
 	{
 		m_iTriggerCondition = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 	{
@@ -2971,7 +2971,7 @@ void CBaseMonster ::KeyValue(KeyValueData *pkvd)
 // if there is a condition, then checks to see if condition is
 // met. If yes, the monster's TriggerTarget is fired.
 //
-// Returns TRUE if the target is fired.
+// Returns true if the target is fired.
 //=========================================================
 BOOL CBaseMonster ::FCheckAITrigger(void)
 {
@@ -2980,23 +2980,23 @@ BOOL CBaseMonster ::FCheckAITrigger(void)
 	if (m_iTriggerCondition == AITRIGGER_NONE)
 	{
 		// no conditions, so this trigger is never fired.
-		return FALSE;
+		return false;
 	}
 
-	fFireTarget = FALSE;
+	fFireTarget = false;
 
 	switch (m_iTriggerCondition)
 	{
 	case AITRIGGER_SEEPLAYER_ANGRY_AT_PLAYER:
 		if (m_hEnemy != NULL && m_hEnemy->IsPlayer() && HasConditions(bits_COND_SEE_ENEMY))
 		{
-			fFireTarget = TRUE;
+			fFireTarget = true;
 		}
 		break;
 	case AITRIGGER_SEEPLAYER_UNCONDITIONAL:
 		if (HasConditions(bits_COND_SEE_CLIENT))
 		{
-			fFireTarget = TRUE;
+			fFireTarget = true;
 		}
 		break;
 	case AITRIGGER_SEEPLAYER_NOT_IN_COMBAT:
@@ -3005,25 +3005,25 @@ BOOL CBaseMonster ::FCheckAITrigger(void)
 			m_MonsterState != MONSTERSTATE_PRONE &&
 			m_MonsterState != MONSTERSTATE_SCRIPT)
 		{
-			fFireTarget = TRUE;
+			fFireTarget = true;
 		}
 		break;
 	case AITRIGGER_TAKEDAMAGE:
 		if (m_afConditions & (bits_COND_LIGHT_DAMAGE | bits_COND_HEAVY_DAMAGE))
 		{
-			fFireTarget = TRUE;
+			fFireTarget = true;
 		}
 		break;
 	case AITRIGGER_DEATH:
 		if (pev->deadflag != DEAD_NO)
 		{
-			fFireTarget = TRUE;
+			fFireTarget = true;
 		}
 		break;
 	case AITRIGGER_HALFHEALTH:
 		if (IsAlive() && pev->health <= (pev->max_health / 2))
 		{
-			fFireTarget = TRUE;
+			fFireTarget = true;
 		}
 		break;
 		/*
@@ -3038,19 +3038,19 @@ BOOL CBaseMonster ::FCheckAITrigger(void)
 	case AITRIGGER_HEARWORLD:
 		if (m_afConditions & bits_COND_HEAR_SOUND && m_afSoundTypes & bits_SOUND_WORLD)
 		{
-			fFireTarget = TRUE;
+			fFireTarget = true;
 		}
 		break;
 	case AITRIGGER_HEARPLAYER:
 		if (m_afConditions & bits_COND_HEAR_SOUND && m_afSoundTypes & bits_SOUND_PLAYER)
 		{
-			fFireTarget = TRUE;
+			fFireTarget = true;
 		}
 		break;
 	case AITRIGGER_HEARCOMBAT:
 		if (m_afConditions & bits_COND_HEAR_SOUND && m_afSoundTypes & bits_SOUND_COMBAT)
 		{
-			fFireTarget = TRUE;
+			fFireTarget = true;
 		}
 		break;
 	}
@@ -3061,10 +3061,10 @@ BOOL CBaseMonster ::FCheckAITrigger(void)
 		ALERT(at_aiconsole, "AI Trigger Fire Target\n");
 		FireTargets(STRING(m_iszTriggerTarget), this, this, USE_TOGGLE, 0);
 		m_iTriggerCondition = AITRIGGER_NONE;
-		return TRUE;
+		return true;
 	}
 
-	return FALSE;
+	return false;
 }
 
 //=========================================================
@@ -3079,26 +3079,26 @@ int CBaseMonster ::CanPlaySequence(BOOL fDisregardMonsterState, int interruptLev
 	if (m_pCine || !IsAlive() || m_MonsterState == MONSTERSTATE_PRONE)
 	{
 		// monster is already running a scripted sequence or dead!
-		return FALSE;
+		return false;
 	}
 
 	if (fDisregardMonsterState)
 	{
 		// ok to go, no matter what the monster state. (scripted AI)
-		return TRUE;
+		return true;
 	}
 
 	if (m_MonsterState == MONSTERSTATE_NONE || m_MonsterState == MONSTERSTATE_IDLE || m_IdealMonsterState == MONSTERSTATE_IDLE)
 	{
 		// ok to go, but only in these states
-		return TRUE;
+		return true;
 	}
 
 	if (m_MonsterState == MONSTERSTATE_ALERT && interruptLevel >= SS_INTERRUPT_BY_NAME)
-		return TRUE;
+		return true;
 
 	// unknown situation
-	return FALSE;
+	return false;
 }
 
 //=========================================================
@@ -3139,7 +3139,7 @@ BOOL CBaseMonster ::FindLateralCover(const Vector &vecThreat, const Vector &vecV
 			{
 				if (MoveToLocation(ACT_RUN, 0, vecLeftTest))
 				{
-					return TRUE;
+					return true;
 				}
 			}
 		}
@@ -3153,13 +3153,13 @@ BOOL CBaseMonster ::FindLateralCover(const Vector &vecThreat, const Vector &vecV
 			{
 				if (MoveToLocation(ACT_RUN, 0, vecRightTest))
 				{
-					return TRUE;
+					return true;
 				}
 			}
 		}
 	}
 
-	return FALSE;
+	return false;
 }
 
 Vector CBaseMonster ::ShootAtEnemy(const Vector &shootOrigin)
@@ -3185,10 +3185,10 @@ BOOL CBaseMonster ::FacingIdeal(void)
 {
 	if (fabs(FlYawDiff()) <= 0.006) //!!!BUGBUG - no magic numbers!!!
 	{
-		return TRUE;
+		return true;
 	}
 
-	return FALSE;
+	return false;
 }
 
 //=========================================================
@@ -3199,10 +3199,10 @@ BOOL CBaseMonster ::FCanActiveIdle(void)
 	/*
 	if ( m_MonsterState == MONSTERSTATE_IDLE && m_IdealMonsterState == MONSTERSTATE_IDLE && !IsMoving() )
 	{
-		return TRUE;
+		return true;
 	}
 	*/
-	return FALSE;
+	return false;
 }
 
 void CBaseMonster::PlaySentence(const char *pszSentence, float duration, float volume, float attenuation)
@@ -3294,7 +3294,7 @@ BOOL CBaseMonster ::BBoxFlat(void)
 	flLength2 = (vecPoint - tr.vecEndPos).Length();
 	if (flLength2 > flLength)
 	{
-		return FALSE;
+		return false;
 	}
 	flLength = flLength2;
 
@@ -3304,7 +3304,7 @@ BOOL CBaseMonster ::BBoxFlat(void)
 	flLength2 = (vecPoint - tr.vecEndPos).Length();
 	if (flLength2 > flLength)
 	{
-		return FALSE;
+		return false;
 	}
 	flLength = flLength2;
 
@@ -3314,11 +3314,11 @@ BOOL CBaseMonster ::BBoxFlat(void)
 	flLength2 = (vecPoint - tr.vecEndPos).Length();
 	if (flLength2 > flLength)
 	{
-		return FALSE;
+		return false;
 	}
 	flLength = flLength2;
 
-	return TRUE;
+	return true;
 }
 
 //=========================================================
@@ -3373,10 +3373,10 @@ BOOL CBaseMonster ::GetEnemy(void)
 	if (m_hEnemy != NULL)
 	{
 		// monster has an enemy.
-		return TRUE;
+		return true;
 	}
 
-	return FALSE; // monster has no enemy
+	return false; // monster has no enemy
 }
 
 //=========================================================
@@ -3402,7 +3402,7 @@ CBaseEntity *CBaseMonster ::DropItem(char *pszItemName, const Vector &vecPos, co
 	else
 	{
 		ALERT(at_console, "DropItem() - Didn't create!\n");
-		return FALSE;
+		return nullptr;
 	}
 }
 
@@ -3410,7 +3410,7 @@ BOOL CBaseMonster ::ShouldFadeOnDeath(void)
 {
 	// if flagged to fade out or I have an owner (I came from a monster spawner)
 	if ((pev->spawnflags & SF_MONSTER_FADECORPSE) || !FNullEnt(pev->owner))
-		return TRUE;
+		return true;
 
-	return FALSE;
+	return false;
 }
diff --git a/src/game/server/hl/nodes.cpp b/src/game/server/hl/nodes.cpp
index 91becd8a..aa1d514e 100644
--- a/src/game/server/hl/nodes.cpp
+++ b/src/game/server/hl/nodes.cpp
@@ -53,9 +53,9 @@ void CGraph ::InitGraph(void)
 
 	// Make the graph unavailable
 	//
-	m_fGraphPresent = FALSE;
-	m_fGraphPointersSet = FALSE;
-	m_fRoutingComplete = FALSE;
+	m_fGraphPresent = false;
+	m_fGraphPointersSet = false;
+	m_fRoutingComplete = false;
 
 	// Free the link pool
 	//
@@ -117,10 +117,10 @@ int CGraph ::AllocNodes(void)
 	if (!WorldGraph.m_pNodes)
 	{
 		ALERT(at_aiconsole, "**ERROR**\nCouldn't malloc %d nodes!\n", WorldGraph.m_cNodes);
-		return FALSE;
+		return false;
 	}
 
-	return TRUE;
+	return true;
 }
 
 //=========================================================
@@ -213,13 +213,13 @@ int CGraph ::HandleLinkEnt(int iNode, entvars_t *pevLinkEnt, int afCapMask, NODE
 	if (!m_fGraphPresent || !m_fGraphPointersSet)
 	{ // protect us in the case that the node graph isn't available
 		ALERT(at_aiconsole, "Graph not ready!\n");
-		return FALSE;
+		return false;
 	}
 
 	if (FNullEnt(pevLinkEnt))
 	{
 		ALERT(at_aiconsole, "dead path ent!\n");
-		return TRUE;
+		return true;
 	}
 	pentWorld = NULL;
 
@@ -234,17 +234,17 @@ int CGraph ::HandleLinkEnt(int iNode, entvars_t *pevLinkEnt, int afCapMask, NODE
 
 			if ((afCapMask & bits_CAP_OPEN_DOORS))
 			{ // let monster right through if he can open doors
-				return TRUE;
+				return true;
 			}
 			else
 			{
 				// monster should try for it if the door is open and looks as if it will stay that way
 				if (pDoor->GetToggleState() == TS_AT_TOP && (pevLinkEnt->spawnflags & SF_DOOR_NO_AUTO_RETURN))
 				{
-					return TRUE;
+					return true;
 				}
 
-				return FALSE;
+				return false;
 			}
 		}
 		else
@@ -253,35 +253,35 @@ int CGraph ::HandleLinkEnt(int iNode, entvars_t *pevLinkEnt, int afCapMask, NODE
 			// monster should try for it if the door is open and looks as if it will stay that way
 			if (pDoor->GetToggleState() == TS_AT_TOP && (pevLinkEnt->spawnflags & SF_DOOR_NO_AUTO_RETURN))
 			{
-				return TRUE;
+				return true;
 			}
 			if ((afCapMask & bits_CAP_OPEN_DOORS))
 			{
 				if (!(pevLinkEnt->spawnflags & SF_DOOR_NOMONSTERS) || queryType == NODEGRAPH_STATIC)
-					return TRUE;
+					return true;
 			}
 
-			return FALSE;
+			return false;
 		}
 	}
 	// func_breakable
 	else if (FClassnameIs(pevLinkEnt, "func_breakable") && queryType == NODEGRAPH_STATIC)
 	{
-		return TRUE;
+		return true;
 	}
 	else
 	{
 		ALERT(at_aiconsole, "Unhandled Ent in Path %s\n", STRING(pevLinkEnt->classname));
-		return FALSE;
+		return false;
 	}
 
-	return FALSE;
+	return false;
 }
 
 #if 0
 //=========================================================
 // FindNearestLink - finds the connection (line) nearest
-// the given point. Returns FALSE if fails, or TRUE if it
+// the given point. Returns false if fails, or true if it
 // has stuffed the index into the nearest link pool connection
 // into the passed int pointer, and a BOOL telling whether or 
 // not the point is along the line into the passed BOOL pointer.
@@ -306,7 +306,7 @@ int	CGraph :: FindNearestLink ( const Vector &vecTestPoint, int *piNearestLink,
 	TraceResult	tr;
 
 	iNearestLink = -1;// prepare for failure
-	fSuccess = FALSE;
+	fSuccess = false;
 
 	flMinDist = 9999;// anything will be closer than this
 
@@ -370,17 +370,17 @@ int	CGraph :: FindNearestLink ( const Vector &vecTestPoint, int *piNearestLink,
 			if ( DotProduct ( vec2Line, ( vec2TestPoint - vec2Spot1 ) ) > 0 )
 			{// point outside of line
 				flDistToLine = ( vec2TestPoint - vec2Spot1 ).Length();
-				fCurrentAlongLine = FALSE;
+				fCurrentAlongLine = false;
 			}
 			else if ( DotProduct ( vec2Line, ( vec2TestPoint - vec2Spot2 ) ) < 0 )
 			{// point outside of line
 				flDistToLine = ( vec2TestPoint - vec2Spot2 ).Length();
-				fCurrentAlongLine = FALSE;
+				fCurrentAlongLine = false;
 			}
 			else
 			{// point inside line
 				flDistToLine = fabs( DotProduct ( vec2TestPoint - vec2Spot2, vec2Normal ) );
-				fCurrentAlongLine = TRUE;
+				fCurrentAlongLine = true;
 			}
 
 			if ( flDistToLine < flMinDist )
@@ -399,7 +399,7 @@ int	CGraph :: FindNearestLink ( const Vector &vecTestPoint, int *piNearestLink,
 
 				}
 				
-				fSuccess = TRUE;// we know there will be something to return.
+				fSuccess = true;// we know there will be something to return.
 				flMinDist = flDistToLine;
 				iNearestLink = m_pNodes [ i ].m_iFirstLink + j;
 				*piNearestLink = m_pNodes[ i ].m_iFirstLink + j;
@@ -579,13 +579,13 @@ int CGraph ::FindShortestPath(int *piPath, int iStart, int iDest, int iHull, int
 	if (!m_fGraphPresent || !m_fGraphPointersSet)
 	{ // protect us in the case that the node graph isn't available or built
 		ALERT(at_aiconsole, "Graph not ready!\n");
-		return FALSE;
+		return false;
 	}
 
 	if (iStart < 0 || (unsigned int)iStart > m_cNodes)
 	{ // The start node is bad?
 		ALERT(at_aiconsole, "Can't build a path, iStart is %d!\n", iStart);
-		return FALSE;
+		return false;
 	}
 
 	if (iStart == iDest)
@@ -1204,7 +1204,7 @@ int CGraph ::LinkVisibleNodes(CLink *pLinkPool, CFile &file, int *piBadNode)
 	if (m_cNodes <= 0)
 	{
 		ALERT(at_aiconsole, "No Nodes!\n");
-		return FALSE;
+		return false;
 	}
 
 	// if the file pointer is bad, don't blow up, just don't write the
@@ -1340,13 +1340,13 @@ int CGraph ::LinkVisibleNodes(CLink *pLinkPool, CFile &file, int *piBadNode)
 				ALERT(at_aiconsole, "**LinkVisibleNodes:\nNode %d has NodeLinks > MAX_NODE_INITIAL_LINKS", i);
 				file.Printf("** NODE %d HAS NodeLinks > MAX_NODE_INITIAL_LINKS **\n", i);
 				*piBadNode = i;
-				return FALSE;
+				return false;
 			}
 			else if (cTotalLinks > MAX_NODE_INITIAL_LINKS * m_cNodes)
 			{ // this is paranoia
 				ALERT(at_aiconsole, "**LinkVisibleNodes:\nTotalLinks > MAX_NODE_INITIAL_LINKS * NUMNODES");
 				*piBadNode = i;
-				return FALSE;
+				return false;
 			}
 
 			if (cLinksThisNode == 0)
@@ -1427,7 +1427,7 @@ int CGraph ::RejectInlineLinks(CLink *pLinkPool, CFile &file)
 
 			pLinkPool[pSrcNode->m_iFirstLink + j].m_flWeight = flDistToCheckNode;
 
-			fRestartLoop = FALSE;
+			fRestartLoop = false;
 			for (k = 0; k < pSrcNode->m_cNumLinks && !fRestartLoop; k++)
 			{
 				if (k == j)
@@ -1458,7 +1458,7 @@ int CGraph ::RejectInlineLinks(CLink *pLinkPool, CFile &file)
 
 						cRejectedLinks++; // keeping track of how many links are cut, so that we can return that value.
 
-						fRestartLoop = TRUE;
+						fRestartLoop = true;
 					}
 				}
 			}
@@ -1550,13 +1550,13 @@ void CNodeEnt ::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "hinttype"))
 	{
 		m_sHintType = (short)atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 
 	if (FStrEq(pkvd->szKeyName, "activity"))
 	{
 		m_sHintActivity = (short)atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CBaseEntity::KeyValue(pkvd);
@@ -1629,9 +1629,9 @@ extern BOOL gTouchDisabled;
 void CTestHull::CallBuildNodeGraph(void)
 {
 	// TOUCH HACK -- Don't allow this entity to call anyone's "touch" function
-	gTouchDisabled = TRUE;
+	gTouchDisabled = true;
 	BuildNodeGraph();
-	gTouchDisabled = FALSE;
+	gTouchDisabled = false;
 	// Undo TOUCH HACK
 }
 
@@ -1812,7 +1812,7 @@ void CTestHull ::BuildNodeGraph(void)
 
 			// if we can't fit a tiny hull through a connection, no other hulls with fit either, so we
 			// should just fall out of the loop. Do so by setting the SkipRemainingHulls flag.
-			fSkipRemainingHulls = FALSE;
+			fSkipRemainingHulls = false;
 			for (hull = 0; hull < MAX_NODE_HULLS; hull++)
 			{
 				if (fSkipRemainingHulls && (hull == NODE_HUMAN_HULL || hull == NODE_LARGE_HULL)) // skip the remaining walk hulls
@@ -1873,7 +1873,7 @@ void CTestHull ::BuildNodeGraph(void)
 
 					flDist = (vecSpot - pev->origin).Length2D();
 
-					int fWalkFailed = FALSE;
+					int fWalkFailed = false;
 
 					// in this loop we take tiny steps from the current node to the nodes that it links to, one at a time.
 					// pev->angles.y = flYaw;
@@ -1887,7 +1887,7 @@ void CTestHull ::BuildNodeGraph(void)
 						if (!WALK_MOVE(ENT(pev), flYaw, stepSize, MoveMode))
 						{ // can't take the next step
 
-							fWalkFailed = TRUE;
+							fWalkFailed = true;
 							break;
 						}
 					}
@@ -1896,7 +1896,7 @@ void CTestHull ::BuildNodeGraph(void)
 					{
 						// ALERT( at_console, "bogus walk\n");
 						// we thought we
-						fWalkFailed = TRUE;
+						fWalkFailed = true;
 					}
 
 					if (fWalkFailed)
@@ -1910,12 +1910,12 @@ void CTestHull ::BuildNodeGraph(void)
 						case NODE_SMALL_HULL: // if this hull can't fit, nothing can, so drop the connection
 							file.Printf("NODE_SMALL_HULL step %i\n", step);
 							pTempPool[pSrcNode->m_iFirstLink + j].m_afLinkInfo &= ~(bits_LINK_SMALL_HULL | bits_LINK_HUMAN_HULL | bits_LINK_LARGE_HULL);
-							fSkipRemainingHulls = TRUE; // don't bother checking larger hulls
+							fSkipRemainingHulls = true; // don't bother checking larger hulls
 							break;
 						case NODE_HUMAN_HULL:
 							file.Printf("NODE_HUMAN_HULL step %i\n", step);
 							pTempPool[pSrcNode->m_iFirstLink + j].m_afLinkInfo &= ~(bits_LINK_HUMAN_HULL | bits_LINK_LARGE_HULL);
-							fSkipRemainingHulls = TRUE; // don't bother checking larger hulls
+							fSkipRemainingHulls = true; // don't bother checking larger hulls
 							break;
 						case NODE_LARGE_HULL:
 							file.Printf("NODE_LARGE_HULL step %i\n", step);
@@ -1992,7 +1992,7 @@ void CTestHull ::BuildNodeGraph(void)
 	//
 	WorldGraph.BuildLinkLookups();
 
-	fPairsValid = TRUE; // assume that the connection pairs are all valid to start
+	fPairsValid = true; // assume that the connection pairs are all valid to start
 
 	file.Printf("\n\n-------------------------------------------------------------------------------\n");
 	file.Printf("Link Pairings:\n");
@@ -2008,7 +2008,7 @@ void CTestHull ::BuildNodeGraph(void)
 			WorldGraph.HashSearch(WorldGraph.INodeLink(i, j), i, iLink);
 			if (iLink < 0)
 			{
-				fPairsValid = FALSE; // unmatched link pair.
+				fPairsValid = false; // unmatched link pair.
 				file.Printf("WARNING: Node %3d does not connect back to Node %3d\n", WorldGraph.INodeLink(i, j), i);
 			}
 		}
@@ -2053,9 +2053,9 @@ void CTestHull ::BuildNodeGraph(void)
 
 	// We now have some graphing capabilities.
 	//
-	WorldGraph.m_fGraphPresent = TRUE;	   //graph is in memory.
-	WorldGraph.m_fGraphPointersSet = TRUE; // since the graph was generated, the pointers are ready
-	WorldGraph.m_fRoutingComplete = FALSE; // Optimal routes aren't computed, yet.
+	WorldGraph.m_fGraphPresent = true;	   //graph is in memory.
+	WorldGraph.m_fGraphPointersSet = true; // since the graph was generated, the pointers are ready
+	WorldGraph.m_fRoutingComplete = false; // Optimal routes aren't computed, yet.
 
 	// Compute and compress the routing information.
 	//
@@ -2583,8 +2583,8 @@ int CGraph ::FSetGraphPointers(void)
 	}
 
 	// the pointers are now set.
-	m_fGraphPointersSet = TRUE;
-	return TRUE;
+	m_fGraphPointersSet = true;
+	return true;
 }
 
 //=========================================================
@@ -2593,7 +2593,7 @@ int CGraph ::FSetGraphPointers(void)
 // ssociated .NOD file. If the NOD file is not present, or
 // is older than the BSP file, we rebuild it.
 //
-// returns FALSE if the .NOD file doesn't qualify and needs
+// returns false if the .NOD file doesn't qualify and needs
 // to be rebuilt.
 //
 // !!!BUGBUG - the file times we get back are 20 hours ahead!
@@ -3321,7 +3321,7 @@ void CGraph ::ComputeStaticRoutingTables(void)
 #if 0
 	TestRoutingTables();
 #endif
-	m_fRoutingComplete = TRUE;
+	m_fRoutingComplete = true;
 }
 
 // Test those routing tables. Doesn't really work, yet.
@@ -3352,9 +3352,9 @@ void CGraph ::TestRoutingTables(void)
 				{
 					for (unsigned int iTo = 0; iTo < m_cNodes; iTo++)
 					{
-						m_fRoutingComplete = FALSE;
+						m_fRoutingComplete = false;
 						unsigned int cPathSize1 = FindShortestPath(pMyPath, iFrom, iTo, iHull, iCapMask);
-						m_fRoutingComplete = TRUE;
+						m_fRoutingComplete = true;
 						unsigned int cPathSize2 = FindShortestPath(pMyPath2, iFrom, iTo, iHull, iCapMask);
 
 						// Unless we can look at the entire path, we can verify that it's correct.
@@ -3374,14 +3374,14 @@ void CGraph ::TestRoutingTables(void)
 							if (pMyPath[i] == pMyPath[i + 1])
 								continue;
 							unsigned int iVisitNode, iLink;
-							BOOL bFound = FALSE;
+							BOOL bFound = false;
 							for (iLink = 0; iLink < m_pNodes[pMyPath[i]].m_cNumLinks; iLink++)
 							{
 								iVisitNode = INodeLink(pMyPath[i], iLink);
 								if (iVisitNode == pMyPath[i + 1])
 								{
 									flDistance1 += m_pLinkPool[m_pNodes[pMyPath[i]].m_iFirstLink + iLink].m_flWeight;
-									bFound = TRUE;
+									bFound = true;
 									break;
 								}
 							}
@@ -3399,14 +3399,14 @@ void CGraph ::TestRoutingTables(void)
 							if (pMyPath2[i] == pMyPath2[i + 1])
 								continue;
 							int iVisitNode;
-							BOOL bFound = FALSE;
+							BOOL bFound = false;
 							for (unsigned int iLink = 0; iLink < m_pNodes[pMyPath2[i]].m_cNumLinks; iLink++)
 							{
 								iVisitNode = INodeLink(pMyPath2[i], iLink);
 								if (iVisitNode == pMyPath2[i + 1])
 								{
 									flDistance2 += m_pLinkPool[m_pNodes[pMyPath2[i]].m_iFirstLink + iLink].m_flWeight;
-									bFound = TRUE;
+									bFound = true;
 									break;
 								}
 							}
@@ -3433,9 +3433,9 @@ void CGraph ::TestRoutingTables(void)
 								ALERT(at_aiconsole, "%d ", pMyPath2[i]);
 							}
 							ALERT(at_aiconsole, "\n");
-							m_fRoutingComplete = FALSE;
+							m_fRoutingComplete = false;
 							cPathSize1 = FindShortestPath(pMyPath, iFrom, iTo, iHull, iCapMask);
-							m_fRoutingComplete = TRUE;
+							m_fRoutingComplete = true;
 							cPathSize2 = FindShortestPath(pMyPath2, iFrom, iTo, iHull, iCapMask);
 							goto EnoughSaid;
 						}
diff --git a/src/game/server/hl/pathcorner.cpp b/src/game/server/hl/pathcorner.cpp
index cf9ea94a..becd1332 100644
--- a/src/game/server/hl/pathcorner.cpp
+++ b/src/game/server/hl/pathcorner.cpp
@@ -56,7 +56,7 @@ void CPathCorner ::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "wait"))
 	{
 		m_flWait = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CPointEntity::KeyValue(pkvd);
@@ -135,7 +135,7 @@ void CPathTrack ::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "altpath"))
 	{
 		m_altName = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CPointEntity::KeyValue(pkvd);
diff --git a/src/game/server/hl/plane.cpp b/src/game/server/hl/plane.cpp
index 601ceb08..dc8f28e7 100644
--- a/src/game/server/hl/plane.cpp
+++ b/src/game/server/hl/plane.cpp
@@ -21,7 +21,7 @@
 //=========================================================
 CPlane ::CPlane(void)
 {
-	m_fInitialized = FALSE;
+	m_fInitialized = false;
 }
 
 //=========================================================
@@ -32,7 +32,7 @@ void CPlane ::InitializePlane(const Vector &vecNormal, const Vector &vecPoint)
 {
 	m_vecNormal = vecNormal;
 	m_flDist = DotProduct(m_vecNormal, vecPoint);
-	m_fInitialized = TRUE;
+	m_fInitialized = true;
 }
 
 //=========================================================
@@ -45,15 +45,15 @@ BOOL CPlane ::PointInFront(const Vector &vecPoint)
 
 	if (!m_fInitialized)
 	{
-		return FALSE;
+		return false;
 	}
 
 	flFace = DotProduct(m_vecNormal, vecPoint) - m_flDist;
 
 	if (flFace >= 0)
 	{
-		return TRUE;
+		return true;
 	}
 
-	return FALSE;
+	return false;
 }
diff --git a/src/game/server/hl/plats.cpp b/src/game/server/hl/plats.cpp
index 51b0a374..f40ceff5 100644
--- a/src/game/server/hl/plats.cpp
+++ b/src/game/server/hl/plats.cpp
@@ -39,9 +39,9 @@ class CBasePlatTrain : public CBaseToggle
 	void Precache(void);
 
 	// This is done to fix spawn flag collisions between this class and a derived class
-	virtual BOOL IsTogglePlat(void) { return (pev->spawnflags & SF_PLAT_TOGGLE) ? TRUE : FALSE; }
+	virtual BOOL IsTogglePlat(void) { return (pev->spawnflags & SF_PLAT_TOGGLE) ? true : false; }
 
-	virtual BOOL IsStuckAdjust(void) { return (pev->spawnflags & SF_PLAT_ADJUST) ? TRUE : FALSE; } //MAR2010_10 - Thothie - adjust platform for stuck bugs when reach top
+	virtual BOOL IsStuckAdjust(void) { return (pev->spawnflags & SF_PLAT_ADJUST) ? true : false; } //MAR2010_10 - Thothie - adjust platform for stuck bugs when reach top
 
 	virtual int Save(CSave &save);
 	virtual int Restore(CRestore &restore);
@@ -66,37 +66,37 @@ void CBasePlatTrain ::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "lip"))
 	{
 		m_flLip = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "wait"))
 	{
 		m_flWait = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "height"))
 	{
 		m_flHeight = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "rotation"))
 	{
 		m_vecFinalAngle.x = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "movesnd"))
 	{
 		m_bMoveSnd = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "stopsnd"))
 	{
 		m_bStopSnd = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "volume"))
 	{
 		m_volume = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CBaseToggle::KeyValue(pkvd);
@@ -396,7 +396,7 @@ void CFuncPlat ::PlatUse(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE
 	if (IsTogglePlat())
 	{
 		// Top is off, bottom is on
-		BOOL on = (m_toggle_state == TS_AT_BOTTOM) ? TRUE : FALSE;
+		BOOL on = (m_toggle_state == TS_AT_BOTTOM) ? true : false;
 
 		if (!ShouldToggle(useType, on))
 			return;
@@ -649,7 +649,7 @@ void CFuncTrain ::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "sounds"))
 	{
 		m_sounds = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CBasePlatTrain::KeyValue(pkvd);
@@ -791,7 +791,7 @@ void CFuncTrain ::Activate(void)
 	// Not yet active, so teleport to first target
 	if (!m_activated)
 	{
-		m_activated = TRUE;
+		m_activated = true;
 		entvars_t *pevTarg = VARS(FIND_ENTITY_BY_TARGETNAME(NULL, STRING(pev->target)));
 
 		pev->target = pevTarg->target;
@@ -843,7 +843,7 @@ void CFuncTrain ::Spawn(void)
 	UTIL_SetSize(pev, pev->mins, pev->maxs);
 	UTIL_SetOrigin(pev, pev->origin);
 
-	m_activated = FALSE;
+	m_activated = false;
 
 	if (m_volume == 0)
 		m_volume = 0.85;
@@ -932,33 +932,33 @@ void CFuncTrackTrain ::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "wheels"))
 	{
 		m_length = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "height"))
 	{
 		m_height = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "startspeed"))
 	{
 		m_startSpeed = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "sounds"))
 	{
 		m_sounds = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "volume"))
 	{
 		m_flVolume = (float)(atoi(pkvd->szValue));
 		m_flVolume *= 0.1;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "bank"))
 	{
 		m_flBank = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CBaseEntity::KeyValue(pkvd);
@@ -1239,7 +1239,7 @@ void CFuncTrackTrain ::Next(void)
 			}
 		}
 		SetThink(&CFuncTrackTrain::Next);
-		NextThink(pev->ltime + time, TRUE);
+		NextThink(pev->ltime + time, true);
 	}
 	else // end of path, stop
 	{
@@ -1260,7 +1260,7 @@ void CFuncTrackTrain ::Next(void)
 			time = distance / m_oldSpeed;
 			pev->velocity = pev->velocity * (m_oldSpeed / distance);
 			SetThink(&CFuncTrackTrain::DeadEnd);
-			NextThink(pev->ltime + time, FALSE);
+			NextThink(pev->ltime + time, false);
 		}
 		else
 		{
@@ -1286,7 +1286,7 @@ void CFuncTrackTrain::DeadEnd(void)
 		{
 			do
 			{
-				pNext = pTrack->ValidPath(pTrack->GetPrevious(), TRUE);
+				pNext = pTrack->ValidPath(pTrack->GetPrevious(), true);
 				if (pNext)
 					pTrack = pNext;
 			} while (pNext);
@@ -1295,7 +1295,7 @@ void CFuncTrackTrain::DeadEnd(void)
 		{
 			do
 			{
-				pNext = pTrack->ValidPath(pTrack->GetNext(), TRUE);
+				pNext = pTrack->ValidPath(pTrack->GetNext(), true);
 				if (pNext)
 					pTrack = pNext;
 			} while (pNext);
@@ -1327,7 +1327,7 @@ BOOL CFuncTrackTrain ::OnControls(entvars_t *pevTest)
 	Vector offset = pevTest->origin - pev->origin;
 
 	if (pev->spawnflags & SF_TRACKTRAIN_NOCONTROL)
-		return FALSE;
+		return false;
 
 	// Transform offset into local coordinates
 	UTIL_MakeVectors(pev->angles);
@@ -1338,9 +1338,9 @@ BOOL CFuncTrackTrain ::OnControls(entvars_t *pevTest)
 
 	if (local.x >= m_controlMins.x && local.y >= m_controlMins.y && local.z >= m_controlMins.z &&
 		local.x <= m_controlMaxs.x && local.y <= m_controlMaxs.y && local.z <= m_controlMaxs.z)
-		return TRUE;
+		return true;
 
-	return FALSE;
+	return false;
 }
 
 void CFuncTrackTrain ::Find(void)
@@ -1372,7 +1372,7 @@ void CFuncTrackTrain ::Find(void)
 	if (pev->spawnflags & SF_TRACKTRAIN_NOPITCH)
 		pev->angles.x = 0;
 	UTIL_SetOrigin(pev, nextPos);
-	NextThink(pev->ltime + 0.1, FALSE);
+	NextThink(pev->ltime + 0.1, false);
 	SetThink(&CFuncTrackTrain::Next);
 	pev->speed = m_startSpeed;
 
@@ -1421,14 +1421,14 @@ void CFuncTrackTrain ::NearestPath(void)
 
 	if (pev->speed != 0)
 	{
-		NextThink(pev->ltime + 0.1, FALSE);
+		NextThink(pev->ltime + 0.1, false);
 		SetThink(&CFuncTrackTrain::Next);
 	}
 }
 
 void CFuncTrackTrain::OverrideReset(void)
 {
-	NextThink(pev->ltime + 0.1, FALSE);
+	NextThink(pev->ltime + 0.1, false);
 	SetThink(&CFuncTrackTrain::NearestPath);
 }
 
@@ -1486,7 +1486,7 @@ void CFuncTrackTrain ::Spawn(void)
 	m_controlMaxs.z += 72;
 	// start trains on the next frame, to make sure their targets have had
 	// a chance to spawn/activate
-	NextThink(pev->ltime + 0.1, FALSE);
+	NextThink(pev->ltime + 0.1, false);
 	SetThink(&CFuncTrackTrain::Find);
 	Precache();
 }
@@ -1621,7 +1621,7 @@ class CFuncTrackChange : public CFuncPlatRot
 	virtual void HitTop(void);
 	void Touch(CBaseEntity *pOther);
 	virtual void UpdateAutoTargets(int toggleState);
-	virtual BOOL IsTogglePlat(void) { return TRUE; }
+	virtual BOOL IsTogglePlat(void) { return true; }
 
 	void DisableUse(void) { m_use = 0; }
 	void EnableUse(void) { m_use = 1; }
@@ -1713,17 +1713,17 @@ void CFuncTrackChange ::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "train"))
 	{
 		m_trainName = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "toptrack"))
 	{
 		m_trackTopName = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "bottomtrack"))
 	{
 		m_trackBottomName = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 	{
@@ -1810,7 +1810,7 @@ void CFuncTrackChange ::UpdateTrain(Vector &dest)
 
 	m_train->pev->velocity = pev->velocity;
 	m_train->pev->avelocity = pev->avelocity;
-	m_train->NextThink(m_train->pev->ltime + time, FALSE);
+	m_train->NextThink(m_train->pev->ltime + time, false);
 
 	// Attempt at getting the train to rotate properly around the origin of the trackchange
 	if (time <= 0)
@@ -2122,7 +2122,7 @@ void CGunTarget::Spawn(void)
 	pev->takedamage = DAMAGE_NO;
 	pev->flags |= FL_MONSTER;
 
-	m_on = FALSE;
+	m_on = false;
 	pev->max_health = pev->health;
 
 	if (pev->spawnflags & FGUNTARGET_START_ON)
diff --git a/src/game/server/hl/schedule.cpp b/src/game/server/hl/schedule.cpp
index 317dfe4f..9434edb7 100644
--- a/src/game/server/hl/schedule.cpp
+++ b/src/game/server/hl/schedule.cpp
@@ -27,17 +27,17 @@
 extern CGraph WorldGraph;
 
 //=========================================================
-// FHaveSchedule - Returns TRUE if monster's m_pSchedule
+// FHaveSchedule - Returns true if monster's m_pSchedule
 // is anything other than NULL.
 //=========================================================
 BOOL CBaseMonster ::FHaveSchedule(void)
 {
 	if (m_pSchedule == NULL)
 	{
-		return FALSE;
+		return false;
 	}
 
-	return TRUE;
+	return true;
 }
 
 //=========================================================
@@ -52,7 +52,7 @@ void CBaseMonster ::ClearSchedule(void)
 }
 
 //=========================================================
-// FScheduleDone - Returns TRUE if the caller is on the
+// FScheduleDone - Returns true if the caller is on the
 // last task in the schedule
 //=========================================================
 BOOL CBaseMonster ::FScheduleDone(void)
@@ -61,10 +61,10 @@ BOOL CBaseMonster ::FScheduleDone(void)
 
 	if (m_iScheduleIndex == m_pSchedule->cTasks)
 	{
-		return TRUE;
+		return true;
 	}
 
-	return FALSE;
+	return false;
 }
 
 //=========================================================
@@ -164,7 +164,7 @@ int CBaseMonster ::IScheduleFlags(void)
 }
 
 //=========================================================
-// FScheduleValid - returns TRUE as long as the current
+// FScheduleValid - returns true as long as the current
 // schedule is still the proper schedule to be executing,
 // taking into account all conditions
 //=========================================================
@@ -173,7 +173,7 @@ BOOL CBaseMonster ::FScheduleValid(void)
 	if (m_pSchedule == NULL)
 	{
 		// schedule is empty, and therefore not valid.
-		return FALSE;
+		return false;
 	}
 
 	if (HasConditions(m_pSchedule->iInterruptMask | bits_COND_SCHEDULE_DONE | bits_COND_TASK_FAILED))
@@ -191,10 +191,10 @@ BOOL CBaseMonster ::FScheduleValid(void)
 #endif // DEBUG
 
 		// some condition has interrupted the schedule, or the schedule is done
-		return FALSE;
+		return false;
 	}
 
-	return TRUE;
+	return true;
 }
 
 //=========================================================
@@ -524,7 +524,7 @@ void CBaseMonster ::RunTask(Task_t *pTask)
 		if (m_pCine->m_iDelay <= 0 && gpGlobals->time >= m_pCine->m_startTime)
 		{
 			TaskComplete();
-			m_pCine->StartSequence((CBaseMonster *)this, m_pCine->m_iszPlay, TRUE);
+			m_pCine->StartSequence((CBaseMonster *)this, m_pCine->m_iszPlay, true);
 			if (m_fSequenceFinished)
 				ClearSchedule();
 			pev->framerate = 1.0;
@@ -1254,7 +1254,7 @@ void CBaseMonster ::StartTask(Task_t *pTask)
 	{
 		if (m_pCine->m_iszIdle)
 		{
-			m_pCine->StartSequence((CBaseMonster *)this, m_pCine->m_iszIdle, FALSE);
+			m_pCine->StartSequence((CBaseMonster *)this, m_pCine->m_iszIdle, false);
 			if (FStrEq(STRING(m_pCine->m_iszIdle), STRING(m_pCine->m_iszPlay)))
 			{
 				pev->framerate = 0;
diff --git a/src/game/server/hl/scripted.cpp b/src/game/server/hl/scripted.cpp
index b3e76691..e4cb46f4 100644
--- a/src/game/server/hl/scripted.cpp
+++ b/src/game/server/hl/scripted.cpp
@@ -57,37 +57,37 @@ void CCineMonster ::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "m_iszIdle"))
 	{
 		m_iszIdle = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "m_iszPlay"))
 	{
 		m_iszPlay = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "m_iszEntity"))
 	{
 		m_iszEntity = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "m_fMoveTo"))
 	{
 		m_fMoveTo = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "m_flRepeat"))
 	{
 		m_flRepeat = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "m_flRadius"))
 	{
 		m_flRadius = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "m_iFinishSchedule"))
 	{
 		m_iFinishSchedule = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 	{
@@ -143,20 +143,20 @@ void CCineMonster ::Spawn(void)
 			m_startTime = gpGlobals->time + 1E6;
 	}
 	if (pev->spawnflags & SF_SCRIPT_NOINTERRUPT)
-		m_interruptable = FALSE;
+		m_interruptable = false;
 	else
-		m_interruptable = TRUE;
+		m_interruptable = true;
 }
 
 //=========================================================
-// FCanOverrideState - returns FALSE, scripted sequences
+// FCanOverrideState - returns false, scripted sequences
 // cannot possess entities regardless of state.
 //=========================================================
 BOOL CCineMonster ::FCanOverrideState(void)
 {
 	if (pev->spawnflags & SF_SCRIPT_OVERRIDESTATE)
-		return TRUE;
-	return FALSE;
+		return true;
+	return false;
 }
 
 //=========================================================
@@ -165,7 +165,7 @@ BOOL CCineMonster ::FCanOverrideState(void)
 //=========================================================
 BOOL CCineAI ::FCanOverrideState(void)
 {
-	return TRUE;
+	return true;
 }
 
 //
@@ -273,7 +273,7 @@ int CCineMonster ::FindEntity(void)
 			if (pTarget && pTarget->CanPlaySequence(FCanOverrideState(), SS_INTERRUPT_BY_NAME))
 			{
 				m_hTargetEnt = pTarget;
-				return TRUE;
+				return true;
 			}
 			ALERT(at_console, "Found %s, but can't play!\n", STRING(m_iszEntity));
 		}
@@ -294,7 +294,7 @@ int CCineMonster ::FindEntity(void)
 					if (pTarget && pTarget->CanPlaySequence(FCanOverrideState(), SS_INTERRUPT_IDLE))
 					{
 						m_hTargetEnt = pTarget;
-						return TRUE;
+						return true;
 					}
 				}
 			}
@@ -302,7 +302,7 @@ int CCineMonster ::FindEntity(void)
 	}
 	pTarget = NULL;
 	m_hTargetEnt = NULL;
-	return FALSE;
+	return false;
 }
 
 // make the entity enter a scripted sequence
@@ -368,7 +368,7 @@ void CCineMonster ::PossessEntity(void)
 		pTarget->m_IdealMonsterState = MONSTERSTATE_SCRIPT;
 		if (m_iszIdle)
 		{
-			StartSequence(pTarget, m_iszIdle, FALSE);
+			StartSequence(pTarget, m_iszIdle, false);
 			if (FStrEq(STRING(m_iszIdle), STRING(m_iszPlay)))
 			{
 				pTarget->pev->framerate = 0;
@@ -445,7 +445,7 @@ void CCineAI ::PossessEntity(void)
 		/*
 		if (m_iszIdle)
 		{
-			StartSequence( pTarget, m_iszIdle, FALSE );
+			StartSequence( pTarget, m_iszIdle, false );
 			if (FStrEq( STRING(m_iszIdle), STRING(m_iszPlay)))
 			{
 				pTarget->pev->framerate = 0;
@@ -482,7 +482,7 @@ BOOL CCineMonster ::StartSequence(CBaseMonster *pTarget, int iszSeq, BOOL comple
 	if (!iszSeq && completeOnEmpty)
 	{
 		SequenceDone(pTarget);
-		return FALSE;
+		return false;
 	}
 
 	pTarget->pev->sequence = pTarget->LookupSequence(STRING(iszSeq));
@@ -490,7 +490,7 @@ BOOL CCineMonster ::StartSequence(CBaseMonster *pTarget, int iszSeq, BOOL comple
 	{
 		ALERT(at_error, "%s: unknown scripted sequence \"%s\"\n", STRING(pTarget->pev->targetname), STRING(iszSeq));
 		pTarget->pev->sequence = 0;
-		// return FALSE;
+		// return false;
 	}
 
 #if 0
@@ -505,7 +505,7 @@ BOOL CCineMonster ::StartSequence(CBaseMonster *pTarget, int iszSeq, BOOL comple
 
 	pTarget->pev->frame = 0;
 	pTarget->ResetSequenceInfo();
-	return TRUE;
+	return true;
 }
 
 // lookup a sequence name and setup the target monster to play it
@@ -521,7 +521,7 @@ BOOL CCineAI ::StartSequence(CBaseMonster *pTarget, int iszSeq, BOOL completeOnE
 
 		SequenceDone(pTarget);
 
-		return TRUE;
+		return true;
 	}
 
 	pTarget->pev->sequence = pTarget->LookupSequence(STRING(iszSeq));
@@ -530,12 +530,12 @@ BOOL CCineAI ::StartSequence(CBaseMonster *pTarget, int iszSeq, BOOL completeOnE
 	{
 		ALERT(at_error, "%s: unknown aiscripted sequence \"%s\"\n", STRING(pTarget->pev->targetname), STRING(iszSeq));
 		pTarget->pev->sequence = 0;
-		// return FALSE;
+		// return false;
 	}
 
 	pTarget->pev->frame = 0;
 	pTarget->ResetSequenceInfo();
-	return TRUE;
+	return true;
 }
 
 //=========================================================
@@ -618,7 +618,7 @@ BOOL CBaseMonster ::ExitScriptedSequence()
 		// is this legal?
 		// BUGBUG -- This doesn't call Killed()
 		m_IdealMonsterState = MONSTERSTATE_DEAD;
-		return FALSE;
+		return false;
 	}
 
 	if (m_pCine)
@@ -626,7 +626,7 @@ BOOL CBaseMonster ::ExitScriptedSequence()
 		m_pCine->CancelScript();
 	}
 
-	return TRUE;
+	return true;
 }
 
 void CCineMonster::AllowInterrupt(BOOL fAllow)
@@ -639,14 +639,14 @@ void CCineMonster::AllowInterrupt(BOOL fAllow)
 BOOL CCineMonster::CanInterrupt(void)
 {
 	if (!m_interruptable)
-		return FALSE;
+		return false;
 
 	CBaseEntity *pTarget = m_hTargetEnt;
 
 	if (pTarget != NULL && pTarget->pev->deadflag == DEAD_NO)
-		return TRUE;
+		return true;
 
-	return FALSE;
+	return false;
 }
 
 int CCineMonster::IgnoreConditions(void)
@@ -815,7 +815,7 @@ BOOL CBaseMonster ::CineCleanup()
 		StopAnimation();
 		pev->movetype = MOVETYPE_NONE;
 		pev->effects |= EF_NOINTERP; // Don't interpolate either, assume the corpse is positioned in its final resting place
-		return FALSE;
+		return false;
 	}
 
 	// If we actually played a sequence
@@ -890,7 +890,7 @@ BOOL CBaseMonster ::CineCleanup()
 	//	SetAnimation( m_MonsterState );
 	ClearBits(pev->spawnflags, SF_MONSTER_WAIT_FOR_SCRIPT);
 
-	return TRUE;
+	return true;
 }
 
 class CScriptedSentence : public CBaseToggle
@@ -951,42 +951,42 @@ void CScriptedSentence ::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "sentence"))
 	{
 		m_iszSentence = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "entity"))
 	{
 		m_iszEntity = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "duration"))
 	{
 		m_flDuration = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "radius"))
 	{
 		m_flRadius = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "refire"))
 	{
 		m_flRepeat = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "attenuation"))
 	{
 		pev->impulse = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "volume"))
 	{
 		m_flVolume = atof(pkvd->szValue) * 0.1;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "listener"))
 	{
 		m_iszListener = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CBaseToggle::KeyValue(pkvd);
@@ -1005,7 +1005,7 @@ void CScriptedSentence ::Spawn(void)
 {
 	pev->solid = SOLID_NOT;
 
-	m_active = TRUE;
+	m_active = true;
 	// if no targetname, start now
 	if (!pev->targetname)
 	{
@@ -1049,7 +1049,7 @@ void CScriptedSentence ::FindThink(void)
 			UTIL_Remove(this);
 		SetThink(&CScriptedSentence::DelayThink);
 		pev->nextthink = gpGlobals->time + m_flDuration + m_flRepeat;
-		m_active = FALSE;
+		m_active = false;
 		//		ALERT( at_console, "%s: found monster %s\n", STRING(m_iszSentence), STRING(m_iszEntity) );
 	}
 	else
@@ -1061,7 +1061,7 @@ void CScriptedSentence ::FindThink(void)
 
 void CScriptedSentence ::DelayThink(void)
 {
-	m_active = TRUE;
+	m_active = true;
 	if (!pev->targetname)
 		pev->nextthink = gpGlobals->time + 0.1;
 	SetThink(&CScriptedSentence::FindThink);
@@ -1074,17 +1074,17 @@ BOOL CScriptedSentence ::AcceptableSpeaker(CBaseMonster *pMonster)
 		if (pev->spawnflags & SF_SENTENCE_FOLLOWERS)
 		{
 			if (pMonster->m_hTargetEnt == NULL || !FClassnameIs(pMonster->m_hTargetEnt->pev, "player"))
-				return FALSE;
+				return false;
 		}
 		BOOL override;
 		if (pev->spawnflags & SF_SENTENCE_INTERRUPT)
-			override = TRUE;
+			override = true;
 		else
-			override = FALSE;
+			override = false;
 		if (pMonster->CanPlaySentence(override))
-			return TRUE;
+			return true;
 	}
-	return FALSE;
+	return false;
 }
 
 CBaseMonster *CScriptedSentence ::FindEntity(void)
@@ -1132,9 +1132,9 @@ BOOL CScriptedSentence ::StartSentence(CBaseMonster *pTarget)
 		return NULL;
 	}
 
-	BOOL bConcurrent = FALSE;
+	BOOL bConcurrent = false;
 	if (!(pev->spawnflags & SF_SENTENCE_CONCURRENT))
-		bConcurrent = TRUE;
+		bConcurrent = true;
 
 	CBaseEntity *pListener = NULL;
 	if (!FStringNull(m_iszListener))
@@ -1150,7 +1150,7 @@ BOOL CScriptedSentence ::StartSentence(CBaseMonster *pTarget)
 	pTarget->PlayScriptedSentence(STRING(m_iszSentence), m_flDuration, m_flVolume, m_flAttenuation, bConcurrent, pListener);
 	ALERT(at_aiconsole, "Playing sentence %s (%.1f)\n", STRING(m_iszSentence), m_flDuration);
 	SUB_UseTargets(NULL, USE_TOGGLE, 0);
-	return TRUE;
+	return true;
 }
 
 /*
diff --git a/src/game/server/hl/sound.cpp b/src/game/server/hl/sound.cpp
index e5fd1732..27fe3e75 100644
--- a/src/game/server/hl/sound.cpp
+++ b/src/game/server/hl/sound.cpp
@@ -133,8 +133,8 @@ class CAmbientGeneric : public CBaseEntity
 	float m_flAttenuation; // attenuation value
 	dynpitchvol_t m_dpv;
 
-	BOOL m_fActive;	 // only TRUE when the entity is playing a looping sound
-	BOOL m_fLooping; // TRUE when the sound played will loop
+	BOOL m_fActive;	 // only true when the entity is playing a looping sound
+	BOOL m_fLooping; // true when the sound played will loop
 };
 
 LINK_ENTITY_TO_CLASS(ambient_generic, CAmbientGeneric); //Thothie - attempting to build new amb generic ms MSMapEnts - so this needs to be altered
@@ -211,12 +211,12 @@ void CAmbientGeneric ::Spawn(void)
 
 	SetUse(&CAmbientGeneric::ToggleUse);
 
-	m_fActive = FALSE;
+	m_fActive = false;
 
 	if (FBitSet(pev->spawnflags, AMBIENT_SOUND_NOT_LOOPING))
-		m_fLooping = FALSE;
+		m_fLooping = false;
 	else
-		m_fLooping = TRUE;
+		m_fLooping = true;
 	Precache();
 }
 
@@ -236,7 +236,7 @@ void CAmbientGeneric ::Precache(void)
 	{
 		// start the sound ASAP
 		if (m_fLooping)
-			m_fActive = TRUE;
+			m_fActive = true;
 	}
 	if (m_fActive)
 	{
@@ -258,7 +258,7 @@ void CAmbientGeneric ::RampThink(void)
 	int pitch = m_dpv.pitch;
 	int vol = m_dpv.vol;
 	int flags = 0;
-	int fChanged = 0; // FALSE if pitch and vol remain unchanged this round
+	int fChanged = 0; // false if pitch and vol remain unchanged this round
 	int prev;
 
 	if (!m_dpv.spinup && !m_dpv.spindown && !m_dpv.fadein && !m_dpv.fadeout && !m_dpv.lfotype)
@@ -593,7 +593,7 @@ void CAmbientGeneric ::ToggleUse(CBaseEntity *pActivator, CBaseEntity *pCaller,
 
 	// Toggle
 
-	// m_fActive is TRUE only if a looping sound is playing.
+	// m_fActive is true only if a looping sound is playing.
 
 	if (m_fActive)
 	{ // turn sound off
@@ -624,7 +624,7 @@ void CAmbientGeneric ::ToggleUse(CBaseEntity *pActivator, CBaseEntity *pCaller,
 		}
 		else
 		{
-			m_fActive = FALSE;
+			m_fActive = false;
 
 			// HACKHACK - this makes the code in Precache() work properly after a save/restore
 			pev->spawnflags |= AMBIENT_SOUND_START_SILENT;
@@ -653,7 +653,7 @@ void CAmbientGeneric ::ToggleUse(CBaseEntity *pActivator, CBaseEntity *pCaller,
 		// and then restarted.
 
 		if (m_fLooping)
-			m_fActive = TRUE;
+			m_fActive = true;
 		else
 			// shut sound off now - may be interrupting a long non-looping sound
 			UTIL_EmitAmbientSound(ENT(pev), pev->origin, szSoundFile,
@@ -681,14 +681,14 @@ void CAmbientGeneric ::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "preset"))
 	{
 		m_dpv.preset = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 
 	// pitchrun
 	else if (FStrEq(pkvd->szKeyName, "pitch"))
 	{
 		m_dpv.pitchrun = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 
 		if (m_dpv.pitchrun > 255)
 			m_dpv.pitchrun = 255;
@@ -700,7 +700,7 @@ void CAmbientGeneric ::KeyValue(KeyValueData *pkvd)
 	else if (FStrEq(pkvd->szKeyName, "pitchstart"))
 	{
 		m_dpv.pitchstart = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 
 		if (m_dpv.pitchstart > 255)
 			m_dpv.pitchstart = 255;
@@ -721,7 +721,7 @@ void CAmbientGeneric ::KeyValue(KeyValueData *pkvd)
 		if (m_dpv.spinup > 0)
 			m_dpv.spinup = (101 - m_dpv.spinup) * 64;
 		m_dpv.spinupsav = m_dpv.spinup;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 
 	// spindown
@@ -737,7 +737,7 @@ void CAmbientGeneric ::KeyValue(KeyValueData *pkvd)
 		if (m_dpv.spindown > 0)
 			m_dpv.spindown = (101 - m_dpv.spindown) * 64;
 		m_dpv.spindownsav = m_dpv.spindown;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 
 	// volstart
@@ -752,7 +752,7 @@ void CAmbientGeneric ::KeyValue(KeyValueData *pkvd)
 
 		m_dpv.volstart *= 10; // 0 - 100
 
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 
 	// fadein
@@ -768,7 +768,7 @@ void CAmbientGeneric ::KeyValue(KeyValueData *pkvd)
 		if (m_dpv.fadein > 0)
 			m_dpv.fadein = (101 - m_dpv.fadein) * 64;
 		m_dpv.fadeinsav = m_dpv.fadein;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 
 	// fadeout
@@ -784,7 +784,7 @@ void CAmbientGeneric ::KeyValue(KeyValueData *pkvd)
 		if (m_dpv.fadeout > 0)
 			m_dpv.fadeout = (101 - m_dpv.fadeout) * 64;
 		m_dpv.fadeoutsav = m_dpv.fadeout;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 
 	// lfotype
@@ -793,7 +793,7 @@ void CAmbientGeneric ::KeyValue(KeyValueData *pkvd)
 		m_dpv.lfotype = atoi(pkvd->szValue);
 		if (m_dpv.lfotype > 4)
 			m_dpv.lfotype = LFO_TRIANGLE;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 
 	// lforate
@@ -808,7 +808,7 @@ void CAmbientGeneric ::KeyValue(KeyValueData *pkvd)
 
 		m_dpv.lforate *= 256;
 
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	// lfomodpitch
 	else if (FStrEq(pkvd->szKeyName, "lfomodpitch"))
@@ -819,7 +819,7 @@ void CAmbientGeneric ::KeyValue(KeyValueData *pkvd)
 		if (m_dpv.lfomodpitch < 0)
 			m_dpv.lfomodpitch = 0;
 
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 
 	// lfomodvol
@@ -831,7 +831,7 @@ void CAmbientGeneric ::KeyValue(KeyValueData *pkvd)
 		if (m_dpv.lfomodvol < 0)
 			m_dpv.lfomodvol = 0;
 
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 
 	// cspinup
@@ -843,7 +843,7 @@ void CAmbientGeneric ::KeyValue(KeyValueData *pkvd)
 		if (m_dpv.cspinup < 0)
 			m_dpv.cspinup = 0;
 
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CBaseEntity::KeyValue(pkvd);
@@ -882,16 +882,16 @@ void CEnvSound ::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "radius"))
 	{
 		m_flRadius = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	if (FStrEq(pkvd->szKeyName, "roomtype"))
 	{
 		m_flRoomtype = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 }
 
-// returns TRUE if the given sound entity (pev) is in range
+// returns true if the given sound entity (pev) is in range
 // and can see the given player entity (pevTarget)
 
 BOOL FEnvSoundInRange(entvars_t *pev, entvars_t *pevTarget, float *pflRange)
@@ -908,7 +908,7 @@ BOOL FEnvSoundInRange(entvars_t *pev, entvars_t *pevTarget, float *pflRange)
 	// check if line of sight crosses water boundary, or is blocked
 
 	if ((tr.fInOpen && tr.fInWater) || tr.flFraction != 1)
-		return FALSE;
+		return false;
 
 	// calc range from sound entity to player
 
@@ -916,12 +916,12 @@ BOOL FEnvSoundInRange(entvars_t *pev, entvars_t *pevTarget, float *pflRange)
 	flRange = vecRange.Length();
 
 	if (pSound->m_flRadius < flRange)
-		return FALSE;
+		return false;
 
 	if (pflRange)
 		*pflRange = flRange;
 
-	return TRUE;
+	return true;
 }
 
 //
@@ -1153,7 +1153,7 @@ int USENTENCEG_Pick(int isentenceg, char *szfound)
 	unsigned char count;
 	char sznum[8];
 	unsigned char ipick;
-	int ffound = FALSE;
+	int ffound = false;
 
 	if (!bSentencesInit)
 		return -1;
@@ -1172,7 +1172,7 @@ int USENTENCEG_Pick(int isentenceg, char *szfound)
 			{
 				ipick = plru[i];
 				plru[i] = 0xFF;
-				ffound = TRUE;
+				ffound = true;
 				break;
 			}
 
@@ -1915,7 +1915,7 @@ void CSpeaker ::ToggleUse(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYP
 {
 	int fActive = (pev->nextthink > 0.0);
 
-	// fActive is TRUE only if an announcement is pending
+	// fActive is true only if an announcement is pending
 
 	if (useType != USE_TOGGLE)
 	{
@@ -1963,7 +1963,7 @@ void CSpeaker ::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "preset"))
 	{
 		m_preset = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CBaseEntity::KeyValue(pkvd);
diff --git a/src/game/server/hl/soundent.cpp b/src/game/server/hl/soundent.cpp
index e0b32ce8..47d8e00a 100644
--- a/src/game/server/hl/soundent.cpp
+++ b/src/game/server/hl/soundent.cpp
@@ -48,29 +48,29 @@ void CSound :: Reset ( void )
 }
 
 //=========================================================
-// FIsSound - returns TRUE if the sound is an Audible sound
+// FIsSound - returns true if the sound is an Audible sound
 //=========================================================
 BOOL CSound :: FIsSound ( void )
 {
 	if ( m_iType & ( bits_SOUND_COMBAT | bits_SOUND_WORLD | bits_SOUND_PLAYER | bits_SOUND_DANGER ) )
 	{
-		return TRUE;
+		return true;
 	}
 
-	return FALSE;
+	return false;
 }
 
 //=========================================================
-// FIsScent - returns TRUE if the sound is actually a scent
+// FIsScent - returns true if the sound is actually a scent
 //=========================================================
 BOOL CSound :: FIsScent ( void )
 {
 	if ( m_iType & ( bits_SOUND_CARCASS | bits_SOUND_MEAT | bits_SOUND_GARBAGE ) )
 	{
-		return TRUE;
+		return true;
 	}
 
-	return FALSE;
+	return false;
 }
 
 //=========================================================
@@ -272,11 +272,11 @@ void CSoundEnt :: Initialize ( void )
 
 	if ( CVAR_GET_FLOAT("displaysoundlist") == 1 )
 	{
-		m_fShowReport = TRUE;
+		m_fShowReport = true;
 	}
 	else
 	{
-		m_fShowReport = FALSE;
+		m_fShowReport = false;
 	}
 }
 
diff --git a/src/game/server/hl/spectator.cpp b/src/game/server/hl/spectator.cpp
index c359bd91..4c8b62e2 100644
--- a/src/game/server/hl/spectator.cpp
+++ b/src/game/server/hl/spectator.cpp
@@ -74,7 +74,7 @@ void CBaseSpectator::SpectatorImpulseCommand(void)
 		// Start at the current goal, skip the world, and stop if we looped
 		//  back around
 
-		bFound = FALSE;
+		bFound = false;
 		while (1)
 		{
 			pCurrentGoal = FIND_ENTITY_BY_CLASSNAME(pCurrentGoal, "info_player_deathmatch");
@@ -87,7 +87,7 @@ void CBaseSpectator::SpectatorImpulseCommand(void)
 			// Found a non-world entity, set success, otherwise, look for the next one.
 			if (!FNullEnt(pCurrentGoal))
 			{
-				bFound = TRUE;
+				bFound = true;
 				break;
 			}
 		}
@@ -98,7 +98,7 @@ void CBaseSpectator::SpectatorImpulseCommand(void)
 		pGoal = pCurrentGoal;
 		UTIL_SetOrigin(pev, pGoal->v.origin);
 		pev->angles = pGoal->v.angles;
-		pev->fixangle = FALSE;
+		pev->fixangle = false;
 		break;
 	default:
 		ALERT(at_console, "Unknown spectator impulse\n");
diff --git a/src/game/server/hl/subs.cpp b/src/game/server/hl/subs.cpp
index c8c1125d..750b2015 100644
--- a/src/game/server/hl/subs.cpp
+++ b/src/game/server/hl/subs.cpp
@@ -71,7 +71,7 @@ void CBaseDMStart::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "master"))
 	{
 		pev->netname = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CPointEntity::KeyValue(pkvd);
@@ -161,12 +161,12 @@ void CBaseDelay ::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "delay"))
 	{
 		m_flDelay = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "killtarget"))
 	{
 		m_iszKillTarget = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 	{
@@ -395,22 +395,22 @@ void CBaseToggle::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "lip"))
 	{
 		m_flLip = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "wait"))
 	{
 		m_flWait = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "master"))
 	{
 		m_sMaster = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "distance"))
 	{
 		m_flMoveDistance = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CBaseDelay::KeyValue(pkvd);
@@ -469,9 +469,9 @@ void CBaseToggle ::LinearMoveDone(void)
 BOOL CBaseToggle ::IsLockedByMaster(void)
 {
 	if (m_sMaster && !UTIL_IsMasterTriggered(m_sMaster, m_hActivator))
-		return TRUE;
+		return true;
 	else
-		return FALSE;
+		return false;
 }
 
 /*
@@ -560,7 +560,7 @@ float CBaseToggle ::AxisDelta(int flags, const Vector &angle1, const Vector &ang
 =============
 FEntIsVisible
 
-returns TRUE if the passed entity is visible to caller, even if not infront ()
+returns true if the passed entity is visible to caller, even if not infront ()
 =============
 */
 BOOL FEntIsVisible(
@@ -574,10 +574,10 @@ BOOL FEntIsVisible(
 	UTIL_TraceLine(vecSpot1, vecSpot2, ignore_monsters, ENT(pev), &tr);
 
 	if (tr.fInOpen && tr.fInWater)
-		return FALSE; // sight line crossed contents
+		return false; // sight line crossed contents
 
 	if (tr.flFraction == 1)
-		return TRUE;
+		return true;
 
-	return FALSE;
+	return false;
 }
diff --git a/src/game/server/hl/util.cpp b/src/game/server/hl/util.cpp
index 719fd630..c282d086 100644
--- a/src/game/server/hl/util.cpp
+++ b/src/game/server/hl/util.cpp
@@ -1339,12 +1339,12 @@ void UTIL_TraceLine(const Vector &vecStart, const Vector &vecEnd, IGNORE_MONSTER
 
 void UTIL_TraceLine(const Vector &vecStart, const Vector &vecEnd, IGNORE_MONSTERS igmon, edict_t *pentIgnore, TraceResult *ptr)
 {
-	TRACE_LINE(vecStart, vecEnd, (igmon == ignore_monsters ? TRUE : FALSE), pentIgnore, ptr);
+	TRACE_LINE(vecStart, vecEnd, (igmon == ignore_monsters ? true : false), pentIgnore, ptr);
 }
 
 void UTIL_TraceHull(const Vector &vecStart, const Vector &vecEnd, IGNORE_MONSTERS igmon, int hullNumber, edict_t *pentIgnore, TraceResult *ptr)
 {
-	TRACE_HULL(vecStart, vecEnd, (igmon == ignore_monsters ? TRUE : FALSE), hullNumber, pentIgnore, ptr);
+	TRACE_HULL(vecStart, vecEnd, (igmon == ignore_monsters ? true : false), hullNumber, pentIgnore, ptr);
 }
 
 void UTIL_TraceModel(const Vector &vecStart, const Vector &vecEnd, int hullNumber, edict_t *pentModel, TraceResult *ptr)
@@ -1496,15 +1496,15 @@ BOOL UTIL_ShouldShowBlood(int color)
 		if (color == BLOOD_COLOR_RED)
 		{
 			if (CVAR_GET_FLOAT("violence_hblood") != 0)
-				return TRUE;
+				return true;
 		}
 		else
 		{
 			if (CVAR_GET_FLOAT("violence_ablood") != 0)
-				return TRUE;
+				return true;
 		}
 	}
-	return FALSE;
+	return false;
 }
 
 int UTIL_PointContents(const Vector &vec)
@@ -1731,16 +1731,16 @@ BOOL UTIL_TeamsMatch(const char *pTeamName1, const char *pTeamName2)
 {
 	// Everyone matches unless it's teamplay
 	if (!g_pGameRules->IsTeamplay())
-		return TRUE;
+		return true;
 
 	// Both on a team?
 	if (*pTeamName1 != 0 && *pTeamName2 != 0)
 	{
 		if (!_stricmp(pTeamName1, pTeamName2)) // Same Team?
-			return TRUE;
+			return true;
 	}
 
-	return FALSE;
+	return false;
 }
 
 void UTIL_StringToVector(float *pVector, const char *pString)
@@ -1945,8 +1945,8 @@ void UTIL_Remove(CBaseEntity *pEntity)
 BOOL UTIL_IsValidEntity(edict_t *pent)
 {
 	if (!pent || pent->free || (pent->v.flags & FL_KILLME))
-		return FALSE;
-	return TRUE;
+		return false;
+	return true;
 }
 
 void UTIL_PrecacheOther(const char *szClassname)
@@ -2179,10 +2179,10 @@ unsigned short CSaveRestoreBuffer ::TokenHash(const char *pszToken)
 	for (unsigned int i = 0; i < m_pdata->tokenCount; i++)
 	{
 #if _DEBUG
-		static qboolean beentheredonethat = FALSE;
+		static qboolean beentheredonethat = false;
 		if (i > 50 && !beentheredonethat)
 		{
-			beentheredonethat = TRUE;
+			beentheredonethat = true;
 			ALERT(at_error, "CSaveRestoreBuffer :: TokenHash() is getting too full!");
 		}
 #endif
@@ -2375,7 +2375,7 @@ void EntvarsKeyvalue(entvars_t *pev, KeyValueData *pkvd)
 				ALERT(at_error, "Bad field in entity!!\n");
 				break;
 			}
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 			return;
 		}
 	}
diff --git a/src/game/server/monsters/combat.cpp b/src/game/server/monsters/combat.cpp
index f3335eba..74f92c2b 100644
--- a/src/game/server/monsters/combat.cpp
+++ b/src/game/server/monsters/combat.cpp
@@ -255,9 +255,9 @@ BOOL CBaseMonster ::HasHumanGibs(void)
 		myClass == CLASS_HUMAN_PASSIVE ||
 		myClass == CLASS_PLAYER)
 
-		return TRUE;
+		return true;
 
-	return FALSE;
+	return false;
 }
 
 BOOL CBaseMonster ::HasAlienGibs(void)
@@ -271,9 +271,9 @@ BOOL CBaseMonster ::HasAlienGibs(void)
 		myClass == CLASS_ALIEN_PREDATOR ||
 		myClass == CLASS_ALIEN_PREY)
 
-		return TRUE;
+		return true;
 
-	return FALSE;
+	return false;
 }
 
 void CBaseMonster::FadeMonster(void)
@@ -294,7 +294,7 @@ void CBaseMonster::FadeMonster(void)
 void CBaseMonster ::GibMonster(void)
 {
 	TraceResult tr;
-	BOOL gibbed = FALSE;
+	BOOL gibbed = false;
 
 	EMIT_SOUND(ENT(pev), CHAN_WEAPON, "common/bodysplat.wav", 1, ATTN_NORM);
 
@@ -308,7 +308,7 @@ void CBaseMonster ::GibMonster(void)
 			CGib::SpawnHeadGib(pev);
 			CGib::SpawnRandomGibs(pev, 4, 1); // throw some human gibs.
 		}
-		gibbed = TRUE;
+		gibbed = true;
 	}
 	else if (HasAlienGibs())
 	{
@@ -316,7 +316,7 @@ void CBaseMonster ::GibMonster(void)
 		{
 			CGib::SpawnRandomGibs(pev, 4, 0); // Throw alien gibs
 		}
-		gibbed = TRUE;
+		gibbed = true;
 	}
 
 	if (!IsPlayer())
@@ -357,7 +357,7 @@ Activity CBaseMonster ::GetDeathActivity(void)
 
 	vecSrc = Center();
 
-	fTriedDirection = FALSE;
+	fTriedDirection = false;
 	deathActivity = ACT_DIESIMPLE; // in case we can't find any special deaths to do.
 
 	UTIL_MakeVectors(pev->angles);
@@ -376,7 +376,7 @@ Activity CBaseMonster ::GetDeathActivity(void)
 
 	case HITGROUP_GENERIC:
 		// try to pick a death based on attack direction
-		fTriedDirection = TRUE;
+		fTriedDirection = true;
 
 		if (flDot > 0.3)
 		{
@@ -390,7 +390,7 @@ Activity CBaseMonster ::GetDeathActivity(void)
 
 	default:
 		// try to pick a death based on attack direction
-		fTriedDirection = TRUE;
+		fTriedDirection = true;
 
 		if (flDot > 0.3)
 		{
@@ -467,7 +467,7 @@ Activity CBaseMonster ::GetSmallFlinchActivity(void)
 	BOOL fTriedDirection;
 	float flDot;
 
-	fTriedDirection = FALSE;
+	fTriedDirection = false;
 	UTIL_MakeVectors(pev->angles);
 	flDot = DotProduct(gpGlobals->v_forward, g_vecAttackDir * -1);
 
@@ -527,24 +527,24 @@ void CBaseMonster::BecomeDead(void)
 BOOL CBaseMonster::ShouldGibMonster(int iGib)
 {
 	if ((iGib == GIB_NORMAL && pev->health < GIB_HEALTH_VALUE) || (iGib == GIB_ALWAYS))
-		return TRUE;
+		return true;
 
-	return FALSE;
+	return false;
 }
 
 void CBaseMonster::CallGibMonster(void)
 {
-	BOOL fade = FALSE;
+	BOOL fade = false;
 
 	if (HasHumanGibs())
 	{
 		if (CVAR_GET_FLOAT("violence_hgibs") == 0)
-			fade = TRUE;
+			fade = true;
 	}
 	else if (HasAlienGibs())
 	{
 		if (CVAR_GET_FLOAT("violence_agibs") == 0)
-			fade = TRUE;
+			fade = true;
 	}
 
 	pev->takedamage = DAMAGE_NO;
@@ -580,7 +580,7 @@ Killed
 */
 void CBaseMonster ::Killed(entvars_t *pevAttacker, int iGib)
 {
-	BOOL fDone = FALSE;
+	BOOL fDone = false;
 
 	if (HasMemory(bits_MEMORY_KILLED))
 	{
@@ -1165,11 +1165,11 @@ bool CBaseEntity ::FInViewCone(CBaseEntity *pEntity, float m_flFieldOfView)
 
 	if (flDot > m_flFieldOfView)
 	{
-		return TRUE;
+		return true;
 	}
 	else
 	{
-		return FALSE;
+		return false;
 	}
 }
 
@@ -1220,14 +1220,14 @@ BOOL CBaseEntity ::FMVisible(CBaseEntity *pEntity)
 	Vector vecTargetOrigin;
 
 	if (FBitSet(pEntity->pev->flags, FL_NOTARGET))
-		return FALSE;
+		return false;
 
 	// don't look through water
 	// Thothie APR2011_29 - WTF not? This is causing issues with players in water
 	/*
 	if ((pev->waterlevel != 3 && pEntity->pev->waterlevel == 3) 
 		|| (pev->waterlevel == 3 && pEntity->pev->waterlevel == 0))
-		return FALSE;
+		return false;
 	*/
 
 	vecLookerOrigin = pev->origin + pev->view_ofs; //look through the caller's 'eyes'
@@ -1238,13 +1238,13 @@ BOOL CBaseEntity ::FMVisible(CBaseEntity *pEntity)
 	if (tr.flFraction != 1.0)
 	{
 		if (tr.pHit == pEntity->edict())
-			return TRUE; //hit my target
+			return true; //hit my target
 
-		return FALSE; // Line of sight is not established
+		return false; // Line of sight is not established
 	}
 	else
 	{
-		return TRUE; // line of sight is valid.
+		return true; // line of sight is valid.
 	}
 }
 
@@ -1263,11 +1263,11 @@ BOOL CBaseEntity ::FMVisible(const Vector &vecOrigin)
 
 	if (tr.flFraction != 1.0)
 	{
-		return FALSE; // Line of sight is not established
+		return false; // Line of sight is not established
 	}
 	else
 	{
-		return TRUE; // line of sight is valid.
+		return true; // line of sight is valid.
 	}
 }
 //=========================================================
@@ -1281,12 +1281,12 @@ BOOL CBaseEntity ::FVisible(CBaseEntity *pEntity)
 	Vector vecTargetOrigin;
 
 	if (FBitSet(pEntity->pev->flags, FL_NOTARGET))
-		return FALSE;
+		return false;
 
 	// don't look through water
 	//if ((pev->waterlevel != 3 && pEntity->pev->waterlevel == 3)
 	//	|| (pev->waterlevel == 3 && pEntity->pev->waterlevel == 0))
-	//	return FALSE;
+	//	return false;
 
 	vecLookerOrigin = pev->origin + pev->view_ofs; //look through the caller's 'eyes'
 	vecTargetOrigin = pEntity->EyePosition();
@@ -1295,11 +1295,11 @@ BOOL CBaseEntity ::FVisible(CBaseEntity *pEntity)
 
 	if (tr.flFraction != 1.0)
 	{
-		return FALSE; // Line of sight is not established
+		return false; // Line of sight is not established
 	}
 	else
 	{
-		return TRUE; // line of sight is valid.
+		return true; // line of sight is valid.
 	}
 }
 
@@ -1318,11 +1318,11 @@ BOOL CBaseEntity ::FVisible(const Vector &vecOrigin)
 
 	if (tr.flFraction != 1.0)
 	{
-		return FALSE; // Line of sight is not established
+		return false; // Line of sight is not established
 	}
 	else
 	{
-		return TRUE; // line of sight is valid.
+		return true; // line of sight is valid.
 	}
 }
 
diff --git a/src/game/server/monsters/corpse.cpp b/src/game/server/monsters/corpse.cpp
index 72827bbb..ccb709ae 100644
--- a/src/game/server/monsters/corpse.cpp
+++ b/src/game/server/monsters/corpse.cpp
@@ -123,7 +123,7 @@ bool CCorpse::AddItem(CGenericItem* pItem, bool ToHand, bool CheckWeight, int Fo
 		if (!pItem->WearItem())
 		{
 			pItem->SUB_Remove();
-			fReturn = FALSE;
+			fReturn = false;
 		}
 	}
 	else
diff --git a/src/game/server/monsters/corpse.h b/src/game/server/monsters/corpse.h
index a6c4ca32..21b11093 100644
--- a/src/game/server/monsters/corpse.h
+++ b/src/game/server/monsters/corpse.h
@@ -13,8 +13,8 @@ class CCorpse : public CMSMonster
 	void Spawn();
 	bool AddItem(CGenericItem* pItem, bool ToHand, bool CheckWeight, int ForceHand = -1);
 	bool RemoveItem(CGenericItem* pItem);
-	BOOL HasHumanGibs() { return TRUE; }
-	BOOL HasAlienGibs() { return FALSE; }
+	BOOL HasHumanGibs() { return true; }
+	BOOL HasAlienGibs() { return false; }
 	int BloodColor(void) { return BLOOD_COLOR_RED; }
 	bool ShouldGibMonster(int iGib) { return true; }
 	int Classify() { return CLASS_NONE; }
diff --git a/src/game/server/monsters/monsteranimation.cpp b/src/game/server/monsters/monsteranimation.cpp
index 6ca458af..0bbeb9d0 100644
--- a/src/game/server/monsters/monsteranimation.cpp
+++ b/src/game/server/monsters/monsteranimation.cpp
@@ -8,7 +8,7 @@
 
 #undef Wielded
 #undef CHWielded
-#define CHWielded ((m_pPlayer->Hand[m_pPlayer->iCurrentHand]) ? m_pPlayer->Hand[m_pPlayer->iCurrentHand]->Wielded() : (m_pPlayer->PlayerHands ? m_pPlayer->PlayerHands->Wielded() : FALSE))
+#define CHWielded ((m_pPlayer->Hand[m_pPlayer->iCurrentHand]) ? m_pPlayer->Hand[m_pPlayer->iCurrentHand]->Wielded() : (m_pPlayer->PlayerHands ? m_pPlayer->PlayerHands->Wielded() : false))
 
 CAnimation *CAnimation::ChangeTo(MONSTER_ANIM NewAnim)
 {
@@ -100,7 +100,7 @@ void CAnimation ::GaitAnimate()
 				NewGait = LookupSequence("crouch");
 		}
 	}
-	else if (speed > m_pOwner->WalkSpeed(FALSE) + 1)
+	else if (speed > m_pOwner->WalkSpeed(false) + 1)
 	{
 		if (bCustomLegs)
 			NewGait = LookupSequence(UTIL_VarArgs("run_%s", m_szAnimLegs));
@@ -167,18 +167,18 @@ void CWalkAnim ::Animate()
 }
 
 CAnimHold gAnimHold; //Never submits to MONSTER_ANIM_WALK
-					 //Submits to anything else if ReleaseAnim == TRUE
+					 //Submits to anything else if ReleaseAnim == true
 					 //Only uses gait if specified with flags
 void CAnimHold ::Initialize(void *vData)
 {
-	ReleaseAnim = TRUE;
+	ReleaseAnim = true;
 	UseGait = false; //defaults
 	int Flags = (int)vData;
 	if (Flags & (1 << 0))
-		ReleaseAnim = FALSE; //Release to any anim besides walk
+		ReleaseAnim = false; //Release to any anim besides walk
 	if (Flags & (1 << 1))
-		UseGait = TRUE; //Use gait
-	IsNewAnim = TRUE;
+		UseGait = true; //Use gait
+	IsNewAnim = true;
 }
 bool CAnimHold ::CanChangeTo(MONSTER_ANIM NewAnim, void *vData)
 {
@@ -243,13 +243,13 @@ void CAnimOnce ::Animate()
 
 /*					//stays in the last pose
 void CAnimAct :: Initialize( void *vData ) {
-	if( vData ) ReleaseAnim = FALSE;
-	else ReleaseAnim = TRUE;
-	IsNewAnim = TRUE;
+	if( vData ) ReleaseAnim = false;
+	else ReleaseAnim = true;
+	IsNewAnim = true;
 }
 bool CAnimAct :: CanChangeTo( MONSTER_ANIM NewAnim, void *vData ) {
-	if( m_fSequenceFinished && ReleaseAnim ) return TRUE;
-	return FALSE;
+	if( m_fSequenceFinished && ReleaseAnim ) return true;
+	return false;
 }
 void CAnimAct :: Animate( ) {
 	if( !IsNewAnim ) return;
diff --git a/src/game/server/monsters/msmonster.h b/src/game/server/monsters/msmonster.h
index 1c7604b3..815136cc 100644
--- a/src/game/server/monsters/msmonster.h
+++ b/src/game/server/monsters/msmonster.h
@@ -363,7 +363,7 @@ class CMSMonster : public CBaseMonster
 	virtual float MaxMP() { return m_MaxMP; }
 	virtual float GetDefaultMoveProximity() { return m_Width * 1.1; }
 
-	BOOL IsAlive() { return pev ? pev->deadflag == DEAD_NO : FALSE; }
+	BOOL IsAlive() { return pev ? pev->deadflag == DEAD_NO : false; }
 	virtual void CancelAttack();
 	//virtual void Step( );
 	//virtual void Jump( );
@@ -435,8 +435,8 @@ class CMSMonster : public CBaseMonster
 	int MSProperties();
 	float HearingSensitivity(void) { return m_HearingSensitivity; }
 	int ObjectCaps(void) { return CBaseMonster ::ObjectCaps() | FCAP_IMPULSE_USE; }
-	BOOL HasHumanGibs() { return TRUE; }
-	BOOL ShouldFadeOnDeath(void) { return FALSE; }
+	BOOL HasHumanGibs() { return true; }
+	BOOL ShouldFadeOnDeath(void) { return false; }
 
 #ifdef VALVE_DLL
 	virtual float GiveHP(float flAmount)
@@ -462,7 +462,7 @@ class CMSMonster : public CBaseMonster
 	virtual void Used(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value);
 	virtual void Trade();												 // Handle trading with others
 	virtual bool AcceptOffer();											 // Accept an offer from a player or monster
-	virtual BOOL SkinMonster(CMSMonster *pDeadMonster) { return FALSE; } //Skin other monsters
+	virtual BOOL SkinMonster(CMSMonster *pDeadMonster) { return false; } //Skin other monsters
 	virtual tradeinfo_t *TradeItem(tradeinfo_t *tiTradeInfo);			 // Trade an item
 	virtual void Attacked(CBaseEntity *pAttacker, damage_t &Damage);
 	virtual void Seen(CMSMonster *pMonster) {}
diff --git a/src/game/server/monsters/msmonsterserver.cpp b/src/game/server/monsters/msmonsterserver.cpp
index 8a412340..89c9989d 100644
--- a/src/game/server/monsters/msmonsterserver.cpp
+++ b/src/game/server/monsters/msmonsterserver.cpp
@@ -300,32 +300,32 @@ void CMSMonster::KeyValue(KeyValueData* pkvd)
 	if (FStrEq(pkvd->szKeyName, "killtarget"))
 	{
 		m_iszKillTarget = pkvd->szValue;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "perishtarget"))
 	{
 		m_iszPerishTarget = pkvd->szValue;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "spawnarea"))
 	{
 		m_iszMonsterSpawnArea = pkvd->szValue;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "delaylow"))
 	{
 		m_SpawnDelayLow = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "delayhigh"))
 	{
 		m_SpawnDelayHigh = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "lives"))
 	{
 		m_Lives = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "spawnchance"))
 	{
@@ -339,18 +339,18 @@ void CMSMonster::KeyValue(KeyValueData* pkvd)
 
 		if (!m_SpawnChance)
 			m_SpawnChance = -1;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "spawnstart"))
 	{
 		m_fSpawnOnTrigger = (atoi(pkvd->szValue)) ? true : false;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "nplayers"))
 	{
 		//Thothie - AUG2007a - adding option to only spawn monster if # players present
 		m_ReqPlayers = (atoi(pkvd->szValue));
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "reqhp"))
 	{
@@ -375,19 +375,19 @@ void CMSMonster::KeyValue(KeyValueData* pkvd)
 		}
 		if (reqhp_stringlist.size() >= 2 && reqhp_stringlist[1].contains("avg"))
 			m_HPReq_useavg = true; //Thothie OCT2015_28 - allow use average when calculating HP req, if token 2-3 is "avg"
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "title"))
 	{
 		//Thothie - AUG2007b - adding option to change monster name
 		m_title = pkvd->szValue;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "params"))
 	{
 		//Thothie - DEC2007b - adding option to send params to script
 		m_addparams = pkvd->szValue;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "hpmulti"))
 	{
@@ -396,7 +396,7 @@ void CMSMonster::KeyValue(KeyValueData* pkvd)
 		if (flHealthMulti > 1)
 		{
 			m_HPMulti = flHealthMulti;
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 	}
 	else if (FStrEq(pkvd->szKeyName, "dmgmulti"))
@@ -406,14 +406,14 @@ void CMSMonster::KeyValue(KeyValueData* pkvd)
 		if (flDamageMulti > 1)
 		{
 			m_DMGMulti = flDamageMulti;
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 	}
 	else if (FStrEq(pkvd->szKeyName, "scriptfile") ||
 		(FStrEq(pkvd->szKeyName, "defscriptfile") && !m_ScriptName))
 	{
 		m_ScriptName = pkvd->szValue;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	//NOV2014_20 - Thothie msmonster_random [begin]
 	else if (randomdata.starts_with("random_")) //optimize this - dis is stupid lazy
@@ -493,7 +493,7 @@ void CMSMonster::KeyValue(KeyValueData* pkvd)
 		}
 		//Gotta use the logfile here, dernitall
 		MS_DEBUG("DEBUG: msmonster_random added rndproperty #%i / tot %i - %s %s", idx, m_nRndMobs, rndproperty.c_str(), pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	//NOV2014_20 - Thothie msmonster_random [end]
 	else
@@ -829,7 +829,7 @@ bool CMSMonster::MoveExecute(moveexec_t& MoveExec)
 
 	return fSuccess;
 }
-BOOL CMSMonster::CanSetVelocity() { return TRUE; }
+BOOL CMSMonster::CanSetVelocity() { return true; }
 
 void CMSMonster::Float()
 {
@@ -1402,19 +1402,19 @@ void CMSMonster::Act()
 
 				if( m_fSequenceFinished ) {
 					//m_Hand->CurrentAttack->tStart = -65534;
-					//m_Hand->CurrentAttack->fCanCancel = TRUE;
+					//m_Hand->CurrentAttack->fCanCancel = true;
 					StopWalking( );
 					CurrentHand->CancelAttack( );
 					return;
 				}
-				else CurrentHand->CurrentAttack->fCanCancel = FALSE;
+				else CurrentHand->CurrentAttack->fCanCancel = false;
 
 				if( LastEvent.event == 600 ) //call attack this frame
 				{
 					CurrentHand->CurrentAttack->fAttackThisFrame = true;
 					pev->iuser4 = -1;
 				}
-				else CurrentHand->CurrentAttack->fAttackThisFrame = FALSE; //basically never
+				else CurrentHand->CurrentAttack->fAttackThisFrame = false; //basically never
 			}
 
 			//m_Hand->AttackButtonDown( );
@@ -2384,7 +2384,7 @@ void CMSMonster::CounterEffect(CBaseEntity* pInflictor, int iEffect, void* pExtr
 
 void CMSMonster::Killed(entvars_t* pevAttacker, int iGib)
 {
-	BOOL DeleteMe = TRUE;
+	BOOL DeleteMe = true;
 
 	//NOV2014_21 Thothie - script side XP management option [begin]
 	bool xp_dump = (strcmp(GetFirstScriptVar("NPC_DUMP_XP"), "1") == 0);	 //dump hits to array
@@ -2528,7 +2528,7 @@ void CMSMonster::Killed(entvars_t* pevAttacker, int iGib)
 			//			ALERT( at_console, "m_flFrameRate: %f\n", m_flFrameRate );
 			//pev->nextthink = gpGlobals->time + ((256 / m_flFrameRate) * pev->framerate);
 			pev->health = pev->max_health / 2; //Thothie - Dunno what this is about
-			DeleteMe = FALSE;				   //live until the body's dead
+			DeleteMe = false;				   //live until the body's dead
 
 			if (FStrEq(STRING(pev->classname), "msmonster_summoned"))
 				g_SummonedMonsters--;
@@ -2579,7 +2579,7 @@ void CMSMonster::Killed(entvars_t* pevAttacker, int iGib)
 			m_SkillLevel = 0; //Thothie APR2011_06 - attempt to make sure monster does not give additional skill post mortem
 		}
 		else
-			DeleteMe = TRUE; // Gibbed, destroy this entity
+			DeleteMe = true; // Gibbed, destroy this entity
 	}
 	if (DeleteMe)
 	{
@@ -2895,7 +2895,7 @@ void CMSMonster::UseMenuOption(CBasePlayer* pPlayer, int Option)
 		MS_ANGEL_INFO("UseMenuOption called for player %s (idx:%d), option %d", 
 					pPlayer ? pPlayer->DisplayName() : "NULL", playerIndex, Option);
 		MS_ANGEL_INFO("  Protection flag: %s, Entity: %d", 
-					m_MenuOptionsProtected[playerIndex] ? "TRUE" : "FALSE", entindex());
+					m_MenuOptionsProtected[playerIndex] ? "true" : "false", entindex());
 		
 		pPlayer->InMenu = false;
 		mslist<menuoption_t>& Menuoptions = m_MenuOptions[playerIndex];
diff --git a/src/game/server/monsters/npcact.cpp b/src/game/server/monsters/npcact.cpp
index 43ec1a1d..03c97f72 100644
--- a/src/game/server/monsters/npcact.cpp
+++ b/src/game/server/monsters/npcact.cpp
@@ -198,7 +198,7 @@ void NPCScript ::PlayAnim()
 		pMonster->SetAnimation(MONSTER_ANIM_ONCE, (char *)STRING(m_sActionAnim));
 	}
 	pMonster->pev->frame = 0;			   //In case the previous AND current anim is sequence 0
-	pMonster->m_fSequenceFinished = FALSE; //ditto...
+	pMonster->m_fSequenceFinished = false; //ditto...
 	SetThink(&NPCScript::AnimateThink);
 	pev->nextthink = gpGlobals->time + 0.1;
 }
@@ -327,42 +327,42 @@ void NPCScript ::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "type"))
 	{
 		m_iType = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "moveanim"))
 	{
 		m_sMoveAnim = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "actionanim"))
 	{
 		m_sActionAnim = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "eventname"))
 	{
 		m_sEventName = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "firewhendone"))
 	{
 		m_sFireWhenDone = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "fireonbreak"))
 	{
 		m_sFireOnBreak = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "firedelay"))
 	{
 		m_flFireDelay = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "stopai"))
 	{
 		m_fStopAI = atoi(pkvd->szValue) ? true : false;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CBaseEntity ::KeyValue(pkvd);
diff --git a/src/game/server/msgamerules.h b/src/game/server/msgamerules.h
index 46602c0b..5c25ce58 100644
--- a/src/game/server/msgamerules.h
+++ b/src/game/server/msgamerules.h
@@ -40,7 +40,7 @@ class CHalfLifeMultiplay : public CGameRules
 	virtual BOOL IsCoOp( void );
 
 // Client connection/disconnection
-	// If ClientConnected returns FALSE, the connection is rejected and the user is provided the reason specified in
+	// If ClientConnected returns false, the connection is rejected and the user is provided the reason specified in
 	//  svRejectReason
 	// Only the client's name and remote address are provided to the dll for verification.
 	virtual BOOL ClientConnected( edict_t *pEntity, const char *pszName, const char *pszAddress, char szRejectReason[ 128 ] );
@@ -107,7 +107,7 @@ class CHalfLifeMultiplay : public CGameRules
 	virtual const char *GetTeamID( CBaseEntity *pEntity ) {return "";}
 	virtual int PlayerRelationship( CBaseEntity *pPlayer, CBaseEntity *pTarget );
 
-	virtual BOOL PlayTextureSounds( void ) { return FALSE; }
+	virtual BOOL PlayTextureSounds( void ) { return false; }
 	virtual BOOL PlayFootstepSounds( CBasePlayer *pl, float fvol );
 
 // Monsters
diff --git a/src/game/server/msmapents.cpp b/src/game/server/msmapents.cpp
index 6af50d66..ce244e4b 100644
--- a/src/game/server/msmapents.cpp
+++ b/src/game/server/msmapents.cpp
@@ -19,7 +19,7 @@ class CCycler : public CBaseMonster
 	void Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value);
 
 	// Don't treat as a live target
-	virtual BOOL IsAlive(void) { return FALSE; }
+	virtual BOOL IsAlive(void) { return false; }
 
 	virtual int Save(CSave &save);
 	virtual int Restore(CRestore &restore);
@@ -122,7 +122,7 @@ void CCycler::Think(void)
 		// hack to avoid reloading model every frame
 		pev->animtime = gpGlobals->time;
 		pev->framerate = 1.0;
-		m_fSequenceFinished = FALSE;
+		m_fSequenceFinished = false;
 		m_flLastEventCheck = gpGlobals->time;
 		pev->frame = 0;
 		if (!m_animate)
@@ -274,13 +274,13 @@ void CCyclerSprite::Animate(float frames)
 		if (FStrEq(pkvd->szKeyName, "prefix"))
 		{
 			thoth_event_prefix = pkvd->szValue;
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 		else if (FStrEq(pkvd->szKeyName, "nevents")) 
 		{
 			//Thothie - AUG2007a - adding option to only spawn monster if # players present
 			thoth_nevents = (atoi(pkvd->szValue));
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 	}
 }*/
@@ -355,7 +355,7 @@ void CTargetMP3Audio ::Spawn(void)
 	pev->solid = SOLID_NOT;
 	pev->movetype = MOVETYPE_NONE;
 
-	m_bPlaying = FALSE; // start out not playing
+	m_bPlaying = false; // start out not playing
 }
 
 void CTargetMP3Audio::Use(CBaseEntity *pActivator, CBaseEntity *pCaller,
@@ -367,10 +367,10 @@ void CTargetMP3Audio::Use(CBaseEntity *pActivator, CBaseEntity *pCaller,
 		return;
 
 	if (!m_bPlaying) // if we're not playing, start playing!
-		m_bPlaying = TRUE;
+		m_bPlaying = true;
 	else
 	{ // if we're already playing, stop the mp3
-		m_bPlaying = FALSE;
+		m_bPlaying = false;
 		CLIENT_COMMAND(pActivator->edict(), "mp3 stop\n");
 		return;
 	}
@@ -432,12 +432,12 @@ class CGameText : public CPointEntity
 		if (FStrEq(pkvd->szKeyName, "npcname"))
 		{
 			ms_npcname = pkvd->szValue;
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 		else if (FStrEq(pkvd->szKeyName, "sayasnpc"))
 		{
 			ms_sayasnpc = (atoi(pkvd->szValue) == 1) ? true : false;
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 	}
 };
@@ -547,22 +547,22 @@ class CAreaMusicDyn : public CAreaInvisible
 		if (FStrEq(pkvd->szKeyName, "midle"))
 		{
 			mt_idle = pkvd->szValue;
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 		else if (FStrEq(pkvd->szKeyName, "mcombat"))
 		{
 			mt_combat = pkvd->szValue;
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 		else if (FStrEq(pkvd->szKeyName, "playall"))
 		{
 			mt_global = pkvd->szValue;
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 		else if (FStrEq(pkvd->szKeyName, "playnow"))
 		{
 			mt_playnow = pkvd->szValue;
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 		else
 			CBaseEntity::KeyValue(pkvd);
@@ -624,12 +624,12 @@ class CAreaMusic : public CAreaInvisible
 		if (keyName == "song")
 		{
 			m_sSong = pkvd->szValue;
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 		else if (keyName.find(".mp3") != std::string::npos) //Legacy way of playing mp3s
 		{
 			m_sSong = pkvd->szKeyName;
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 		else
 			CBaseEntity::KeyValue(pkvd);
@@ -832,7 +832,7 @@ class CAreaMonsterSpawn : public CAreaInvisible
 			m_SpawnLoc = (spawnloc_e)atoi(pkvd->szValue);
 			if (m_SpawnLoc < SPAWNLOC_FIXED || m_SpawnLoc > SPAWNLOC_RANDOM)
 				m_SpawnLoc = SPAWNLOC_FIXED;
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 		else if (FStrEq(pkvd->szKeyName, "spawnstart"))
 		{
@@ -854,7 +854,7 @@ class CAreaMonsterSpawn : public CAreaInvisible
 			m_fSpawnOnTrigger = (atoi(pkvd->szValue)) ? true : false;
 			//Thothie - store original spawnstart state
 			bSpawnImmediately = (atoi(pkvd->szValue)) ? true : false;
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 		//NOV2014_20 seeing if we can change how ms_monsterspawn handles mob respawning
 		//- the fact that ms_monster and ms_monsterspawn seem to kinda be the same entity is making this confusing though
@@ -862,24 +862,24 @@ class CAreaMonsterSpawn : public CAreaInvisible
 		{
 			//0=all mobs depleated, 1=any mob depleated, 2=whenever called
 			resetwhen = atoi(pkvd->szValue);
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 		else if (FStrEq(pkvd->szKeyName, "fireallperish"))
 		{
 			m_sTargetAllPerish = pev->target = ALLOC_STRING(pkvd->szValue);
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 		else if (FStrEq(pkvd->szKeyName, "params"))
 		{
 			//Thothie OCT2015_28 - pass additional parameters via monsterspawner
 			sAddParams = pkvd->szValue;
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 		else if (FStrEq(pkvd->szKeyName, "nplayers"))
 		{
 			//Thothie AUG2007a - player req for monster spawns
 			iPlayerReq = (atoi(pkvd->szValue));
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 		else if (FStrEq(pkvd->szKeyName, "reqhp"))
 		{
@@ -903,7 +903,7 @@ class CAreaMonsterSpawn : public CAreaInvisible
 				//if ( iHPReq_min == 0 ) iHPReq_min = 1; //OCT2015_28 disabled in case all players flagged AFK
 			}
 			if (reqhp_stringlist.size() > 2 && reqhp_stringlist[1].contains("avg")) hpreq_useavg = true; //Thothie OCT2015_28 - allow use average when calculating HP req, if token 2-3 is "avg"
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 		else
 			CBaseEntity::KeyValue(pkvd);
@@ -1403,37 +1403,37 @@ class CAreaTransitionLocal : public CAreaInvisible
 		if (FStrEq(pkvd->szKeyName, "rallplayers"))
 		{
 			mtl_req_all_players = (strcmp(pkvd->szValue, "1") == 0);
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 		else if (FStrEq(pkvd->szKeyName, "title"))
 		{
 			mtl_title = pkvd->szValue;
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 		else if (FStrEq(pkvd->szKeyName, "master"))
 		{
 			ms_master = ALLOC_STRING(pkvd->szValue);
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 		else if (FStrEq(pkvd->szKeyName, "teleport"))
 		{
 			mtl_teledest = ALLOC_STRING(pkvd->szValue);
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 		else if (FStrEq(pkvd->szKeyName, "spawntotie"))
 		{
 			mtl_respawnat = pkvd->szValue;
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 		else if (FStrEq(pkvd->szKeyName, "firetarget"))
 		{
 			mtl_target = ALLOC_STRING(pkvd->szValue);
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 		else if (FStrEq(pkvd->szKeyName, "touchtarget"))
 		{
 			mtl_touchtarget = ALLOC_STRING(pkvd->szValue);
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 		else
 			CBaseEntity::KeyValue(pkvd);
@@ -1544,7 +1544,7 @@ class CAreaTransitionLocal : public CAreaInvisible
 								pevToucher->flags &= ~FL_ONGROUND;
 								UTIL_SetOrigin(pevToucher, tmp);
 								pevToucher->angles = pentTarget->v.angles;
-								pevToucher->fixangle = TRUE;
+								pevToucher->fixangle = true;
 								pevToucher->velocity = pevToucher->basevelocity = g_vecZero;
 							}
 							else
@@ -1668,7 +1668,7 @@ class CAreaTransition : public CAreaInvisible
 			if (!UTIL_IsMasterTriggered(ms_master, pMchecker))
 			{
 				ALERT(at_console, "DEBUG: %s - master not unlocked.\n", "msarea_transition");
-				return FALSE;
+				return false;
 			}
 			else
 			{
@@ -1679,15 +1679,15 @@ class CAreaTransition : public CAreaInvisible
 		CBaseEntity* pGameMasterEnt = UTIL_FindEntityByString(NULL, "netname", msstring("-") + "game_master");
 		IScripted* pGMScript = (pGameMasterEnt ? pGameMasterEnt->GetScripted() : NULL);
 		if (pGMScript && (strcmp(pGMScript->GetFirstScriptVar("GM_DISABLE_TRANSITIONS"), "1") == 0))
-			return FALSE;
+			return false;
 
 		if (!CBaseEntity::Instance(pev)->IsPlayer())
-			return FALSE;
+			return false;
 
 		CBasePlayer *pPlayer = (CBasePlayer *)CBaseEntity::Instance(pev);
 
 		if (pPlayer->CurrentTransArea == this)
-			return FALSE;
+			return false;
 		pPlayer->CurrentTransArea = this;
 		if (pPlayer->m_MapStatus == FIRST_MAP)
 			pPlayer->m_MapStatus = OLD_MAP;
@@ -1761,7 +1761,7 @@ class CAreaTransition : public CAreaInvisible
 		WRITE_STRING_LIMIT(STRING(sDestTrans), 32);
 		MESSAGE_END();
 
-		return TRUE;
+		return true;
 	}
 
 	// DeathNotice - Lets this transition area know that a client has left it;
@@ -1911,7 +1911,7 @@ class CAreaTransition : public CAreaInvisible
 
 				msstring dest_map = STRING(sDestMap);
 				if (IS_MAP_VALID(dest_map.c_str()))
-					pOtherPlayer->EnableControl(FALSE);
+					pOtherPlayer->EnableControl(false);
 				
 				if (as_enabled.value > 0)
 				{
@@ -1969,22 +1969,22 @@ class CAreaTransition : public CAreaInvisible
 		if (FStrEq(pkvd->szKeyName, "destname"))
 		{
 			sDestName = ALLOC_STRING(pkvd->szValue);
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 		else if (FStrEq(pkvd->szKeyName, "destmap"))
 		{
 			sDestMap = ALLOC_STRING(pkvd->szValue);
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 		else if (FStrEq(pkvd->szKeyName, "desttrans"))
 		{
 			sDestTrans = ALLOC_STRING(pkvd->szValue);
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 		else if (FStrEq(pkvd->szKeyName, "master"))
 		{
 			ms_master = ALLOC_STRING(pkvd->szValue);
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 		else
 			CBaseEntity::KeyValue(pkvd);
@@ -2004,11 +2004,11 @@ class CAreaNoSave : public CAreaInvisible
 	BOOL OnControls(entvars_t *pev)
 	{
 		if (!CBaseEntity::Instance(pev)->IsPlayer())
-			return FALSE;
+			return false;
 
 		CBasePlayer *pPlayer = (CBasePlayer *)CBaseEntity::Instance(pev);
 		if (pPlayer->CurrentNoSaveArea == this)
-			return FALSE;
+			return false;
 		pPlayer->CurrentNoSaveArea = this;
 
 		//Let the client know they can no longer save
@@ -2017,7 +2017,7 @@ class CAreaNoSave : public CAreaInvisible
 		WRITE_BYTE(0);
 		MESSAGE_END();
 
-		return TRUE;
+		return true;
 	}
 	// DeathNotice - Let the client save again
 	void DeathNotice(entvars_t *pev)
@@ -2053,15 +2053,15 @@ class CAreaTown : public CAreaInvisible
 	BOOL OnControls(entvars_t *pev)
 	{
 		if (!CBaseEntity::Instance(pev)->IsPlayer())
-			return FALSE;
+			return false;
 
 		CBasePlayer *pPlayer = (CBasePlayer *)CBaseEntity::Instance(pev);
 		if (pPlayer->CurrentTownArea == this)
-			return FALSE;
+			return false;
 
 		pPlayer->CurrentTownArea = this;
 
-		return TRUE;
+		return true;
 	}
 	// DeathNotice - Player left the area
 	void DeathNotice(entvars_t *pev)
@@ -2080,8 +2080,8 @@ class CAreaTown : public CAreaInvisible
 	void *MSQuery(int iRequest)
 	{
 		if (m_fAllowPK)
-			return (void *)TRUE;
-		return (void *)FALSE;
+			return (void *)true;
+		return (void *)false;
 	}
 
 	void KeyValue(KeyValueData *pkvd)
@@ -2089,7 +2089,7 @@ class CAreaTown : public CAreaInvisible
 		if (FStrEq(pkvd->szKeyName, "pkill"))
 		{
 			m_fAllowPK = atoi(pkvd->szValue) ? true : false;
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 		else
 			CBaseEntity::KeyValue(pkvd);
diff --git a/src/game/server/player/player.cpp b/src/game/server/player/player.cpp
index 89664558..02b284ea 100644
--- a/src/game/server/player/player.cpp
+++ b/src/game/server/player/player.cpp
@@ -76,7 +76,7 @@ extern DLL_GLOBAL BOOL g_fGameOver;
 extern DLL_GLOBAL BOOL g_fDrawLines;
 int gEvilImpulse101;
 extern DLL_GLOBAL int g_iSkillLevel, gDisplayTitle;
-BOOL gInitHUD = TRUE;
+BOOL gInitHUD = true;
 
 extern void respawn(entvars_t *pev, BOOL fCopyCorpse);
 extern Vector VecBModelOrigin(entvars_t *pevBModel);
@@ -433,7 +433,7 @@ float CBasePlayer ::TraceAttack(damage_t &Damage)
 			{
 				if( CH && ((CGenericItem *)CH)->CurrentAttack )
 					((CGenericItem *)CH)->CancelAttack( );
-				SwitchHands( iHand, FALSE );
+				SwitchHands( iHand, false );
 			}
 
 			if( iCurrentHand == iHand )
@@ -467,7 +467,7 @@ int CBasePlayer ::TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, fl
 {
 	// have suit diagnose the problem - ie: report damage type
 	int bitsDamage = bitsDamageType;
-	int ffound = TRUE;
+	int ffound = true;
 	int fTookDamage;
 	//float flHealthPrev = pev->health;
 
@@ -560,7 +560,7 @@ void CBasePlayer::TakeDamageEffect(CBaseEntity *pInflictor, CBaseEntity *pAttack
 void CBasePlayer::PackDeadPlayerItems(void)
 {
 	if (m_fDropAllItems)
-		RemoveAllItems(TRUE); // now strip off everything the player has
+		RemoveAllItems(true); // now strip off everything the player has
 	m_fDropAllItems = false;
 }
 
@@ -686,7 +686,7 @@ void CBasePlayer::Killed(entvars_t *pevAttacker, int iGib)
 
 	if (FBitSet(pev->flags, FL_DUCKING))
 	{
-		CinematicCamera(FALSE);
+		CinematicCamera(false);
 		ClearBits(pev->flags, FL_DUCKING);
 		ClearBits(m_afPhysicsFlags, PFLAG_DUCKING);
 		pev->origin.z = pev->origin.z + ((Size(0).z / 2) - (Size(FL_DUCKING).z / 2));
@@ -795,7 +795,7 @@ void CBasePlayer::Killed(entvars_t *pevAttacker, int iGib)
 	m_Corpse = (CCorpse *)GetClassPtr((CCorpse *)NULL);
 	m_Corpse->CreateCorpse(this, LoseGoldPercent);
 
-	CinematicCamera(TRUE, vOrigin, vAngles);
+	CinematicCamera(true, vOrigin, vAngles);
 	pev->effects |= EF_NODRAW;
 	UTIL_SetSize(pev, Vector(0, 0, 0), Vector(0, 0, 0));
 	pev->takedamage = DAMAGE_NO;
@@ -934,7 +934,7 @@ void CBasePlayer::WaterMove()
 	//	pev->velocity = pev->velocity - 0.8 * pev->waterlevel * gpGlobals->frametime * pev->velocity;
 }
 
-// TRUE if the player is attached to a ladder
+// true if the player is attached to a ladder
 BOOL CBasePlayer::IsOnLadder(void)
 {
 	return (pev->movetype == MOVETYPE_FLY);
@@ -1057,7 +1057,7 @@ void CBasePlayer::StartObserver(Vector vecPosition, Vector vecViewAngle)
 
 	pev->view_ofs = g_vecZero;
 	pev->angles = pev->v_angle = vecViewAngle;
-	pev->fixangle = TRUE;
+	pev->fixangle = true;
 	pev->solid = SOLID_NOT;
 	pev->takedamage = DAMAGE_NO;
 	pev->movetype = MOVETYPE_NONE;
@@ -1066,7 +1066,7 @@ void CBasePlayer::StartObserver(Vector vecPosition, Vector vecViewAngle)
 }
 void CBasePlayer::CinematicCamera(BOOL OnorOff, Vector vecPosition, Vector vecViewAngle, BOOL bCreateClone)
 {
-	if (OnorOff == TRUE)
+	if (OnorOff == true)
 	{
 		m_afPhysicsFlags |= PFLAG_OBSERVER;
 		CamEntity = GetClassPtr((CBaseEntity *)NULL);
@@ -1342,7 +1342,7 @@ void CBasePlayer::DoAction( int iAction ) {
 				SetAnimation( MONSTER_ANIM_BREAK );
 				SetAnimation( MONSTER_ANIM_HOLD, "sitdown", (void *)0 );
 				SetBits( m_StatusFlags, PLAYER_MOVE_SITTING );
-				LockSpeed = TRUE;
+				LockSpeed = true;
 				UTIL_MakeVectors( pev->angles );
 				m_TimeGainHP = 0;  //Reset the gain HP time
 			}
@@ -1361,8 +1361,8 @@ void CBasePlayer::DoAction( int iAction ) {
 					SendInfoMsg( "You stand back up." );
 					//strcpy( m_szAnimExtention, m_szAnimLast );
 					ClearBits( m_StatusFlags, PLAYER_MOVE_SITTING );
-					CinematicCamera( FALSE );
-					LockSpeed = FALSE;
+					CinematicCamera( false );
+					LockSpeed = false;
 
 					ClearBits(pev->flags,FL_DUCKING);
 					ClearBits(m_afPhysicsFlags,PFLAG_DUCKING);
@@ -1444,7 +1444,7 @@ void CBasePlayer::UpdateStatusBar()
 		}
 	}
 
-	BOOL bForceResend = FALSE;
+	BOOL bForceResend = false;
 
 	if (strcmp(sbuf0, m_SbarString0))
 	{
@@ -1456,7 +1456,7 @@ void CBasePlayer::UpdateStatusBar()
 		 strncpy(m_SbarString0,  sbuf0, sizeof(m_SbarString0) );
 
 		// make sure everything's resent
-		bForceResend = TRUE;
+		bForceResend = true;
 	}
 
 	if (strcmp(sbuf1, m_SbarString1))
@@ -1469,7 +1469,7 @@ void CBasePlayer::UpdateStatusBar()
 		 strncpy(m_SbarString1,  sbuf1, sizeof(m_SbarString1) );
 
 		// make sure everything's resent
-		bForceResend = TRUE;
+		bForceResend = true;
 	}
 
 	// Check values and send if they don't match
@@ -1679,7 +1679,7 @@ void CBasePlayer::PreThink(void)
 
 	if (m_TimeTillSuicide)
 	{
-		EnableControl(FALSE);
+		EnableControl(false);
 		if (gpGlobals->time >= m_TimeTillSuicide)
 		{
 			// have the player kill themself
@@ -1853,7 +1853,7 @@ void CBasePlayer::CheckTimeBasedDamage()
 					{
 						m_rgbTimeBasedDamage[i] = 0;
 						m_rgItems[ITEM_ANTIDOTE]--;
-						//						SetSuitUpdate("!HEV_HEAL4", FALSE, SUIT_REPEAT_OK);
+						//						SetSuitUpdate("!HEV_HEAL4", false, SUIT_REPEAT_OK);
 					}
 				}
 
@@ -2288,14 +2288,14 @@ BOOL IsSpawnPointValid(CBaseEntity *pPlayer, CBaseEntity *pSpot)
 
 	// if (!pSpot->IsTriggered(pPlayer))
 	// {
-	// 	return FALSE;
+	// 	return false;
 	// }
 
 	// /*	while ( (ent = UTIL_FindEntityInSphere( ent, pSpot->pev->origin, 128 )) != NULL )
 	// {
 	// 	// if ent is a client, don't spawn on 'em
 	// 	if ( ent->IsPlayer() && ent != pPlayer )
-	// 		return FALSE;
+	// 		return false;
 	// }*/
 	// bool fBlocked = false;
 	// float Range = 72;
@@ -2314,7 +2314,7 @@ BOOL IsSpawnPointValid(CBaseEntity *pPlayer, CBaseEntity *pSpot)
 	// 	break;
 	// }
 
-	return TRUE;
+	return true;
 }
 void CBasePlayer::AddNoise(float flNoiseAmt)
 {
@@ -2704,7 +2704,7 @@ void CBasePlayer::Spawn(void)
 		//because the coords were sent from client.
 		//If not the first spawn, then a spawn spot was selected and
 		//the above !pentSpawnSpot skips over this
-		if( m_MapStatus != OLD_MAP ) SpawnPlayer = FALSE;
+		if( m_MapStatus != OLD_MAP ) SpawnPlayer = false;
 	}
 	else {
 	}*/
@@ -2725,12 +2725,12 @@ void CBasePlayer::Spawn(void)
 	if (m_iPlayerSound == SOUNDLIST_EMPTY)
 		ALERT(at_console, "Couldn't alloc player sound slot!\n");
 
-	m_fNoPlayerSound = FALSE; // normal sound behavior.
+	m_fNoPlayerSound = false; // normal sound behavior.
 
 	m_pLastItem = NULL;
-	m_fInitHUD = TRUE;
+	m_fInitHUD = true;
 	m_iClientHideHUD = -1; // force this to be recalculated
-	m_fWeapon = FALSE;
+	m_fWeapon = false;
 	m_pClientActiveItem = NULL;
 
 	if (!SpawnPlayer)
@@ -2748,7 +2748,7 @@ void CBasePlayer::Spawn(void)
 		SetBits(pev->flags, FL_NOTARGET);
 		m_afPhysicsFlags |= PFLAG_OBSERVER;
 		m_iHideHUD = HIDEHUD_ALL;
-		EnableControl(FALSE); //So you can't move
+		EnableControl(false); //So you can't move
 
 
 		//Load the list of characters either from file or from the Central Server
@@ -2787,13 +2787,13 @@ void CBasePlayer::Spawn(void)
 		ClearBits(pev->flags, FL_NOTARGET);
 		//SetBits( pev->effects, EF_NODRAW ); //Thothie - making char invisible for new body
 		UTIL_ScreenFade(this, Vector(0, 0, 0), 1, 0, 0, FFADE_IN);
-		CinematicCamera(FALSE); //Returns you to normal viewing
-		LockSpeed = FALSE;
+		CinematicCamera(false); //Returns you to normal viewing
+		LockSpeed = false;
 		m_SkillLevel = -1; //Force a score screen update
 		//Call the client dll spawn function in UpdateClientData
 		SetBits(m_MsgFlags, MSGFLAG_SPAWN);
 		m_iHideHUD = 0; //Unhide HUD, if hidden
-		EnableControl(TRUE);
+		EnableControl(true);
 		UTIL_SetOrigin(pev, pev->origin);
 
 		//Shuriken - This should send an Exp message for all the players' stats.
@@ -2857,7 +2857,7 @@ void CBasePlayer::Spawn(void)
 	}
 	m_pLastAnimHandler = NULL;				 // Set these
 	m_pAnimHandler = &gAnimWalk;			 // or it crashes
-	m_fSequenceFinished = TRUE;				 //So it knows to begin the first animation
+	m_fSequenceFinished = true;				 //So it knows to begin the first animation
 	pev->sequence = LookupSequence("stand"); //LookupActivity( ACT_IDLE )
 	BlockButton(IN_ATTACK);					 //Make it inconsequential if the player is still holding down the button
 
@@ -2929,7 +2929,7 @@ bool CBasePlayer::MoveToSpawnSpot()
 		pev->velocity = g_vecZero;
 		pev->angles = pSpawnSpot->pev->angles;
 		pev->punchangle = g_vecZero;
-		pev->fixangle = TRUE;
+		pev->fixangle = true;
 		if (pSpawnSpot->pev->target)
 			FireTargets(STRING(pSpawnSpot->pev->target), this, this, USE_TOGGLE, 0);
 	}
@@ -3053,7 +3053,7 @@ void CBasePlayer ::Precache(void)
 	m_iUpdateTime = 5; // won't update for 1/2 a second
 
 	if (gInitHUD)
-		m_fInitHUD = TRUE;
+		m_fInitHUD = true;
 }
 
 int CBasePlayer::Save(CSave &save)
@@ -3093,7 +3093,7 @@ int CBasePlayer::Restore(CRestore &restore)
 	pev->v_angle.z = 0;	// Clear out roll
 	pev->angles = pev->v_angle;
 
-	pev->fixangle = TRUE;           // turn this way immediately
+	pev->fixangle = true;           // turn this way immediately
 
 // Copied from spawn() for now
 	m_bloodColor	= BLOOD_COLOR_RED;
@@ -3192,7 +3192,7 @@ void CSprayCan::Think(void)
 	}
 	else
 	{
-		UTIL_PlayerDecalTrace(&tr, playernum, pev->frame, TRUE);
+		UTIL_PlayerDecalTrace(&tr, playernum, pev->frame, true);
 		// Just painted last custom frame.
 		if (pev->frame++ >= (nFrames - 1))
 			UTIL_Remove(this);
@@ -3343,8 +3343,8 @@ Reset stuff so that the state is transmitted.
 {
 	m_iClientHealth  = -1;
 	m_iTrain |= TRAIN_NEW;  // Force new train message.
-	m_fWeapon = FALSE;          // Force weapon send
-	m_fKnownItem = FALSE;    // Force weaponinit messages.
+	m_fWeapon = false;          // Force weapon send
+	m_fKnownItem = false;    // Force weaponinit messages.
 
 	// Now force all the necessary messages
 	//  to be sent.
@@ -3439,11 +3439,11 @@ void CBasePlayer::CheatImpulseCommands(int iImpulse)
 	}
 
 	case 101:
-		gEvilImpulse101 = TRUE;
+		gEvilImpulse101 = true;
 
 		//GiveDefaultItems( );
 
-		gEvilImpulse101 = FALSE;
+		gEvilImpulse101 = false;
 		break;
 
 	case 102:
@@ -3472,12 +3472,12 @@ void CBasePlayer::CheatImpulseCommands(int iImpulse)
 		if (m_fNoPlayerSound)
 		{
 			ALERT(at_console, "Player is audible\n");
-			m_fNoPlayerSound = FALSE;
+			m_fNoPlayerSound = false;
 		}
 		else
 		{
 			ALERT(at_console, "Player is silent\n");
-			m_fNoPlayerSound = TRUE;
+			m_fNoPlayerSound = true;
 		}
 		break;
 	}
@@ -3628,8 +3628,8 @@ void CBasePlayer::UpdateClientData(void)
 		//Thothie nothing changed here, but somewhere whithin we are getting:
 		//Error (SERVER): Error: CBasePlayer::UpdateClientData --> Call InitHUD
 		//Maybe caused by a script, not sure
-		m_fInitHUD = FALSE;
-		gInitHUD = FALSE;
+		m_fInitHUD = false;
+		gInitHUD = false;
 
 		MESSAGE_BEGIN(MSG_ONE, gmsgResetHUD, NULL, pev);
 		WRITE_BYTE(0);
@@ -3686,7 +3686,7 @@ void CBasePlayer::UpdateClientData(void)
 			WRITE_BYTE(FNShared::IsEnabled() ? 1 : 0);
 			MESSAGE_END();
 
-			m_fGameHUDInitialized = TRUE;
+			m_fGameHUDInitialized = true;
 			InitHUD();
 			fConnectedThisFrame = true;
 		}
@@ -4119,7 +4119,7 @@ void CBasePlayer::UpdateClientData(void)
 BOOL CBasePlayer ::FBecomeProne(void)
 {
 	m_afPhysicsFlags |= PFLAG_ONBARNACLE;
-	return TRUE;
+	return true;
 }
 
 //=========================================================
@@ -4276,7 +4276,7 @@ Vector CBasePlayer ::GetAutoaimVector(float flDelta)
 
 	if ( CVAR_GET_FLOAT("sv_aim") == 0 )
 	{
-		m_fOnTarget = FALSE;
+		m_fOnTarget = false;
 		return g_vecZero;
 	}
 
@@ -4287,7 +4287,7 @@ Vector CBasePlayer ::GetAutoaimVector(float flDelta)
 	bestdot = flDelta; // +- 10 degrees
 	bestent = NULL;
 
-	m_fOnTarget = FALSE;
+	m_fOnTarget = false;
 
 	UTIL_TraceLine( vecSrc, vecSrc + bestdir * flDist, dont_ignore_monsters, edict(), &tr );
 
@@ -4299,7 +4299,7 @@ Vector CBasePlayer ::GetAutoaimVector(float flDelta)
 			|| (pev->waterlevel == 3 && tr.pHit->v.waterlevel == 0)))
 		{
 			if (tr.pHit->v.takedamage == DAMAGE_AIM)
-				m_fOnTarget = TRUE;
+				m_fOnTarget = true;
 
 			return m_vecAutoAim;
 		}
@@ -4380,7 +4380,7 @@ Vector CBasePlayer ::GetAutoaimVector(float flDelta)
 		bestdir = bestdir - pev->v_angle - pev->punchangle;
 
 		if (bestent->v.takedamage == DAMAGE_AIM)
-			m_fOnTarget = TRUE;
+			m_fOnTarget = true;
 
 		return bestdir;
 	}
@@ -4395,7 +4395,7 @@ void CBasePlayer ::ResetAutoaim()
 		m_vecAutoAim = Vector(0, 0, 0);
 		SET_CROSSHAIRANGLE(edict(), 0, 0);
 	}
-	m_fOnTarget = FALSE;
+	m_fOnTarget = false;
 }
 
 /*
@@ -4451,7 +4451,7 @@ void CStripWeapons ::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE
 	}
 
 	if (pPlayer)
-		pPlayer->RemoveAllItems(FALSE);
+		pPlayer->RemoveAllItems(false);
 }
 
 class CRevertSaved : public CPointEntity
@@ -4496,22 +4496,22 @@ void CRevertSaved ::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "duration"))
 	{
 		SetDuration(atof(pkvd->szValue));
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "holdtime"))
 	{
 		SetHoldTime(atof(pkvd->szValue));
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "messagetime"))
 	{
 		SetMessageTime(atof(pkvd->szValue));
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "loadtime"))
 	{
 		SetLoadTime(atof(pkvd->szValue));
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CPointEntity::KeyValue(pkvd);
@@ -5575,7 +5575,7 @@ void CBasePlayer::TransactionCallback(CBasePlayer *pPlayer, int slot, TCallbackM
 		#define MIN_GOLD_STEAL 5
 		int StealAmt = min(max(GetSkillStat(SKILL_THEFT) * 10,MIN_GOLD_STEAL),pMonster->Gold); //Max amt (skill * 10)
 		StealAmt = RANDOM_LONG(0,StealAmt); //Actual amt to steal
-		GiveGold( StealAmt, FALSE );
+		GiveGold( StealAmt, false );
 		SendInfoMsg( "You steal %i gold coins from %s\n", StealAmt, STRING(pMonster->DisplayName) );
 		pMonster->Gold -= StealAmt;
 		StealNoticeCheck( this, pMonster, true );
@@ -5704,7 +5704,7 @@ void CBasePlayer ::ShowMenu(const char *pszText, int bitsValidSlots,
 			strncpy(cTemp, &pszText[n], 127);
 			cTemp[127] = 0;
 			n += 127;
-			bLclNeedMore = TRUE;
+			bLclNeedMore = true;
 		}
 		else
 		{
@@ -6015,7 +6015,7 @@ bool CBasePlayer ::AcceptOffer()
 BOOL CBasePlayer::SkinMonster(CMSMonster *pDeadMonster)
 {
 	/*if( !pDeadMonster->Skin )
-		return FALSE;
+		return false;
 
 	CGenericItem *pSkin = NULL;
 	bool fSkinIt = false;
@@ -6040,12 +6040,12 @@ BOOL CBasePlayer::SkinMonster(CMSMonster *pDeadMonster)
 		if( fSkinIt ) {
 			pSkin->pev->origin = pDeadMonster->pev->origin;
 			pSkin->pev->angles.y = RANDOM_FLOAT(0,360);
-			return TRUE;
+			return true;
 		}
 		else pSkin->SUB_Remove( );
 	}*/
 
-	return FALSE;
+	return false;
 }
 void CBasePlayer::InitHUD()
 {
diff --git a/src/game/server/player/player.h b/src/game/server/player/player.h
index 45947d57..a978419b 100644
--- a/src/game/server/player/player.h
+++ b/src/game/server/player/player.h
@@ -119,9 +119,9 @@ constexpr const char* VAR_NPC_ANIM_LEGS = "game.monster.legs_anim";
 constexpr const char* PLAYER_SCRIPT = "player/player";
 //#define mCH m_pOwner->iCurrentHand
 
-/*//#define Wielded( iHand ) ((Hand[iHand])?Hand[iHand]->Wielded:(PlayerHands?PlayerHands->Wielded:FALSE))
-#define Wielded( iHand ) ((Hand[iHand])?TRUE:(PlayerHands?PlayerHands->Wielded:FALSE))
-//#define CHWielded ((Hand[iCurrentHand])?Hand[iCurrentHand]->Wielded:(PlayerHands?PlayerHands->Wielded:FALSE))
+/*//#define Wielded( iHand ) ((Hand[iHand])?Hand[iHand]->Wielded:(PlayerHands?PlayerHands->Wielded:false))
+#define Wielded( iHand ) ((Hand[iHand])?true:(PlayerHands?PlayerHands->Wielded:false))
+//#define CHWielded ((Hand[iCurrentHand])?Hand[iCurrentHand]->Wielded:(PlayerHands?PlayerHands->Wielded:false))
 #define CHWielded Wielded(iCurrentHand)*/
 
 constexpr int MAX_PLAYER_HANDS = 2;
@@ -158,8 +158,8 @@ constexpr int PFLAG_OBSERVER = (1 << 5); // player is locked in stationary cam m
 //-----------------------------------------------------
 /*#define CSUITPLAYLIST	4		// max of 4 suit sentences queued up at any time
 
-#define SUIT_GROUP			TRUE
-#define	SUIT_SENTENCE		FALSE
+#define SUIT_GROUP			true
+#define	SUIT_SENTENCE		false
 
 #define	SUIT_REPEAT_OK		0
 #define SUIT_NEXT_IN_30SEC	30
@@ -568,7 +568,7 @@ class CBasePlayer : public CMSMonster
 	//	void				UpdateFatigue( );
 	//	void				UpdateMana( );
 	//bool				SwapHands( bool bVerbose = true );
-	void ShowMenu(const char *pszText, int bitsValidSlots, int nDisplayTime = 0, BOOL fNeedMore = FALSE);
+	void ShowMenu(const char *pszText, int bitsValidSlots, int nDisplayTime = 0, BOOL fNeedMore = false);
 	int GiveGold(int iAmount, bool bVerbose = true);
 	//float				TraceAttack( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType, int iAccuracyRoll);
 	void AttackSound();
@@ -581,7 +581,7 @@ class CBasePlayer : public CMSMonster
 	void PlayerAction(const char* Action);
 	bool PrepareSpell(const char *pszName);
 	void TakeDamageEffect(CBaseEntity *pInflicter, CBaseEntity *pAttacker, float flDamage, int bitsDamageType);
-	void CinematicCamera(BOOL OnorOff, Vector vecPosition = g_vecZero, Vector vecViewAngle = g_vecZero, BOOL bCreateClone = FALSE);
+	void CinematicCamera(BOOL OnorOff, Vector vecPosition = g_vecZero, Vector vecViewAngle = g_vecZero, BOOL bCreateClone = false);
 	CBaseEntity *GiveNamedItem(const char *szName);
 
 	CGenericItem *ActiveItem();
@@ -718,7 +718,7 @@ class CBasePlayer : public CMSMonster
 	BOOL m_fInitHUD;	 // True when deferred HUD restart msg needs to be sent
 	BOOL m_fGameHUDInitialized;
 	int m_iTrain;	// Train control position
-	BOOL m_fWeapon; // Set this to FALSE to force a reset of the current weapon HUD info
+	BOOL m_fWeapon; // Set this to false to force a reset of the current weapon HUD info
 
 	EHANDLE m_pTank;   // the tank which the player is currently controlling,  NULL if no tank
 	float m_fDeadTime; // the time at which the player died  (used in PlayerDeathThink())
@@ -767,11 +767,11 @@ class CBasePlayer : public CMSMonster
 	virtual void StartSneaking(void) { m_tSneaking = gpGlobals->time - 1; }
 	virtual void StopSneaking(void) { m_tSneaking = gpGlobals->time + 30; }
 	virtual BOOL IsSneaking(void) { return m_tSneaking <= gpGlobals->time; }
-	virtual BOOL ShouldFadeOnDeath(void) { return FALSE; }
-	virtual BOOL IsPlayer(void) { return TRUE; } // Spectators should return FALSE for this, they aren't "players" as far as game logic is concerned
+	virtual BOOL ShouldFadeOnDeath(void) { return false; }
+	virtual BOOL IsPlayer(void) { return true; } // Spectators should return false for this, they aren't "players" as far as game logic is concerned
 
-	virtual BOOL IsNetClient(void) { return TRUE; } // Bots should return FALSE for this, they can't receive NET messages
-													// Spectators should return TRUE for this
+	virtual BOOL IsNetClient(void) { return true; } // Bots should return false for this, they can't receive NET messages
+													// Spectators should return true for this
 	virtual const char *TeamID(void);
 
 	virtual int Save(CSave &save);
diff --git a/src/game/server/player/playershared.cpp b/src/game/server/player/playershared.cpp
index b64f2c48..7c835aed 100644
--- a/src/game/server/player/playershared.cpp
+++ b/src/game/server/player/playershared.cpp
@@ -350,7 +350,7 @@ bool CBasePlayer::AddItem(CGenericItem* pItem, bool ToHand, bool CheckWeight, in
 int CBasePlayer::NewItemHand(CGenericItem* pItem, bool CheckWeight, bool bVerbose, bool FreeHands, char* pszErrorString)
 {
 	//Returns the hand (or -1) of where the new item can be held
-	//bNonVerbose == TRUE means don't say anything just return the value
+	//bNonVerbose == true means don't say anything just return the value
 	int iAddHand = -1;
 	char cErrorString[128];
 
@@ -609,9 +609,9 @@ bool CBasePlayer::CanHold(CGenericItem* pItem, bool bVerbose, char* pszErrorStri
 }*/
 /*
 	RemovePlayerItem - Removes an item from the player's hands or packlist.
-	(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)   Set bCallItemDropFunc to TRUE if you want to call
+	(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)   Set bCallItemDropFunc to true if you want to call
 					   pItem->Drop which completely disassociates the item
-					   from its owner.  Set to FALSE if you're just removing
+					   from its owner.  Set to false if you're just removing
 					   it from the player's hands (to wear it or something)
 */
 bool CBasePlayer::RemoveItem(CGenericItem* pItem)
@@ -749,7 +749,7 @@ bool CBasePlayer::UseItem(int iHand, bool bVerbose)
 		if( pItem )
 		{
 			pItem->GiveTo( this, true, false );
-			//if( AddItem( pItem, TRUE ) )
+			//if( AddItem( pItem, true ) )
 			//	pPack->Container_RemoveItem( pItem );
 
 			//#ifdef VALVE_DLL
diff --git a/src/game/server/triggers.cpp b/src/game/server/triggers.cpp
index 0fae878b..70b400b3 100644
--- a/src/game/server/triggers.cpp
+++ b/src/game/server/triggers.cpp
@@ -87,7 +87,7 @@ void CFrictionModifier ::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "modifier"))
 	{
 		m_frictionFraction = atof(pkvd->szValue) / 100.0;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CBaseEntity::KeyValue(pkvd);
@@ -131,7 +131,7 @@ void CAutoTrigger::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "globalstate"))
 	{
 		m_globalstate = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "triggerstate"))
 	{
@@ -148,7 +148,7 @@ void CAutoTrigger::KeyValue(KeyValueData *pkvd)
 			triggerType = USE_ON;
 			break;
 		}
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CBaseDelay::KeyValue(pkvd);
@@ -211,12 +211,12 @@ void CTriggerRelay::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "scriptevent"))
 	{
 		m_scriptevent = pkvd->szValue;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "master"))
 	{
 		ms_master = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "triggerstate"))
 	{
@@ -233,7 +233,7 @@ void CTriggerRelay::KeyValue(KeyValueData *pkvd)
 			triggerType = USE_ON;
 			break;
 		}
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "random"))
 	{
@@ -314,13 +314,13 @@ class CMultiManager : public CBaseToggle
 	int m_iTargetName[MAX_MULTI_TARGETS];	  // list if indexes into global string array
 	float m_flTargetDelay[MAX_MULTI_TARGETS]; // delay (in seconds) from time of manager fire to target fire
 private:
-	inline BOOL IsClone(void) { return (pev->spawnflags & SF_MULTIMAN_CLONE) ? TRUE : FALSE; }
+	inline BOOL IsClone(void) { return (pev->spawnflags & SF_MULTIMAN_CLONE) ? true : false; }
 	inline BOOL ShouldClone(void)
 	{
 		if (IsClone())
-			return FALSE;
+			return false;
 
-		return (pev->spawnflags & SF_MULTIMAN_THREAD) ? TRUE : FALSE;
+		return (pev->spawnflags & SF_MULTIMAN_THREAD) ? true : false;
 	}
 
 	CMultiManager *Clone(void);
@@ -350,12 +350,12 @@ void CMultiManager ::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "wait"))
 	{
 		m_flWait = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "random"))
 	{
 		fFireRandom = atoi(pkvd->szValue) ? true : false;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else // add this field to the target list
 	{
@@ -368,7 +368,7 @@ void CMultiManager ::KeyValue(KeyValueData *pkvd)
 			m_iTargetName[m_cTargets] = ALLOC_STRING(tmp);
 			m_flTargetDelay[m_cTargets] = atof(pkvd->szValue);
 			m_cTargets++;
-			pkvd->fHandled = TRUE;
+			pkvd->fHandled = true;
 		}
 	}
 }
@@ -407,9 +407,9 @@ BOOL CMultiManager::HasTarget(string_t targetname)
 {
 	for (unsigned int i = 0; i < m_cTargets; i++)
 		if (FStrEq(STRING(targetname), STRING(m_iTargetName[i])))
-			return TRUE;
+			return true;
 
-	return FALSE;
+	return false;
 }
 
 // Designers were using this to fire targets that may or may not exist --
@@ -632,7 +632,7 @@ void CBaseTrigger ::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "scriptevent"))
 	{
 		m_scriptevent = pkvd->szValue;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 
 	//Thothie NOV2014_19 - applying MiB's individualized triggers
@@ -641,7 +641,7 @@ void CBaseTrigger ::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "indivcooldown"))
 	{
 		trig_individualized = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 
 	//Thothie NOV2014_19 - fix for trigger_once
@@ -651,50 +651,50 @@ void CBaseTrigger ::KeyValue(KeyValueData *pkvd)
 	{
 		//Print("DEBUG: eventallinbounds\n");
 		trig_eventallinbounds = (atoi(pkvd->szValue) == 1) ? true : false;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 
 	//Thothie AUG2011_17 - trigger require total hp
 	if (FStrEq(pkvd->szKeyName, "reqhp"))
 	{
 		m_reqhp = pkvd->szValue;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 
 	//Thothie AUG2011_17 - trigger require average hp
 	if (FStrEq(pkvd->szKeyName, "reqavghp"))
 	{
 		m_reqavghp = pkvd->szValue;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 
 	//Thothie AUG2011_17 - trigger require #players
 	if (FStrEq(pkvd->szKeyName, "reqplayers"))
 	{
 		m_players = pkvd->szValue;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 
 	if (FStrEq(pkvd->szKeyName, "reqelsetarget"))
 	{
 		m_else_target = pkvd->szValue;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 
 	if (FStrEq(pkvd->szKeyName, "damage"))
 	{
 		pev->dmg = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "count"))
 	{
 		m_cTriggersLeft = (int)atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "damagetype"))
 	{
 		m_bitsDamageInflict = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CBaseToggle::KeyValue(pkvd);
@@ -866,7 +866,7 @@ void CTargetCDAudio ::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "radius"))
 	{
 		pev->scale = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CPointEntity::KeyValue(pkvd);
@@ -1758,24 +1758,24 @@ void CChangeLevel ::KeyValue(KeyValueData *pkvd)
 		if (strlen(pkvd->szValue) >= cchMapNameMost)
 			ALERT(at_error, "Map name '%s' too long (32 chars)\n", pkvd->szValue);
 		 strncpy(m_szMapName,  pkvd->szValue, sizeof(m_szMapName) );
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "landmark"))
 	{
 		if (strlen(pkvd->szValue) >= cchMapNameMost)
 			ALERT(at_error, "Landmark name '%s' too long (32 chars)\n", pkvd->szValue);
 		 strncpy(m_szLandmarkName,  pkvd->szValue, sizeof(m_szLandmarkName) );
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "changetarget"))
 	{
 		m_changeTarget = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "changedelay"))
 	{
 		m_changeTargetDelay = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CBaseTrigger::KeyValue(pkvd);
@@ -2129,7 +2129,7 @@ void NextLevel(void)
 		pChange = GetClassPtr((CChangeLevel *)VARS(pent));
 
 	 strncpy(st_szNextMap,  pChange->m_szMapName, sizeof(st_szNextMap) );
-	g_fGameOver = TRUE;
+	g_fGameOver = true;
 
 	if (pChange->pev->nextthink < gpGlobals->time)
 	{
@@ -2490,7 +2490,7 @@ void CBaseTrigger ::TeleportTouch(CBaseEntity *pOther)
 		pevToucher->v_angle = pentTarget->v.angles;
 	}
 
-	pevToucher->fixangle = TRUE;
+	pevToucher->fixangle = true;
 	pevToucher->velocity = pevToucher->basevelocity = g_vecZero;
 }
 
@@ -2610,7 +2610,7 @@ void CTriggerEndSection ::KeyValue(KeyValueData *pkvd)
 		//		m_iszSectionName = ALLOC_STRING( pkvd->szValue );
 		// Store this in message so we don't have to write save/restore for this ent
 		pev->message = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CBaseTrigger::KeyValue(pkvd);
@@ -2670,7 +2670,7 @@ void CTriggerChangeTarget::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "m_iszNewTarget"))
 	{
 		m_iszNewTarget = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CBaseDelay::KeyValue(pkvd);
@@ -2771,22 +2771,22 @@ void CTriggerCamera ::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "wait"))
 	{
 		m_flWait = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "moveto"))
 	{
 		m_sPath = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "acceleration"))
 	{
 		m_acceleration = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "deceleration"))
 	{
 		m_deceleration = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CBaseDelay::KeyValue(pkvd);
@@ -2869,7 +2869,7 @@ void CTriggerCamera::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE
 	{
 		for (unsigned int i = 0; i < m_iNumPlayers; i++)
 		{
-			((CBasePlayer*)((CBaseEntity*)m_hPlayer[i]))->EnableControl(FALSE);
+			((CBasePlayer*)((CBaseEntity*)m_hPlayer[i]))->EnableControl(false);
 		}
 	}
 
@@ -2915,7 +2915,7 @@ void CTriggerCamera::FollowTarget()
 			if (m_hPlayer[i]->IsAlive())
 			{
 				SET_VIEW(m_hPlayer[i]->edict(), m_hPlayer[i]->edict());
-				((CBasePlayer*)((CBaseEntity*)m_hPlayer[i]))->EnableControl(TRUE);
+				((CBasePlayer*)((CBaseEntity*)m_hPlayer[i]))->EnableControl(true);
 			}
 		}
 
diff --git a/src/game/server/vehicle.cpp b/src/game/server/vehicle.cpp
index 4680f077..4e15e7d5 100644
--- a/src/game/server/vehicle.cpp
+++ b/src/game/server/vehicle.cpp
@@ -40,38 +40,38 @@ void CFuncVehicle::KeyValue(KeyValueData* pkvd)
 	if (FStrEq(pkvd->szKeyName, "length"))
 	{
 		m_length = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	if (FStrEq(pkvd->szKeyName, "width"))
 	{
 		m_width = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "height"))
 	{
 		m_height = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "startspeed"))
 	{
 		m_startSpeed = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "sounds"))
 	{
 		m_sounds = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "volume"))
 	{
 		m_flVolume = (float)(atoi(pkvd->szValue));
 		m_flVolume *= 0.1;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "bank"))
 	{
 		m_flBank = atof(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "acceleration"))
 	{
@@ -80,7 +80,7 @@ void CFuncVehicle::KeyValue(KeyValueData* pkvd)
 			m_acceleration = 1;
 		else if (m_acceleration > 10)
 			m_acceleration = 10;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		return CBaseEntity::KeyValue(pkvd);
@@ -796,7 +796,7 @@ BOOL CFuncVehicle ::OnControls(entvars_t* pevTest)
 	Vector offset = pevTest->origin - pev->origin;
 
 	if (pev->spawnflags & SF_TRACKTRAIN_NOCONTROL)
-		return FALSE;
+		return false;
 
 	// Transform offset into local coordinates
 	UTIL_MakeVectors(pev->angles);
@@ -807,9 +807,9 @@ BOOL CFuncVehicle ::OnControls(entvars_t* pevTest)
 
 	if (local.x >= m_controlMins.x && local.y >= m_controlMins.y && local.z >= m_controlMins.z &&
 		local.x <= m_controlMaxs.x && local.y <= m_controlMaxs.y && local.z <= m_controlMaxs.z)
-		return TRUE;
+		return true;
 
-	return FALSE;
+	return false;
 }
 
 
diff --git a/src/game/server/world.cpp b/src/game/server/world.cpp
index 09cf7db4..b0902f75 100644
--- a/src/game/server/world.cpp
+++ b/src/game/server/world.cpp
@@ -372,7 +372,7 @@ void RestoreGlobalState(SAVERESTOREDATA *pSaveData)
 void ResetGlobalState(void)
 {
 	gGlobalState.ClearStates();
-	gInitHUD = TRUE; // Init the HUD on a new game / load game
+	gInitHUD = true; // Init the HUD on a new game / load game
 }
 // this moved here from world.cpp, to allow classes to be derived from it
 //=======================
@@ -409,7 +409,7 @@ void CWorld ::Spawn(void)
 {	
 	MS_INFO("World Spawn...");
 
-	g_fGameOver = FALSE;
+	g_fGameOver = false;
 	CScriptedEnt::Spawn();
 	Precache();
 
@@ -601,9 +601,9 @@ void CWorld ::Precache(void)
 		CVAR_SET_FLOAT("v_dark", 0.0);
 
 	if (pev->spawnflags & SF_WORLD_TITLE)
-		gDisplayTitle = TRUE; // display the game title if this key is set
+		gDisplayTitle = true; // display the game title if this key is set
 	else
-		gDisplayTitle = FALSE;
+		gDisplayTitle = false;
 
 	g_fInPrecache = false;
 }
@@ -617,7 +617,7 @@ void CWorld ::KeyValue(KeyValueData *pkvd)
 	{
 		// Sent over net now.
 		CVAR_SET_STRING("sv_skyname", pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 
 		//AUG2013_28 Thothie - fixing sticky music
 		//NOV2014_09 Thothie - can't do this here, skyname doesn't always come before music defs
@@ -626,32 +626,32 @@ void CWorld ::KeyValue(KeyValueData *pkvd)
 	else if (FStrEq(pkvd->szKeyName, "sounds"))
 	{
 		//gpGlobals->cdAudioTrack = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "WaveHeight"))
 	{
 		// Sent over net now.
 		pev->scale = atof(pkvd->szValue) * (1.0 / 8.0);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 		CVAR_SET_FLOAT("sv_wateramp", pev->scale);
 	}
 	else if (FStrEq(pkvd->szKeyName, "MaxRange"))
 	{
 		pev->speed = atof(pkvd->szValue);
 		MSGlobals::maxviewdistance = atof(pkvd->szValue); //Thothie JAN2010_23
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "chaptertitle"))
 	{
 		pev->netname = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "startdark"))
 	{
 		// UNDONE: This is a gross hack!!! The CVAR is NOT sent over the client/sever link
 		// but it will work for single player
 		int flag = atoi(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 		if (flag)
 			pev->spawnflags |= SF_WORLD_DARK;
 	}
@@ -660,19 +660,19 @@ void CWorld ::KeyValue(KeyValueData *pkvd)
 		// Single player only.  Clear save directory if set
 		if (atoi(pkvd->szValue))
 			CVAR_SET_FLOAT("sv_newunit", 1);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "gametitle"))
 	{
 		if (atoi(pkvd->szValue))
 			pev->spawnflags |= SF_WORLD_TITLE;
 
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	/*else if ( FStrEq(pkvd->szKeyName, "mapteams") )
 	{
 		pev->team = ALLOC_STRING( pkvd->szValue );
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}*/
 	else if (FStrEq(pkvd->szKeyName, "defaultteam"))
 	{
@@ -680,7 +680,7 @@ void CWorld ::KeyValue(KeyValueData *pkvd)
 		{
 			pev->spawnflags |= SF_WORLD_FORCETEAM;
 		}
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	//Master Sword: Game types
 	else if (FStrEq(pkvd->szKeyName, "gametype"))
diff --git a/src/game/shared/filesystem_shared.cpp b/src/game/shared/filesystem_shared.cpp
index c79c4bfc..3ac3dd8a 100644
--- a/src/game/shared/filesystem_shared.cpp
+++ b/src/game/shared/filesystem_shared.cpp
@@ -33,7 +33,7 @@ bool FileSystem_Init()
 	szFSDir[0] = '\0';
 
 #ifdef ISCLIENT
-	if(gEngfuncs.COM_ExpandFilename(szFsModule, szFSDir, sizeof(szFSDir)) == FALSE)
+	if(gEngfuncs.COM_ExpandFilename(szFsModule, szFSDir, sizeof(szFSDir)) == false)
 	{
 		return false;
 	}
diff --git a/src/game/shared/ms/global.cpp b/src/game/shared/ms/global.cpp
index 7add8c39..ccd6a871 100644
--- a/src/game/shared/ms/global.cpp
+++ b/src/game/shared/ms/global.cpp
@@ -513,10 +513,10 @@ void CScriptedEnt::KeyValue(KeyValueData *pkvd)
 	{
 		Script_Add(pkvd->szValue, this);
 		RunScriptEvents(); //For precachefile
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
-		pkvd->fHandled = FALSE;
+		pkvd->fHandled = false;
 }
 
 void CScriptedEnt::Deactivate()
diff --git a/src/game/shared/ms/iscript.h b/src/game/shared/ms/iscript.h
index 5ae9f4e3..e36c2c8b 100644
--- a/src/game/shared/ms/iscript.h
+++ b/src/game/shared/ms/iscript.h
@@ -229,11 +229,11 @@ inline const char* RETURN_ZERO() {
 	return "0";
 }
 
-inline const char* RETURN_TRUE(){
+inline const char* RETURN_true(){
 	return "1";
 }
 
-inline const char* RETURN_FALSE() {
+inline const char* RETURN_false() {
 	return "0";
 }
 
diff --git a/src/game/shared/ms/script.cpp b/src/game/shared/ms/script.cpp
index d4563ae0..eef2e4fd 100644
--- a/src/game/shared/ms/script.cpp
+++ b/src/game/shared/ms/script.cpp
@@ -761,9 +761,9 @@ msstring CScript::ScriptGetter_Cone(msstring& FullName, msstring& ParserName, ms
 		if (ParserName.starts_with("$within_cone"))
 		{
 			if (flDot >= ConeFOV) 
-				return RETURN_TRUE();
+				return RETURN_true();
 			else 
-				return RETURN_FALSE();
+				return RETURN_false();
 		}
 		else return RETURN_FLOAT(flDot);
 	}
diff --git a/src/game/shared/weapons/genericitem.cpp b/src/game/shared/weapons/genericitem.cpp
index 15e05e91..a100f227 100644
--- a/src/game/shared/weapons/genericitem.cpp
+++ b/src/game/shared/weapons/genericitem.cpp
@@ -1145,7 +1145,7 @@ CGenericItem* CGenericItem::FindPackForItem(CBasePlayer* pPlayer, bool fVerbose)
 			CGenericItem* pNextPack = pPlayer->Gear[i];
 
 			if (FBitSet(pNextPack->MSProperties(), ITEM_CONTAINER) &&
-				//pPlayer->PutInPack( this, pNextPack, FALSE ) )
+				//pPlayer->PutInPack( this, pNextPack, false ) )
 				CanPutInPack(pNextPack))
 			{
 				pPack = pNextPack;
@@ -1186,7 +1186,7 @@ bool CGenericItem::PutInAnyPack(CBasePlayer* pPlayer, bool fVerbose)
 				pOldPlayer->m_ClientHandID[LastHand] = (pOldPlayer->Hand[LastHand] ? pOldPlayer->Hand[LastHand]->m_iId : 0);
 				pOldPlayer->m_ClientCurrentHand = pOldPlayer->iCurrentHand;
 			}
-			return TRUE;
+			return true;
 		}
 	#endif*/
 	return PutInPack(pPack);
@@ -1498,7 +1498,7 @@ void CGenericItem::RemoveFromOwner()
 		ClearBits(pev->flags, FL_SKIPLOCALHOST); // Start sending the entity to the owner again
 
 	m_Location = ITEMPOS_HANDS;
-	Wielded = FALSE;
+	Wielded = false;
 
 	if (m_pPlayer)
 		m_pPlayer->m_TimeResetLegs = 0;
@@ -2036,9 +2036,9 @@ bool CGenericItem::Script_ExecuteCmd(CScript* Script, SCRIPT_EVENT& Event, scrip
 						UsedHands++;
 
 				if (MAX_PLAYER_HANDS - (UsedHands + ReqHands) >= 0)
-					Wielded = TRUE;
+					Wielded = true;
 				else
-					Wielded = FALSE;
+					Wielded = false;
 			}
 		}
 		else
diff --git a/src/game/shared/weapons/giattack.cpp b/src/game/shared/weapons/giattack.cpp
index 1726af6c..9fe3b6a3 100644
--- a/src/game/shared/weapons/giattack.cpp
+++ b/src/game/shared/weapons/giattack.cpp
@@ -1218,8 +1218,8 @@ void CGenericItem::OwnerTakeDamage(damage_t &Damage)
 	//BeamEffect( vecSrc, vecEnd, iBeam, 0, 0, 100, 10, 0, 255, 255, 255, 255, 20 );
 
 	//bActualHit: Did the combination of luck&skill produce a hit?
-	//bool fDidHit = FALSE, fHitWorld = TRUE, bActualHit = FALSE,
-	//	fReportHit = FALSE, fDodged = FALSE;
+	//bool fDidHit = false, fHitWorld = true, bActualHit = false,
+	//	fReportHit = false, fDodged = false;
 
 	bool fReportHit = false;
 	Damage.AttackHit = false;
@@ -1230,7 +1230,7 @@ void CGenericItem::OwnerTakeDamage(damage_t &Damage)
 	if( Damage.outTraceResult.flFraction < 1.0 )
 	{
 		// hit
-		//fDidHit = TRUE;
+		//fDidHit = true;
 
 		pEntity = CBaseEntity::Instance(Damage.outTraceResult.pHit);
 
@@ -1628,8 +1628,8 @@ CBaseEntity* DoDamage(damage_t &Damage, CBaseEntity *pTarget)
 		}
 
 		//bActualHit: Did the combination of luck&skill produce a hit?
-		//bool fDidHit = FALSE, fHitWorld = TRUE, bActualHit = FALSE,
-		//	fReportHit = FALSE, fDodged = FALSE;
+		//bool fDidHit = false, fHitWorld = true, bActualHit = false,
+		//	fReportHit = false, fDodged = false;
 
 		bool fReportHit = false;
 		Damage.AttackHit = true;
diff --git a/src/game/shared/weapons/gispawn.cpp b/src/game/shared/weapons/gispawn.cpp
index 21da4546..43e917f7 100644
--- a/src/game/shared/weapons/gispawn.cpp
+++ b/src/game/shared/weapons/gispawn.cpp
@@ -88,17 +88,17 @@ void CBaseGISpawn::KeyValue(KeyValueData *pkvd)
 	if (FStrEq(pkvd->szKeyName, "scriptfile"))
 	{
 		sScriptFile = ALLOC_STRING(pkvd->szValue);
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "container"))
 	{
 		 strncpy(cContainer,  pkvd->szValue, sizeof(cContainer) );
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else if (FStrEq(pkvd->szKeyName, "spawnstart"))
 	{
 		m_fSpawnOnTrigger = (atoi(pkvd->szValue)) ? true : false;
-		pkvd->fHandled = TRUE;
+		pkvd->fHandled = true;
 	}
 	else
 		CBaseEntity::KeyValue(pkvd);
diff --git a/src/game/shared/weapons/weapons.cpp b/src/game/shared/weapons/weapons.cpp
index 6c4643c8..075857a6 100644
--- a/src/game/shared/weapons/weapons.cpp
+++ b/src/game/shared/weapons/weapons.cpp
@@ -505,7 +505,7 @@ CBaseEntity *CBasePlayerItem::Respawn(void)
 */
 bool CBasePlayerItem::GiveTo(CMSMonster *pReciever, bool fSound)
 {
-	return TRUE;
+	return true;
 }
 bool CBasePlayerItem::Deploy(void)
 {
@@ -522,11 +522,11 @@ BOOL CanAttack(float attack_time, float curtime, BOOL isPredicted)
 	if ( 1 )
 #endif*/
 	{
-		return (attack_time <= curtime) ? TRUE : FALSE;
+		return (attack_time <= curtime) ? true : false;
 	}
 	else
 	{
-		return (attack_time <= 0.0) ? TRUE : FALSE;
+		return (attack_time <= 0.0) ? true : false;
 	}
 }
 void CBasePlayerItem::ItemPostFrame(void)
@@ -562,7 +562,7 @@ bool CBasePlayerWeapon::ShouldIdle(void)
 		m_flNextPrimaryAttack < gpGlobals->time)
 		return true;
 	else
-		return FALSE;
+		return false;
 }
 
 /*void CBasePlayerItem::DestroyItem( void )
@@ -634,7 +634,7 @@ int CBasePlayerWeapon::AddDuplicate(CBasePlayerItem *pOriginal)
 
 int CBasePlayerWeapon::UpdateClientData(CBasePlayer *pPlayer)
 {
-	/*	BOOL bSend = FALSE;
+	/*	BOOL bSend = false;
 	int state = 0;
 	if ( pPlayer->m_pActiveItem == this )
 	{
@@ -647,7 +647,7 @@ int CBasePlayerWeapon::UpdateClientData(CBasePlayer *pPlayer)
 	// Forcing send of all data!
 	if ( !pPlayer->m_fWeapon )
 	{
-		bSend = TRUE;
+		bSend = true;
 	}
 	
 	// This is the current or last weapon, so the state will need to be updated
@@ -656,7 +656,7 @@ int CBasePlayerWeapon::UpdateClientData(CBasePlayer *pPlayer)
 	{
 		if ( pPlayer->m_pActiveItem != pPlayer->m_pClientActiveItem )
 		{
-			bSend = TRUE;
+			bSend = true;
 		}
 	}
 
@@ -665,7 +665,7 @@ int CBasePlayerWeapon::UpdateClientData(CBasePlayer *pPlayer)
 		 state != m_iClientWeaponState || 
 		 pPlayer->m_iFOV != pPlayer->m_iClientFOV )
 	{
-		bSend = TRUE;
+		bSend = true;
 	}
 
 	if ( bSend )
@@ -678,7 +678,7 @@ int CBasePlayerWeapon::UpdateClientData(CBasePlayer *pPlayer)
 
 		m_iClientClip = m_iClip;
 		m_iClientWeaponState = state;
-		pPlayer->m_fWeapon = TRUE;
+		pPlayer->m_fWeapon = true;
 	}
 
 	if ( m_pNext )
@@ -739,11 +739,11 @@ BOOL CBasePlayerWeapon ::IsUseable(void)
 		if (m_pPlayer->m_rgAmmo[PrimaryAmmoIndex()] <= 0 && iMaxAmmo1() != -1)
 		{
 			// clip is empty (or nonexistant) and the player has no more ammo of this type.
-			return FALSE;
+			return false;
 		}
 	}
 
-	return TRUE;
+	return true;
 }
 
 bool CBasePlayerWeapon ::CanDeploy(void)
@@ -754,7 +754,7 @@ bool CBasePlayerWeapon ::CanDeploy(void)
 BOOL CBasePlayerWeapon ::DefaultDeploy(char *szViewModel, char *szWeaponModel, int iAnim, char *szAnimExt, int skiplocal /* = 0 */)
 {
 	/*	if (!CanDeploy( ))
-		return FALSE;
+		return false;
 
 	m_pPlayer->pev->viewmodel = MAKE_STRING(szViewModel); //player's WEAPON view model
 	m_pPlayer->pev->weaponmodel = MAKE_STRING(szWeaponModel);
@@ -764,7 +764,7 @@ BOOL CBasePlayerWeapon ::DefaultDeploy(char *szViewModel, char *szWeaponModel, i
 	m_pPlayer->m_flNextAttack = gpGlobals->time + 0.5;
 	IdleTime = gpGlobals->time + 1.0;
 */
-	return TRUE;
+	return true;
 }
 
 BOOL CBasePlayerWeapon ::PlayEmptySound(void)
@@ -781,7 +781,7 @@ void CBasePlayerWeapon ::ResetEmptySound(void)
 //=========================================================
 void CBasePlayerWeapon::Holster(int skiplocal /* = 0 */)
 {
-	m_fInReload = FALSE; // cancel any reload in progress.
+	m_fInReload = false; // cancel any reload in progress.
 	m_pPlayer->pev->viewmodel = 0;
 	m_pPlayer->pev->weaponmodel = 0;
 }
diff --git a/src/game/shared/weapons/weapons.h b/src/game/shared/weapons/weapons.h
index 0220106e..8058e51e 100644
--- a/src/game/shared/weapons/weapons.h
+++ b/src/game/shared/weapons/weapons.h
@@ -231,7 +231,7 @@ class CBasePlayerItem : public CBaseAnimating
 
 	static TYPEDESCRIPTION m_SaveData[];
 
-	virtual int AddDuplicate(CBasePlayerItem *pItem) { return FALSE; } // return TRUE if you want your duplicate removed from world
+	virtual int AddDuplicate(CBasePlayerItem *pItem) { return false; } // return true if you want your duplicate removed from world
 	//void EXPORT DestroyItem( void );
 	void EXPORT AttemptToMaterialize(void); // the weapon desires to become visible and tangible, if the game rules allow for it
 	CBaseEntity *Respawn(void);				// copy a weapon
@@ -309,7 +309,7 @@ class CBasePlayerWeapon : public CBasePlayerItem
 	virtual void Reload(void) { return; }				// do "+RELOAD"
 	virtual int UpdateClientData(CBasePlayer *pPlayer); // sends hud info to client dll, if things have changed
 	virtual void Holster(int skiplocal = 0);
-	virtual BOOL UseDecrement(void) { return FALSE; };
+	virtual BOOL UseDecrement(void) { return false; };
 
 	void PrintState(void);
 
@@ -332,7 +332,7 @@ class CBasePlayerAmmo : public CBaseEntity
 {
 public:
 	/*	virtual void Spawn( void );
-	virtual BOOL AddAmmo( CBaseEntity *pOther ) { return TRUE; };
+	virtual BOOL AddAmmo( CBaseEntity *pOther ) { return true; };
 
 	CBaseEntity* Respawn( void );
 	void EXPORT Materialize( void );*/
diff --git a/thirdparty/angelscript/as_thread.cpp b/thirdparty/angelscript/as_thread.cpp
index b68f9bb7..15fbb895 100644
--- a/thirdparty/angelscript/as_thread.cpp
+++ b/thirdparty/angelscript/as_thread.cpp
@@ -449,7 +449,7 @@ void asCThreadReadWriteLock::AcquireExclusive()
 	// If we try to lock all at once it is quite possible the writer will
 	// never succeed.
 	for( asUINT n = 0; n < maxReaders; n++ )
-		WaitForSingleObjectEx(readLocks, INFINITE, FALSE);
+		WaitForSingleObjectEx(readLocks, INFINITE, false);
 
 	// Allow another writer to lock. It will only be able to
 	// lock the readers when this writer releases them anyway.
@@ -473,7 +473,7 @@ void asCThreadReadWriteLock::AcquireShared()
 	pthread_rwlock_rdlock(&lock);
 #elif defined AS_WINDOWS_THREADS
 	// Lock a reader slot
-	WaitForSingleObjectEx(readLocks, INFINITE, FALSE);
+	WaitForSingleObjectEx(readLocks, INFINITE, false);
 #endif
 }
 

From fff35b665e00065ce169ed1035bfd2a0ec528d32 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 19 Mar 2026 19:50:56 -0400
Subject: [PATCH 128/291] changed define to constexpr. changes NULL to nullptr

---
 src/game/client/richpresence.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/game/client/richpresence.cpp b/src/game/client/richpresence.cpp
index 623b52d6..677b71e6 100644
--- a/src/game/client/richpresence.cpp
+++ b/src/game/client/richpresence.cpp
@@ -15,7 +15,7 @@
 #include "discord/discord_rpc.h"
 #include <time.h>
 
-#define DISCORD_RPC_UPDATE_TIME 35.0 // sec
+constexpr float DISCORD_RPC_UPDATE_TIME = 35.0; // sec
 
 void CRichPresence::Init(void)
 {
@@ -57,7 +57,7 @@ void CRichPresence::Update(void)
 	{
 		for (int i = 1; i < MAX_PLAYERS; i++)
 		{
-			if (g_PlayerInfoList[i].name == NULL)
+			if (g_PlayerInfoList[i].name == nullptr)
 				continue;
 
 			if (g_PlayerInfoList[i].thisplayer)

From 49966f9cb972ffda8b8bb02b9ae95bc18b21b7b0 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 19 Mar 2026 20:15:01 -0400
Subject: [PATCH 129/291] changed defines to constexpr / const where applicable

---
 src/game/client/saytext.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/game/client/saytext.cpp b/src/game/client/saytext.cpp
index 424fc315..111305a4 100644
--- a/src/game/client/saytext.cpp
+++ b/src/game/client/saytext.cpp
@@ -29,12 +29,12 @@
 
 extern float *GetClientColor( int clientIndex );
 
-#define MAX_LINES	5
-#define MAX_CHARS_PER_LINE	256  /* it can be less than this, depending on char size */
+constexpr int MAX_LINES = 5;
+constexpr int MAX_CHARS_PER_LINE = 256;  /* it can be less than this, depending on char size */
 
 // allow 20 pixels on either side of the text
-#define MAX_LINE_WIDTH  ( ScreenWidth() - 40 )
-#define LINE_START  10
+const int MAX_LINE_WIDTH = (ScreenWidth() - 40);
+constexpr int LINE_START = 10;
 static float SCROLL_SPEED = 5;
 
 static char g_szLineBuffer[ MAX_LINES + 1 ][ MAX_CHARS_PER_LINE ];
@@ -42,7 +42,7 @@ static float *g_pflNameColors[ MAX_LINES + 1 ];
 static int g_iNameLengths[ MAX_LINES + 1 ];
 static float flScrollTime = 0;  // the time at which the lines next scroll up
 
-#define SAYTEXT_START_Y  ( ScreenHeight() - YRES(160) )
+const int SAYTEXT_START_Y = (ScreenHeight() - YRES(160));
 static int Y_START = 0; //varies
 static int line_height = 0;
 
@@ -225,7 +225,7 @@ void CHudSayText :: SayTextPrint( const char *pszBuf, int iBufSize, int clientIn
 		}
 	}*/
 
-	strncpy( g_szLineBuffer[i], pszBuf, V_max(iBufSize -1, MAX_CHARS_PER_LINE-1) );
+	strncpy( g_szLineBuffer[i], pszBuf, V_max(iBufSize -1, MAX_CHARS_PER_LINE - 1) );
 
 	// make sure the text fits in one line
 	EnsureTextFitsInOneLineAndWrapIfHaveTo( i );

From 2d73e418146bac239290769fe15e6e3e047b6e67 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 19 Mar 2026 20:35:11 -0400
Subject: [PATCH 130/291] changed define to constexpr, changed to safe printf

---
 src/game/client/text_message.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/game/client/text_message.cpp b/src/game/client/text_message.cpp
index 52ffe1bb..3e88de3c 100644
--- a/src/game/client/text_message.cpp
+++ b/src/game/client/text_message.cpp
@@ -166,7 +166,7 @@ char *ConvertCRtoNL(char *str)
 // the next (optional) one to four strings are parameters for that string (which can also be message names if they begin with '#')
 int CHudTextMessage::MsgFunc_TextMsg(const char *pszName, int iSize, void *pbuf)
 {
-	#define MSG_BUF_SIZE 128
+	constexpr unsigned int MSG_BUF_SIZE = 128;
 	BEGIN_READ(pbuf, iSize);
 
 	int msg_dest = READ_BYTE();
@@ -223,6 +223,6 @@ int CHudTextMessage::MsgFunc_TextMsg(const char *pszName, int iSize, void *pbuf)
 void PrintNotifyMsg(char *pszmsg)
 {
 	static char string[1024];
-	_snprintf(string, sizeof(string), "%c%s", HUD_PRINTNOTIFY, pszmsg);
+	_snprintf_s(string, sizeof(string), "%c%s", HUD_PRINTNOTIFY, pszmsg);
 	gHUD.m_TextMessage.MsgFunc_TextMsg(string, strlen(string), &string[0]);
 }
\ No newline at end of file

From dc3755323734f61e83075f8b632c7ad235ed6b2a Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 19 Mar 2026 20:39:40 -0400
Subject: [PATCH 131/291] changed defines to constexpr/enum

---
 src/game/client/view.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/game/client/view.cpp b/src/game/client/view.cpp
index 17ef190d..6e5566c6 100644
--- a/src/game/client/view.cpp
+++ b/src/game/client/view.cpp
@@ -97,8 +97,10 @@ extern cvar_t *chase_active;
 extern cvar_t *scr_ofsx, *scr_ofsy, *scr_ofsz;
 extern cvar_t *cl_vsmoothing;
 
-#define CAM_MODE_RELAX 1
-#define CAM_MODE_FOCUS 2
+enum {
+	CAM_MODE_RELAX = 1,
+	CAM_MODE_FOCUS = 2
+};
 
 Vector v_origin, v_angles, v_cl_angles, v_sim_org, v_lastAngles;
 Vector g_ViewForward, g_ViewRight, g_ViewUp;
@@ -489,8 +491,8 @@ void V_CalcIntermissionRefdef(struct ref_params_s *pparams)
 	v_angles = pparams->viewangles;
 }
 
-#define ORIGIN_BACKUP 64
-#define ORIGIN_MASK (ORIGIN_BACKUP - 1)
+constexpr unsigned int ORIGIN_BACKUP = 64;
+constexpr unsigned int ORIGIN_MASK = (ORIGIN_BACKUP - 1);
 
 typedef struct
 {

From 20d1f36ea820c1784c3f1c1ae369eef125f82e1b Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 19 Mar 2026 20:53:39 -0400
Subject: [PATCH 132/291] Changed VEC_TO_ANGLES to function

---
 src/game/server/enginecallback.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/game/server/enginecallback.h b/src/game/server/enginecallback.h
index 76e9d1d2..800a7376 100644
--- a/src/game/server/enginecallback.h
+++ b/src/game/server/enginecallback.h
@@ -41,7 +41,12 @@ void SET_MODEL( edict_t *e, const char *szModel );
 #define GET_SPAWN_PARMS (*g_engfuncs.pfnGetSpawnParms)
 #define SAVE_SPAWN_PARMS (*g_engfuncs.pfnSaveSpawnParms)
 #define VEC_TO_YAW (*g_engfuncs.pfnVecToYaw)
-#define VEC_TO_ANGLES (*g_engfuncs.pfnVecToAngles)
+//#define VEC_TO_ANGLES (*g_engfuncs.pfnVecToAngles)
+
+void VEC_TO_ANGLES(const float* rgflVectorIn, float* rgflVectorOut ) {
+	g_engfuncs.pfnVecToAngles(rgflVectorIn, rgflVectorOut);
+}
+
 #define MOVE_TO_ORIGIN (*g_engfuncs.pfnMoveToOrigin)
 #define oldCHANGE_YAW (*g_engfuncs.pfnChangeYaw)
 #define CHANGE_PITCH (*g_engfuncs.pfnChangePitch)

From b24b2374069e06f30d4525627aa5b1bfa89f5a54 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 19 Mar 2026 20:56:32 -0400
Subject: [PATCH 133/291] updated define to constexpr int, change to inline.

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

diff --git a/src/game/server/enginecallback.h b/src/game/server/enginecallback.h
index 800a7376..85b3c6e1 100644
--- a/src/game/server/enginecallback.h
+++ b/src/game/server/enginecallback.h
@@ -22,7 +22,7 @@ extern enginefuncs_t g_engfuncs;
 
 extern unsigned int g_iNumBytesWritten;
 extern int g_iUserMessageType;
-#define MAX_USERMESSAGE_SIZE 192
+constexpr int MAX_USERMESSAGE_SIZE = 192;
 
 // The actual engine callbacks
 #define GETPLAYERUSERID (*g_engfuncs.pfnGetPlayerUserId)
@@ -43,7 +43,7 @@ void SET_MODEL( edict_t *e, const char *szModel );
 #define VEC_TO_YAW (*g_engfuncs.pfnVecToYaw)
 //#define VEC_TO_ANGLES (*g_engfuncs.pfnVecToAngles)
 
-void VEC_TO_ANGLES(const float* rgflVectorIn, float* rgflVectorOut ) {
+inline void VEC_TO_ANGLES(const float* rgflVectorIn, float* rgflVectorOut ) {
 	g_engfuncs.pfnVecToAngles(rgflVectorIn, rgflVectorOut);
 }
 

From 03f6167d261ff9373fc598eafedeaf7e462f2a87 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 19 Mar 2026 20:56:47 -0400
Subject: [PATCH 134/291] inline commit

---
 src/game/server/enginecallback.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/server/enginecallback.h b/src/game/server/enginecallback.h
index 85b3c6e1..adea4a42 100644
--- a/src/game/server/enginecallback.h
+++ b/src/game/server/enginecallback.h
@@ -22,7 +22,7 @@ extern enginefuncs_t g_engfuncs;
 
 extern unsigned int g_iNumBytesWritten;
 extern int g_iUserMessageType;
-constexpr int MAX_USERMESSAGE_SIZE = 192;
+inline constexpr int MAX_USERMESSAGE_SIZE = 192;
 
 // The actual engine callbacks
 #define GETPLAYERUSERID (*g_engfuncs.pfnGetPlayerUserId)

From 65a2fbb68833ecb5ae26aba890ce411a1f3c8ec3 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 10:42:20 -0400
Subject: [PATCH 135/291] changed nulls to nullptrs

---
 src/game/client/ms/clglobal.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/game/client/ms/clglobal.cpp b/src/game/client/ms/clglobal.cpp
index 2922ff9f..eecf0804 100644
--- a/src/game/client/ms/clglobal.cpp
+++ b/src/game/client/ms/clglobal.cpp
@@ -82,7 +82,7 @@ void MSCLGlobals::InitializePlayer()
 	player.CreateStats();
 	player.m_CharacterState = CHARSTATE_UNLOADED;
 	player.m_DisplayName = "Adventurer";
-	player.PlayerHands = NULL;
+	player.PlayerHands = nullptr;
 	player.ClearConditions(MONSTER_OPENCONTAINER);
 	player.Gear.clear();
 	player.m_HP = player.m_MP = 0;
@@ -139,7 +139,7 @@ void MSCLGlobals::RemoveAllEntities()
 	//Delete all entites
 	if (player.m_CharacterState == CHARSTATE_LOADED)
 	{
-		player.Killed(NULL, 0);
+		player.Killed(nullptr, 0);
 		player.RemoveAllItems(false, true);
 	}
 
@@ -158,7 +158,7 @@ void MSCLGlobals::RemoveAllEntities()
 
 		//unset player hands (should happen in CBasePlayer::RemoveAllItems() first...)
 		if (pEntity == (CBaseEntity *)player.PlayerHands)
-			player.PlayerHands = NULL;
+			player.PlayerHands = nullptr;
 
 		Print("Cleanup Item %i: %s\n", killed++, pEntity->DisplayName());
 

From ffad299010167e61dd31862762ee52b59ad96168 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 10:47:46 -0400
Subject: [PATCH 136/291] changed some NULL to nullptr

---
 src/game/client/ms/clplayer.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/game/client/ms/clplayer.cpp b/src/game/client/ms/clplayer.cpp
index 28db02dd..c857967e 100644
--- a/src/game/client/ms/clplayer.cpp
+++ b/src/game/client/ms/clplayer.cpp
@@ -666,7 +666,7 @@ void HUD_WeaponsPostThink(local_state_s* from, local_state_s* to, usercmd_t* cmd
 	player.m_afButtonLast = KeyHistory[0].Buttons; //player.pev->button;
 
 	// Wipe it so we can't use it after this frame
-	g_finalstate = NULL;
+	g_finalstate = nullptr;
 }
 /*
 =====================
@@ -731,7 +731,7 @@ void ShowWeaponDesc(CGenericItem* pItem)
 	msg.fadein = 2.0;
 	msg.holdtime = 5.0;
 	msg.fadeout = 3.0;
-	msg.pName = NULL;
+	msg.pName = nullptr;
 	msg.pMessage = cDescString;
 	gHUD.m_Message.MessageAdd(msg);
 }
@@ -1300,7 +1300,7 @@ int __MsgFunc_CLDllFunc(const char* pszName, int iSize, void* pbuf)
 	case 1: //Killed
 		if (player.m_CharacterState == CHARSTATE_UNLOADED)
 			break;
-		player.Killed(NULL, NULL);
+		player.Killed(nullptr, NULL);
 		break;
 
 	case 2: //[OPEN]

From 8fced83fc362ac49d2f65abc289862f68312d447 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 11:04:40 -0400
Subject: [PATCH 137/291] Changes null to nullptr. changed defines to enums.
 regroups some enums to door.h header file. Included door.h header into
 multiplay_gamerules.cpp

---
 src/game/server/bmodels.cpp                   | 21 ++---
 .../server/gamerules/multiplay_gamerules.cpp  |  3 +
 src/game/server/hl/cbase.h                    | 90 ++++++++++---------
 src/game/server/hl/doors.h                    | 39 +++++---
 src/game/server/player/player.cpp             | 12 +--
 5 files changed, 94 insertions(+), 71 deletions(-)

diff --git a/src/game/server/bmodels.cpp b/src/game/server/bmodels.cpp
index 7612ff0d..3c6bbd1f 100644
--- a/src/game/server/bmodels.cpp
+++ b/src/game/server/bmodels.cpp
@@ -25,16 +25,17 @@
 
 extern DLL_GLOBAL Vector g_vecAttackDir;
 
-#define SF_BRUSH_ACCDCC 16		 // brush should accelerate and decelerate when toggled
-#define SF_BRUSH_HURT 32		 // rotating brush that inflicts pain based on rotation speed
-#define SF_ROTATING_NOT_SOLID 64 // some special rotating objects are not solid.
+
 
 // covering cheesy noise1, noise2, & noise3 fields so they make more sense (for rotating fans)
+
+
+
 #define noiseStart noise1
 #define noiseStop noise2
 #define noiseRunning noise3
 
-#define SF_PENDULUM_SWING 2 // spawnflag that makes a pendulum a rope swing.
+
 //
 // BModelOrigin - calculates origin of a bmodel from absmin/size because all bmodel origins are 0 0 0
 //
@@ -79,7 +80,6 @@ void CFuncWall ::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE use
 	CScriptedEnt::Use(pActivator, pCaller, useType, value);
 }
 
-#define SF_WALL_START_OFF 0x0001
 
 class CFuncWallToggle : public CFuncWall
 {
@@ -135,9 +135,6 @@ void CFuncWallToggle ::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TY
 	CScriptedEnt::Use(pActivator, pCaller, useType, value);
 }
 
-#define SF_CONVEYOR_VISUAL 0x0001
-#define SF_CONVEYOR_NOTSOLID 0x0002
-#define SF_CONVEYOR_TOGGLE 0x0004 //Thothie AUG2011_30 toggle conveyors
 
 class CFuncConveyor : public CFuncWall
 {
@@ -274,7 +271,7 @@ void CFuncIllusionary ::Spawn(void)
 //
 // -------------------------------------------------------------------------------
 
-#define SF_MONSTERCLIP_START_OFF 0x0001
+
 
 class CFuncMonsterClip : public CFuncWallToggle
 {
@@ -352,7 +349,7 @@ BOOL CFuncMonsterClip::IsOn(void)
 //
 // -------------------------------------------------------------------------------
 
-#define SF_PLAYERCLIP_START_OFF 0x0001
+
 
 class CMSFuncPlayerClip : public CFuncWallToggle
 {
@@ -717,8 +714,8 @@ void CFuncRotating ::HurtTouch(CBaseEntity *pOther)
 // RampPitchVol - ramp pitch and volume up to final values, based on difference
 // between how fast we're going vs how fast we plan to go
 //
-#define FANPITCHMIN 30
-#define FANPITCHMAX 100
+constexpr float FANPITCHMIN = 30;
+constexpr float FANPITCHMAX = 100;
 
 void CFuncRotating ::RampPitchVol(int fUp)
 {
diff --git a/src/game/server/gamerules/multiplay_gamerules.cpp b/src/game/server/gamerules/multiplay_gamerules.cpp
index 071ca4e3..661a5ec0 100644
--- a/src/game/server/gamerules/multiplay_gamerules.cpp
+++ b/src/game/server/gamerules/multiplay_gamerules.cpp
@@ -34,6 +34,9 @@
 #include	"trains.h" // for CFuncVehicle
 #include	<asbind20/asbind.hpp>
 
+#ifndef DOORS_H
+#include "doors.h"
+#endif
 #include <climits>
 #include <string>
 #include <algorithm>
diff --git a/src/game/server/hl/cbase.h b/src/game/server/hl/cbase.h
index 73e6cae5..71cc0c36 100644
--- a/src/game/server/hl/cbase.h
+++ b/src/game/server/hl/cbase.h
@@ -27,28 +27,34 @@ CBaseEntity
 #ifndef CBASE_H
 #define CBASE_H
 
-#define MAX_PATH_SIZE 10 // max number of nodes available for a path.
+constexpr int MAX_PATH_SIZE = 10; // max number of nodes available for a path.
 
 // These are caps bits to indicate what an object's capabilities (currently used for save/restore and level transitions)
-#define FCAP_CUSTOMSAVE 0x00000001
-#define FCAP_ACROSS_TRANSITION 0x00000002 // should transfer between transitions
-#define FCAP_MUST_SPAWN 0x00000004		  // Spawn after restore
-#define FCAP_DONT_SAVE 0x80000000		  // Don't save this
-#define FCAP_IMPULSE_USE 0x00000008		  // can be used by the player
-#define FCAP_CONTINUOUS_USE 0x00000010	  // can be used by the player
-#define FCAP_ONOFF_USE 0x00000020		  // can be used by the player
-#define FCAP_DIRECTIONAL_USE 0x00000040	  // Player sends +/- 1 when using (currently only tracktrains)
-#define FCAP_MASTER 0x00000080			  // Can be used to "master" other entities (like multisource)
-
-// UNDONE: This will ignore transition volumes (trigger_transition), but not the PVS!!!
-#define FCAP_FORCE_TRANSITION 0x00000080 // ALWAYS goes across transitions
+enum {
+	FCAP_CUSTOMSAVE = 0x00000001,
+	FCAP_ACROSS_TRANSITION = 0x00000002,// should transfer between transitions
+	FCAP_MUST_SPAWN = 0x00000004,		// Spawn after restore
+	FCAP_DONT_SAVE = 0x80000000,		// Don't save this
+	FCAP_IMPULSE_USE = 0x00000008,		// can be used by the player
+	FCAP_CONTINUOUS_USE = 0x00000010,	// can be used by the player
+	FCAP_ONOFF_USE = 0x00000020,		// can be used by the player
+	FCAP_DIRECTIONAL_USE = 0x00000040,	// Player sends +/- 1 when using (currently only tracktrains)
+	FCAP_MASTER = 0x00000080,			// Can be used to "master" other entities (like multisource)
+
+	// UNDONE: This will ignore transition volumes (trigger_transition), but not the PVS!!!
+	FCAP_FORCE_TRANSITION = 0x00000080 // ALWAYS goes across transitions
+};
+
+
+
+
 
 #include "iscript.h"
 
 #include "archtypes.h"     // DAL
 
 //Master Sword - no save/restore in client dll
-#define MAXPLAYERS 32
+constexpr int MAXPLAYERS = 32;
 #ifdef VALVE_DLL
 #include "saverestore.h"
 #else
@@ -117,38 +123,42 @@ typedef void (CBaseEntity::*USEPTR)(CBaseEntity *pActivator, CBaseEntity *pCalle
 
 // Master Sword - New CLASS defs:
 
-#define CLASS_NONE 0
-#define CLASS_MACHINE 1
-#define CLASS_PLAYER 2
-#define CLASS_NPC 3
-#define CLASS_MONSTER 4 //CLASS_HUMAN_MILITARY
-
-// OLD DEFS!
-// For CLASSIFY
-//#define	CLASS_NONE				0
-//#define CLASS_MACHINE			1
-//#define CLASS_PLAYER			2
-#define CLASS_HUMAN_PASSIVE 5
-#define CLASS_HUMAN_MILITARY 6
-#define CLASS_ALIEN_MILITARY 7
-#define CLASS_ALIEN_PASSIVE 8
-#define CLASS_ALIEN_MONSTER 9
-#define CLASS_ALIEN_PREY 10
-#define CLASS_ALIEN_PREDATOR 11
-#define CLASS_INSECT 12
-#define CLASS_PLAYER_ALLY 13
-#define CLASS_PLAYER_BIOWEAPON 14 // hornets and snarks.launched by players
-#define CLASS_ALIEN_BIOWEAPON 15  // hornets and snarks.launched by the alien menace
-#define CLASS_BARNACLE 99		  // special because no one pays attention to it, and it eats a wide cross-section of creatures.
-#define CHAR_LEVEL_CAP 45		  // MiB JAN2010_15 Global Level Cap
-#define CLASS_VEHICLE 16 // we use 16 because of MS class defines.
+enum {
+	CLASS_NONE = 0,
+	CLASS_MACHINE = 1,
+	CLASS_PLAYER = 2,
+	CLASS_NPC = 3,
+	CLASS_MONSTER = 4, //CLASS_HUMAN_MILITARY
+
+	// OLD DEFS!
+	// For CLASSIFY
+	//#define	CLASS_NONE				0
+	//#define CLASS_MACHINE			1
+	//#define CLASS_PLAYER			2
+	CLASS_HUMAN_PASSIVE = 5,
+	CLASS_HUMAN_MILITARY = 6,
+	CLASS_ALIEN_MILITARY = 7,
+	CLASS_ALIEN_PASSIVE = 8,
+	CLASS_ALIEN_MONSTER = 9,
+	CLASS_ALIEN_PREY = 10,
+	CLASS_ALIEN_PREDATOR = 11,
+	CLASS_INSECT = 12,
+	CLASS_PLAYER_ALLY = 13,
+	CLASS_PLAYER_BIOWEAPON = 14, // hornets and snarks.launched by players
+	CLASS_ALIEN_BIOWEAPON = 15,  // hornets and snarks.launched by the alien menace
+	CLASS_BARNACLE = 99,	  // special because no one pays attention to it, and it eats a wide cross-section of creatures.
+	CLASS_VEHICLE = 16, // we use 16 because of MS class defines.
+};
+
+constexpr int CHAR_LEVEL_CAP = 45;		  // MiB JAN2010_15 Global Level Cap
 
 class CBaseEntity;
 class CBaseMonster;
 class CBasePlayerItem;
 class CSquadMonster;
 
-#define SF_NORESPAWN (1 << 30) // !!!set this bit on guns and stuff that should never respawn.
+
+
 
 //
 // EHANDLE. Safe way to point to CBaseEntities who may die between frames
diff --git a/src/game/server/hl/doors.h b/src/game/server/hl/doors.h
index 3fefa635..6e82c176 100644
--- a/src/game/server/hl/doors.h
+++ b/src/game/server/hl/doors.h
@@ -14,19 +14,32 @@
 ****/
 #ifndef DOORS_H
 #define DOORS_H
+#endif
 
 // doors
-#define SF_DOOR_ROTATE_Y 0
-#define SF_DOOR_START_OPEN 1
-#define SF_DOOR_ROTATE_BACKWARDS 2
-#define SF_DOOR_PASSABLE 8
-#define SF_DOOR_ONEWAY 16
-#define SF_DOOR_NO_AUTO_RETURN 32
-#define SF_DOOR_ROTATE_Z 64
-#define SF_DOOR_ROTATE_X 128
-#define SF_DOOR_USE_ONLY 256     // door must be opened by player's use button.
-#define SF_DOOR_NOMONSTERS 512   // Monster can't open
-#define SF_DOOR_UNBLOCKABLE 1024 //Thothie AUG2011_29 - make door unstoppable
-#define SF_DOOR_SILENT 0x80000000
+enum {
+	SF_DOOR_ROTATE_Y = 0,
+	SF_DOOR_START_OPEN = 1,
+	SF_DOOR_ROTATE_BACKWARDS = 2,
+	SF_DOOR_PASSABLE =  8,
+	SF_DOOR_ONEWAY = 16,
+	SF_DOOR_NO_AUTO_RETURN = 32,
+	SF_DOOR_ROTATE_Z = 64,
+	SF_DOOR_ROTATE_X = 128,
+	SF_DOOR_USE_ONLY = 256,    // door must be opened by player's use button.
+	SF_DOOR_NOMONSTERS = 512 ,  // Monster can't open
+	SF_DOOR_UNBLOCKABLE = 1024, //Thothie AUG2011_29 - make door unstoppable
+	SF_DOOR_SILENT = 0x80000000,
+	SF_PLAYERCLIP_START_OFF = 0x0001,
+	SF_WALL_START_OFF = 0x0001,
+	SF_MONSTERCLIP_START_OFF = 0x0001,
+	SF_PENDULUM_SWING = 2, // spawnflag that makes a pendulum a rope swing.
+	SF_BRUSH_ACCDCC = 16,		 // brush should accelerate and decelerate when toggled
+	SF_BRUSH_HURT = 32,		 // rotating brush that inflicts pain based on rotation speed
+	SF_ROTATING_NOT_SOLID = 64, // some special rotating objects are not solid.
+	SF_CONVEYOR_VISUAL = 0x0001,
+	SF_CONVEYOR_NOTSOLID = 0x0002,
+	SF_CONVEYOR_TOGGLE = 0x0004, //Thothie AUG2011_30 toggle conveyors
+	SF_NORESPAWN = (1 << 30) // !!!set this bit on guns and stuff that should never respawn.
+};
 
-#endif //DOORS_H
diff --git a/src/game/server/player/player.cpp b/src/game/server/player/player.cpp
index 02b284ea..598ae84d 100644
--- a/src/game/server/player/player.cpp
+++ b/src/game/server/player/player.cpp
@@ -1066,10 +1066,10 @@ void CBasePlayer::StartObserver(Vector vecPosition, Vector vecViewAngle)
 }
 void CBasePlayer::CinematicCamera(BOOL OnorOff, Vector vecPosition, Vector vecViewAngle, BOOL bCreateClone)
 {
-	if (OnorOff == true)
+	if ((bool)OnorOff == true)
 	{
 		m_afPhysicsFlags |= PFLAG_OBSERVER;
-		CamEntity = GetClassPtr((CBaseEntity *)NULL);
+		CamEntity = GetClassPtr((CBaseEntity *)nullptr);
 		CamEntity->pev->classname = MAKE_STRING("camera");
 		CamEntity->pev->modelindex = MODEL_INDEX("models/null.mdl");
 		CamEntity->pev->renderamt = 0; // The engine won't draw this model if this is set to 0 and blending is on
@@ -1089,7 +1089,7 @@ void CBasePlayer::CinematicCamera(BOOL OnorOff, Vector vecPosition, Vector vecVi
 		if (CamEntity)
 		{
 			CamEntity->SUB_Remove();
-			CamEntity = NULL;
+			CamEntity = nullptr;
 		}
 	}
 }
@@ -1127,7 +1127,7 @@ void CBasePlayer::PlayerUse(void)
 				m_iTrain = TRAIN_NEW | TRAIN_OFF;
 				CBaseEntity* pTrain = CBaseEntity::Instance(pev->groundentity);
 				if (pTrain && (pTrain->Classify() == CLASS_VEHICLE))
-					((CFuncVehicle*)pTrain)->m_pDriver = NULL;
+					((CFuncVehicle*)pTrain)->m_pDriver = nullptr;
 				return;
 			}
 			else
@@ -1146,8 +1146,8 @@ void CBasePlayer::PlayerUse(void)
 		}
 	}
 
-	CBaseEntity *pObject = NULL;
-	CBaseEntity *pClosest = NULL;
+	CBaseEntity *pObject = nullptr;
+	CBaseEntity *pClosest = nullptr;
 	Vector vecLOS;
 	float flMaxDot = VIEW_FIELD_NARROW;
 	float flDot;

From 410d7abca7457f4bc49d842d97494ba67660ec5c Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 11:15:42 -0400
Subject: [PATCH 138/291] commended why this macro is needed

---
 src/game/server/bmodels.cpp  | 3 +--
 src/game/server/hl/doors.cpp | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/game/server/bmodels.cpp b/src/game/server/bmodels.cpp
index 3c6bbd1f..7d292f97 100644
--- a/src/game/server/bmodels.cpp
+++ b/src/game/server/bmodels.cpp
@@ -29,8 +29,7 @@ extern DLL_GLOBAL Vector g_vecAttackDir;
 
 // covering cheesy noise1, noise2, & noise3 fields so they make more sense (for rotating fans)
 
-
-
+//overloaded generic variable names
 #define noiseStart noise1
 #define noiseStop noise2
 #define noiseRunning noise3
diff --git a/src/game/server/hl/doors.cpp b/src/game/server/hl/doors.cpp
index a8efc437..7b490e6f 100644
--- a/src/game/server/hl/doors.cpp
+++ b/src/game/server/hl/doors.cpp
@@ -25,6 +25,7 @@
 
 extern void SetMovedir(entvars_t *ev);
 
+//overloaded varables with generic names
 #define noiseMoving noise1
 #define noiseArrived noise2
 

From 05ff1858d790ce4e169acd2a5f79524caed0f1b6 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 11:19:04 -0400
Subject: [PATCH 139/291] Added other enum entries to main enum. re-added
 missing button_use_only enum

---
 src/game/server/hl/cbase.h | 2 +-
 src/game/server/hl/doors.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/game/server/hl/cbase.h b/src/game/server/hl/cbase.h
index 71cc0c36..0f68867c 100644
--- a/src/game/server/hl/cbase.h
+++ b/src/game/server/hl/cbase.h
@@ -789,7 +789,7 @@ class CBaseAnimating : public CBaseDelay
 //
 // generic Toggle entity.
 //
-#define SF_ITEM_USE_ONLY 256 //  ITEM_USE_ONLY = BUTTON_USE_ONLY = DOOR_USE_ONLY!!!
+
 
 class CBaseToggle : public CBaseAnimating
 {
diff --git a/src/game/server/hl/doors.h b/src/game/server/hl/doors.h
index 6e82c176..134d22ec 100644
--- a/src/game/server/hl/doors.h
+++ b/src/game/server/hl/doors.h
@@ -27,6 +27,8 @@ enum {
 	SF_DOOR_ROTATE_Z = 64,
 	SF_DOOR_ROTATE_X = 128,
 	SF_DOOR_USE_ONLY = 256,    // door must be opened by player's use button.
+	SF_ITEM_USE_ONLY = 256, //  ITEM_USE_ONLY = BUTTON_USE_ONLY = DOOR_USE_ONLY!!!
+	SF_BUTTON_USE_ONLY = 256,
 	SF_DOOR_NOMONSTERS = 512 ,  // Monster can't open
 	SF_DOOR_UNBLOCKABLE = 1024, //Thothie AUG2011_29 - make door unstoppable
 	SF_DOOR_SILENT = 0x80000000,

From c4e2f14bbb7f73902d96ceedbc892dc20f980544 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 11:20:52 -0400
Subject: [PATCH 140/291] changed some nulls to nullptr

---
 src/game/client/ms/clplayer.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/game/client/ms/clplayer.cpp b/src/game/client/ms/clplayer.cpp
index c857967e..99e1cbc7 100644
--- a/src/game/client/ms/clplayer.cpp
+++ b/src/game/client/ms/clplayer.cpp
@@ -509,7 +509,7 @@ physent_t* MSUTIL_EntityByIndex(int playerindex)
 		}
 	}
 	gEngfuncs.pEventAPI->EV_PopPMStates();
-	return NULL;
+	return nullptr;
 }
 /*
 =====================
@@ -1127,7 +1127,7 @@ void Player_ToggleInventory()
 		return;
 	}
 
-	CGenericItem* pWearable = NULL; //Fallback, in case a pack isn't found
+	CGenericItem* pWearable = nullptr; //Fallback, in case a pack isn't found
 	for (unsigned int i = 0; i < player.Gear.size(); i++)
 	{
 		CGenericItem* pPack = player.Gear[i];
@@ -1477,7 +1477,7 @@ int __MsgFunc_CLDllFunc(const char* pszName, int iSize, void* pbuf)
 				msg.fadein = 0.01;
 				msg.holdtime = 3.0;
 				msg.fadeout = 1.0;
-				msg.pName = NULL;
+				msg.pName = nullptr;
 				msg.fxtime = 4.0;
 
 				static char msgtext[256];

From 4e79da2592c7ec670cbeadb31de892ac209ade00 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 11:29:49 -0400
Subject: [PATCH 141/291] changed nulls to nullptr

---
 src/game/client/ms/hudid.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/game/client/ms/hudid.cpp b/src/game/client/ms/hudid.cpp
index a8c149bf..c2007d57 100644
--- a/src/game/client/ms/hudid.cpp
+++ b/src/game/client/ms/hudid.cpp
@@ -168,7 +168,7 @@ entinfo_t *CHudID::GetEntInFrontOfMe(float Range)
 	Vector vViewAngle;
 	gEngfuncs.GetViewAngles(vViewAngle);
 	cl_entity_s *clplayer = gEngfuncs.GetLocalPlayer();
-	AngleVectors(vViewAngle, &vForward, NULL, NULL);
+	AngleVectors(vViewAngle, &vForward, nullptr, nullptr);
 	Vector vecSrc = clplayer->origin, vecEnd,
 		   viewOfs;
 	gEngfuncs.pEventAPI->EV_LocalPlayerViewheight(viewOfs);
@@ -179,7 +179,7 @@ entinfo_t *CHudID::GetEntInFrontOfMe(float Range)
 
 	physent_t *pPhyplayer = gEngfuncs.pEventAPI->EV_GetPhysent(clplayer->index);
 	if (!pPhyplayer)
-		return NULL;
+		return nullptr;
 
 	// Now add in all of the players.
 	gEngfuncs.pEventAPI->EV_SetSolidPlayers(clplayer->index - 1);
@@ -195,5 +195,5 @@ entinfo_t *CHudID::GetEntInFrontOfMe(float Range)
 				return &player.m_EntInfo[i];
 	}
 
-	return NULL;
+	return nullptr;
 }

From b07934ebd7ba1614f4f14f55cc64fec68f387084 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 11:30:25 -0400
Subject: [PATCH 142/291] Changed null to nullptr

---
 src/game/client/ms/hudid.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/client/ms/hudid.cpp b/src/game/client/ms/hudid.cpp
index c2007d57..73efc944 100644
--- a/src/game/client/ms/hudid.cpp
+++ b/src/game/client/ms/hudid.cpp
@@ -50,7 +50,7 @@ void CHudID::Reset(void)
 	m_iFlags |= HUD_ACTIVE;
 	TimeDecAlpha = 0;
 	Alpha = 0;
-	pActiveInfo = pDrawInfo = NULL;
+	pActiveInfo = pDrawInfo = nullptr;
 }
 void CHudID ::InitHUDData(void)
 {

From 70f6fda197c97952635833b381c29e7cd35499fc Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 11:33:04 -0400
Subject: [PATCH 143/291] changes functions to _s variants to fix warning.

---
 src/game/client/ms/hudmisc.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/game/client/ms/hudmisc.cpp b/src/game/client/ms/hudmisc.cpp
index 61971aef..e63e7e30 100644
--- a/src/game/client/ms/hudmisc.cpp
+++ b/src/game/client/ms/hudmisc.cpp
@@ -199,7 +199,7 @@ void CHudMisc ::UserCmd_RemovePack(void)
 	int test = *(int *)&m_RemoveList;
 	int test2 = m_RemoveList.size();
 
-	 strncpy(MenuText,  "Remove item:\n\n", sizeof(MenuText) );
+	 strncpy_s(MenuText,  "Remove item:\n\n", sizeof(MenuText) );
 
 	m_RemoveList.clear();
 	for (unsigned int i = 0; i < player.Gear.size(); i++)
@@ -305,7 +305,7 @@ void CHudMisc ::UserCmd_Offer(void)
 	clrmem(m_OfferInfo);
 	//bool fOfferedSomething = false;
 
-	 _snprintf(MenuText, sizeof(MenuText),  "Offer to %s:\n",  pEntInfo->Name.c_str() );
+	 _snprintf_s(MenuText, sizeof(MenuText),  "Offer to %s:\n",  pEntInfo->Name.c_str() );
 
 	//if( player.m_Gold )
 	{

From a2e7c0779512020c24079a46e05b9b4b1db6df77 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 11:36:46 -0400
Subject: [PATCH 144/291] changed null to nullptr. changed define to enum

---
 src/game/client/ms/hudscript.cpp |  6 +++---
 src/game/shared/ms/script.h      |  2 +-
 src/public/engine/shake.h        | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/game/client/ms/hudscript.cpp b/src/game/client/ms/hudscript.cpp
index 1950a169..bc58328d 100644
--- a/src/game/client/ms/hudscript.cpp
+++ b/src/game/client/ms/hudscript.cpp
@@ -193,7 +193,7 @@ int CHudScript::MsgFunc_ClientScript( const char *pszName, int iSize, void *pbuf
 
 			 for (unsigned int p = 0; p < Parameters.size(); p++) 
 				Script->SetVar( msstring("PARAM") + ((int)p+1), Parameters[p].c_str() );
-			Script->RunScriptEventByName( EventName, Parameters.size() ? &Parameters : NULL );
+			Script->RunScriptEventByName( EventName, Parameters.size() ? &Parameters : nullptr );
 			break;
 		}
 	}
@@ -228,7 +228,7 @@ CScript *CHudScript::CreateScript(const char* ScriptName, msstringlist &Paramete
 
 	//Create a new script if not latching onto a prev copy
 	CScript *Script = Script_Add( ScriptName, &player );
-	if( !Script ) return NULL;
+	if( !Script ) return nullptr;
 
 
 	Script->m.pScriptedInterface = &player;
@@ -249,7 +249,7 @@ void CHudScript::HandleAnimEvent(const char* Options, const cl_entity_s *clEntit
 	const char* ScriptName = ParsedOptions[0];
 	const char* EventName = ParsedOptions[1];
 
-	CScript *Script = NULL;
+	CScript *Script = nullptr;
 
 	//Latch onto an existing script
 	if( Type == HAE_EITHER || Type == HAE_ATTACH )
diff --git a/src/game/shared/ms/script.h b/src/game/shared/ms/script.h
index 872d4cc9..3851775c 100644
--- a/src/game/shared/ms/script.h
+++ b/src/game/shared/ms/script.h
@@ -92,7 +92,7 @@ class CScript : public IVariables
 #endif
 	bool Spawn(msstring Filename, CBaseEntity *pScriptedEnt, IScripted *pScriptedInterface, bool PrecacheOnly = false, bool Casual = false);
 	void RunScriptEvents( bool fOnlyRunNamedEvents = false );	//Runs all events
-	void RunScriptEventByName(const char* pszEventName, msstringlist *Parameters = NULL );	//Run one named event
+	void RunScriptEventByName(const char* pszEventName, msstringlist *Parameters = nullptr );	//Run one named event
 	void CallLogged(const char* title, std::clock_t start);
 	bool ParseScriptFile( const char *pszScriptData );
 	LegacyScriptEvent *EventByName( const char *pszEventName );
diff --git a/src/public/engine/shake.h b/src/public/engine/shake.h
index a18ddc25..c18bdc54 100644
--- a/src/public/engine/shake.h
+++ b/src/public/engine/shake.h
@@ -36,12 +36,12 @@ extern int V_ScreenFade( const char *pszName, int iSize, void *pbuf );
 
 // Fade in/out
 extern int gmsgFade;
-
-#define FFADE_IN			0x0000		// Just here so we don't pass 0 into the function
-#define FFADE_OUT			0x0001		// Fade out (not in)
-#define FFADE_MODULATE		0x0002		// Modulate (don't blend)
-#define FFADE_STAYOUT		0x0004		// ignores the duration, stays faded out until new ScreenFade message received
-
+enum {
+	FFADE_IN			= 0x0000,		// Just here so we don't pass 0 into the function
+	FFADE_OUT			= 0x0001,		// Fade out (not in)
+	FFADE_MODULATE		= 0x0002,		// Modulate (don't blend)
+	FFADE_STAYOUT		= 0x0004		// ignores the duration, stays faded out until new ScreenFade message received
+};
 // This structure is sent over the net to describe a screen fade event
 typedef struct
 {

From f7b9009430db14dc44c669e71afe26a4ad279939 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 11:43:25 -0400
Subject: [PATCH 145/291] Changed defines to constexpr/enum. Changed null to
 nullptr

---
 src/game/client/render/clrender.cpp | 12 +++++++-----
 src/game/client/render/clrender.h   |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/game/client/render/clrender.cpp b/src/game/client/render/clrender.cpp
index e9c0997e..125a2902 100644
--- a/src/game/client/render/clrender.cpp
+++ b/src/game/client/render/clrender.cpp
@@ -25,8 +25,8 @@
 //OGL
 void DeleteGLTextures();
 #ifdef _WIN32
-PFNGLMULTITEXCOORD2FARBPROC glMultiTexCoord2fARB = NULL;
-PFNGLACTIVETEXTUREARBPROC glActiveTextureARB = NULL;
+PFNGLMULTITEXCOORD2FARBPROC glMultiTexCoord2fARB = nullptr;
+PFNGLACTIVETEXTUREARBPROC glActiveTextureARB = nullptr;
 #endif
 
 //Environment Manager
@@ -58,7 +58,7 @@ CParticle::CParticle()
 {
 	m_Width = 0;
 	m_Origin = g_vecZero;
-	m_Texture = NULL;
+	m_Texture = nullptr;
 	m_Color = Color4F(1.0f, 1.0f, 1.0f, 1.0f);
 	m_Brightness = 1.0f;
 	m_DirForward = g_vecZero;
@@ -184,7 +184,7 @@ struct skyface_t
 	//Vector Offset;
 };
 
-#define SKYFILENAME_PREFIX "gfx/env/"
+constexpr const char* SKYFILENAME_PREFIX = "gfx/env/";
 struct
 {
 	Vector Dir; //Dir the wall is facing.  It gets scooted back in the opp. direction
@@ -392,7 +392,9 @@ uint CRender::m_RT_Height = 256;
 float CRender::m_RT_TexU = 1.0f;
 float CRender::m_RT_TexV = 1.0f;
 
-#define MS_GL_ATTRIBUTES GL_ALL_ATTRIB_BITS
+enum {
+	MS_GL_ATTRIBUTES = GL_ALL_ATTRIB_BITS
+};
 //#define MS_GL_ATTRIBUTES
 
 void CRender::PushHLStates()
diff --git a/src/game/client/render/clrender.h b/src/game/client/render/clrender.h
index 60162660..f566a2b0 100644
--- a/src/game/client/render/clrender.h
+++ b/src/game/client/render/clrender.h
@@ -184,7 +184,7 @@ class Plane
 class CSurface
 {
 public:
-	CSurface() { m_Surface = NULL; }
+	CSurface() { m_Surface = nullptr; }
 	CSurface(msurface_t *Surface) { m_Surface = Surface; }
 	void Draw();
 	void DrawProjective();

From a2c27158cc96ec289ad7730a004c4f025d58c028 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 11:49:27 -0400
Subject: [PATCH 146/291] changes defines to enums/constexpr

---
 src/public/engine/studio.h | 123 +++++++++++++++++++------------------
 1 file changed, 64 insertions(+), 59 deletions(-)

diff --git a/src/public/engine/studio.h b/src/public/engine/studio.h
index 8bb15c0f..94d5228b 100644
--- a/src/public/engine/studio.h
+++ b/src/public/engine/studio.h
@@ -29,20 +29,20 @@ Studio models are position independent, so the cache manager can move them.
 */
 
 
-#define MAXSTUDIOTRIANGLES	20000	// TODO: tune this
-#define MAXSTUDIOVERTS		2048	// TODO: tune this
-#define MAXSTUDIOSEQUENCES	2048	// total animation sequences
-#define MAXSTUDIOSKINS		100		// total textures
-#define MAXSTUDIOSRCBONES	512		// bones allowed at source movement
-#define MAXSTUDIOBONES		128		// total bones actually used
-#define MAXSTUDIOMODELS		32		// sub-models per model
-#define MAXSTUDIOBODYPARTS	32
-#define MAXSTUDIOGROUPS		16
-#define MAXSTUDIOANIMATIONS	2048	// per sequence
-#define MAXSTUDIOMESHES		256
-#define MAXSTUDIOEVENTS		1024
-#define MAXSTUDIOPIVOTS		256
-#define MAXSTUDIOCONTROLLERS 8
+constexpr int MAXSTUDIOTRIANGLES	= 20000;	// TODO: tune this
+constexpr int MAXSTUDIOVERTS		= 2048;		// TODO: tune this
+constexpr int MAXSTUDIOSEQUENCES	= 2048;		// total animation sequences
+constexpr int MAXSTUDIOSKINS		= 100;		// total textures
+constexpr int MAXSTUDIOSRCBONES		= 512;		// bones allowed at source movement
+constexpr int MAXSTUDIOBONES		= 128;		// total bones actually used
+constexpr int MAXSTUDIOMODELS		= 32;		// sub-models per model
+constexpr int MAXSTUDIOBODYPARTS	= 32;
+constexpr int MAXSTUDIOGROUPS		= 16;
+constexpr int MAXSTUDIOANIMATIONS	= 2048;		// per sequence
+constexpr int MAXSTUDIOMESHES		= 256;
+constexpr int MAXSTUDIOEVENTS		= 1024;
+constexpr int MAXSTUDIOPIVOTS		= 256;
+constexpr int MAXSTUDIOCONTROLLERS	= 8;
 
 typedef struct 
 {
@@ -324,53 +324,58 @@ typedef struct
 #endif
 
 // model flags
-#define	EF_ROCKET	1
-#define	EF_GRENADE	2
-#define	EF_GIB		4
-#define	EF_ROTATE	8
-#define	EF_TRACER	16
-#define	EF_ZOMGIB	32
-#define	EF_TRACER2	64
-#define	EF_TRACER3	128
-
+enum {
+	EF_ROCKET	= 1,
+	EF_GRENADE	= 2,
+	EF_GIB		= 4,
+	EF_ROTATE	= 8,
+	EF_TRACER	= 16,
+	EF_ZOMGIB	= 32,
+	EF_TRACER2	= 64,
+	EF_TRACER3	= 128
+};
 // lighting options
-#define STUDIO_NF_FLATSHADE		0x0001
-#define STUDIO_NF_CHROME		0x0002
-#define STUDIO_NF_FULLBRIGHT	0x0004
-#define STUDIO_NF_NOMIPS        0x0008
-#define STUDIO_NF_ALPHA         0x0010
-#define STUDIO_NF_ADDITIVE      0x0020
-#define STUDIO_NF_MASKED        0x0040
 
+enum {
+	STUDIO_NF_FLATSHADE		= 0x0001,
+	STUDIO_NF_CHROME		= 0x0002,
+	STUDIO_NF_FULLBRIGHT	= 0x0004,
+	STUDIO_NF_NOMIPS        = 0x0008,
+	STUDIO_NF_ALPHA         = 0x0010,
+	STUDIO_NF_ADDITIVE      = 0x0020,
+	STUDIO_NF_MASKED        = 0x0040
+};
 // motion flags
-#define STUDIO_X		0x0001
-#define STUDIO_Y		0x0002	
-#define STUDIO_Z		0x0004
-#define STUDIO_XR		0x0008
-#define STUDIO_YR		0x0010
-#define STUDIO_ZR		0x0020
-#define STUDIO_LX		0x0040
-#define STUDIO_LY		0x0080
-#define STUDIO_LZ		0x0100
-#define STUDIO_AX		0x0200
-#define STUDIO_AY		0x0400
-#define STUDIO_AZ		0x0800
-#define STUDIO_AXR		0x1000
-#define STUDIO_AYR		0x2000
-#define STUDIO_AZR		0x4000
-#define STUDIO_TYPES	0x7FFF
-#define STUDIO_RLOOP	0x8000	// controller that wraps shortest distance
-
-// sequence flags
-#define STUDIO_LOOPING	0x0001
-
+enum {
+	STUDIO_X = 0x0001,
+	STUDIO_Y = 0x0002,
+	STUDIO_Z = 0x0004,
+	STUDIO_XR = 0x0008,
+	STUDIO_YR = 0x0010,
+	STUDIO_ZR = 0x0020,
+	STUDIO_LX = 0x0040,
+	STUDIO_LY = 0x0080,
+	STUDIO_LZ = 0x0100,
+	STUDIO_AX = 0x0200,
+	STUDIO_AY = 0x0400,
+	STUDIO_AZ = 0x0800,
+	STUDIO_AXR = 0x1000,
+	STUDIO_AYR = 0x2000,
+	STUDIO_AZR = 0x4000,
+	STUDIO_TYPES = 0x7FFF,
+	STUDIO_RLOOP = 0x8000,		// controller that wraps shortest distance
+	// sequence flags
+	STUDIO_LOOPING = 0x0001,
+};
+
+enum {
 // bone flags
-#define STUDIO_HAS_NORMALS	0x0001
-#define STUDIO_HAS_VERTICES 0x0002
-#define STUDIO_HAS_BBOX		0x0004
-#define STUDIO_HAS_CHROME	0x0008	// if any of the textures have chrome on them
-
-#define RAD_TO_STUDIO		(32768.0/M_PI)
-#define STUDIO_TO_RAD		(M_PI/32768.0)
-
+	STUDIO_HAS_NORMALS	= 0x0001,
+	STUDIO_HAS_VERTICES = 0x0002,
+	STUDIO_HAS_BBOX		= 0x0004,
+	STUDIO_HAS_CHROME	= 0x0008		// if any of the textures have chrome on them
+};
+
+constexpr float RAD_TO_STUDIO		= (32768.0/PI);
+constexpr float STUDIO_TO_RAD		= (PI / 32768.0);
 #endif

From 659548cd512d5827393242db68365357c42c4ea0 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 11:55:04 -0400
Subject: [PATCH 147/291] changed define to constexpr changed null to nullptr

---
 src/game/client/render/clrendermirror.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/game/client/render/clrendermirror.cpp b/src/game/client/render/clrendermirror.cpp
index 76ab32f7..171beb2d 100644
--- a/src/game/client/render/clrendermirror.cpp
+++ b/src/game/client/render/clrendermirror.cpp
@@ -56,7 +56,7 @@ extern int OldVisFrame, OldContents;
 
 //#define DEBUG_MIRRORS		//Enable viewing mirrors at world origin
 //#define MIRROR_STENCIL_MASK 0x3
-#define MIRROR_STENCIL_MASK 0xFFFFFFFF
+constexpr unsigned int MIRROR_STENCIL_MASK = 0xFFFFFFFF;
 
 class CFrustum
 {
@@ -180,7 +180,7 @@ bool CheckSurface(TraverseInfo_t &Info, msurface_t *pSurface)
 	if( Surface.plane->dist != -64 )
 		return false;*/
 
-	mstexture_t *pCustomTexture = NULL;
+	mstexture_t *pCustomTexture = nullptr;
 	for (unsigned int t = 0; t < MSCLGlobals::Textures.size(); t++)
 	{
 		mstexture_t &MSTexture = MSCLGlobals::Textures[t];

From 83cb8897d8c0166bf42d36b62aa6f05b5623db30 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 11:56:03 -0400
Subject: [PATCH 148/291] changes NULL to nullptr

---
 src/game/client/render/gamestudiomodelrenderer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/game/client/render/gamestudiomodelrenderer.cpp b/src/game/client/render/gamestudiomodelrenderer.cpp
index 63b1cd22..373b8614 100644
--- a/src/game/client/render/gamestudiomodelrenderer.cpp
+++ b/src/game/client/render/gamestudiomodelrenderer.cpp
@@ -75,7 +75,7 @@ R_StudioDrawModel
 int R_StudioDrawModel(int flags)
 {
 	//return g_StudioRenderer.StudioDrawModel( flags );
-	return CModelMgr::MSStudioDrawModel(flags, NULL);
+	return CModelMgr::MSStudioDrawModel(flags, nullptr);
 }
 
 extern cl_entity_t *DrawEnt;
@@ -91,7 +91,7 @@ int CModelMgr::MSStudioDrawModel(int flags, entity_state_t *pplayer)
 	{
 		OldEntity = *CurrentEnt;
 		*CurrentEnt = *DrawEnt;
-		DrawEnt = NULL;
+		DrawEnt = nullptr;
 		Replaced = true;
 	}
 

From 38ad74d427dc8a72fffa8057799bcbadc81905a7 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 12:01:57 -0400
Subject: [PATCH 149/291] changed some null to nullptr

---
 .../client/render/studiomodelrenderer.cpp     | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/game/client/render/studiomodelrenderer.cpp b/src/game/client/render/studiomodelrenderer.cpp
index 402a7817..ec827048 100644
--- a/src/game/client/render/studiomodelrenderer.cpp
+++ b/src/game/client/render/studiomodelrenderer.cpp
@@ -52,7 +52,7 @@ void ViewModel_InactiveModelVisible(bool fVisible, const cl_entity_s* ActiveEnti
 extern Vector v_origin, v_angles, v_cl_angles, v_sim_org, v_lastAngles;
 //CStudioModelRenderer *g_StudioRender = NULL;
 
-cl_entity_t* DrawEnt = NULL;
+cl_entity_t* DrawEnt = nullptr;
 
 /////////////////////
 // Implementation of CStudioModelRenderer.h
@@ -89,24 +89,24 @@ CStudioModelRenderer
 */
 CStudioModelRenderer::CStudioModelRenderer(void)
 {
-	m_fDoInterp = 1;
-	m_fGaitEstimation = 1;
-	m_pCurrentEntity = NULL;
-	m_pCvarHiModels = NULL;
-	m_pCvarDeveloper = NULL;
-	m_pCvarDrawEntities = NULL;
-	m_pChromeSprite = NULL;
-	m_pStudioModelCount = NULL;
-	m_pModelsDrawn = NULL;
-	m_protationmatrix = NULL;
-	m_paliastransform = NULL;
-	m_pbonetransform = NULL;
-	m_plighttransform = NULL;
-	m_pStudioHeader = NULL;
-	m_pBodyPart = NULL;
-	m_pSubModel = NULL;
-	m_pPlayerInfo = NULL;
-	m_pRenderModel = NULL;
+	m_fDoInterp			= 1;
+	m_fGaitEstimation	= 1;
+	m_pCurrentEntity	= nullptr;
+	m_pCvarHiModels		= nullptr;
+	m_pCvarDeveloper	= nullptr;
+	m_pCvarDrawEntities = nullptr;
+	m_pChromeSprite		= nullptr;
+	m_pStudioModelCount = nullptr;
+	m_pModelsDrawn		= nullptr;
+	m_protationmatrix	= nullptr;
+	m_paliastransform	= nullptr;
+	m_pbonetransform	= nullptr;
+	m_plighttransform	= nullptr;
+	m_pStudioHeader		= nullptr;
+	m_pBodyPart			= nullptr;
+	m_pSubModel			= nullptr;
+	m_pPlayerInfo		= nullptr;
+	m_pRenderModel		= nullptr;
 	//m_MirrorRender		= false;
 	/*AngleMatrix( g_vecZero, m_FlipMatrix );
 	float scalemat[ 3 ][ 4 ] =
@@ -1340,7 +1340,7 @@ int CStudioModelRenderer::StudioDrawModel(int flags)
 			studiohdr_t* pStudioHeader = (studiohdr_t*)IEngineStudio.Mod_Extradata(RenderEnt.model);
 
 			cl_entity_s* view = gEngfuncs.GetViewModel();
-			view->model = NULL; //MiB JUN2010_21 - Disable the HL viewmodel. We use our own.
+			view->model = nullptr; //MiB JUN2010_21 - Disable the HL viewmodel. We use our own.
 
 			RenderEnt.SetBody(pItem->m_ViewModelPart, pItem->m_ViewModelSubmodel); //Set the specified submodel on the item
 
@@ -1522,7 +1522,7 @@ int CStudioModelRenderer::StudioDrawModel(int flags)
 
 			m_pPlayerInfo = IEngineStudio.PlayerInfo(ZeroBasedPlayerIdx);
 			m_pPlayerInfo->prevgaitorigin = PrevOrigin;
-			m_pPlayerInfo = NULL;
+			m_pPlayerInfo = nullptr;
 
 			m_pCurrentEntity->curstate.number = oldnum;
 			m_pCurrentEntity->index = oldidx;
@@ -1732,7 +1732,7 @@ StudioProcessGait
 */
 void CStudioModelRenderer::StudioProcessGait(entity_state_t* pplayer)
 {
-	mstudioseqdesc_t* pseqdesc = NULL;
+	mstudioseqdesc_t* pseqdesc = nullptr;
 	//float frametime;
 	int iBlend = 0;
 	float flYaw = 0; // view direction relative to movement
@@ -1913,7 +1913,7 @@ int CStudioModelRenderer::StudioDrawPlayer(int flags, entity_state_t* pplayer)
 		return 0;
 
 	m_pRenderModel = IEngineStudio.SetupPlayerModel(m_nPlayerIndex);
-	if (m_pRenderModel == NULL)
+	if (m_pRenderModel == nullptr)
 		return 0;
 
 	m_pStudioHeader = (studiohdr_t*)IEngineStudio.Mod_Extradata(m_pRenderModel);
@@ -1944,7 +1944,7 @@ int CStudioModelRenderer::StudioDrawPlayer(int flags, entity_state_t* pplayer)
 		}
 		else
 		{
-			modelinfo_t* pModelInfo = NULL;
+			modelinfo_t* pModelInfo = nullptr;
 			if (Ent.HasExtra())
 				pModelInfo = &CModelMgr::m_ModelInfo[Ent.index];
 
@@ -2108,7 +2108,7 @@ int CStudioModelRenderer::StudioDrawPlayer(int flags, entity_state_t* pplayer)
 		//Instead, the bodypart attachmets are rendered -- UNDONE
 		StudioRenderModel();
 
-		m_pPlayerInfo = NULL;
+		m_pPlayerInfo = nullptr;
 
 		/*
 		Master Sword - don't render the weaponmodel

From 176cf46df36e8c1036a6bb5a65318f8ca909fa63 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 14:14:37 -0400
Subject: [PATCH 150/291] changes define to enum. changes NULL pointers to
 nullptr

---
 src/game/server/client.cpp | 78 +++++++++++++++++++-------------------
 src/game/server/hl/util.h  | 15 ++++----
 2 files changed, 48 insertions(+), 45 deletions(-)

diff --git a/src/game/server/client.cpp b/src/game/server/client.cpp
index 28c3d21d..b6807285 100644
--- a/src/game/server/client.cpp
+++ b/src/game/server/client.cpp
@@ -50,7 +50,7 @@
 extern void PlayerPrecache();
 
 // Temp
-#define MAX_MONSTERS 5
+constexpr int MAX_MONSTERS = 5;
 int g_SummonedMonsters = 0;
 
 extern DLL_GLOBAL unsigned long g_ulModelIndexPlayer;
@@ -351,23 +351,23 @@ void Host_Say(edict_t *pEntity, int teamonly)
 	}
 
 	// make sure the text has content
-	char *pc = NULL;
-	for (pc = p; pc != NULL && *pc != 0; pc++)
+	char *pc = nullptr;
+	for (pc = p; pc != nullptr && *pc != 0; pc++)
 	{
 		if (isprint(*pc) && !isspace(*pc))
 		{
-			pc = NULL; // we've found an alphanumeric character,  so text is valid
+			pc = nullptr; // we've found an alphanumeric character,  so text is valid
 			break;
 		}
 	}
-	if (pc != NULL)
+	if (pc != nullptr)
 		return; // no character found, so say nothing
 
 	// turn on color set 2  (color on,  no sound)
 	if (teamonly)
-		_snprintf(text, sizeof(text), "%c(TEAM) %s: ",  2, STRING(pEntity->v.netname) );
+		_snprintf_s(text, sizeof(text), "%c(TEAM) %s: ",  2, STRING(pEntity->v.netname) );
 	else
-		_snprintf(text, sizeof(text), "%c%s: ",  2, STRING(pEntity->v.netname) );
+		_snprintf_s(text, sizeof(text), "%c%s: ",  2, STRING(pEntity->v.netname) );
 
 	j = sizeof(text) - 2 - strlen(text); // -2 for /n and null terminator
 	if ((int)strlen(p) > j)
@@ -383,8 +383,8 @@ void Host_Say(edict_t *pEntity, int teamonly)
 	// This may return the world in single player if the client types something between levels or during spawn
 	// so check it, or it will infinite loop
 
-	client = NULL;
-	while (((client = (CBasePlayer *)UTIL_FindEntityByClassname(client, "player")) != NULL) && (!FNullEnt(client->edict())))
+	client = nullptr;
+	while (((client = (CBasePlayer *)UTIL_FindEntityByClassname(client, "player")) != nullptr) && (!FNullEnt(client->edict())))
 	{
 		if (!client->pev)
 			continue;
@@ -402,14 +402,14 @@ void Host_Say(edict_t *pEntity, int teamonly)
 		if (teamonly && g_pGameRules->PlayerRelationship(client, CBaseEntity::Instance(pEntity)) != GR_TEAMMATE)
 			continue;
 
-		MESSAGE_BEGIN(MSG_ONE, gmsgSayText, NULL, client->pev);
+		MESSAGE_BEGIN(MSG_ONE, gmsgSayText, nullptr, client->pev);
 		WRITE_BYTE(ENTINDEX(pEntity));
 		WRITE_STRING(text);
 		MESSAGE_END();
 	}
 
 	// print to the sending client
-	MESSAGE_BEGIN(MSG_ONE, gmsgSayText, NULL, &pEntity->v);
+	MESSAGE_BEGIN(MSG_ONE, gmsgSayText, nullptr, &pEntity->v);
 	WRITE_BYTE(ENTINDEX(pEntity));
 	WRITE_STRING(text);
 	MESSAGE_END();
@@ -512,8 +512,8 @@ void ClientCommand2(edict_t *pEntity)
 			msstring Text = msstring(Args).find_str(" "); //skip the first parameter
 			Text = Text.substr(1);
 
-			CBaseEntity* pGameMasterEnt = UTIL_FindEntityByString(NULL, "netname", msstring("-") + "game_master");
-			IScripted* pGMScript = (pGameMasterEnt ? pGameMasterEnt->GetScripted() : NULL);
+			CBaseEntity* pGameMasterEnt = UTIL_FindEntityByString(nullptr, "netname", msstring("-") + "game_master");
+			IScripted* pGMScript = (pGameMasterEnt ? pGameMasterEnt->GetScripted() : nullptr);
 			if (pGMScript)
 			{
 				msstringlist Parameters;
@@ -651,7 +651,7 @@ void ClientCommand2(edict_t *pEntity)
 		if (CMD_ARGC() >= 3)
 		{
 			CBaseEntity *pEntity = StringToEnt(CMD_ARGV(1));
-			IScripted *pScript = NULL;
+			IScripted *pScript = nullptr;
 			if (pEntity && (pScript = pEntity->GetScripted()))
 			{
 				static msstringlist Params;
@@ -811,11 +811,11 @@ void ClientCommand2(edict_t *pEntity)
 
 	//Stealing disabled
 	//else if (FStrEq(pcmd, "steal"))
-	//	pPlayer->StealAnyItems( NULL );
+	//	pPlayer->StealAnyItems( nullptr );
 
 	else if (FStrEq(pcmd, "getmenuoptions"))
 	{
-		CMSMonster *pMonster = NULL;
+		CMSMonster *pMonster = nullptr;
 
 		if (CMD_ARGC() >= 2)
 		{
@@ -994,7 +994,7 @@ void ClientCommand2(edict_t *pEntity)
 						return;
 
 					int ItemID = atoi(CMD_ARGV(2));
-					genericitem_t *pStorageItem = NULL;
+					genericitem_t *pStorageItem = nullptr;
 					int StorageItemIdx = 0;
 					for (unsigned int i = 0; i < pStorage->Items.size(); i++)
 						if (pStorage->Items[i].ID == ItemID)
@@ -1112,7 +1112,7 @@ void ClientCommand2(edict_t *pEntity)
 		//syntax: "drop <ID>"
 		if (bCanUseInventory)
 		{
-			CGenericItem *pItem = NULL;
+			CGenericItem *pItem = nullptr;
 			if (CMD_ARGC() > 1)
 				pItem = MSUtil_GetItemByID(atol(CMD_ARGV(1)), pPlayer);
 			else
@@ -1189,7 +1189,7 @@ void ClientCommand2(edict_t *pEntity)
 			if( pItem->GiveTo( pPlayer, true, false ) )
 			{
 
-				MESSAGE_BEGIN( MSG_ONE, g_netmsg[NETMSG_PACK], NULL, pPlayer->pev );
+				MESSAGE_BEGIN( MSG_ONE, g_netmsg[NETMSG_PACK], nullptr, pPlayer->pev );
 					WRITE_BYTE( 1 );
 					WRITE_LONG( pItem->m_iId );
 					WRITE_BYTE( iHand + 1 );
@@ -1452,7 +1452,7 @@ void ClientCommand2(edict_t *pEntity)
 						pAddToHand->iQuantity = vNewStackAmount;
 						pItem->iQuantity -= vNewStackAmount;
 
-						MESSAGE_BEGIN(MSG_ONE, g_netmsg[NETMSG_ITEM], NULL, pPlayer->pev);
+						MESSAGE_BEGIN(MSG_ONE, g_netmsg[NETMSG_ITEM], nullptr, pPlayer->pev);
 							WRITE_BYTE(1);
 							SendGenericItem(pPlayer, pItem, false);
 						MESSAGE_END();
@@ -1521,7 +1521,7 @@ void ClientCommand2(edict_t *pEntity)
 				pPlayer->SendInfoMsg("You are now Elite\n");
 			else
 				pPlayer->SendInfoMsg("You are now Normal\n");
-			MESSAGE_BEGIN(MSG_ONE, g_netmsg[NETMSG_CLDLLFUNC], NULL, pPlayer->pev);
+			MESSAGE_BEGIN(MSG_ONE, g_netmsg[NETMSG_CLDLLFUNC], nullptr, pPlayer->pev);
 			WRITE_BYTE(7);
 			WRITE_BYTE(pPlayer->m_fIsElite);
 			MESSAGE_END();
@@ -1726,14 +1726,14 @@ void ClientCommand2(edict_t *pEntity)
 					ClearBits(pPlayer->m_afPhysicsFlags, PFLAG_OBSERVER);
 					ClearBits(pPlayer->pev->flags, FL_NOTARGET);
 					//pPlayer->SetSpeed( 0 );
-					MESSAGE_BEGIN(MSG_ONE, gmsgHideWeapon, NULL, pPlayer->pev);
+					MESSAGE_BEGIN(MSG_ONE, gmsgHideWeapon, nullptr, pPlayer->pev);
 					WRITE_BYTE(0);
 					MESSAGE_END();
 				}
 				break;
 			case 1:
 				//pPlayer->RemoveAllItems( false, true );
-				MESSAGE_BEGIN(MSG_ONE, gmsgHideWeapon, NULL, pPlayer->pev);
+				MESSAGE_BEGIN(MSG_ONE, gmsgHideWeapon, nullptr, pPlayer->pev);
 				WRITE_BYTE(HIDEHUD_ALL);
 				MESSAGE_END();
 				//--- NO BREAK ---
@@ -1789,7 +1789,7 @@ void ClientUserInfoChanged(edict_t *pEntity, char *infobuffer)
 	{
 		char text[256];
 		 _snprintf(text, sizeof(text),  "* %s prefers the name %s\n",  STRING(pEntity->v.netname),  g_engfuncs.pfnInfoKeyValue( infobuffer,  "name" ) );
-		MESSAGE_BEGIN( MSG_ALL, gmsgSayText, NULL );
+		MESSAGE_BEGIN( MSG_ALL, gmsgSayText, nullptr );
 			WRITE_BYTE( ENTINDEX(pEntity) );
 			WRITE_STRING( text );
 		MESSAGE_END();
@@ -1922,7 +1922,7 @@ void ServerActivate(edict_t *pEdictList, int edictCount, int clientMax)
 	// If not found via global, search by netname
 	if (!pGameMasterEnt)
 	{
-		pGameMasterEnt = UTIL_FindEntityByString(NULL, "netname", msstring("-") + "game_master");
+		pGameMasterEnt = UTIL_FindEntityByString(nullptr, "netname", msstring("-") + "game_master");
 		if (pGameMasterEnt)
 		{
 			MS_INFO("Game master found via search at index %d", pGameMasterEnt->entindex());
@@ -1948,7 +1948,7 @@ void ServerActivate(edict_t *pEdictList, int edictCount, int clientMax)
 				MS_INFO("ServerActivate event fired successfully");
 				
 				// After ServerActivate, try to find the game_master again
-				pGameMasterEnt = UTIL_FindEntityByString(NULL, "netname", msstring("-") + "game_master");
+				pGameMasterEnt = UTIL_FindEntityByString(nullptr, "netname", msstring("-") + "game_master");
 				if (pGameMasterEnt)
 				{
 					MS_INFO("Game master created by AngelScript at index %d", pGameMasterEnt->entindex());
@@ -1972,7 +1972,7 @@ void ServerActivate(edict_t *pEdictList, int edictCount, int clientMax)
 	}
 	else
 	{
-		CBaseEntity* pGameMasterEnt = UTIL_FindEntityByString(NULL, "netname", msstring("-") + "game_master");
+		CBaseEntity* pGameMasterEnt = UTIL_FindEntityByString(nullptr, "netname", msstring("-") + "game_master");
 		if (!pGameMasterEnt)
 		{
 			MS_INFO("Creating legacy game master");
@@ -2325,8 +2325,8 @@ void SetupVisibility(edict_t *pViewEntity, edict_t *pClient, unsigned char **pvs
 
 	if (pClient->v.flags & FL_PROXY)
 	{
-		*pvs = NULL; // the spectator proxy sees
-		*pas = NULL; // and hears everything
+		*pvs = nullptr; // the spectator proxy sees
+		*pas = nullptr; // and hears everything
 		return;
 	}
 
@@ -2849,15 +2849,17 @@ void Player_Encode(struct delta_s *pFields, const unsigned char *from, const uns
 	}
 }
 
-#define CUSTOMFIELD_ORIGIN0 0
-#define CUSTOMFIELD_ORIGIN1 1
-#define CUSTOMFIELD_ORIGIN2 2
-#define CUSTOMFIELD_ANGLES0 3
-#define CUSTOMFIELD_ANGLES1 4
-#define CUSTOMFIELD_ANGLES2 5
-#define CUSTOMFIELD_SKIN 6
-#define CUSTOMFIELD_SEQUENCE 7
-#define CUSTOMFIELD_ANIMTIME 8
+enum {
+	CUSTOMFIELD_ORIGIN0 = 0,
+	CUSTOMFIELD_ORIGIN1 = 1,
+	CUSTOMFIELD_ORIGIN2 = 2,
+	CUSTOMFIELD_ANGLES0 = 3,
+	CUSTOMFIELD_ANGLES1 = 4,
+	CUSTOMFIELD_ANGLES2 = 5,
+	CUSTOMFIELD_SKIN = 6,
+	CUSTOMFIELD_SEQUENCE = 7,
+	CUSTOMFIELD_ANIMTIME = 8
+};
 
 entity_field_alias_t custom_entity_field_alias[] =
 	{
diff --git a/src/game/server/hl/util.h b/src/game/server/hl/util.h
index 9600f275..9346c941 100644
--- a/src/game/server/hl/util.h
+++ b/src/game/server/hl/util.h
@@ -162,7 +162,7 @@ inline entvars_t *VARS(entvars_t *pev) { return pev; }
 inline entvars_t *VARS(edict_t *pent)
 {
 	if (!pent)
-		return NULL;
+		return nullptr;
 
 	return &pent->v;
 }
@@ -364,8 +364,8 @@ extern void UTIL_BubbleTrail(Vector from, Vector to, int count);
 extern void UTIL_PrecacheOther(const char *szClassname);
 
 // prints a message to each client
-extern void UTIL_ClientPrintAll(int msg_dest, const char *msg_name, const char *param1 = NULL, const char *param2 = NULL, const char *param3 = NULL, const char *param4 = NULL);
-inline void UTIL_CenterPrintAll(const char *msg_name, const char *param1 = NULL, const char *param2 = NULL, const char *param3 = NULL, const char *param4 = NULL)
+extern void UTIL_ClientPrintAll(int msg_dest, const char *msg_name, const char *param1 = nullptr, const char *param2 = nullptr, const char *param3 = nullptr, const char *param4 = nullptr);
+inline void UTIL_CenterPrintAll(const char *msg_name, const char *param1 = nullptr, const char *param2 = nullptr, const char *param3 = nullptr, const char *param4 = nullptr)
 {
 	UTIL_ClientPrintAll(HUD_PRINTCENTER, msg_name, param1, param2, param3, param4);
 }
@@ -379,7 +379,7 @@ extern CBasePlayer* UTIL_PlayerBySteamID(ID64 steamID64);
 extern ID64 UTIL_ComputeSteamID64(const char* id, char sep = ':');
 
 // prints messages through the HUD
-extern void ClientPrint(entvars_t *client, int msg_dest, const char *msg_name, const char *param1 = NULL, const char *param2 = NULL, const char *param3 = NULL, const char *param4 = NULL);
+extern void ClientPrint(entvars_t *client, int msg_dest, const char *msg_name, const char *param1 = nullptr, const char *param2 = nullptr, const char *param3 = nullptr, const char *param4 = nullptr);
 
 // prints a message to the HUD say (chat)
 extern void UTIL_SayText(const char *pText, CBaseEntity *pEntity);
@@ -643,9 +643,10 @@ void EMIT_GROUPNAME_SUIT(edict_t *entity, const char *groupname);
 #define PLAYBACK_EVENT(flags, who, index) PLAYBACK_EVENT_FULL(flags, who, index, 0, (float *)&g_vecZero, (float *)&g_vecZero, 0.0, 0.0, 0, 0, 0, 0);
 #define PLAYBACK_EVENT_DELAY(flags, who, index, delay) PLAYBACK_EVENT_FULL(flags, who, index, delay, (float *)&g_vecZero, (float *)&g_vecZero, 0.0, 0.0, 0, 0, 0, 0);
 
-#define GROUP_OP_AND 0
-#define GROUP_OP_NAND 1
-
+enum {
+	GROUP_OP_AND = 0,
+	GROUP_OP_NAND = 1
+};
 extern int g_groupmask;
 extern int g_groupop;
 

From 260413ae9033444a86d8c3d0a12f5fd3888dd90f Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 14:15:43 -0400
Subject: [PATCH 151/291] changed NULL to nullptr

---
 src/game/server/hl/util.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/game/server/hl/util.h b/src/game/server/hl/util.h
index 9346c941..f9b11805 100644
--- a/src/game/server/hl/util.h
+++ b/src/game/server/hl/util.h
@@ -182,8 +182,8 @@ inline BOOL FNullEnt(EOFFSET eoffset)
 {
 	return eoffset == 0;
 }
-inline BOOL FNullEnt(const edict_t *pent) { return pent == NULL || FNullEnt(OFFSET(pent)); }
-inline BOOL FNullEnt(entvars_t *pev) { return pev == NULL || FNullEnt(OFFSET(pev)); }
+inline BOOL FNullEnt(const edict_t *pent) { return pent == nullptr || FNullEnt(OFFSET(pent)); }
+inline BOOL FNullEnt(entvars_t *pev) { return pev == nullptr || FNullEnt(OFFSET(pev)); }
 
 // Testing strings for nullity
 constexpr int iStringNull = 0;

From 3e4b763f187c9b97aba03e3675977f3f6e2374be Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 14:22:57 -0400
Subject: [PATCH 152/291] changed define to constexpr

---
 src/game/server/client.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/server/client.cpp b/src/game/server/client.cpp
index b6807285..c9b70d2c 100644
--- a/src/game/server/client.cpp
+++ b/src/game/server/client.cpp
@@ -2592,7 +2592,7 @@ int AddToFullPack(struct entity_state_s *state, int e, edict_t *ent, edict_t *ho
 }
 
 // defaults for clientinfo messages
-#define DEFAULT_VIEWHEIGHT 28
+constexpr int DEFAULT_VIEWHEIGHT = 28;
 
 /*
 ===================

From 96bb30bba0423c69907594d7772126b55503d377 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 14:31:29 -0400
Subject: [PATCH 153/291] Groups defines into an enum in the header file.

---
 src/game/server/effects.cpp  | 21 +++-------------
 src/game/server/hl/effects.h | 48 ++++++++++++++++++++++++------------
 2 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/src/game/server/effects.cpp b/src/game/server/effects.cpp
index 88ced1c9..ab671feb 100644
--- a/src/game/server/effects.cpp
+++ b/src/game/server/effects.cpp
@@ -21,9 +21,6 @@
 #include "func_break.h"
 #include "shake.h"
 
-#define SF_GIBSHOOTER_REPEATABLE 1 // allows a gibshooter to be refired
-
-#define SF_FUNNEL_REVERSE 1 // funnel effect repels particles instead of attracting them.
 
 // Lightning target, just alias landmark
 LINK_ENTITY_TO_CLASS(info_target, CPointEntity);
@@ -62,7 +59,6 @@ TYPEDESCRIPTION CBubbling::m_SaveData[] =
 
 IMPLEMENT_SAVERESTORE(CBubbling, CBaseEntity);
 
-#define SF_BUBBLES_STARTOFF 0x0001
 
 void CBubbling::Spawn(void)
 {
@@ -847,8 +843,8 @@ void CLightning::BeamUpdateVars(void)
 	int beamType;
 	int pointStart, pointEnd;
 
-	edict_t *pStart = FIND_ENTITY_BY_TARGETNAME(NULL, STRING(m_iszStartEntity));
-	edict_t *pEnd = FIND_ENTITY_BY_TARGETNAME(NULL, STRING(m_iszEndEntity));
+	edict_t *pStart = FIND_ENTITY_BY_TARGETNAME(nullptr, STRING(m_iszStartEntity));
+	edict_t *pEnd = FIND_ENTITY_BY_TARGETNAME(nullptr, STRING(m_iszEndEntity));
 	pointStart = IsPointEntity(CBaseEntity::Instance(pStart));
 	pointEnd = IsPointEntity(CBaseEntity::Instance(pEnd));
 
@@ -1678,11 +1674,6 @@ class CBlood : public CPointEntity
 
 LINK_ENTITY_TO_CLASS(env_blood, CBlood);
 
-#define SF_BLOOD_RANDOM 0x0001
-#define SF_BLOOD_STREAM 0x0002
-#define SF_BLOOD_PLAYER 0x0004
-#define SF_BLOOD_DECAL 0x0008
-
 void CBlood::Spawn(void)
 {
 	pev->solid = SOLID_NOT;
@@ -1794,10 +1785,7 @@ LINK_ENTITY_TO_CLASS(env_shake, CShake);
 // radius of 0 means all players
 // NOTE: UTIL_ScreenShake() will only shake players who are on the ground
 
-#define SF_SHAKE_EVERYONE 0x0001 // Don't check radius
-// UNDONE: These don't work yet
-#define SF_SHAKE_DISRUPT 0x0002 // Disrupt controls
-#define SF_SHAKE_INAIR 0x0004	// Shake players in air
+
 
 void CShake::Spawn(void)
 {
@@ -1861,9 +1849,6 @@ LINK_ENTITY_TO_CLASS(env_fade, CFade);
 
 // pev->dmg_take is duration
 // pev->dmg_save is hold duration
-#define SF_FADE_IN 0x0001		// Fade in, not out
-#define SF_FADE_MODULATE 0x0002 // Modulate, don't blend
-#define SF_FADE_ONLYONE 0x0004
 
 void CFade::Spawn(void)
 {
diff --git a/src/game/server/hl/effects.h b/src/game/server/hl/effects.h
index 24efca7d..333b815d 100644
--- a/src/game/server/hl/effects.h
+++ b/src/game/server/hl/effects.h
@@ -15,20 +15,37 @@
 #ifndef EFFECTS_H
 #define EFFECTS_H
 
-#define SF_BEAM_STARTON 0x0001
-#define SF_BEAM_TOGGLE 0x0002
-#define SF_BEAM_RANDOM 0x0004
-#define SF_BEAM_RING 0x0008
-#define SF_BEAM_SPARKSTART 0x0010
-#define SF_BEAM_SPARKEND 0x0020
-#define SF_BEAM_DECALS 0x0040
-#define SF_BEAM_SHADEIN 0x0080
-#define SF_BEAM_SHADEOUT 0x0100
-#define SF_BEAM_TEMPORARY 0x8000
-
-#define SF_SPRITE_STARTON 0x0001
-#define SF_SPRITE_ONCE 0x0002
-#define SF_SPRITE_TEMPORARY 0x8000
+enum {
+	SF_BEAM_STARTON = 0x0001,
+	SF_BEAM_TOGGLE = 0x0002,
+	SF_BEAM_RANDOM = 0x0004,
+	SF_BEAM_RING = 0x0008,
+	SF_BEAM_SPARKSTART = 0x0010,
+	SF_BEAM_SPARKEND = 0x0020,
+	SF_BEAM_DECALS = 0x0040,
+	SF_BEAM_SHADEIN = 0x0080,
+	SF_BEAM_SHADEOUT = 0x0100,
+	SF_BEAM_TEMPORARY = 0x8000,
+	SF_SPRITE_STARTON = 0x0001,
+	SF_SPRITE_ONCE = 0x0002,
+	SF_SPRITE_TEMPORARY = 0x8000,
+	SF_GIBSHOOTER_REPEATABLE = 1, // allows a gibshooter to be refired
+	SF_FUNNEL_REVERSE = 1, // funnel effect repels particles instead of attracting them.
+	SF_BUBBLES_STARTOFF = 0x0001,
+	SF_BLOOD_RANDOM = 0x0001,
+	SF_BLOOD_STREAM = 0x0002,
+	SF_BLOOD_PLAYER = 0x0004,
+	SF_BLOOD_DECAL = 0x0008,
+	SF_SHAKE_EVERYONE = 0x0001, // Don't check radius
+	// UNDONE: These don't work yet
+	SF_SHAKE_DISRUPT = 0x0002, // Disrupt controls
+	SF_SHAKE_INAIR = 0x0004,	// Shake players in air
+	SF_FADE_IN = 0x0001,		// Fade in, not out
+	SF_FADE_MODULATE = 0x0002, // Modulate, don't blend
+	SF_FADE_ONLYONE = 0x0004,
+	SF_MESSAGE_ONCE = 0x0001, // Fade in, not out
+	SF_MESSAGE_ALL = 0x0002  // Send to all clients
+};
 
 class CSprite : public CPointEntity
 {
@@ -189,8 +206,7 @@ class CBeam : public CBaseEntity
 	}
 };
 
-#define SF_MESSAGE_ONCE 0x0001 // Fade in, not out
-#define SF_MESSAGE_ALL 0x0002  // Send to all clients
+
 
 class CLaser : public CBeam
 {

From 2c7cf04d1d3bd97e11545a39705df2ed613bb0c8 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 14:39:05 -0400
Subject: [PATCH 154/291] changed defines to constexpr/enum

---
 src/game/server/func_break.cpp  |  2 +-
 src/game/server/hl/cbase.h      | 14 ++++++++------
 src/game/server/hl/func_break.h |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/game/server/func_break.cpp b/src/game/server/func_break.cpp
index 0f55d343..c6285423 100644
--- a/src/game/server/func_break.cpp
+++ b/src/game/server/func_break.cpp
@@ -651,7 +651,7 @@ void CBreakable::Die(void)
 {
 	Vector vecSpot;		// shard origin
 	Vector vecVelocity; // shard velocity
-	CBaseEntity *pEntity = NULL;
+	CBaseEntity *pEntity = nullptr;
 	char cFlag = 0;
 	int pitch;
 	float fvol;
diff --git a/src/game/server/hl/cbase.h b/src/game/server/hl/cbase.h
index 0f68867c..f6cdd8f3 100644
--- a/src/game/server/hl/cbase.h
+++ b/src/game/server/hl/cbase.h
@@ -700,8 +700,8 @@ void PlayLockSounds(entvars_t *pev, locksound_t *pls, int flocked, int fbutton);
 // MultiSouce
 //
 
-#define MAX_MULTI_TARGETS 16 // maximum number of targets a single multi_manager entity may be assigned.
-#define MS_MAX_TARGETS 32
+constexpr int MAX_MULTI_TARGETS = 16; // maximum number of targets a single multi_manager entity may be assigned.
+constexpr int MS_MAX_TARGETS = 32;
 
 class CMultiSource : public CPointEntity
 {
@@ -955,10 +955,12 @@ enum {
 
 // when calling KILLED(), a value that governs gib behavior is expected to be
 // one of these three values
-#define GIB_NORMAL 0 // gib if entity was overkilled
-#define GIB_NEVER 1	 // never gib, no matter how much death damage is done ( freezing, etc )
-#define GIB_ALWAYS 2 // always gib ( Houndeye Shock, Barnacle Bite )
 
+enum {
+	GIB_NORMAL = 0, // gib if entity was overkilled
+	GIB_NEVER = 1,	 // never gib, no matter how much death damage is done ( freezing, etc )
+	GIB_ALWAYS = 2 // always gib ( Houndeye Shock, Barnacle Bite )
+};
 class CBaseMonster;
 class CCineMonster;
 class CSound;
@@ -1079,7 +1081,7 @@ env_sound_data
 push_trigger_data
 */
 
-#define TRACER_FREQ 4 // Tracers fire every 4 bullets
+constexpr int TRACER_FREQ = 4; // Tracers fire every 4 bullets
 
 typedef struct _SelAmmo
 {
diff --git a/src/game/server/hl/func_break.h b/src/game/server/hl/func_break.h
index 81b17ffd..795efa31 100644
--- a/src/game/server/hl/func_break.h
+++ b/src/game/server/hl/func_break.h
@@ -35,7 +35,7 @@ typedef enum
 	matLastMaterial
 } Materials;
 
-#define NUM_SHARDS 6 // this many shards spawned when breakable objects break;
+constexpr int NUM_SHARDS = 6; // this many shards spawned when breakable objects break;
 
 class CBreakable : public CBaseDelay
 {

From d2b464bd51d00f7f86c4b1ea73d26fd2221d43b3 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 14:47:29 -0400
Subject: [PATCH 155/291] changed definest to enums. moved solitary enum to
 effects.h added effects.h as include

---
 src/game/server/ggrenade.cpp  |  5 ++++-
 src/game/server/hl/effects.h  |  4 +++-
 src/game/server/hl/soundent.h | 41 ++++++++++++++++++-----------------
 3 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/src/game/server/ggrenade.cpp b/src/game/server/ggrenade.cpp
index ebed187e..4d73aa3d 100644
--- a/src/game/server/ggrenade.cpp
+++ b/src/game/server/ggrenade.cpp
@@ -25,12 +25,15 @@
 #include "soundent.h"
 #include "decals.h"
 
+#ifndef EFFECTS_H
+#include "effects.h"
+#endif
+
 //===================grenade
 
 LINK_ENTITY_TO_CLASS(grenade, CGrenade);
 
 // Grenades flagged with this will be triggered when the owner calls detonateSatchelCharges
-#define SF_DETONATE 0x0001
 
 //
 // Grenade Explode
diff --git a/src/game/server/hl/effects.h b/src/game/server/hl/effects.h
index 333b815d..60ff5d93 100644
--- a/src/game/server/hl/effects.h
+++ b/src/game/server/hl/effects.h
@@ -44,7 +44,9 @@ enum {
 	SF_FADE_MODULATE = 0x0002, // Modulate, don't blend
 	SF_FADE_ONLYONE = 0x0004,
 	SF_MESSAGE_ONCE = 0x0001, // Fade in, not out
-	SF_MESSAGE_ALL = 0x0002  // Send to all clients
+	SF_MESSAGE_ALL = 0x0002,  // Send to all clients
+	SF_DETONATE = 0x0001
+
 };
 
 class CSprite : public CPointEntity
diff --git a/src/game/server/hl/soundent.h b/src/game/server/hl/soundent.h
index 49e943a4..8ac6faa3 100644
--- a/src/game/server/hl/soundent.h
+++ b/src/game/server/hl/soundent.h
@@ -18,27 +18,28 @@
 // lists.
 //=========================================================
 
-#define MAX_WORLD_SOUNDS 64 // maximum number of sounds handled by the world at one time.
-
-#define bits_SOUND_NONE 0
-#define bits_SOUND_COMBAT (1 << 0)	// gunshots, explosions
-#define bits_SOUND_WORLD (1 << 1)	// door opening/closing, glass breaking
-#define bits_SOUND_PLAYER (1 << 2)	// all noises generated by player. walking, shooting, falling, splashing
-#define bits_SOUND_CARCASS (1 << 3) // dead body
-#define bits_SOUND_MEAT (1 << 4)	// gib or pork chop
-#define bits_SOUND_DANGER (1 << 5)	// pending danger. Grenade that is about to explode, explosive barrel that is damaged, falling crate
-#define bits_SOUND_GARBAGE (1 << 6) // trash cans, banana peels, old fast food bags.
-#define bits_SOUND_WALKING (1 << 7) // MasterSword: Just walking/moving
-
-#define bits_ALL_SOUNDS 0xFFFFFFFF
-
-#define SOUNDLIST_EMPTY -1
-
-#define SOUNDLISTTYPE_FREE 1 // identifiers passed to functions that can operate on either list, to indicate which list to operate on.
-#define SOUNDLISTTYPE_ACTIVE 2
-
-#define SOUND_NEVER_EXPIRE -1 // with this set as a sound's ExpireTime, the sound will never expire.
+constexpr int MAX_WORLD_SOUNDS = 64; // maximum number of sounds handled by the world at one time.
+
+
+enum {
+	bits_SOUND_NONE = 0,
+	bits_SOUND_COMBAT = (1 << 0),	// gunshots, explosions
+	bits_SOUND_WORLD = (1 << 1),	// door opening/closing, glass breaking
+	bits_SOUND_PLAYER = (1 << 2),	// all noises generated by player. walking, shooting, falling, splashing
+	bits_SOUND_CARCASS = (1 << 3), // dead body
+	bits_SOUND_MEAT = (1 << 4),	// gib or pork chop
+	bits_SOUND_DANGER = (1 << 5),	// pending danger. Grenade that is about to explode, explosive barrel that is damaged, falling crate
+	bits_SOUND_GARBAGE = (1 << 6), // trash cans, banana peels, old fast food bags.
+	bits_SOUND_WALKING = (1 << 7), // MasterSword: Just walking/moving
+	bits_ALL_SOUNDS = 0xFFFFFFFF
+};
 
+enum {
+	SOUNDLIST_EMPTY = -1,
+	SOUNDLISTTYPE_FREE = 1, // identifiers passed to functions that can operate on either list, to indicate which list to operate on.
+	SOUNDLISTTYPE_ACTIVE = 2,
+	SOUND_NEVER_EXPIRE = -1 // with this set as a sound's ExpireTime, the sound will never expire.
+};
 //=========================================================
 // CSound - an instance of a sound in the world.
 //=========================================================

From 1b76c1813bcbf22deece48269cc14fd37d97044b Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 15:02:19 -0400
Subject: [PATCH 156/291] moved define to transtype enum. moved transtype enum
 to header file.

---
 src/game/server/hl/effects.h      |  4 +++-
 src/game/server/msmapents.cpp     | 10 ++++++----
 src/game/server/player/player.cpp |  9 +--------
 src/game/server/player/player.h   | 13 +++++++++++++
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/game/server/hl/effects.h b/src/game/server/hl/effects.h
index 60ff5d93..684300f2 100644
--- a/src/game/server/hl/effects.h
+++ b/src/game/server/hl/effects.h
@@ -45,7 +45,9 @@ enum {
 	SF_FADE_ONLYONE = 0x0004,
 	SF_MESSAGE_ONCE = 0x0001, // Fade in, not out
 	SF_MESSAGE_ALL = 0x0002,  // Send to all clients
-	SF_DETONATE = 0x0001
+	SF_DETONATE = 0x0001,
+	SF_LOOP = 1,
+	SF_REMOVE_ON_FIRE = 2
 
 };
 
diff --git a/src/game/server/msmapents.cpp b/src/game/server/msmapents.cpp
index ce244e4b..13e1e057 100644
--- a/src/game/server/msmapents.cpp
+++ b/src/game/server/msmapents.cpp
@@ -7,6 +7,11 @@
 #include "mslogger.h"
 #include "ms/angelscript/CAngelScriptManager.h" // For AngelScript map transitions
 
+#ifndef EFFECTS_H
+#include "effects.h"
+#endif // !EFFECTS_H
+
+
 class CCycler : public CBaseMonster
 {
 public:
@@ -334,8 +339,7 @@ LINK_ENTITY_TO_CLASS(env_model, CStaticModel);
 
 // MP3 Playback
 
-#define SF_LOOP 1
-#define SF_REMOVE_ON_FIRE 2
+
 
 class CTargetMP3Audio : public CPointEntity
 {
@@ -1707,8 +1711,6 @@ class CAreaTransition : public CAreaInvisible
 			}
 		}
 
-#define TRANS_AUTOSHOWBROWSER (1 << 0)
-#define TRANS_PLAYSOUND (1 << 1)
 
 		strncpy(pPlayer->m_OldTransition,  STRING(sName), sizeof(pPlayer->m_OldTransition) );
 		strncpy(pPlayer->m_NextMap,  STRING(sDestMap), sizeof(pPlayer->m_NextMap) );
diff --git a/src/game/server/player/player.cpp b/src/game/server/player/player.cpp
index 598ae84d..0e46ed78 100644
--- a/src/game/server/player/player.cpp
+++ b/src/game/server/player/player.cpp
@@ -5034,14 +5034,7 @@ void CBasePlayer::UpdateMiscPositions(void)
 	//	UpdateMana( );
 }
 
-enum transtype_e
-{
-	TRANS_GETGROUND,
-	TRANS_STEAL,
-	TRANS_STEALITEM,
-	TRANS_STEALPACKITEM,
-	TRANS_GIVE,
-};
+
 struct itemdesc_t
 {
 	unsigned int iEntIndex;
diff --git a/src/game/server/player/player.h b/src/game/server/player/player.h
index a978419b..69a81003 100644
--- a/src/game/server/player/player.h
+++ b/src/game/server/player/player.h
@@ -37,6 +37,19 @@ enum sbar_data
 	SBAR_END,
 };
 
+enum transtype_e
+{
+	TRANS_GETGROUND,
+	TRANS_STEAL,
+	TRANS_STEALITEM,
+	TRANS_STEALPACKITEM,
+	TRANS_GIVE,
+	TRANS_AUTOSHOWBROWSER = (1 << 0),
+	TRANS_PLAYSOUND = (1 << 1),
+
+};
+
+
 constexpr float CHAT_INTERVAL = 1.0f;
 //Master Sword
 

From caf6ddfc3d24badce6ea047f233b6f3213c75687 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 15:07:49 -0400
Subject: [PATCH 157/291] changed define to enum

---
 src/game/shared/weapons/weapons.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/game/shared/weapons/weapons.h b/src/game/shared/weapons/weapons.h
index 8058e51e..ed9d4e59 100644
--- a/src/game/shared/weapons/weapons.h
+++ b/src/game/shared/weapons/weapons.h
@@ -26,9 +26,11 @@ extern int gmsgWeapPickup;
 #ifdef VALVE_DLL
 void G_SolidifyEnts(bool fEnable, bool fSolidShields, bool fEnableCorpses, bool fEnlargeboxes);
 
-#define MSTRACE_SOLIDSHIELDS (1 << 0)
-#define MSTRACE_LARGEHITBOXES (1 << 1)
-#define MSTRACE_HITCORPSES (1 << 2)
+enum {
+	MSTRACE_SOLIDSHIELDS = (1 << 0),
+	MSTRACE_LARGEHITBOXES = (1 << 1),
+	MSTRACE_HITCORPSES = (1 << 2)
+};
 
 void MSTraceLine(const Vector &vecSrc, const Vector &vecEnd, IGNORE_MONSTERS igmon, edict_t *pentIgnore, TraceResult &tr, int flags);
 

From 93b48be7eb66ba4228dc8c9b2af624665ee139bd Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 15:08:45 -0400
Subject: [PATCH 158/291] changed define to constexpr

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

diff --git a/src/game/server/shurispritedefs.h b/src/game/server/shurispritedefs.h
index 1319e075..b3afe864 100644
--- a/src/game/server/shurispritedefs.h
+++ b/src/game/server/shurispritedefs.h
@@ -1,6 +1,6 @@
 //Shuriken FEB2008a Sprite crap
-#define INV_SPRITE_NUM 77
-#define INV_SPRITE "allitems"
+constexpr unsigned int INV_SPRITE_NUM = 77;
+constexpr const char* INV_SPRITE = "allitems";
 
 const char *SpriteArray[INV_SPRITE_NUM] = {
 	"apple",

From 78397248fd8d806086e967c877b1129b1268f847 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 15:10:03 -0400
Subject: [PATCH 159/291] change define to constexpr

---
 src/game/server/enginecallback.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/server/enginecallback.h b/src/game/server/enginecallback.h
index adea4a42..4601f0fe 100644
--- a/src/game/server/enginecallback.h
+++ b/src/game/server/enginecallback.h
@@ -197,7 +197,7 @@ inline void WRITE_STRING(const char* sz)
 }
 
 #ifdef VALVE_DLL
-#define WRITE_STRING_MAX 180 // Upper limit for a usermessage is around 192 bytes, keep this in mind!
+constexpr unsigned int WRITE_STRING_MAX = 180; // Upper limit for a usermessage is around 192 bytes, keep this in mind!
 extern char g_pTempStringLimit[WRITE_STRING_MAX];
 // Use this to ensure that we only write this many bytes, ensure null terminated string, prevent overflows.
 #define WRITE_STRING_LIMIT(src, len) memset(g_pTempStringLimit, 0, WRITE_STRING_MAX); strncpy(g_pTempStringLimit, src, WRITE_STRING_MAX); g_pTempStringLimit[V_min((unsigned int)WRITE_STRING_MAX-1, (unsigned int)len)] = 0; WRITE_STRING(g_pTempStringLimit)

From 106cee33105c22ef07792a77ddd0457779fc82f0 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 15:11:47 -0400
Subject: [PATCH 160/291] changed define to constexpr

---
 src/game/server/svglobals.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/server/svglobals.cpp b/src/game/server/svglobals.cpp
index 56cf07da..f4bd468f 100644
--- a/src/game/server/svglobals.cpp
+++ b/src/game/server/svglobals.cpp
@@ -526,7 +526,7 @@ void MSGameThink()
 
 //Called when the map changes or server is shutdown from ServerDeactivate
 //Note that ClientDisconnect is called after this, and the player is deallocated again!
-#define WORLD_MAX 6000
+constexpr int WORLD_MAX = 6000;
 void MSGameEnd()
 {
 	if(MSGlobals::GameScript)

From c6221acbb6f6fc2d1c29e5d7cd4f2ad3cadcd716 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 15:13:21 -0400
Subject: [PATCH 161/291] Fixed float-enum comparison warning

---
 src/game/server/hl/soundent.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/server/hl/soundent.cpp b/src/game/server/hl/soundent.cpp
index 47d8e00a..b4acc634 100644
--- a/src/game/server/hl/soundent.cpp
+++ b/src/game/server/hl/soundent.cpp
@@ -102,7 +102,7 @@ void CSoundEnt :: Think ( void )
 
 	while ( iSound != SOUNDLIST_EMPTY )
 	{
-		if ( m_SoundPool[ iSound ].m_flExpireTime <= gpGlobals->time && m_SoundPool[ iSound ].m_flExpireTime != SOUND_NEVER_EXPIRE )
+		if ( m_SoundPool[ iSound ].m_flExpireTime <= gpGlobals->time && (int)m_SoundPool[ iSound ].m_flExpireTime != SOUND_NEVER_EXPIRE )
 		{
 			int iNext = m_SoundPool[ iSound ].m_iNext;
 

From 95a9c976c66754835ef2e21e6942d04f45e0409e Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 15:16:37 -0400
Subject: [PATCH 162/291] changed some defines to enums

---
 src/game/shared/ms/mscharacter.h | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/game/shared/ms/mscharacter.h b/src/game/shared/ms/mscharacter.h
index d3b29c9a..8c337fca 100644
--- a/src/game/shared/ms/mscharacter.h
+++ b/src/game/shared/ms/mscharacter.h
@@ -63,11 +63,13 @@ struct charinfo_base_t
 	}
 };
 
-#define GEARFL_COVER_HEAD (1 << 0)
-#define GEARFL_COVER_TORSO (1 << 1)
-#define GEARFL_COVER_ARMS (1 << 2)
-#define GEARFL_COVER_LEGS (1 << 3)
-#define GEARFL_WEARING (1 << 4)
+enum {
+	GEARFL_COVER_HEAD = (1 << 0),
+	GEARFL_COVER_TORSO = (1 << 1),
+	GEARFL_COVER_ARMS = (1 << 2),
+	GEARFL_COVER_LEGS = (1 << 3),
+	GEARFL_WEARING = (1 << 4)
+};
 
 struct gearinfo_t
 {
@@ -122,10 +124,11 @@ struct spellskillstat_t
 	long Exp[STAT_PROP_TOTAL];
 };
 
-#define SAVECHAR_VERSION_MSC 11 // Legacy MS: Classic
-#define SAVECHAR_VERSION_MSR 12 // MS Rebirth and up.
-
-#define SAVECHAR_VERSION SAVECHAR_VERSION_MSR
+enum {
+	SAVECHAR_VERSION_MSC = 11, // Legacy MS: Classic
+	SAVECHAR_VERSION_MSR = 12, // MS Rebirth and up.
+	SAVECHAR_VERSION = SAVECHAR_VERSION_MSR
+};
 
 //The types of headers.  Each time the save file is revised, a new header is added.
 //The old headers are kept so the game knows when it is encountering an old save file
@@ -180,7 +183,7 @@ const char *GetSaveFileName(int iCharacter, CBasePlayer *pPlayer = NULL);	 //Cli
 bool IsValidCharVersion(int Version);										 //Client & Server
 savedata_t *GetCharInfo(const char *pszFileName, msstringlist &VisitedMaps); //Client & Server
 
-#define MAX_CHARSLOTS 3 //Max number of characters one person can have. This is the max the game supports.  A server operator can set less for his server via CVAR "ms_serverchar"
+constexpr unsigned int MAX_CHARSLOTS = 3; //Max number of characters one person can have. This is the max the game supports.  A server operator can set less for his server via CVAR "ms_serverchar"
 
 struct charslot_t
 {

From 3f6c197df7420058cb6c031221f646892f4d4269 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 15:29:38 -0400
Subject: [PATCH 163/291] changed define to enum. group at top of file.

---
 src/game/server/triggers.cpp | 48 +++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/game/server/triggers.cpp b/src/game/server/triggers.cpp
index 70b400b3..49416c43 100644
--- a/src/game/server/triggers.cpp
+++ b/src/game/server/triggers.cpp
@@ -27,13 +27,29 @@
 #include "gamerules.h"
 #include "ms/angelscript/CAngelScriptManager.h" // For AngelScript map transitions
 
-#define SF_TRIGGER_PUSH_START_OFF 2		   //spawnflag that makes trigger_push spawn turned OFF
-#define SF_TRIGGER_HURT_TARGETONCE 1	   // Only fire hurt target once
-#define SF_TRIGGER_HURT_START_OFF 2		   //spawnflag that makes trigger_push spawn turned OFF
-#define SF_TRIGGER_HURT_NO_CLIENTS 8	   //spawnflag that makes trigger_push spawn turned OFF
-#define SF_TRIGGER_HURT_CLIENTONLYFIRE 16  // trigger hurt will only fire its target if it is hurting a client
-#define SF_TRIGGER_HURT_CLIENTONLYTOUCH 32 // only clients may touch this trigger.
 
+enum {
+	SF_AUTO_FIREONCE = 0x0001,
+	SF_TRIGGER_PUSH_START_OFF = 2,		   //spawnflag that makes trigger_push spawn turned OFF
+	SF_TRIGGER_HURT_TARGETONCE = 1,	   // Only fire hurt target once
+	SF_TRIGGER_HURT_START_OFF = 2,		   //spawnflag that makes trigger_push spawn turned OFF
+	SF_TRIGGER_HURT_NO_CLIENTS = 8,	   //spawnflag that makes trigger_push spawn turned OFF
+	SF_TRIGGER_HURT_CLIENTONLYFIRE = 16,  // trigger hurt will only fire its target if it is hurting a client
+	SF_TRIGGER_HURT_CLIENTONLYTOUCH = 32, // only clients may touch this trigger.
+	SF_RELAY_FIREONCE = 0x0001,
+	SF_MULTIMAN_CLONE = 0x80000000,
+	SF_MULTIMAN_THREAD = 0x00000001,
+	SF_RENDER_MASKFX = (1 << 0),
+	SF_RENDER_MASKAMT = (1 << 1),
+	SF_RENDER_MASKMODE = (1 << 2),
+	SF_RENDER_MASKCOLOR = (1 << 3),
+	SF_CHANGELEVEL_USEONLY = 0x0002,
+	SF_ENDSECTION_USEONLY = 0x0001,
+	SF_CAMERA_PLAYER_POSITION = 1,
+	SF_CAMERA_PLAYER_TARGET = 2,
+	SF_CAMERA_PLAYER_TAKECONTROL = 4,
+	SF_CAMERA_PLAYER_ALL = 8
+};
 extern DLL_GLOBAL BOOL g_fGameOver;
 
 extern void SetMovedir(entvars_t *pev);
@@ -96,7 +112,6 @@ void CFrictionModifier ::KeyValue(KeyValueData *pkvd)
 // This trigger will fire when the level spawns (or respawns if not fire once)
 // It will check a global state before firing.  It supports delay and killtargets
 
-#define SF_AUTO_FIREONCE 0x0001
 
 class CAutoTrigger : public CBaseDelay
 {
@@ -174,8 +189,6 @@ void CAutoTrigger::Think(void)
 	}
 }
 
-#define SF_RELAY_FIREONCE 0x0001
-
 class CTriggerRelay : public CBaseDelay
 {
 public:
@@ -282,8 +295,6 @@ void CTriggerRelay::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE
 // FLAG:		THREAD (create clones when triggered)
 // FLAG:		CLONE (this is a clone for a threaded execution)
 
-#define SF_MULTIMAN_CLONE 0x80000000
-#define SF_MULTIMAN_THREAD 0x00000001
 
 class CMultiManager : public CBaseToggle
 {
@@ -514,10 +525,7 @@ void CMultiManager ::ManagerReport(void)
 //
 
 // Flags to indicate masking off various render parameters that are normally copied to the targets
-#define SF_RENDER_MASKFX (1 << 0)
-#define SF_RENDER_MASKAMT (1 << 1)
-#define SF_RENDER_MASKMODE (1 << 2)
-#define SF_RENDER_MASKCOLOR (1 << 3)
+
 
 class CRenderFxManager : public CBaseEntity
 {
@@ -1707,7 +1715,7 @@ void CFireAndDie::Think(void)
 	UTIL_Remove(this);
 }
 
-#define SF_CHANGELEVEL_USEONLY 0x0002
+
 class CChangeLevel : public CBaseTrigger
 {
 public:
@@ -2000,7 +2008,7 @@ int CChangeLevel::InTransitionVolume(CBaseEntity *pEntity, char *pVolumeName)
 }
 
 // We can only ever move 512 entities across a transition
-#define MAX_ENTITY 512
+constexpr int MAX_ENTITY = 512;
 
 // This has grown into a complicated beast
 // Can we make this more elegant?
@@ -2545,7 +2553,6 @@ void CTriggerSave::SaveTouch(CBaseEntity *pOther)
 	SERVER_COMMAND("autosave\n");
 }
 
-#define SF_ENDSECTION_USEONLY 0x0001
 
 class CTriggerEndSection : public CBaseTrigger
 {
@@ -2695,11 +2702,6 @@ void CTriggerChangeTarget::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, US
 	}
 }
 
-#define SF_CAMERA_PLAYER_POSITION 1
-#define SF_CAMERA_PLAYER_TARGET 2
-#define SF_CAMERA_PLAYER_TAKECONTROL 4
-#define SF_CAMERA_PLAYER_ALL 8
-
 class CTriggerCamera : public CBaseDelay
 {
 public:

From 2b419ad9e12a57ad9c493cd13a18f50c1f9419aa Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 15:33:58 -0400
Subject: [PATCH 164/291] changed define to constexpr

---
 src/game/server/vehicle.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/game/server/vehicle.cpp b/src/game/server/vehicle.cpp
index 4e15e7d5..f32397b3 100644
--- a/src/game/server/vehicle.cpp
+++ b/src/game/server/vehicle.cpp
@@ -29,9 +29,9 @@ static void FixupAngles2(Vector& v)
 //
 // ---------------------------------------------------------------------
 
-#define VEHICLE_STARTPITCH 60
-#define VEHICLE_MAXPITCH 200
-#define VEHICLE_MAXSPEED 1500 // approx max speed for sound pitch calculation
+constexpr float VEHICLE_STARTPITCH = 60;
+constexpr float VEHICLE_MAXPITCH = 200;
+constexpr float VEHICLE_MAXSPEED = 1500; // approx max speed for sound pitch calculation
 
 LINK_ENTITY_TO_CLASS(func_vehicle, CFuncVehicle);
 

From 245f0900f3a85d0c9632dbd3484ed2d62146692f Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 15:35:20 -0400
Subject: [PATCH 165/291] moved SF to effects.h enum

---
 src/game/server/hl/effects.h | 7 ++++++-
 src/game/server/world.cpp    | 5 +----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/game/server/hl/effects.h b/src/game/server/hl/effects.h
index 684300f2..b0312203 100644
--- a/src/game/server/hl/effects.h
+++ b/src/game/server/hl/effects.h
@@ -47,10 +47,15 @@ enum {
 	SF_MESSAGE_ALL = 0x0002,  // Send to all clients
 	SF_DETONATE = 0x0001,
 	SF_LOOP = 1,
-	SF_REMOVE_ON_FIRE = 2
+	SF_REMOVE_ON_FIRE = 2,
+	SF_DECAL_NOTINDEATHMATCH = 2048,
+	SF_WORLD_DARK = 0x0001,	  // Fade from black at startup
+	SF_WORLD_TITLE = 0x0002,	  // Display game title at startup
+	SF_WORLD_FORCETEAM = 0x0004 // Force teams
 
 };
 
+
 class CSprite : public CPointEntity
 {
 public:
diff --git a/src/game/server/world.cpp b/src/game/server/world.cpp
index b0902f75..719cfa43 100644
--- a/src/game/server/world.cpp
+++ b/src/game/server/world.cpp
@@ -102,7 +102,7 @@ BODY QUE
 ==============================================================================
 */
 
-#define SF_DECAL_NOTINDEATHMATCH 2048
+
 
 class CDecal : public CBaseEntity
 {
@@ -399,9 +399,6 @@ class CWorld : public CScriptedEnt
 
 LINK_ENTITY_TO_CLASS(worldspawn, CWorld);
 
-#define SF_WORLD_DARK 0x0001	  // Fade from black at startup
-#define SF_WORLD_TITLE 0x0002	  // Display game title at startup
-#define SF_WORLD_FORCETEAM 0x0004 // Force teams
 
 extern DLL_GLOBAL BOOL g_fGameOver;
 

From c212cd042593941a24d7b66da497504d9e7473a2 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 15:37:15 -0400
Subject: [PATCH 166/291] Moves enum in triggers to effects.h added include

---
 src/game/server/hl/effects.h | 23 +++++++++++++++++++++++
 src/game/server/triggers.cpp | 25 +++----------------------
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/game/server/hl/effects.h b/src/game/server/hl/effects.h
index b0312203..b70f3a66 100644
--- a/src/game/server/hl/effects.h
+++ b/src/game/server/hl/effects.h
@@ -56,6 +56,29 @@ enum {
 };
 
 
+enum {
+	SF_AUTO_FIREONCE = 0x0001,
+	SF_TRIGGER_PUSH_START_OFF = 2,		   //spawnflag that makes trigger_push spawn turned OFF
+	SF_TRIGGER_HURT_TARGETONCE = 1,	   // Only fire hurt target once
+	SF_TRIGGER_HURT_START_OFF = 2,		   //spawnflag that makes trigger_push spawn turned OFF
+	SF_TRIGGER_HURT_NO_CLIENTS = 8,	   //spawnflag that makes trigger_push spawn turned OFF
+	SF_TRIGGER_HURT_CLIENTONLYFIRE = 16,  // trigger hurt will only fire its target if it is hurting a client
+	SF_TRIGGER_HURT_CLIENTONLYTOUCH = 32, // only clients may touch this trigger.
+	SF_RELAY_FIREONCE = 0x0001,
+	SF_MULTIMAN_CLONE = 0x80000000,
+	SF_MULTIMAN_THREAD = 0x00000001,
+	SF_RENDER_MASKFX = (1 << 0),
+	SF_RENDER_MASKAMT = (1 << 1),
+	SF_RENDER_MASKMODE = (1 << 2),
+	SF_RENDER_MASKCOLOR = (1 << 3),
+	SF_CHANGELEVEL_USEONLY = 0x0002,
+	SF_ENDSECTION_USEONLY = 0x0001,
+	SF_CAMERA_PLAYER_POSITION = 1,
+	SF_CAMERA_PLAYER_TARGET = 2,
+	SF_CAMERA_PLAYER_TAKECONTROL = 4,
+	SF_CAMERA_PLAYER_ALL = 8
+};
+
 class CSprite : public CPointEntity
 {
 public:
diff --git a/src/game/server/triggers.cpp b/src/game/server/triggers.cpp
index 49416c43..f33451de 100644
--- a/src/game/server/triggers.cpp
+++ b/src/game/server/triggers.cpp
@@ -27,29 +27,10 @@
 #include "gamerules.h"
 #include "ms/angelscript/CAngelScriptManager.h" // For AngelScript map transitions
 
+#ifndef EFFECTS_H
+#include "effects.h"
+#endif // !EFFECTS_H
 
-enum {
-	SF_AUTO_FIREONCE = 0x0001,
-	SF_TRIGGER_PUSH_START_OFF = 2,		   //spawnflag that makes trigger_push spawn turned OFF
-	SF_TRIGGER_HURT_TARGETONCE = 1,	   // Only fire hurt target once
-	SF_TRIGGER_HURT_START_OFF = 2,		   //spawnflag that makes trigger_push spawn turned OFF
-	SF_TRIGGER_HURT_NO_CLIENTS = 8,	   //spawnflag that makes trigger_push spawn turned OFF
-	SF_TRIGGER_HURT_CLIENTONLYFIRE = 16,  // trigger hurt will only fire its target if it is hurting a client
-	SF_TRIGGER_HURT_CLIENTONLYTOUCH = 32, // only clients may touch this trigger.
-	SF_RELAY_FIREONCE = 0x0001,
-	SF_MULTIMAN_CLONE = 0x80000000,
-	SF_MULTIMAN_THREAD = 0x00000001,
-	SF_RENDER_MASKFX = (1 << 0),
-	SF_RENDER_MASKAMT = (1 << 1),
-	SF_RENDER_MASKMODE = (1 << 2),
-	SF_RENDER_MASKCOLOR = (1 << 3),
-	SF_CHANGELEVEL_USEONLY = 0x0002,
-	SF_ENDSECTION_USEONLY = 0x0001,
-	SF_CAMERA_PLAYER_POSITION = 1,
-	SF_CAMERA_PLAYER_TARGET = 2,
-	SF_CAMERA_PLAYER_TAKECONTROL = 4,
-	SF_CAMERA_PLAYER_ALL = 8
-};
 extern DLL_GLOBAL BOOL g_fGameOver;
 
 extern void SetMovedir(entvars_t *pev);

From f774fba4cdbe8418cfc10c451795525af4d75cd7 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 15:39:37 -0400
Subject: [PATCH 167/291] moved included and defines to top of file. added
 include guard.

---
 src/game/server/effects/mseffects.h | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/game/server/effects/mseffects.h b/src/game/server/effects/mseffects.h
index e4a67ce0..9e11e311 100644
--- a/src/game/server/effects/mseffects.h
+++ b/src/game/server/effects/mseffects.h
@@ -1,3 +1,16 @@
+
+
+
+
+#ifndef EFFECTS_H
+#include "effects.h"
+#endif // !EFFECTS_H
+
+
+
+constexpr int = SPRITE_TORCH = 1;
+constexpr int = TORCH_LIGHTS = 2;
+
 class CPortal : public CBaseEntity
 {
 public:
@@ -8,9 +21,6 @@ class CPortal : public CBaseEntity
 	void CloseSpawnPortal(void);
 };
 
-#define SPRITE_TORCH 1
-
-#include "effects.h"
 
 class CMSSprite : public CSprite
 {
@@ -22,7 +32,7 @@ class CMSSprite : public CSprite
 	void Think();
 };
 
-#define TORCH_LIGHTS 2
+
 
 class CTorchLight : public CBaseEntity
 {

From 90dcdaf9ec708a3d061c22b265b5579b00e2bcae Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 15:40:17 -0400
Subject: [PATCH 168/291] fixed syntax error

---
 src/game/server/effects/mseffects.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/game/server/effects/mseffects.h b/src/game/server/effects/mseffects.h
index 9e11e311..88b8baab 100644
--- a/src/game/server/effects/mseffects.h
+++ b/src/game/server/effects/mseffects.h
@@ -8,8 +8,8 @@
 
 
 
-constexpr int = SPRITE_TORCH = 1;
-constexpr int = TORCH_LIGHTS = 2;
+constexpr int SPRITE_TORCH = 1;
+constexpr int TORCH_LIGHTS = 2;
 
 class CPortal : public CBaseEntity
 {

From 1d4cdedbc05c972074aeb7b1ad16b46b11f677b7 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 15:57:56 -0400
Subject: [PATCH 169/291] fixed typo in var name. Changed REQPARAMS macro to
 function.

---
 src/game/server/effects/mseffects.cpp | 62 ++++++++++++++++++++-------
 src/game/server/effects/mseffects.h   |  5 ++-
 2 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/src/game/server/effects/mseffects.cpp b/src/game/server/effects/mseffects.cpp
index acf4ada8..6ff8a9d5 100644
--- a/src/game/server/effects/mseffects.cpp
+++ b/src/game/server/effects/mseffects.cpp
@@ -5,6 +5,9 @@
 #include "ms/angelscript/CAngelScriptManager.h" // For AngelScript map transitions
 //#include "monsters/bodyparts/bodyparts.h"
 
+#include "player.h"
+
+
 void UTIL_ScreenFadeBuild(ScreenFade &fade, const Vector &color, float fadeTime, float fadeHold, int alpha, int flags);
 void UTIL_ScreenFadeWrite(const ScreenFade &fade, CBaseEntity *pEntity);
 
@@ -172,7 +175,6 @@ void CTorchLight ::SUB_Remove()
 }
 LINK_ENTITY_TO_CLASS(ms_torchlight, CTorchLight);
 
-#include "player.h"
 
 class CChangePlayerSpeed : public CBaseDelay
 {
@@ -306,7 +308,7 @@ CEntGlow *CEntGlow::Create(CBaseEntity *pTarget, Vector Color, float Amount, flo
 	pGlowEnt->m_Target = pTarget;
 	pGlowEnt->m_Color = Color;
 	pGlowEnt->m_Amount = Amount;
-	pGlowEnt->m_CurentAmount = pGlowEnt->m_Amount;
+	pGlowEnt->m_CurrentAmount = pGlowEnt->m_Amount;
 	pGlowEnt->m_Duration = Duration;
 	pGlowEnt->m_FadeDuration = FadeDuration;
 	pGlowEnt->m_StartTime = gpGlobals->time;
@@ -340,7 +342,7 @@ void CEntGlow::SetGlow(bool On)
 		{
 			pEntity->pev->renderfx = kRenderFxGlowShell;
 			pEntity->pev->rendercolor = m_Color;
-			pEntity->pev->renderamt = m_CurentAmount;
+			pEntity->pev->renderamt = m_CurrentAmount;
 		}
 	}
 	else
@@ -381,7 +383,7 @@ void CEntGlow::Think()
 		if (FadeAmt > 1)
 			FadeAmt = 1;
 
-		m_CurentAmount = m_Amount * (1 - FadeAmt);
+		m_CurrentAmount = m_Amount * (1 - FadeAmt);
 		SetGlow(true);
 		pev->nextthink = gpGlobals->time; //MiB
 	}
@@ -458,12 +460,24 @@ class CMSChangeLevel : public CBaseEntity
 };
 LINK_ENTITY_TO_CLASS(mstrig_changelevel, CMSChangeLevel);
 
-#define REQPARAMS(a)                                                                                                 \
-	if (Params.size() < a)                                                                                           \
-	{                                                                                                                \
-		ALERT(at_console, "Script: %s, effect '%s' missing parameters!\n", m.ScriptFile.c_str(), Params[0].c_str()); \
-		return;                                                                                                      \
+
+bool REQPARAMS(msstring& ScriptFileName, msstringlist& Params, unsigned int count) {
+
+	if (Params.size() < count) {
+		ALERT(at_console, "Script: %s, effect '%s' missing parameters!\n", ScriptFileName.c_str(), Params[0].c_str());
+		return false;
 	}
+	else return true;
+}
+
+//#define REQPARAMS(a)                                                                                                 
+//	if (Params.size() < a)                                                                                           
+//	{                                                                                                                
+//		ALERT(at_console, "Script: %s, effect '%s' missing parameters!\n", m.ScriptFile.c_str(), Params[0].c_str()); 
+//		return;                                                                                                      
+//	}
+//
+
 
 void CScript::ScriptedEffect(msstringlist &Params)
 {
@@ -500,7 +514,11 @@ void CScript::ScriptedEffect(msstringlist &Params)
 
 	if (Params[0] == "beam")
 	{
-		REQPARAMS(4);
+		
+		if (!REQPARAMS(m.ScriptFile, Params, 4)) {
+			return;
+		}
+
 		int Type = 0;
 		if (Params[1] == "end")
 			Type = 0;
@@ -720,17 +738,23 @@ void CScript::ScriptedEffect(msstringlist &Params)
 		if (Params[1] == "gibs")
 		{
 			Type = 0;
-			REQPARAMS(9);
+			if (!REQPARAMS(m.ScriptFile, Params, 9)) {
+				return;
+			}
 		}
 		else if (Params[1] == "spray")
 		{
 			Type = 1;
-			REQPARAMS(8);
+			if (!REQPARAMS(m.ScriptFile, Params, 8)) {
+				return;
+			}
 		}
 		else if (Params[1] == "trail")
 		{
 			Type = 2;
-			REQPARAMS(10);
+			if (!REQPARAMS(m.ScriptFile, Params, 10)) {
+				return;
+			}
 		}
 
 		const char* ModelName = GetFullResourceName(Params[2]);
@@ -850,7 +874,9 @@ void CScript::ScriptedEffect(msstringlist &Params)
 	}
 	else if (Params[0] == "screenshake")
 	{
-		REQPARAMS(6);
+		if (!REQPARAMS(m.ScriptFile, Params, 6)) {
+			return;
+		}
 
 		Vector Origin = StringToVec(Params[1]);
 		float Amplitude = atof(Params[2]);
@@ -864,7 +890,9 @@ void CScript::ScriptedEffect(msstringlist &Params)
 	{
 		//Thothie APR2016_08 - allow screen shake vs. single client
 		//effect screenshake_one <target> <amp> <freq> <dur>
-		REQPARAMS(5);
+		if (!REQPARAMS(m.ScriptFile, Params, 5)) {
+			return;
+		}
 		CBaseEntity* pEntity = (m.pScriptedEnt ? m.pScriptedEnt->RetrieveEntity(Params[1]) : NULL);
 		if (pEntity && pEntity->IsPlayer())
 		{
@@ -909,7 +937,9 @@ void CScript::ScriptedEffect(msstringlist &Params)
 	}
 	else if (Params[0] == "glow")
 	{
-		REQPARAMS(6);
+		if (!REQPARAMS(m.ScriptFile, Params, 6)) {
+			return;
+		}
 
 		CBaseEntity *pTarget = m.pScriptedEnt->RetrieveEntity(Params[1]);
 		if (!pTarget)
diff --git a/src/game/server/effects/mseffects.h b/src/game/server/effects/mseffects.h
index 88b8baab..8d402909 100644
--- a/src/game/server/effects/mseffects.h
+++ b/src/game/server/effects/mseffects.h
@@ -57,9 +57,12 @@ class CEntGlow : public CBaseEntity
 	void SetGlow(bool On);
 
 	entityinfo_t m_Target;
-	float m_Amount, m_CurentAmount;
+	float m_Amount, m_CurrentAmount;
 	float m_StartTime;
 	float m_Duration;
 	float m_FadeDuration;
 	Vector m_Color;
 };
+
+
+bool REQPARAMS(msstring& ScriptFileName, msstringlist& Params, unsigned int count);
\ No newline at end of file

From 4909073745133c1258c3d64e533b5a31c04c35b0 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 16:00:59 -0400
Subject: [PATCH 170/291] changed to constexpr

---
 src/game/server/fn/FNSharedDefs.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/server/fn/FNSharedDefs.cpp b/src/game/server/fn/FNSharedDefs.cpp
index 084900c6..f8e493fc 100644
--- a/src/game/server/fn/FNSharedDefs.cpp
+++ b/src/game/server/fn/FNSharedDefs.cpp
@@ -20,7 +20,7 @@
 #include "LoadCharacterReq.h"
 #include "DeleteCharacterReq.h"
 
-#define STRING_BUFFER 1024
+constexpr unsigned int STRING_BUFFER = 1024;
 
 // AsyncSendRequest does not make use the connection pooling.
 // Frequent requests should make use the RequestManager to take advantage of

From b715c1672a26d3de135a513f8f65a3a2d2aa1c16 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 16:07:51 -0400
Subject: [PATCH 171/291] changed defines to constexpr

---
 .../server/gamerules/multiplay_gamerules.cpp  | 22 +++++++++----------
 src/game/server/gamerules/teams.h             |  2 +-
 src/game/server/monsters/msmonster.h          |  3 ++-
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/game/server/gamerules/multiplay_gamerules.cpp b/src/game/server/gamerules/multiplay_gamerules.cpp
index 661a5ec0..9c570dce 100644
--- a/src/game/server/gamerules/multiplay_gamerules.cpp
+++ b/src/game/server/gamerules/multiplay_gamerules.cpp
@@ -51,12 +51,12 @@ extern int gmsgMOTD;
 bool CheckBanned(const char* SteamID );
 
 //float g_TimeTryValidate = 0.0f;
-#define VALIDATE_DELAY (60 * 30)// 30 mins
+constexpr int VALIDATE_DELAY = (60 * 30);// 30 mins
 float g_ServerResetTimer = 0.0f;
 
-#define ITEM_RESPAWN_TIME	30
-#define WEAPON_RESPAWN_TIME	20
-#define AMMO_RESPAWN_TIME	20
+constexpr int ITEM_RESPAWN_TIME	= 30;
+constexpr int WEAPON_RESPAWN_TIME = 20;
+constexpr int AMMO_RESPAWN_TIME = 20;
 
 CVoiceGameMgr	g_VoiceGameMgr;
 
@@ -156,8 +156,7 @@ void CHalfLifeMultiplay::RefreshSkillData( void )
 }
 
 // longest the intermission can last, in seconds
-#define MAX_INTERMISSION_TIME		120
-
+constexpr int MAX_INTERMISSION_TIME = 120;
 //Master Sword
 //bool CheckData( );
 //------------
@@ -775,7 +774,7 @@ float CHalfLifeMultiplay::FlWeaponRespawnTime( CBasePlayerItem *pWeapon )
 
 // when we are within this close to running out of entities,  items 
 // marked with the ITEM_FLAG_LIMITINWORLD will delay their respawn
-#define ENTITY_INTOLERANCE 100
+constexpr int ENTITY_INTOLERANCE = 100;
 
 //=========================================================
 // FlWeaponRespawnTime - Returns 0 if the weapon can respawn 
@@ -999,7 +998,7 @@ BOOL CHalfLifeMultiplay::FAllowMonsters( void )
 
 //=========================================================
 //======== CHalfLifeMultiplay private functions ===========
-#define INTERMISSION_TIME 6
+constexpr int INTERMISSION_TIME = 6;
 
 void CHalfLifeMultiplay::GoToIntermission( void )
 {
@@ -1013,8 +1012,7 @@ void CHalfLifeMultiplay::GoToIntermission( void )
 	g_fGameOver = true;
 	m_iEndIntermissionButtonHit = false;
 }
-
-#define MAX_RULE_BUFFER 1024
+constexpr int MAX_RULE_BUFFER = 1024;
 
 typedef struct mapcycle_item_s
 {
@@ -1536,8 +1534,8 @@ void CHalfLifeMultiplay :: ChangeLevel( void )
 	}
 }
 
-#define MAX_MOTD_CHUNK	  60
-#define MAX_MOTD_LENGTH   (MAX_MOTD_CHUNK * 4)
+constexpr int MAX_MOTD_CHUNK = 60;
+constexpr int MAX_MOTD_LENGTH = (MAX_MOTD_CHUNK * 4);
 
 void CHalfLifeMultiplay :: SendMOTDToClient( edict_t *client )
 {
diff --git a/src/game/server/gamerules/teams.h b/src/game/server/gamerules/teams.h
index 4950a482..9d3906f1 100644
--- a/src/game/server/gamerules/teams.h
+++ b/src/game/server/gamerules/teams.h
@@ -1,7 +1,7 @@
 #ifndef TEAM_H
 #define TEAM_H
 
-#define MAX_TEAMNAME_LEN 12
+constexpr int MAX_TEAMNAME_LEN = 12;
 
 #ifdef VALVE_DLL
 #ifdef CBASE_H
diff --git a/src/game/server/monsters/msmonster.h b/src/game/server/monsters/msmonster.h
index 815136cc..a2f5a78b 100644
--- a/src/game/server/monsters/msmonster.h
+++ b/src/game/server/monsters/msmonster.h
@@ -78,7 +78,8 @@ enum speech_type
 	SPEECH_LOCAL,
 	SPEECH_PARTY
 };
-#define SPEECH_LOCAL_RANGE 300
+
+constexpr float SPEECH_LOCAL_RANGE = 300;
 
 enum gender_e
 {

From d67b6da633ff59b5a20d967420e9d0959e3ab4cc Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 16:17:39 -0400
Subject: [PATCH 172/291] changed defines to enum. Added include for studio.h
 removed redefition of studio_looping

---
 src/game/server/hl/animation.h    | 14 ++++++++++----
 src/game/server/hl/monsterevent.h | 19 +++++++++++--------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/game/server/hl/animation.h b/src/game/server/hl/animation.h
index 591cff15..dd0932f3 100644
--- a/src/game/server/hl/animation.h
+++ b/src/game/server/hl/animation.h
@@ -12,10 +12,19 @@
 *   without written permission from Valve LLC.
 *
 ****/
+
+#ifndef STUDIO_H
+#include "studio.h"
+#endif
+
 #ifndef ANIMATION_H
 #define ANIMATION_H
 
-#define ACTIVITY_NOT_AVAILABLE -1
+
+
+enum {
+	ACTIVITY_NOT_AVAILABLE = -1
+};
 
 #ifndef MONSTEREVENT_H
 #include "monsterevent.h"
@@ -41,7 +50,4 @@ int GetBodygroup(void *pmodel, entvars_t *pev, int iGroup);
 int GetAnimationEvent(void *pmodel, entvars_t *pev, MonsterEvent_t *pMonsterEvent, float flStart, float flEnd, unsigned int index);
 int ExtractBbox(void *pmodel, int sequence, float *mins, float *maxs);
 
-// From /engine/studio.h
-#define STUDIO_LOOPING 0x0001
-
 #endif //ANIMATION_H
diff --git a/src/game/server/hl/monsterevent.h b/src/game/server/hl/monsterevent.h
index 78d396fc..b9b637dd 100644
--- a/src/game/server/hl/monsterevent.h
+++ b/src/game/server/hl/monsterevent.h
@@ -21,14 +21,17 @@ typedef struct
 	char *options;
 } MonsterEvent_t;
 
-#define EVENT_SPECIFIC 0
-#define EVENT_SCRIPTED 1000
-#define EVENT_SHARED 2000
-#define EVENT_CLIENT 5000
+enum {
+	EVENT_SPECIFIC = 0,
+	EVENT_SCRIPTED = 1000,
+	EVENT_SHARED = 2000,
+	EVENT_CLIENT = 5000
+};
 
-#define MONSTER_EVENT_BODYDROP_LIGHT 2001
-#define MONSTER_EVENT_BODYDROP_HEAVY 2002
-
-#define MONSTER_EVENT_SWISHSOUND 2010
+enum {
+	MONSTER_EVENT_BODYDROP_LIGHT = 2001,
+	MONSTER_EVENT_BODYDROP_HEAVY = 2002,
+	MONSTER_EVENT_SWISHSOUND = 2010
+};
 
 #endif // MONSTEREVENT_H

From e231691d23a8adc30fab3b3ecb2eb6b6c3194809 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 16:17:57 -0400
Subject: [PATCH 173/291] removed whitespace

---
 src/game/server/hl/animation.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/game/server/hl/animation.h b/src/game/server/hl/animation.h
index dd0932f3..cead84df 100644
--- a/src/game/server/hl/animation.h
+++ b/src/game/server/hl/animation.h
@@ -20,8 +20,6 @@
 #ifndef ANIMATION_H
 #define ANIMATION_H
 
-
-
 enum {
 	ACTIVITY_NOT_AVAILABLE = -1
 };

From 9ede6edc95752f8c6710bb31ba36d751b94cc399 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 16:19:31 -0400
Subject: [PATCH 174/291] moved define to enum in door.h

---
 src/game/server/hl/buttons.cpp | 7 -------
 src/game/server/hl/doors.h     | 9 ++++++++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/game/server/hl/buttons.cpp b/src/game/server/hl/buttons.cpp
index 1b97e9ab..5716e21d 100644
--- a/src/game/server/hl/buttons.cpp
+++ b/src/game/server/hl/buttons.cpp
@@ -24,13 +24,6 @@
 #include "saverestore.h"
 #include "doors.h"
 
-#define SF_BUTTON_DONTMOVE 1
-#define SF_ROTBUTTON_NOTSOLID 1
-#define SF_BUTTON_TOGGLE 32		  // button stays pushed until reactivated
-#define SF_BUTTON_SPARK_IF_OFF 64 // button sparks in OFF state
-#define SF_BUTTON_TOUCH_ONLY 256  // button only fires as a result of USE key.
-
-#define SF_GLOBAL_SET 1 // Set global state to initial state on spawn
 
 class CEnvGlobal : public CPointEntity
 {
diff --git a/src/game/server/hl/doors.h b/src/game/server/hl/doors.h
index 134d22ec..776fe4be 100644
--- a/src/game/server/hl/doors.h
+++ b/src/game/server/hl/doors.h
@@ -42,6 +42,13 @@ enum {
 	SF_CONVEYOR_VISUAL = 0x0001,
 	SF_CONVEYOR_NOTSOLID = 0x0002,
 	SF_CONVEYOR_TOGGLE = 0x0004, //Thothie AUG2011_30 toggle conveyors
-	SF_NORESPAWN = (1 << 30) // !!!set this bit on guns and stuff that should never respawn.
+	SF_NORESPAWN = (1 << 30), // !!!set this bit on guns and stuff that should never respawn.
+	SF_GLOBAL_SET = 1,
+	SF_BUTTON_DONTMOVE = 1,
+	SF_ROTBUTTON_NOTSOLID = 1,
+	SF_BUTTON_TOGGLE = 32,		  // button stays pushed until reactivated
+	SF_BUTTON_SPARK_IF_OFF = 64, // button sparks in OFF state
+	SF_BUTTON_TOUCH_ONLY = 256  // button only fires as a result of USE key.
+
 };
 

From 0802f1841f017089992cd3d65b7f9361388517b4 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 16:25:34 -0400
Subject: [PATCH 175/291] changed defines to enums. moved to door.h groups
 enums into more logical sections.

---
 src/game/server/hl/buttons.cpp |  7 +-----
 src/game/server/hl/doors.h     | 39 ++++++++++++++++++++++++----------
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/game/server/hl/buttons.cpp b/src/game/server/hl/buttons.cpp
index 5716e21d..729a13ed 100644
--- a/src/game/server/hl/buttons.cpp
+++ b/src/game/server/hl/buttons.cpp
@@ -150,8 +150,6 @@ void CMultiSource::KeyValue(KeyValueData *pkvd)
 		CPointEntity::KeyValue(pkvd);
 }
 
-#define SF_MULTI_INIT 1
-
 void CMultiSource::Spawn()
 {
 	// set up think for later registration
@@ -951,7 +949,7 @@ void CRotButton::Spawn(void)
 // This will disable use and make the button solid
 // rotating buttons were made SOLID_NOT by default since their were some
 // collision problems with them...
-#define SF_MOMENTARY_DOOR 0x0001
+
 
 class CMomentaryRotButton : public CBaseToggle
 {
@@ -1296,9 +1294,6 @@ void EXPORT CEnvSpark::SparkStop(CBaseEntity *pActivator, CBaseEntity *pCaller,
 	SetThink(NULL);
 }
 
-#define SF_BTARGET_USE 0x0001
-#define SF_BTARGET_ON 0x0002
-
 class CButtonTarget : public CBaseEntity
 {
 public:
diff --git a/src/game/server/hl/doors.h b/src/game/server/hl/doors.h
index 776fe4be..34716b27 100644
--- a/src/game/server/hl/doors.h
+++ b/src/game/server/hl/doors.h
@@ -17,21 +17,39 @@
 #endif
 
 // doors
+
+enum {
+	SF_GLOBAL_SET = 1,
+	SF_MULTI_INIT = 1,
+	SF_MOMENTARY_DOOR = 0x0001
+};
+
 enum {
 	SF_DOOR_ROTATE_Y = 0,
 	SF_DOOR_START_OPEN = 1,
 	SF_DOOR_ROTATE_BACKWARDS = 2,
-	SF_DOOR_PASSABLE =  8,
+	SF_DOOR_PASSABLE = 8,
 	SF_DOOR_ONEWAY = 16,
 	SF_DOOR_NO_AUTO_RETURN = 32,
 	SF_DOOR_ROTATE_Z = 64,
 	SF_DOOR_ROTATE_X = 128,
 	SF_DOOR_USE_ONLY = 256,    // door must be opened by player's use button.
-	SF_ITEM_USE_ONLY = 256, //  ITEM_USE_ONLY = BUTTON_USE_ONLY = DOOR_USE_ONLY!!!
-	SF_BUTTON_USE_ONLY = 256,
-	SF_DOOR_NOMONSTERS = 512 ,  // Monster can't open
+	SF_DOOR_NOMONSTERS = 512,  // Monster can't open
 	SF_DOOR_UNBLOCKABLE = 1024, //Thothie AUG2011_29 - make door unstoppable
 	SF_DOOR_SILENT = 0x80000000,
+
+};
+
+enum {
+	SF_CONVEYOR_VISUAL = 0x0001,
+	SF_CONVEYOR_NOTSOLID = 0x0002,
+	SF_CONVEYOR_TOGGLE = 0x0004, //Thothie AUG2011_30 toggle conveyors
+};
+
+enum {
+
+	SF_ITEM_USE_ONLY = 256, //  ITEM_USE_ONLY = BUTTON_USE_ONLY = DOOR_USE_ONLY!!!
+	SF_BUTTON_USE_ONLY = 256,
 	SF_PLAYERCLIP_START_OFF = 0x0001,
 	SF_WALL_START_OFF = 0x0001,
 	SF_MONSTERCLIP_START_OFF = 0x0001,
@@ -39,16 +57,15 @@ enum {
 	SF_BRUSH_ACCDCC = 16,		 // brush should accelerate and decelerate when toggled
 	SF_BRUSH_HURT = 32,		 // rotating brush that inflicts pain based on rotation speed
 	SF_ROTATING_NOT_SOLID = 64, // some special rotating objects are not solid.
-	SF_CONVEYOR_VISUAL = 0x0001,
-	SF_CONVEYOR_NOTSOLID = 0x0002,
-	SF_CONVEYOR_TOGGLE = 0x0004, //Thothie AUG2011_30 toggle conveyors
 	SF_NORESPAWN = (1 << 30), // !!!set this bit on guns and stuff that should never respawn.
-	SF_GLOBAL_SET = 1,
+};
+
+enum {
 	SF_BUTTON_DONTMOVE = 1,
 	SF_ROTBUTTON_NOTSOLID = 1,
 	SF_BUTTON_TOGGLE = 32,		  // button stays pushed until reactivated
 	SF_BUTTON_SPARK_IF_OFF = 64, // button sparks in OFF state
-	SF_BUTTON_TOUCH_ONLY = 256  // button only fires as a result of USE key.
-
+	SF_BUTTON_TOUCH_ONLY = 256,  // button only fires as a result of USE key.
+	SF_BTARGET_USE = 0x0001,
+	SF_BTARGET_ON = 0x0002
 };
-

From 021d3f5e15006ef7223d11113d50a0c00e60bfb4 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 21:51:24 -0400
Subject: [PATCH 176/291] changed defines to enum,s

---
 src/game/server/hl/buttons.cpp |   2 +
 src/game/server/hl/cbase.h     |   4 ++
 src/game/server/hl/monsters.h  | 101 +++++++++++++++++++--------------
 3 files changed, 64 insertions(+), 43 deletions(-)

diff --git a/src/game/server/hl/buttons.cpp b/src/game/server/hl/buttons.cpp
index 729a13ed..3f5ce2b9 100644
--- a/src/game/server/hl/buttons.cpp
+++ b/src/game/server/hl/buttons.cpp
@@ -766,6 +766,8 @@ void CBaseButton::ButtonActivate()
 	ASSERT(m_toggle_state == TS_AT_BOTTOM);
 	m_toggle_state = TS_GOING_UP;
 
+
+
 	SetMoveDone(&CBaseButton::TriggerAndWait);
 	if (!m_fRotating)
 		LinearMove(m_vecPosition2, pev->speed);
diff --git a/src/game/server/hl/cbase.h b/src/game/server/hl/cbase.h
index f6cdd8f3..2f519e67 100644
--- a/src/game/server/hl/cbase.h
+++ b/src/game/server/hl/cbase.h
@@ -843,8 +843,12 @@ class CBaseToggle : public CBaseAnimating
 						// the button will be allowed to operate. Otherwise, it will be
 						// deactivated.
 };
+
+
 #define SetMoveDone(a) m_pfnCallWhenMoveDone = static_cast<void (CBaseToggle::*)(void)>(a)
 
+
+
 // people gib if their health is <= this at the time of death
 constexpr int GIB_HEALTH_VALUE = -30;
 constexpr int ROUTE_SIZE = 8;	  // how many waypoints a monster can store at one time
diff --git a/src/game/server/hl/monsters.h b/src/game/server/hl/monsters.h
index f2e64b1d..38626303 100644
--- a/src/game/server/hl/monsters.h
+++ b/src/game/server/hl/monsters.h
@@ -25,11 +25,15 @@
 */
 
 // CHECKLOCALMOVE result types
-#define LOCALMOVE_INVALID 0					 // move is not possible
-#define LOCALMOVE_INVALID_DONT_TRIANGULATE 1 // move is not possible, don't try to triangulate
-#define LOCALMOVE_VALID 2					 // move is possible
 
-// Hit Group standards
+enum localmove_e {
+	LOCALMOVE_INVALID = 0,					 // move is not possible
+	LOCALMOVE_INVALID_DONT_TRIANGULATE = 1,	 // move is not possible, don't try to triangulate
+	LOCALMOVE_VALID = 2						 // move is possible
+};
+
+enum hitgroup_e {
+	// Hit Group standards
 #define HITGROUP_GENERIC 0
 #define HITGROUP_HEAD 1
 #define HITGROUP_CHEST 2
@@ -38,32 +42,36 @@
 #define HITGROUP_RIGHTARM 5
 #define HITGROUP_LEFTLEG 6
 #define HITGROUP_RIGHTLEG 7
+};
 
-// Monster Spawnflags
-#define SF_MONSTER_WAIT_TILL_SEEN 1 // spawnflag that makes monsters wait until player can see them before attacking.
-#define SF_MONSTER_GAG 2			// no idle noises from this monster
-#define SF_MONSTER_HITMONSTERCLIP 4
-//										8
-#define SF_MONSTER_PRISONER 16 // monster won't attack anyone, no one will attacke him.
+enum monster_sf_e {
+	// Monster Spawnflags
+	 SF_MONSTER_WAIT_TILL_SEEN = 1, // spawnflag that makes monsters wait until player can see them before attacking.
+	 SF_MONSTER_GAG = 2,			// no idle noises from this monster
+	 SF_MONSTER_HITMONSTERCLIP = 4,
+//								8
+	SF_MONSTER_PRISONER = 16, // monster won't attack anyone, no one will attacke him.
 //										32
 //										64
-#define SF_MONSTER_WAIT_FOR_SCRIPT 128 //spawnflag that makes monsters wait to check for attacking until the script is done or they've been attacked
-#define SF_MONSTER_PREDISASTER 256	   //this is a predisaster scientist or barney. Influences how they speak.
-#define SF_MONSTER_FADECORPSE 512	   // Fade out corpse after death
-#define SF_MONSTER_FALL_TO_GROUND 0x80000000
+	SF_MONSTER_WAIT_FOR_SCRIPT = 128, //spawnflag that makes monsters wait to check for attacking until the script is done or they've been attacked
+	SF_MONSTER_PREDISASTER = 256,	   //this is a predisaster scientist or barney. Influences how they speak.
+	SF_MONSTER_FADECORPSE = 512,	   // Fade out corpse after death
+	SF_MONSTER_FALL_TO_GROUND = 0x80000000,
 
 // specialty spawnflags
-#define SF_MONSTER_TURRET_AUTOACTIVATE 32
-#define SF_MONSTER_TURRET_STARTINACTIVE 64
-#define SF_MONSTER_WAIT_UNTIL_PROVOKED 64 // don't attack the player unless provoked
 
-// MoveToOrigin stuff
-#define MOVE_START_TURN_DIST 64 // when this far away from moveGoal, start turning to face next goal
-#define MOVE_STUCK_DIST 32		// if a monster can't step this far, it is stuck.
+	SF_MONSTER_TURRET_AUTOACTIVATE = 32,
+	SF_MONSTER_TURRET_STARTINACTIVE = 64,
+	SF_MONSTER_WAIT_UNTIL_PROVOKED = 64 // don't attack the player unless provoked
+};
 
-// MoveToOrigin stuff
-#define MOVE_NORMAL 0 // normal move in the direction monster is facing
-#define MOVE_STRAFE 1 // moves in direction specified, no matter which way monster is facing
+enum move_origin_e {
+	// MoveToOrigin stuff
+	MOVE_NORMAL = 0 ,// normal move in the direction monster is facing
+	MOVE_STRAFE = 1 ,// moves in direction specified, no matter which way monster is facing
+	MOVE_STUCK_DIST = 32,		// if a monster can't step this far, it is stuck.
+	MOVE_START_TURN_DIST = 64 // when this far away from moveGoal, start turning to face next goal
+};
 
 // spawn flags 256 and above are already taken by the engine
 extern void UTIL_MoveToOrigin(edict_t *pent, const Vector &vecGoal, float flDist, int iMoveType);
@@ -81,31 +89,38 @@ BOOL FBoxVisible(entvars_t *pevLooker, entvars_t *pevTarget);
 BOOL FBoxVisible(entvars_t *pevLooker, entvars_t *pevTarget, Vector &vecTargetOrigin, float flSize = 0.0);
 
 // monster to monster relationship types
-#define R_AL -2 // (ALLY) pals. Good alternative to R_NO when applicable.
-#define R_FR -1 // (FEAR)will run
-#define R_NO 0	// (NO RELATIONSHIP) disregard
-#define R_DL 1	// (DISLIKE) will attack
-#define R_HT 2	// (HATE)will attack this character instead of any visible DISLIKEd characters
-#define R_NM 3	// (NEMESIS)  A monster Will ALWAYS attack its nemsis, no matter what
+
+enum monster_relationship_e {
+	R_AL = -2,	// (ALLY) pals. Good alternative to R_NO when applicable.
+	R_FR = -1,	// (FEAR)will run
+	R_NO = 0,	// (NO RELATIONSHIP) disregard
+	R_DL = 1,	// (DISLIKE) will attack
+	R_HT = 2,	// (HATE)will attack this character instead of any visible DISLIKEd characters
+	R_NM = 3	// (NEMESIS)  A monster Will ALWAYS attack its nemsis, no matter what
+};
 
 // these bits represent the monster's memory
-#define MEMORY_CLEAR 0
-#define bits_MEMORY_PROVOKED (1 << 0)	   // right now only used for houndeyes.
-#define bits_MEMORY_INCOVER (1 << 1)	   // monster knows it is in a covered position.
-#define bits_MEMORY_SUSPICIOUS (1 << 2)	   // Ally is suspicious of the player, and will move to provoked more easily
-#define bits_MEMORY_PATH_FINISHED (1 << 3) // Finished monster path (just used by big momma for now)
-#define bits_MEMORY_ON_PATH (1 << 4)	   // Moving on a path
-#define bits_MEMORY_MOVE_FAILED (1 << 5)   // Movement has already failed
-#define bits_MEMORY_FLINCHED (1 << 6)	   // Has already flinched
-#define bits_MEMORY_KILLED (1 << 7)		   // HACKHACK -- remember that I've already called my Killed()
-#define bits_MEMORY_CUSTOM4 (1 << 28)	   // Monster-specific memory
-#define bits_MEMORY_CUSTOM3 (1 << 29)	   // Monster-specific memory
-#define bits_MEMORY_CUSTOM2 (1 << 30)	   // Monster-specific memory
-#define bits_MEMORY_CUSTOM1 (1 << 31)	   // Monster-specific memory
 
+enum monster_bits_e {
+
+	MEMORY_CLEAR = 0,
+	bits_MEMORY_PROVOKED = (1 << 0),	  // right now only used for houndeyes.
+	bits_MEMORY_INCOVER = (1 << 1),		  // monster knows it is in a covered position.
+	bits_MEMORY_SUSPICIOUS = (1 << 2),	  // Ally is suspicious of the player, and will move to provoked more easily
+	bits_MEMORY_PATH_FINISHED = (1 << 3), // Finished monster path (just used by big momma for now)
+	bits_MEMORY_ON_PATH = (1 << 4),		  // Moving on a path
+	bits_MEMORY_MOVE_FAILED = (1 << 5),	  // Movement has already failed
+	bits_MEMORY_FLINCHED = (1 << 6),	  // Has already flinched
+	bits_MEMORY_KILLED = (1 << 7),		  // HACKHACK -- remember that I've already called my Killed()
+	bits_MEMORY_CUSTOM4 = (1 << 28),	  // Monster-specific memory
+	bits_MEMORY_CUSTOM3 = (1 << 29),	  // Monster-specific memory
+	bits_MEMORY_CUSTOM2 = (1 << 30),	  // Monster-specific memory
+	bits_MEMORY_CUSTOM1 = (1 << 31),	  // Monster-specific memory
+
+};
 // trigger conditions for scripted AI
 // these MUST match the CHOICES interface in halflife.fgd for the base monster
-enum
+enum aitrigger_e
 {
 	AITRIGGER_NONE = 0,
 	AITRIGGER_SEEPLAYER_ANGRY_AT_PLAYER,

From 3460fa98e877fe72b83d0b8ccf8cbc3c91a73708 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 21:53:35 -0400
Subject: [PATCH 177/291] changed defines to enum

---
 src/game/server/hl/scripted.h | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/game/server/hl/scripted.h b/src/game/server/hl/scripted.h
index 064da13f..b1973de3 100644
--- a/src/game/server/hl/scripted.h
+++ b/src/game/server/hl/scripted.h
@@ -19,16 +19,17 @@
 #include "scriptevent.h"
 #endif
 
-#define SF_SCRIPT_WAITTILLSEEN 1
-#define SF_SCRIPT_EXITAGITATED 2
-#define SF_SCRIPT_REPEATABLE 4
-#define SF_SCRIPT_LEAVECORPSE 8
-//#define SF_SCRIPT_INTERPOLATE		16 // don't use, old bug
-#define SF_SCRIPT_NOINTERRUPT 32
-#define SF_SCRIPT_OVERRIDESTATE 64
-#define SF_SCRIPT_NOSCRIPTMOVEMENT 128
-
-#define SCRIPT_BREAK_CONDITIONS (bits_COND_LIGHT_DAMAGE | bits_COND_HEAVY_DAMAGE)
+enum script_conditions_e {
+	SF_SCRIPT_WAITTILLSEEN = 1,
+	SF_SCRIPT_EXITAGITATED = 2,
+	SF_SCRIPT_REPEATABLE = 4,
+	SF_SCRIPT_LEAVECORPSE = 8,
+	//SF_SCRIPT_INTERPOLATE = 16, // don't use, old bug
+	SF_SCRIPT_NOINTERRUPT = 32,
+	SF_SCRIPT_OVERRIDESTATE = 64,
+	SF_SCRIPT_NOSCRIPTMOVEMENT = 128,
+	SCRIPT_BREAK_CONDITIONS = (bits_COND_LIGHT_DAMAGE | bits_COND_HEAVY_DAMAGE)
+};
 
 enum SS_INTERRUPT
 {
@@ -40,8 +41,11 @@ enum SS_INTERRUPT
 // when a monster finishes an AI scripted sequence, we can choose
 // a schedule to place them in. These defines are the aliases to
 // resolve worldcraft input to real schedules (sjb)
-#define SCRIPT_FINISHSCHED_DEFAULT 0
-#define SCRIPT_FINISHSCHED_AMBUSH 1
+
+enum script_finishedsched_e {
+	SCRIPT_FINISHSCHED_DEFAULT = 0,
+	SCRIPT_FINISHSCHED_AMBUSH = 1
+};
 
 class CCineMonster : public CBaseMonster
 {

From f6c387328c7d54e1b5ca8e16804d921edc765a94 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 21:56:16 -0400
Subject: [PATCH 178/291] moved consts to header.

---
 src/game/server/hl/doors.cpp | 4 ----
 src/game/server/hl/doors.h   | 5 +++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/game/server/hl/doors.cpp b/src/game/server/hl/doors.cpp
index 7b490e6f..1120a86a 100644
--- a/src/game/server/hl/doors.cpp
+++ b/src/game/server/hl/doors.cpp
@@ -90,10 +90,6 @@ TYPEDESCRIPTION CBaseDoor::m_SaveData[] =
 
 IMPLEMENT_SAVERESTORE(CBaseDoor, CBaseToggle);
 
-#define DOOR_SENTENCEWAIT 6
-#define DOOR_SOUNDWAIT 3
-#define BUTTON_SOUNDWAIT 0.5
-
 // play door or button locked or unlocked sounds.
 // pass in pointer to valid locksound struct.
 // if flocked is true, play 'door is locked' sound,
diff --git a/src/game/server/hl/doors.h b/src/game/server/hl/doors.h
index 34716b27..e9463d59 100644
--- a/src/game/server/hl/doors.h
+++ b/src/game/server/hl/doors.h
@@ -18,6 +18,11 @@
 
 // doors
 
+constexpr int DOOR_SENTENCEWAIT = 6;
+constexpr int DOOR_SOUNDWAIT = 3;
+constexpr float BUTTON_SOUNDWAIT = 0.5;
+
+
 enum {
 	SF_GLOBAL_SET = 1,
 	SF_MULTI_INIT = 1,

From 689f7038bd9af4dbb3c924f19d4368252471424f Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 21:58:42 -0400
Subject: [PATCH 179/291] changed costexpr to enum

---
 src/game/server/hl/explode.h | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/game/server/hl/explode.h b/src/game/server/hl/explode.h
index 95f183f4..77fabe9c 100644
--- a/src/game/server/hl/explode.h
+++ b/src/game/server/hl/explode.h
@@ -15,13 +15,14 @@
 #ifndef EXPLODE_H
 #define EXPLODE_H
 
-#define SF_ENVEXPLOSION_NODAMAGE (1 << 0)   // when set, ENV_EXPLOSION will not actually inflict damage
-#define SF_ENVEXPLOSION_REPEATABLE (1 << 1) // can this entity be refired?
-#define SF_ENVEXPLOSION_NOFIREBALL (1 << 2) // don't draw the fireball
-#define SF_ENVEXPLOSION_NOSMOKE (1 << 3)    // don't draw the smoke
-#define SF_ENVEXPLOSION_NODECAL (1 << 4)    // don't make a scorch mark
-#define SF_ENVEXPLOSION_NOSPARKS (1 << 5)   // don't make a scorch mark
-
+enum sf_envexplosion_e {
+	SF_ENVEXPLOSION_NODAMAGE = (1 << 0),   // when set, ENV_EXPLOSION will not actually inflict damage
+	SF_ENVEXPLOSION_REPEATABLE = (1 << 1), // can this entity be refired?
+	SF_ENVEXPLOSION_NOFIREBALL = (1 << 2), // don't draw the fireball
+	SF_ENVEXPLOSION_NOSMOKE = (1 << 3),    // don't draw the smoke
+	SF_ENVEXPLOSION_NODECAL = (1 << 4),    // don't make a scorch mark
+	SF_ENVEXPLOSION_NOSPARKS = (1 << 5)   // don't make a scorch mark
+};
 //extern DLL_GLOBAL	short	g_sModelIndexFireball;
 //extern DLL_GLOBAL	short	g_sModelIndexSmoke;
 

From 05135de3ac2b4beb07e21823f5619911df476bbe Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 22:02:06 -0400
Subject: [PATCH 180/291] changed define to constexpr

---
 src/game/server/hl/func_tank.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/game/server/hl/func_tank.cpp b/src/game/server/hl/func_tank.cpp
index 0b0f65ff..460896a9 100644
--- a/src/game/server/hl/func_tank.cpp
+++ b/src/game/server/hl/func_tank.cpp
@@ -21,13 +21,15 @@
 
 #include "player.h"
 
-#define SF_TANK_ACTIVE 0x0001
-#define SF_TANK_PLAYER 0x0002
-#define SF_TANK_HUMANS 0x0004
-#define SF_TANK_ALIENS 0x0008
-#define SF_TANK_LINEOFSIGHT 0x0010
-#define SF_TANK_CANCONTROL 0x0020
-#define SF_TANK_SOUNDON 0x8000
+enum sf_tank_e {
+	SF_TANK_ACTIVE = 0x0001,
+	SF_TANK_PLAYER = 0x0002,
+	SF_TANK_HUMANS = 0x0004,
+	SF_TANK_ALIENS = 0x0008,
+	SF_TANK_LINEOFSIGHT = 0x0010,
+	SF_TANK_CANCONTROL = 0x0020,
+	SF_TANK_SOUNDON = 0x8000,
+};
 
 enum TANKBULLET
 {
@@ -178,7 +180,8 @@ static Vector gTankSpread[] =
 		Vector(0.1, 0.1, 0.1),		 // large cone
 		Vector(0.25, 0.25, 0.25),	 // extra-large cone
 };
-#define MAX_FIRING_SPREADS std::size(gTankSpread)
+
+constexpr size_t MAX_FIRING_SPREADS = std::size(gTankSpread);
 
 void CFuncTank ::Spawn(void)
 {

From d016fd91e7f04159b81585560c68e2851b030b6c Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 22:09:50 -0400
Subject: [PATCH 181/291] changed define to const/enum

---
 src/game/server/hl/monsters.cpp | 12 +++++++-----
 src/game/server/hl/monsters.h   | 17 +++++++++--------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/game/server/hl/monsters.cpp b/src/game/server/hl/monsters.cpp
index fb7d0896..da5a35c6 100644
--- a/src/game/server/hl/monsters.cpp
+++ b/src/game/server/hl/monsters.cpp
@@ -34,7 +34,7 @@
 #include "soundent.h"
 #include "gamerules.h"
 
-#define MONSTER_CUT_CORNER_DIST 8 // 8 means the monster's bounding box is contained without the box of the node in WC
+constexpr float MONSTER_CUT_CORNER_DIST = 8; // 8 means the monster's bounding box is contained without the box of the node in WC
 
 Vector VecBModelOrigin(entvars_t *pevBModel);
 
@@ -1293,7 +1293,7 @@ void CBaseMonster ::SetSequenceByName(char *szSequence)
 // !!!PERFORMANCE - should we try to load balance this?
 // DON"T USE SETORIGIN!
 //=========================================================
-#define LOCAL_STEP_SIZE 16
+constexpr float LOCAL_STEP_SIZE = 16;
 int CBaseMonster ::CheckLocalMove(const Vector &vecStart, const Vector &vecEnd, CBaseEntity *pTarget, float *pflDist)
 {
 	Vector vecStartPos; // record monster's position before trying the move
@@ -1792,7 +1792,7 @@ BOOL CBaseMonster ::FTriangulate(const Vector &vecStart, const Vector &vecEnd, f
 //=========================================================
 // Move - take a single step towards the next ROUTE location
 //=========================================================
-#define DIST_TO_CHECK 200
+constexpr float DIST_TO_CHECK = 200;
 
 void CBaseMonster ::Move(float flInterval)
 {
@@ -3106,8 +3106,10 @@ int CBaseMonster ::CanPlaySequence(BOOL fDisregardMonsterState, int interruptLev
 // directly to the left or right of the caller that will
 // conceal them from view of pSightEnt
 //=========================================================
-#define COVER_CHECKS 5 // how many checks are made
-#define COVER_DELTA 48 // distance between checks
+
+
+constexpr unsigned int COVER_CHECKS = 5;	// how many checks are made
+constexpr unsigned int COVER_DELTA = 48;	// distance between checks
 
 BOOL CBaseMonster ::FindLateralCover(const Vector &vecThreat, const Vector &vecViewOffset)
 {
diff --git a/src/game/server/hl/monsters.h b/src/game/server/hl/monsters.h
index 38626303..bdda89f2 100644
--- a/src/game/server/hl/monsters.h
+++ b/src/game/server/hl/monsters.h
@@ -34,14 +34,15 @@ enum localmove_e {
 
 enum hitgroup_e {
 	// Hit Group standards
-#define HITGROUP_GENERIC 0
-#define HITGROUP_HEAD 1
-#define HITGROUP_CHEST 2
-#define HITGROUP_STOMACH 3
-#define HITGROUP_LEFTARM 4
-#define HITGROUP_RIGHTARM 5
-#define HITGROUP_LEFTLEG 6
-#define HITGROUP_RIGHTLEG 7
+
+	HITGROUP_GENERIC = 0,
+	HITGROUP_HEAD = 1,
+	HITGROUP_CHEST = 2,
+	HITGROUP_STOMACH = 3,
+	HITGROUP_LEFTARM = 4,
+	HITGROUP_RIGHTARM = 5,
+	HITGROUP_LEFTLEG = 6,
+	HITGROUP_RIGHTLEG = 7
 };
 
 enum monster_sf_e {

From 2b928c9f54739f2e2101815b76dfd998f430d85d Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 22:32:18 -0400
Subject: [PATCH 182/291] changes defines to functions/enums/constexpr most
 consts to header.

---
 src/game/server/hl/nodes.cpp       | 80 ++++++++++++++----------------
 src/game/server/hl/nodes.h         | 75 +++++++++++++++++++++-------
 src/game/server/player/modeldefs.h |  2 +-
 3 files changed, 94 insertions(+), 63 deletions(-)

diff --git a/src/game/server/hl/nodes.cpp b/src/game/server/hl/nodes.cpp
index aa1d514e..71722d79 100644
--- a/src/game/server/hl/nodes.cpp
+++ b/src/game/server/hl/nodes.cpp
@@ -26,13 +26,11 @@
 #include "doors.h"
 #include "filesystem_shared.h"
 
-#define HULL_STEP_SIZE 16 // how far the test hull moves on each step
-#define NODE_HEIGHT 8	  // how high to lift nodes off the ground after we drop them all (make stair/ramp mapping easier)
+
 
 // to help eliminate node clutter by level designers, this is used to cap how many other nodes
 // any given node is allowed to 'see' in the first stage of graph creation "LinkVisibleNodes()".
-#define MAX_NODE_INITIAL_LINKS 128
-#define MAX_NODES 1024
+
 
 extern DLL_GLOBAL edict_t *g_pBodyQueueHead;
 
@@ -1588,7 +1586,7 @@ void CNodeEnt ::Spawn(void)
 	}
 
 	WorldGraph.m_pNodes[WorldGraph.m_cNodes].m_vecOriginPeek =
-		WorldGraph.m_pNodes[WorldGraph.m_cNodes].m_vecOrigin = pev->origin;
+	WorldGraph.m_pNodes[WorldGraph.m_cNodes].m_vecOrigin = pev->origin;
 	WorldGraph.m_pNodes[WorldGraph.m_cNodes].m_flHintYaw = pev->angles.y;
 	WorldGraph.m_pNodes[WorldGraph.m_cNodes].m_sHintType = m_sHintType;
 	WorldGraph.m_pNodes[WorldGraph.m_cNodes].m_sHintActivity = m_sHintActivity;
@@ -2262,9 +2260,20 @@ int CQueuePriority ::Remove(float &fPriority)
 	return iReturn;
 }
 
-#define HEAP_LEFT_CHILD(x) (2 * (x) + 1)
-#define HEAP_RIGHT_CHILD(x) (2 * (x) + 2)
-#define HEAP_PARENT(x) (((x)-1) / 2)
+int HEAP_LEFT_CHILD(int parent) {
+	return ((2 * parent) + 1);
+}
+int HEAP_RIGHT_CHILD(int parent) {
+	return ((2 * parent) + 2);
+}
+
+int HEAP_PARENT(int child) {
+	return ((child-1) / 2);
+}
+
+//#define HEAP_LEFT_CHILD(x) (2 * (x) + 1)
+//#define HEAP_RIGHT_CHILD(x) (2 * (x) + 2)
+//#define HEAP_PARENT(x) (((x)-1) / 2)
 
 void CQueuePriority::Heap_SiftDown(int iSubRoot)
 {
@@ -2630,17 +2639,9 @@ int CGraph ::CheckNODFile(const char *szMapName)
 	return retValue;
 }
 
-#define ENTRY_STATE_EMPTY -1
-
-struct tagNodePair
-{
-	short iSrc;
-	short iDest;
-};
-
 void CGraph::HashInsert(int iSrcNode, int iDestNode, int iKey)
 {
-	struct tagNodePair np;
+	struct tagNodePair np {};
 
 	np.iSrc = iSrcNode;
 	np.iDest = iDestNode;
@@ -2690,24 +2691,9 @@ void CGraph::HashSearch(int iSrcNode, int iDestNode, int &iKey)
 	iKey = m_pHashLinks[i];
 }
 
-#define NUMBER_OF_PRIMES 177
-
-int Primes[NUMBER_OF_PRIMES] =
-	{1, 2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67,
-	 71, 73, 79, 83, 89, 97, 101, 103, 107, 109, 113, 127, 131, 137, 139, 149, 151,
-	 157, 163, 167, 173, 179, 181, 191, 193, 197, 199, 211, 223, 227, 229, 233, 239,
-	 241, 251, 257, 263, 269, 271, 277, 281, 283, 293, 307, 311, 313, 317, 331, 337,
-	 347, 349, 353, 359, 367, 373, 379, 383, 389, 397, 401, 409, 419, 421, 431, 433,
-	 439, 443, 449, 457, 461, 463, 467, 479, 487, 491, 499, 503, 509, 521, 523, 541,
-	 547, 557, 563, 569, 571, 577, 587, 593, 599, 601, 607, 613, 617, 619, 631, 641,
-	 643, 647, 653, 659, 661, 673, 677, 683, 691, 701, 709, 719, 727, 733, 739, 743,
-	 751, 757, 761, 769, 773, 787, 797, 809, 811, 821, 823, 827, 829, 839, 853, 857,
-	 859, 863, 877, 881, 883, 887, 907, 911, 919, 929, 937, 941, 947, 953, 967, 971,
-	 977, 983, 991, 997, 1009, 1013, 1019, 1021, 1031, 1033, 1039, 0};
-
 void CGraph::HashChoosePrimes(int TableSize)
 {
-	int LargestPrime = TableSize / 2;
+	unsigned int LargestPrime = TableSize / 2;
 	if (LargestPrime > Primes[NUMBER_OF_PRIMES - 2])
 	{
 		LargestPrime = Primes[NUMBER_OF_PRIMES - 2];
@@ -2769,7 +2755,7 @@ void CGraph::HashChoosePrimes(int TableSize)
 
 // Renumber nodes so that nodes that link together are together.
 //
-#define UNNUMBERED_NODE -1
+
 void CGraph::SortNodes(void)
 {
 	// We are using m_iPreviousNode to be the new node number.
@@ -3018,10 +3004,18 @@ void CGraph::BuildRegionTables(void)
 	memset(m_Cache, 0, sizeof(m_Cache));
 }
 
+
+//#define FROM_TO(x, y) ((x)*m_cNodes + (y))
+
+int FROM_TO(unsigned int iFrom, unsigned int iTo, int nodes) {
+	return (iFrom * nodes) + iTo;
+}
+
+
 void CGraph ::ComputeStaticRoutingTables(void)
 {
 	int nRoutes = m_cNodes * m_cNodes;
-#define FROM_TO(x, y) ((x)*m_cNodes + (y))
+
 	short *Routes = new short[nRoutes];
 
 	int *pMyPath = new int[m_cNodes];
@@ -3054,15 +3048,15 @@ void CGraph ::ComputeStaticRoutingTables(void)
 				{
 					for (unsigned int iTo = 0; iTo < m_cNodes; iTo++)
 					{
-						Routes[FROM_TO(iFrom, iTo)] = -1;
+						Routes[FROM_TO(iFrom, iTo, m_cNodes)] = -1;
 					}
 				}
 
 				for (iFrom = 0; iFrom < m_cNodes; iFrom++)
 				{
-					for (iTo = m_cNodes - 1; iTo >= 0; iTo--)
+					for (iTo = m_cNodes - 1; iTo > 0; iTo--)
 					{
-						if (Routes[FROM_TO(iFrom, iTo)] != -1)
+						if (Routes[FROM_TO(iFrom, iTo, m_cNodes)] != -1)
 							continue;
 
 						int cPathSize = FindShortestPath(pMyPath, iFrom, iTo, iHull, iCapMask);
@@ -3078,7 +3072,7 @@ void CGraph ::ComputeStaticRoutingTables(void)
 								for (int iNode1 = iNode + 1; iNode1 < cPathSize; iNode1++)
 								{
 									int iEnd = pMyPath[iNode1];
-									Routes[FROM_TO(iStart, iEnd)] = iNext;
+									Routes[FROM_TO(iStart, iEnd, m_cNodes)] = iNext;
 								}
 							}
 #if 0
@@ -3094,15 +3088,15 @@ void CGraph ::ComputeStaticRoutingTables(void)
 								for (int iNode1 = iNode-1; iNode1 >= 0; iNode1--)
 								{
 									int iEnd = pMyPath[iNode1];
-									Routes[FROM_TO(iStart, iEnd)] = iNext;
+									Routes[FROM_TO(iStart, iEnd, m_cNodes)] = iNext;
 								}
 							}
 #endif
 						}
 						else
 						{
-							Routes[FROM_TO(iFrom, iTo)] = iFrom;
-							Routes[FROM_TO(iTo, iFrom)] = iTo;
+							Routes[FROM_TO(iFrom, iTo, m_cNodes)] = iFrom;
+							Routes[FROM_TO(iTo, iFrom, m_cNodes)] = iTo;
 						}
 					}
 				}
@@ -3111,7 +3105,7 @@ void CGraph ::ComputeStaticRoutingTables(void)
 				{
 					for (unsigned int iTo = 0; iTo < m_cNodes; iTo++)
 					{
-						BestNextNodes[iTo] = Routes[FROM_TO(iFrom, iTo)];
+						BestNextNodes[iTo] = Routes[FROM_TO(iFrom, iTo, m_cNodes)];
 					}
 
 					// Compress this node's routing table.
diff --git a/src/game/server/hl/nodes.h b/src/game/server/hl/nodes.h
index 27738047..7e0623ab 100644
--- a/src/game/server/hl/nodes.h
+++ b/src/game/server/hl/nodes.h
@@ -24,15 +24,47 @@ class CFile;
 //=========================================================
 // DEFINE
 //=========================================================
-#define MAX_STACK_NODES 100
-#define NO_NODE -1
-#define MAX_NODE_HULLS 4
 
-#define bits_NODE_LAND (1 << 0)	 // Land node, so nudge if necessary.
-#define bits_NODE_AIR (1 << 1)	 // Air node, don't nudge.
-#define bits_NODE_WATER (1 << 2) // Water node, don't nudge.
-#define bits_NODE_GROUP_REALM (bits_NODE_LAND | bits_NODE_AIR | bits_NODE_WATER)
+constexpr unsigned int MAX_STACK_NODES = 100;
+constexpr unsigned int MAX_NODE_HULLS = 4;
+constexpr unsigned int CACHE_SIZE = 128;
+constexpr unsigned int NUM_RANGES = 256;
+constexpr unsigned MAX_NODE_INITIAL_LINKS = 128;
+constexpr unsigned MAX_NODES = 1024;
+constexpr float HULL_STEP_SIZE = 16; // how far the test hull moves on each step
+constexpr float NODE_HEIGHT = 8;	  // how high to lift nodes off the ground after we drop them all (make stair/ramp mapping easier)
+constexpr unsigned int NUMBER_OF_PRIMES = 177;
+constexpr int NO_NODE = -1;
+constexpr int UNNUMBERED_NODE = -1;
+constexpr int ENTRY_STATE_EMPTY = -1;
+
+constexpr unsigned int Primes[NUMBER_OF_PRIMES] =
+{ 1, 2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67,
+ 71, 73, 79, 83, 89, 97, 101, 103, 107, 109, 113, 127, 131, 137, 139, 149, 151,
+ 157, 163, 167, 173, 179, 181, 191, 193, 197, 199, 211, 223, 227, 229, 233, 239,
+ 241, 251, 257, 263, 269, 271, 277, 281, 283, 293, 307, 311, 313, 317, 331, 337,
+ 347, 349, 353, 359, 367, 373, 379, 383, 389, 397, 401, 409, 419, 421, 431, 433,
+ 439, 443, 449, 457, 461, 463, 467, 479, 487, 491, 499, 503, 509, 521, 523, 541,
+ 547, 557, 563, 569, 571, 577, 587, 593, 599, 601, 607, 613, 617, 619, 631, 641,
+ 643, 647, 653, 659, 661, 673, 677, 683, 691, 701, 709, 719, 727, 733, 739, 743,
+ 751, 757, 761, 769, 773, 787, 797, 809, 811, 821, 823, 827, 829, 839, 853, 857,
+ 859, 863, 877, 881, 883, 887, 907, 911, 919, 929, 937, 941, 947, 953, 967, 971,
+ 977, 983, 991, 997, 1009, 1013, 1019, 1021, 1031, 1033, 1039, 0 };
+
+struct tagNodePair
+{
+	short iSrc;
+	short iDest;
+};
+
+enum bits_node_type_e {
 
+	bits_NODE_LAND = (1 << 0),	 // Land node, so nudge if necessary.
+	bits_NODE_AIR = (1 << 1),	 // Air node, don't nudge.
+	bits_NODE_WATER = (1 << 2), // Water node, don't nudge.
+	bits_NODE_GROUP_REALM = (bits_NODE_LAND | bits_NODE_AIR | bits_NODE_WATER)
+
+};
 //=========================================================
 // Instance of a node.
 //=========================================================
@@ -67,17 +99,23 @@ class CNode
 //=========================================================
 // CLink - A link between 2 nodes
 //=========================================================
-#define bits_LINK_SMALL_HULL (1 << 0) // headcrab box can fit through this connection
-#define bits_LINK_HUMAN_HULL (1 << 1) // player box can fit through this connection
-#define bits_LINK_LARGE_HULL (1 << 2) // big box can fit through this connection
-#define bits_LINK_FLY_HULL (1 << 3)	  // a flying big box can fit through this connection
-#define bits_LINK_DISABLED (1 << 4)	  // link is not valid when the set
 
-#define NODE_SMALL_HULL 0
-#define NODE_HUMAN_HULL 1
-#define NODE_LARGE_HULL 2
-#define NODE_FLY_HULL 3
+enum bits_clink_e {
+	bits_LINK_SMALL_HULL = (1 << 0), // headcrab box can fit through this connection
+	bits_LINK_HUMAN_HULL = (1 << 1), // player box can fit through this connection
+	bits_LINK_LARGE_HULL = (1 << 2), // big box can fit through this connection
+	bits_LINK_FLY_HULL = (1 << 3),	  // a flying big box can fit through this connection
+	bits_LINK_DISABLED = (1 << 4)	  // link is not valid when the set
+};
+
+enum node_hull_e {
+
+	NODE_SMALL_HULL = 0,
+	NODE_HUMAN_HULL = 1,
+	NODE_LARGE_HULL = 2,
+	NODE_FLY_HULL = 3
 
+};
 class CLink
 {
 public:
@@ -134,8 +172,7 @@ class CGraph
 	// search each range. After the search is exhausted, we know we have the closest
 	// node.
 	//
-#define CACHE_SIZE 128
-#define NUM_RANGES 256
+
 	DIST_INFO *m_di; // This is m_cNodes long, but the entries don't correspond to CNode entries.
 	unsigned int m_RangeStart[3][NUM_RANGES];
 	unsigned int m_RangeEnd[3][NUM_RANGES];
@@ -347,7 +384,7 @@ class CQueuePriority
 // hints - these MUST coincide with the HINTS listed under
 // info_node in the FGD file!
 //=========================================================
-enum
+enum hint_node_e
 {
 	HINT_NONE = 0,
 	HINT_WORLD_DOOR,
diff --git a/src/game/server/player/modeldefs.h b/src/game/server/player/modeldefs.h
index 1dda9878..77c807a2 100644
--- a/src/game/server/player/modeldefs.h
+++ b/src/game/server/player/modeldefs.h
@@ -1,3 +1,3 @@
 // YOU NEED THIS (MODEL_HUMAN_REF) for animations even though it's the
 // exact same as male1...
-#define MODEL_HUMAN_REF "models/human/reference.mdl"
+constexpr const char* MODEL_HUMAN_REF = "models/human/reference.mdl";

From 43cf79d9e94e02a0bacf2e15a6057fe5879960af Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 22:34:59 -0400
Subject: [PATCH 183/291] changed defs to enum

---
 src/game/server/hl/trains.h | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/game/server/hl/trains.h b/src/game/server/hl/trains.h
index 69be4f14..b168c718 100644
--- a/src/game/server/hl/trains.h
+++ b/src/game/server/hl/trains.h
@@ -16,24 +16,31 @@
 #define TRAINS_H
 
 // Tracktrain spawn flags
-#define SF_TRACKTRAIN_NOPITCH 0x0001
-#define SF_TRACKTRAIN_NOCONTROL 0x0002
-#define SF_TRACKTRAIN_FORWARDONLY 0x0004
-#define SF_TRACKTRAIN_PASSABLE 0x0008
-#define SF_TRACKTRAIN_NOYAW 0x0010 //APR2008a - No Yaw option for Tracktrain
+enum sf_tracktrain_e {
+	SF_TRACKTRAIN_NOPITCH = 0x0001,
+	SF_TRACKTRAIN_NOCONTROL = 0x0002,
+	SF_TRACKTRAIN_FORWARDONLY = 0x0004,
+	SF_TRACKTRAIN_PASSABLE = 0x0008,
+	SF_TRACKTRAIN_NOYAW = 0x0010, //APR2008a - No Yaw option for Tracktrain
+};
 
 // Spawnflag for CPathTrack
-#define SF_PATH_DISABLED 0x00000001
-#define SF_PATH_FIREONCE 0x00000002
-#define SF_PATH_ALTREVERSE 0x00000004
-#define SF_PATH_DISABLE_TRAIN 0x00000008
-#define SF_PATH_ALTERNATE 0x00008000
+
+enum sf_cpathtrack_e {
+	SF_PATH_DISABLED = 0x00000001,
+	SF_PATH_FIREONCE = 0x00000002,
+	SF_PATH_ALTREVERSE = 0x00000004,
+	SF_PATH_DISABLE_TRAIN = 0x00000008,
+	SF_PATH_ALTERNATE = 0x00008000
+};
 
 // Spawnflags of CPathCorner
-#define SF_CORNER_WAITFORTRIG 0x001
-#define SF_CORNER_TELEPORT 0x002
-#define SF_CORNER_FIREONCE 0x004
 
+enum sf_cpath_corner_e {
+	SF_CORNER_WAITFORTRIG = 0x001,
+	SF_CORNER_TELEPORT = 0x002,
+	SF_CORNER_FIREONCE = 0x004
+};
 //#define PATH_SPARKLE_DEBUG		1	// This makes a particle effect around path_track entities for debugging
 class CPathTrack : public CPointEntity
 {

From 5bc4fe8d6fa4bef803993eaf3b0e9b8105bdc6d2 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 22:37:07 -0400
Subject: [PATCH 184/291] changed plat to enum

---
 src/game/server/hl/plats.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/game/server/hl/plats.cpp b/src/game/server/hl/plats.cpp
index f40ceff5..734e2c3d 100644
--- a/src/game/server/hl/plats.cpp
+++ b/src/game/server/hl/plats.cpp
@@ -28,8 +28,10 @@
 
 static void PlatSpawnInsideTrigger(entvars_t *pevPlatform);
 
-#define SF_PLAT_TOGGLE 0x0001
-#define SF_PLAT_ADJUST 0x0002 //MAR2010_10 - Thothie - adjust platform for stuck bugs when reach top
+enum sf_plat_e {
+	SF_PLAT_TOGGLE = 0x0001,
+	SF_PLAT_ADJUST = 0x0002 //MAR2010_10 - Thothie - adjust platform for stuck bugs when reach top
+};
 
 class CBasePlatTrain : public CBaseToggle
 {

From 4f26e99c0d8504b9160d801ff1e22dfa36d16d26 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 22:40:07 -0400
Subject: [PATCH 185/291] named some enums

---
 src/game/server/hl/schedule.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/game/server/hl/schedule.h b/src/game/server/hl/schedule.h
index 173da264..211b5050 100644
--- a/src/game/server/hl/schedule.h
+++ b/src/game/server/hl/schedule.h
@@ -18,8 +18,10 @@
 
 #ifndef	SCHEDULE_H
 #define	SCHEDULE_H
+
 
-enum {
+
+enum taskstatus_e {
 	TASKSTATUS_NEW = 0,			// Just started
 	TASKSTATUS_RUNNING = 1,		// Running task & movement
 	TASKSTATUS_RUNNING_MOVEMENT = 2,			// Just running movement
@@ -177,7 +179,7 @@ typedef enum
 
 
 // These go in the flData member of the TASK_WALK_TO_TARGET, TASK_RUN_TO_TARGET
-enum 
+enum target_move_e
 {
 	TARGET_MOVE_NORMAL = 0,
 	TARGET_MOVE_SCRIPTED = 1,
@@ -188,7 +190,7 @@ enum
 // The goal index should indicate which schedule (ordinally) the monster is running.  
 // That way, when tasks fail, the AI can make decisions based on the context of the 
 // current goal and sequence rather than just the current schedule.
-enum
+enum goal_e
 {
 	GOAL_ATTACK_ENEMY,
 	GOAL_MOVE,

From 806aafeb242e0113c54e8f2616849548eb3eed4f Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 22:43:43 -0400
Subject: [PATCH 186/291] changed defs to enum. moved enum to header

---
 src/game/server/hl/scripted.cpp | 5 +----
 src/game/server/hl/scripted.h   | 7 +++++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/game/server/hl/scripted.cpp b/src/game/server/hl/scripted.cpp
index e4cb46f4..52b525c7 100644
--- a/src/game/server/hl/scripted.cpp
+++ b/src/game/server/hl/scripted.cpp
@@ -924,10 +924,7 @@ class CScriptedSentence : public CBaseToggle
 	int m_iszListener; // name of entity to look at while talking
 };
 
-#define SF_SENTENCE_ONCE 0x0001
-#define SF_SENTENCE_FOLLOWERS 0x0002  // only say if following player
-#define SF_SENTENCE_INTERRUPT 0x0004  // force talking except when dead
-#define SF_SENTENCE_CONCURRENT 0x0008 // allow other people to keep talking
+
 
 TYPEDESCRIPTION CScriptedSentence::m_SaveData[] =
 	{
diff --git a/src/game/server/hl/scripted.h b/src/game/server/hl/scripted.h
index b1973de3..8698cb49 100644
--- a/src/game/server/hl/scripted.h
+++ b/src/game/server/hl/scripted.h
@@ -31,6 +31,13 @@ enum script_conditions_e {
 	SCRIPT_BREAK_CONDITIONS = (bits_COND_LIGHT_DAMAGE | bits_COND_HEAVY_DAMAGE)
 };
 
+enum sf_sentence_e {
+	SF_SENTENCE_ONCE = 0x0001,
+	SF_SENTENCE_FOLLOWERS = 0x0002, // only say if following player
+	SF_SENTENCE_INTERRUPT = 0x0004, // force talking except when dead
+	SF_SENTENCE_CONCURRENT = 0x0008 // allow other people to keep talking
+};
+
 enum SS_INTERRUPT
 {
 	SS_INTERRUPT_IDLE = 0,

From 2c10916d5dfc92ba52f13a63cede3eb1ab331cda Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 22:45:10 -0400
Subject: [PATCH 187/291] changed defines to enum

---
 src/game/server/hl/scriptevent.h | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/game/server/hl/scriptevent.h b/src/game/server/hl/scriptevent.h
index e8b29703..0e11a23d 100644
--- a/src/game/server/hl/scriptevent.h
+++ b/src/game/server/hl/scriptevent.h
@@ -15,15 +15,18 @@
 #ifndef SCRIPTEVENT_H
 #define SCRIPTEVENT_H
 
-#define SCRIPT_EVENT_DEAD 1000          // character is now dead
-#define SCRIPT_EVENT_NOINTERRUPT 1001   // does not allow interrupt
-#define SCRIPT_EVENT_CANINTERRUPT 1002  // will allow interrupt
-#define SCRIPT_EVENT_FIREEVENT 1003     // event now fires
-#define SCRIPT_EVENT_SOUND 1004         // Play named wave file (on CHAN_BODY)
-#define SCRIPT_EVENT_SENTENCE 1005      // Play named sentence
-#define SCRIPT_EVENT_INAIR 1006         // Leave the character in air at the end of the sequence (don't find the floor)
-#define SCRIPT_EVENT_ENDANIMATION 1007  // Set the animation by name after the sequence completes
-#define SCRIPT_EVENT_SOUND_VOICE 1008   // Play named wave file (on CHAN_VOICE)
-#define SCRIPT_EVENT_SENTENCE_RND1 1009 // Play sentence group 25% of the time
-#define SCRIPT_EVENT_NOT_DEAD 1010      // Bring back to life (for life/death sequences)
+enum script_event_e {
+
+	SCRIPT_EVENT_DEAD = 1000,          // character is now dead
+	SCRIPT_EVENT_NOINTERRUPT = 1001,   // does not allow interrupt
+	SCRIPT_EVENT_CANINTERRUPT = 1002,  // will allow interrupt
+	SCRIPT_EVENT_FIREEVENT = 1003,     // event now fires
+	SCRIPT_EVENT_SOUND = 1004,         // Play named wave file (on CHAN_BODY)
+	SCRIPT_EVENT_SENTENCE = 1005,      // Play named sentence
+	SCRIPT_EVENT_INAIR = 1006,         // Leave the character in air at the end of the sequence (don't find the floor)
+	SCRIPT_EVENT_ENDANIMATION = 1007,  // Set the animation by name after the sequence completes
+	SCRIPT_EVENT_SOUND_VOICE = 1008,   // Play named wave file (on CHAN_VOICE)
+	SCRIPT_EVENT_SENTENCE_RND1 = 1009, // Play sentence group 25% of the time
+	SCRIPT_EVENT_NOT_DEAD = 1010      // Bring back to life (for life/death sequences)
+};
 #endif                                  //SCRIPTEVENT_H

From aa7eb53be9159b71a7a6e7b787fb02ca31cb8716 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sat, 21 Mar 2026 22:46:25 -0400
Subject: [PATCH 188/291] changed define to enum

---
 src/game/server/hl/skill.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/game/server/hl/skill.h b/src/game/server/hl/skill.h
index fd072917..73c9f148 100644
--- a/src/game/server/hl/skill.h
+++ b/src/game/server/hl/skill.h
@@ -141,6 +141,9 @@ float GetSkillCvar(char *pName);
 
 extern DLL_GLOBAL int g_iSkillLevel;
 
-#define SKILL_EASY 1
-#define SKILL_MEDIUM 2
-#define SKILL_HARD 3
+
+enum skill_level_e {
+	SKILL_EASY = 1,
+	SKILL_MEDIUM = 2,
+	SKILL_HARD = 3
+};
\ No newline at end of file

From d5e961b5b6b4574a0a13b70f286d430b58ebe063 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 22 Mar 2026 01:16:31 -0400
Subject: [PATCH 189/291] changed some defines to constexpr

---
 src/game/server/hl/sound.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/game/server/hl/sound.cpp b/src/game/server/hl/sound.cpp
index 27fe3e75..9db5f7fa 100644
--- a/src/game/server/hl/sound.cpp
+++ b/src/game/server/hl/sound.cpp
@@ -80,7 +80,7 @@ typedef struct dynpitchvol
 
 } dynpitchvol_t;
 
-#define CDPVPRESETMAX 27
+constexpr unsigned int CDPVPRESETMAX = 27;
 
 // presets for runtime pitch and vol modulation of ambient sounds
 
@@ -1045,7 +1045,7 @@ void CEnvSound ::Spawn()
 
 // ==================== SENTENCE GROUPS, UTILITY FUNCTIONS  ======================================
 
-#define CSENTENCE_LRU_MAX 32 // max number of elements per sentence group
+constexpr unsigned int CSENTENCE_LRU_MAX = 32; // max number of elements per sentence group
 
 // group of related sentences
 
@@ -1057,7 +1057,7 @@ typedef struct sentenceg
 
 } SENTENCEG;
 
-#define CSENTENCEG_MAX 200 // max number of sentence groups
+constexpr unsigned int CSENTENCEG_MAX = 200; // max number of sentence groups
 // globals
 
 SENTENCEG rgsentenceg[CSENTENCEG_MAX];
@@ -1528,7 +1528,7 @@ void EMIT_GROUPNAME_SUIT(edict_t *entity, const char *groupname)
 // Used to detect the texture the player is standing on, map the
 // texture name to a material type.  Play footstep sound based
 // on material type.
-#define CTEXTURESMAX 512 // max number of textures loaded
+constexpr unsigned int CTEXTURESMAX = 512; // max number of textures loaded
 
 unsigned int gcTextures = 0;
 char grgszTextureName[CTEXTURESMAX][CBTEXTURENAMEMAX]; // texture names

From fe331cc9a97327b261e856bd586655e2c626c47f Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 22 Mar 2026 01:17:45 -0400
Subject: [PATCH 190/291] fixed unitialized memory warning

---
 src/game/server/hl/soundent.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/server/hl/soundent.cpp b/src/game/server/hl/soundent.cpp
index b4acc634..fe9df4a5 100644
--- a/src/game/server/hl/soundent.cpp
+++ b/src/game/server/hl/soundent.cpp
@@ -287,7 +287,7 @@ void CSoundEnt :: Initialize ( void )
 int CSoundEnt :: ISoundsInList ( int iListType )
 {
 	unsigned int i;
-	int iThisSound;
+	int iThisSound{};
 
 	if ( iListType == SOUNDLISTTYPE_FREE )
 	{

From 63d75efd57dfcbf453d5e8495f7269670ca331da Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 22 Mar 2026 01:27:11 -0400
Subject: [PATCH 191/291] templated SWAP macro. Changed some defines to
 constexpr/enum

---
 src/game/server/hl/util.cpp | 12 +++++++++---
 src/public/engine/eiface.h  | 17 ++++++++++-------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/game/server/hl/util.cpp b/src/game/server/hl/util.cpp
index c282d086..5566bd52 100644
--- a/src/game/server/hl/util.cpp
+++ b/src/game/server/hl/util.cpp
@@ -316,7 +316,7 @@ TYPEDESCRIPTION gEntvarsDescription[] =
 		DEFINE_ENTITY_FIELD(radsuit_finished, FIELD_TIME),
 };
 
-#define ENTVARS_COUNT (sizeof(gEntvarsDescription) / sizeof(gEntvarsDescription[0]))
+constexpr unsigned int ENTVARS_COUNT = (sizeof(gEntvarsDescription) / sizeof(gEntvarsDescription[0]));
 
 #ifdef DEBUG
 edict_t *DBG_EntOfVars(const entvars_t *pev)
@@ -992,7 +992,13 @@ void UTIL_MakeAimVectors(const Vector &vecAngles)
 	MAKE_VECTORS(rgflVec);
 }
 
-#define SWAP(a, b, temp) ((temp) = (a), (a) = (b), (b) = (temp))
+//#define SWAP(a, b, temp) ((temp) = (a), (a) = (b), (b) = (temp))
+template <typename Type>
+inline void SWAP (Type &a, Type &b, Type &temp) {
+	Type temp = a;
+	a = b;
+	b = temp;
+}
 
 void UTIL_MakeInvVectors(const Vector &vec, globalvars_t *pgv)
 {
@@ -1058,7 +1064,7 @@ void UTIL_ScreenShake(const Vector &center, float amplitude, float frequency, fl
 {
 	unsigned int i;
 	float localAmplitude;
-	ScreenShake shake;
+	ScreenShake shake{};
 
 	shake.duration = FixedUnsigned16(duration, 1 << 12);  // 4.12 fixed
 	shake.frequency = FixedUnsigned16(frequency, 1 << 8); // 8.8 fixed
diff --git a/src/public/engine/eiface.h b/src/public/engine/eiface.h
index 3cbb32d8..0af3ba2f 100644
--- a/src/public/engine/eiface.h
+++ b/src/public/engine/eiface.h
@@ -283,7 +283,7 @@ typedef struct
 	edict_t	*pentLandmark;
 	Vector 		vecLandmarkOrigin;
 } LEVELLIST;
-#define MAX_LEVEL_CONNECTIONS	16		// These are encoded in the lower 16bits of ENTITYTABLE->flags
+constexpr unsigned int MAX_LEVEL_CONNECTIONS = 16;		// These are encoded in the lower 16bits of ENTITYTABLE->flags
 
 typedef struct 
 {
@@ -297,10 +297,12 @@ typedef struct
 
 } ENTITYTABLE;
 
-#define FENTTABLE_PLAYER		0x80000000
-#define FENTTABLE_REMOVED		0x40000000
-#define FENTTABLE_MOVEABLE		0x20000000
-#define FENTTABLE_GLOBAL		0x10000000
+enum fent_table_e {
+	FENTTABLE_PLAYER		= 0x80000000,
+	FENTTABLE_REMOVED		= 0x40000000,
+	FENTTABLE_MOVEABLE		= 0x20000000,
+	FENTTABLE_GLOBAL		= 0x10000000
+};
 
 typedef struct saverestore_s SAVERESTOREDATA;
 
@@ -370,8 +372,9 @@ typedef enum _fieldtypes
 #define DEFINE_ENTITY_GLOBAL_FIELD(name,fieldtype)	_FIELD(entvars_t, name, fieldtype, 1, FTYPEDESC_GLOBAL )
 #define DEFINE_GLOBAL_FIELD(type,name,fieldtype)	_FIELD(type, name, fieldtype, 1, FTYPEDESC_GLOBAL )
 
-
-#define FTYPEDESC_GLOBAL			0x0001		// This field is masked for global entity save/restore
+enum g_ftype_desc_e {
+	FTYPEDESC_GLOBAL = 0x0001		// This field is masked for global entity save/restore
+};
 
 typedef struct 
 {

From 5f5991544c03d3851b2dd62da1a15f8bf1376ff3 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 22 Mar 2026 01:28:05 -0400
Subject: [PATCH 192/291] fix redef of param in templated swap.

---
 src/game/server/hl/util.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/server/hl/util.cpp b/src/game/server/hl/util.cpp
index 5566bd52..c46acc3f 100644
--- a/src/game/server/hl/util.cpp
+++ b/src/game/server/hl/util.cpp
@@ -995,7 +995,7 @@ void UTIL_MakeAimVectors(const Vector &vecAngles)
 //#define SWAP(a, b, temp) ((temp) = (a), (a) = (b), (b) = (temp))
 template <typename Type>
 inline void SWAP (Type &a, Type &b, Type &temp) {
-	Type temp = a;
+	temp = a;
 	a = b;
 	b = temp;
 }

From 59e0572920ad761fa53eca4af7baf29c2a8473f9 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 22 Mar 2026 01:31:05 -0400
Subject: [PATCH 193/291] removed unneded empty CONSTANT define

---
 src/game/server/hl/monsters.h | 6 +++---
 src/game/server/hl/util.h     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/game/server/hl/monsters.h b/src/game/server/hl/monsters.h
index bdda89f2..3ac15994 100644
--- a/src/game/server/hl/monsters.h
+++ b/src/game/server/hl/monsters.h
@@ -80,9 +80,9 @@ extern void UTIL_MoveToOrigin(edict_t *pent, const Vector &vecGoal, float flDist
 Vector VecCheckToss(entvars_t *pev, const Vector &vecSpot1, Vector vecSpot2, float flGravityAdj = 1.0);
 Vector VecCheckThrow(entvars_t *pev, const Vector &vecSpot1, Vector vecSpot2, float flSpeed, float flGravityAdj = 1.0);
 extern DLL_GLOBAL Vector g_vecAttackDir;
-extern DLL_GLOBAL CONSTANT float g_flMeleeRange;
-extern DLL_GLOBAL CONSTANT float g_flMediumRange;
-extern DLL_GLOBAL CONSTANT float g_flLongRange;
+extern DLL_GLOBAL float g_flMeleeRange;
+extern DLL_GLOBAL float g_flMediumRange;
+extern DLL_GLOBAL float g_flLongRange;
 extern void EjectBrass(const Vector &vecOrigin, const Vector &vecVelocity, float rotation, int model, int soundtype);
 extern void ExplodeModel(const Vector &vecOrigin, float speed, int model, int count);
 
diff --git a/src/game/server/hl/util.h b/src/game/server/hl/util.h
index f9b11805..270eac47 100644
--- a/src/game/server/hl/util.h
+++ b/src/game/server/hl/util.h
@@ -88,7 +88,7 @@ bool FBitSet(const Type& vector, const int bit) {
 
 // Until we figure out why "const" gives the compiler problems, we'll just have to use
 // this bogus "empty" define to mark things as constant.
-#define CONSTANT
+//#define CONSTANT
 
 // More explicit than "int"
 typedef int EOFFSET;

From c6b4ca2f099b0c9fd26df80e4fb2089378812978 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 22 Mar 2026 01:38:39 -0400
Subject: [PATCH 194/291] changed gib to to enum grouping

---
 src/game/server/monsters/combat.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/game/server/monsters/combat.cpp b/src/game/server/monsters/combat.cpp
index 74f92c2b..33730080 100644
--- a/src/game/server/monsters/combat.cpp
+++ b/src/game/server/monsters/combat.cpp
@@ -34,9 +34,11 @@ extern DLL_GLOBAL int g_iSkillLevel;
 extern Vector VecBModelOrigin(entvars_t *pevBModel);
 extern entvars_t *g_pevLastInflictor;
 
-#define GERMAN_GIB_COUNT 4
-#define HUMAN_GIB_COUNT 6
-#define ALIEN_GIB_COUNT 4
+enum gib_count_e {
+	GERMAN_GIB_COUNT = 4,
+	HUMAN_GIB_COUNT = 6,
+	ALIEN_GIB_COUNT = 4
+};
 
 // HACKHACK -- The gib velocity equations don't work
 void CGib ::LimitVelocity(void)

From dbbf3595c79cfa96e514111758349d3d1c242111 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 22 Mar 2026 01:53:15 -0400
Subject: [PATCH 195/291] Removed macros

---
 src/game/server/monsters/monsteranimation.cpp | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/game/server/monsters/monsteranimation.cpp b/src/game/server/monsters/monsteranimation.cpp
index 0bbeb9d0..e96dd8ae 100644
--- a/src/game/server/monsters/monsteranimation.cpp
+++ b/src/game/server/monsters/monsteranimation.cpp
@@ -2,13 +2,13 @@
 #include "weapons/weapons.h"
 
 //Shorten things up a lot
-#define m_Activity m_pOwner->m_Activity
-#define m_fSequenceFinished m_pOwner->m_fSequenceFinished
-#define LookupSequence m_pOwner->LookupSequence
+
+//#define LookupSequence m_pOwner->LookupSequence
 
 #undef Wielded
-#undef CHWielded
-#define CHWielded ((m_pPlayer->Hand[m_pPlayer->iCurrentHand]) ? m_pPlayer->Hand[m_pPlayer->iCurrentHand]->Wielded() : (m_pPlayer->PlayerHands ? m_pPlayer->PlayerHands->Wielded() : false))
+
+
+//#define CHWielded ((m_pPlayer->Hand[m_pPlayer->iCurrentHand]) ? m_pPlayer->Hand[m_pPlayer->iCurrentHand]->Wielded() : (m_pPlayer->PlayerHands ? m_pPlayer->PlayerHands->Wielded() : false))
 
 CAnimation *CAnimation::ChangeTo(MONSTER_ANIM NewAnim)
 {
@@ -33,7 +33,7 @@ bool CAnimation ::SetAnim(const char* pszSequence)
 	if (!pszSequence || !pszSequence[0])
 		return false;
 
-	int animDesired = LookupSequence(pszSequence);
+	int animDesired = m_pOwner->LookupSequence(pszSequence);
 
 	if (animDesired <= -1)
 	{
@@ -52,7 +52,7 @@ bool CAnimation ::SetAnim(const char* pszSequence)
 }
 bool CAnimation ::SetGaitAnim(const char* pszSequence)
 {
-	int animDesired = LookupSequence(pszSequence);
+	int animDesired = m_pOwner->LookupSequence(pszSequence);
 	if (animDesired <= -1)
 	{
 		m_pOwner->pev->gaitsequence = 0;
@@ -86,41 +86,41 @@ void CAnimation ::GaitAnimate()
 		if (speed == 0)
 		{
 			if (bCustomLegs)
-				NewGait = LookupSequence(UTIL_VarArgs("crouchidle_", m_szAnimLegs));
+				NewGait = m_pOwner->LookupSequence(UTIL_VarArgs("crouchidle_", m_szAnimLegs));
 
 			if (NewGait < 0)
-				NewGait = LookupSequence("crouchidle");
+				NewGait = m_pOwner->LookupSequence("crouchidle");
 		}
 		else
 		{
 			if (bCustomLegs)
-				NewGait = LookupSequence(UTIL_VarArgs("crouchmove_", m_szAnimLegs));
+				NewGait = m_pOwner->LookupSequence(UTIL_VarArgs("crouchmove_", m_szAnimLegs));
 
 			if (NewGait < 0)
-				NewGait = LookupSequence("crouch");
+				NewGait = m_pOwner->LookupSequence("crouch");
 		}
 	}
 	else if (speed > m_pOwner->WalkSpeed(false) + 1)
 	{
 		if (bCustomLegs)
-			NewGait = LookupSequence(UTIL_VarArgs("run_%s", m_szAnimLegs));
+			NewGait = m_pOwner->LookupSequence(UTIL_VarArgs("run_%s", m_szAnimLegs));
 		if (NewGait < 0)
-			NewGait = LookupSequence("run");
+			NewGait = m_pOwner->LookupSequence("run");
 	}
 	else if (speed > 0)
 	{
 		if (bCustomLegs)
-			NewGait = LookupSequence(UTIL_VarArgs("walk_%s", m_szAnimLegs));
+			NewGait = m_pOwner->LookupSequence(UTIL_VarArgs("walk_%s", m_szAnimLegs));
 		if (NewGait < 0)
-			NewGait = LookupSequence("walk");
+			NewGait = m_pOwner->LookupSequence("walk");
 	}
 	else
 	{
 		if (bCustomLegs)
-			NewGait = LookupSequence(UTIL_VarArgs("stand_%s", m_szAnimLegs));
+			NewGait = m_pOwner->LookupSequence(UTIL_VarArgs("stand_%s", m_szAnimLegs));
 		//		if( bCustomLegs ) NewGait = 0;
 		if (NewGait < 0)
-			NewGait = LookupSequence("stand");
+			NewGait = m_pOwner->LookupSequence("stand");
 		//else NewGait = 0;
 	}
 
@@ -157,7 +157,7 @@ void CWalkAnim ::Animate()
 		LegsAnimName = pPlayer->m_szAnimLegs;
 	}
 
-	int animDesired = LookupSequence(TorsoAnimName);
+	int animDesired = m_pOwner->LookupSequence(TorsoAnimName);
 
 	if (animDesired != m_pOwner->pev->sequence) //Continue playing the same uninterrupted animation until told otherwise
 		SetAnim(TorsoAnimName);
@@ -218,7 +218,7 @@ void CAnimOnce ::Initialize(void *vData)
 }
 bool CAnimOnce ::CanChangeTo(MONSTER_ANIM NewAnim, void *vData)
 {
-	return m_fSequenceFinished ? true : false;
+	return m_pOwner->m_fSequenceFinished ? true : false;
 }
 void CAnimOnce ::Animate()
 {

From bd802eab28e28180f3978663d1927d884de12f1e Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 22 Mar 2026 01:55:07 -0400
Subject: [PATCH 196/291] named enums

---
 src/game/server/monsters/msmonster.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/game/server/monsters/msmonster.h b/src/game/server/monsters/msmonster.h
index a2f5a78b..bb43b455 100644
--- a/src/game/server/monsters/msmonster.h
+++ b/src/game/server/monsters/msmonster.h
@@ -202,7 +202,7 @@ struct random_monster_t
 
 //Frame conditions
 
-enum {
+enum frame_condition_monster_e {
 	FC_STEP = (1 << 1),  //Monster walked up a step this frame
 	FC_JUMP = (1 << 2),  //Monster began a jump this frame
 	FC_AVOID = (1 << 3) //Monster is avoiding an object this frame
@@ -210,7 +210,7 @@ enum {
 
 //General Conditions (Added to those defined in schedule.h)
 
-enum {
+enum monster_conditions_e {
 	MONSTER_ROAM = (1 << 23),// Monster should roam around
 	MONSTER_HASMOVEDEST = (1 << 24),// vMoveDest is valid
 	MONSTER_TRADING = (1 << 25),// NPC is trading with a player

From 5b6008f63375a95e7a0662d88046598d4d90bd7f Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 22 Mar 2026 17:22:16 -0400
Subject: [PATCH 197/291] commented unused macros. Added extern to UTIL
 commented out unneeded include.

---
 src/game/server/hl/sound.cpp      |  7 +++--
 src/game/server/hl/subs.cpp       |  1 -
 src/game/server/hl/util.h         |  2 +-
 src/game/shared/ms/sharedutil.cpp |  3 +-
 src/game/shared/ms/sharedutil.h   | 48 ++++++++++++++++++++-----------
 5 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/src/game/server/hl/sound.cpp b/src/game/server/hl/sound.cpp
index 9db5f7fa..670e82d9 100644
--- a/src/game/server/hl/sound.cpp
+++ b/src/game/server/hl/sound.cpp
@@ -17,7 +17,7 @@
 //=========================================================
 
 #define VALVE_DLL 1
-#define CHAR_TEX_SNOW 'N'
+constexpr char CHAR_TEX_SNOW = 'N';
 
 #include "msdllheaders.h"
 #include "weapons.h"
@@ -1811,8 +1811,9 @@ void CSpeaker ::Spawn(void)
 	Precache();
 }
 
-#define ANNOUNCE_MINUTES_MIN 0.25
-#define ANNOUNCE_MINUTES_MAX 2.25
+
+constexpr float ANNOUNCE_MINUTES_MIN = 0.25;
+constexpr float ANNOUNCE_MINUTES_MAX = 2.25;
 static float g_talkWaitTime = 0.0f; // time delay until it's ok to speak: used so that two NPCs don't talk at once
 
 void CSpeaker ::Precache(void)
diff --git a/src/game/server/hl/subs.cpp b/src/game/server/hl/subs.cpp
index 750b2015..d5a840a8 100644
--- a/src/game/server/hl/subs.cpp
+++ b/src/game/server/hl/subs.cpp
@@ -80,7 +80,6 @@ void CBaseDMStart::KeyValue(KeyValueData *pkvd)
 BOOL CBaseDMStart::IsTriggered(CBaseEntity *pEntity)
 {
 	BOOL master = UTIL_IsMasterTriggered(pev->netname, pEntity);
-
 	return master;
 }
 
diff --git a/src/game/server/hl/util.h b/src/game/server/hl/util.h
index 270eac47..c37eeacf 100644
--- a/src/game/server/hl/util.h
+++ b/src/game/server/hl/util.h
@@ -669,5 +669,5 @@ float UTIL_SharedRandomFloat(unsigned int seed, float low, float high);
 float UTIL_WeaponTimeBase(void);
 
 //Master Sword
-#include "sharedutil.h"
+//#include "sharedutil.h"
 #endif
diff --git a/src/game/shared/ms/sharedutil.cpp b/src/game/shared/ms/sharedutil.cpp
index 2fa9e116..22ac8dc7 100644
--- a/src/game/shared/ms/sharedutil.cpp
+++ b/src/game/shared/ms/sharedutil.cpp
@@ -15,7 +15,6 @@ extern CBasePlayer player;
 
 CBaseEntity *MSInstance(edict_t *pent);
 
-#define ENT_FORMAT ENT_PREFIX "(%i,%u)"
 msstring EntToString(class CBaseEntity *pEntity)
 {
 	if (!pEntity)
@@ -71,7 +70,7 @@ Color4F StringToColor(const char* String) //Converts a string of the format "(r,
 {
 	Color4F Color(0, 0, 0, 0);
 
-	sscanf(String, "(%f,%f,%f,%f)", &Color.r, &Color.g, &Color.b, &Color.a);
+	sscanf_s(String, "(%f,%f,%f,%f)", &Color.r, &Color.g, &Color.b, &Color.a);
 	return Color;
 }
 
diff --git a/src/game/shared/ms/sharedutil.h b/src/game/shared/ms/sharedutil.h
index 87fde9be..4d026f04 100644
--- a/src/game/shared/ms/sharedutil.h
+++ b/src/game/shared/ms/sharedutil.h
@@ -1,11 +1,8 @@
 #ifndef SHAREDUTIL_H
 #define SHAREDUTIL_H
 
-#include "buildcontrol.h"
-#include "strhelper.h"
-
 //Extentions
-#define SCRIPT_EXT ".script"
+constexpr const char* SCRIPT_EXT = ".script";
 
 #ifdef WIN32
 #define DEFAULT_SO_EXT ".dll"
@@ -17,6 +14,10 @@
 #error "Unknown target platform, no known shared library extension"
 #endif
 
+#include "stackstring.h"
+#include "msdebug.h"
+
+
 typedef unsigned char  uchar;
 typedef unsigned short ushort;
 typedef unsigned int   uint;
@@ -29,7 +30,10 @@ typedef struct COLOR_T {
 	operator ulong ( ) { ulong l; ((uchar *)&l)[0] = r; ((uchar *)&l)[1] = g; ((uchar *)&l)[2] = b; ((uchar *)&l)[3] = a; return l; }
 	unsigned char r,g,b,a;
 } COLOR;
-#define COLORTORGBA( color )  MakeRGBA( color.r, color.g, color.b, color.a )
+//#define COLORTORGBA( color )  MakeRGBA( color.r, color.g, color.b, color.a )
+
+
+
 
 class Color4F	//For opengl or when you need colors in the [0-1] range
 {
@@ -42,19 +46,26 @@ class Color4F	//For opengl or when you need colors in the [0-1] range
 	float r, g, b, a;
 };
 
-#define MACRO_CREATEITEM(item) (CBaseEntity *)GET_PRIVATE(CREATE_NAMED_ENTITY(MAKE_STRING(item)))
+//#define MACRO_CREATEITEM(item) (CBaseEntity *)GET_PRIVATE(CREATE_NAMED_ENTITY(MAKE_STRING(item)))
 //#define clrmem( a ) memset( &a, 0, sizeof(a) );
 int numofdigits(int x);
 void Print(const char *szFmt, ...);
-#define FloatToString( a ) UTIL_VarArgs( "%.2f", a )
-#define IntToString( a ) UTIL_VarArgs( "%i", a )
+extern char* UTIL_VarArgs(const char* format, ...);
+
+
+
+inline char* FloatToString(const float a) {
+	return UTIL_VarArgs("%.2f", a);
+}
+
+inline char* IntToString(const int a) {
+	return UTIL_VarArgs("%i", a);
+}
 
 #ifndef _WIN32
 	extern "C" char* strlwr( char* str );
 #endif
 
-#include "stackstring.h"
-#include "msdebug.h"
 
 #ifdef VECTOR_H
 	const char* VecToString(const Vector& Vec, bool bAs2D = false); //Converts a vector to a string of format "(x,y,z)"
@@ -63,7 +74,9 @@ void Print(const char *szFmt, ...);
 	Vector GetRelativePos( Vector &Ang, Vector &Dir );	//Uses Dir.x for right-left, Dir.y for forward-back, and Dir.z as up-down, relative to the angle
 #endif
 
-#define ENT_PREFIX "PentP"
+constexpr const char* ENT_PREFIX = "\u0081Pent\u0081P";
+constexpr const char *ENT_FORMAT = "\u0081Pent\u0081P (%i,%u)";
+
 msstring EntToString( class CBaseEntity *pEntity );			//Converts an entity to a string of format "PentP(idx,addr)"
 std::string EntToStdString(class CBaseEntity* pEntity);	//Converts an entity to a string of format "PentP(idx,addr)"
 CBaseEntity *StringToEnt(const char* EntString);			//Converts an string of format "PentP(idx,addr)" to an entity
@@ -89,12 +102,15 @@ void dbgtxt(const char* Text );
 	};
 #pragma pack( pop )
 #endif
+enum error_print_type_e {
 
-#define ERRORPRINT_LOG      (1 << 0)
-#define ERRORPRINT_CONSOLE  (1 << 1)
-#define ERRORPRINT_INFOMSG  (1 << 2)
-#define ERRORPRINT_CVAR     (1 << 3)
-#define ERRORPRINT_POPUP    (1 << 4)
+	ERRORPRINT_LOG      = (1 << 0),
+	ERRORPRINT_CONSOLE  = (1 << 1),
+	ERRORPRINT_INFOMSG  = (1 << 2),
+	ERRORPRINT_CVAR     = (1 << 3),
+	ERRORPRINT_POPUP    = (1 << 4)
+
+};
 void ErrorPrint(msstring vsUnqeTag, int vFlags, const char *szFmt, ...);
 
 #endif // SHAREDUTIL_H

From 098a951eec446e563dd3dcb705fcac3a9fa1b4e4 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Sun, 22 Mar 2026 20:17:15 -0400
Subject: [PATCH 198/291] changed define to function. named some enums

---
 src/game/server/hl/util.h | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/game/server/hl/util.h b/src/game/server/hl/util.h
index c37eeacf..0b6f28af 100644
--- a/src/game/server/hl/util.h
+++ b/src/game/server/hl/util.h
@@ -264,7 +264,12 @@ extern CBaseEntity *UTIL_FindEntityGeneric(const char *szName, Vector &vecSrc, f
 // Index is 1 based
 extern CBaseEntity *UTIL_PlayerByIndex(int playerIndex);
 
-#define UTIL_EntitiesInPVS(pent) (*g_engfuncs.pfnEntitiesInPVS)(pent)
+//#define UTIL_EntitiesInPVS(edict_t * pent) (*g_engfuncs.pfnEntitiesInPVS)(pent)
+
+inline edict_t* UTIL_EntitiesInPVS(edict_t* pent) {
+	return g_engfuncs.pfnEntitiesInPVS(pent);
+}
+
 extern void UTIL_MakeVectors(const Vector &vecAngles);
 
 // Pass in an array of pointers and an array size, it fills the array and returns the number inserted
@@ -309,20 +314,24 @@ typedef enum
 	dont_ignore_monsters = 0,
 	missile = 2
 } IGNORE_MONSTERS;
+
 typedef enum
 {
 	ignore_glass = 1,
 	dont_ignore_glass = 0
 } IGNORE_GLASS;
+
 extern void UTIL_TraceLine(const Vector &vecStart, const Vector &vecEnd, IGNORE_MONSTERS igmon, edict_t *pentIgnore, TraceResult *ptr);
 extern void UTIL_TraceLine(const Vector &vecStart, const Vector &vecEnd, IGNORE_MONSTERS igmon, IGNORE_GLASS ignoreGlass, edict_t *pentIgnore, TraceResult *ptr);
-enum
+
+enum hull_e
 {
 	point_hull = 0,
 	human_hull = 1,
 	large_hull = 2,
 	head_hull = 3
 };
+
 extern void UTIL_TraceHull(const Vector &vecStart, const Vector &vecEnd, IGNORE_MONSTERS igmon, int hullNumber, edict_t *pentIgnore, TraceResult *ptr);
 extern TraceResult UTIL_GetGlobalTrace(void);
 extern void UTIL_TraceModel(const Vector &vecStart, const Vector &vecEnd, int hullNumber, edict_t *pentModel, TraceResult *ptr);
@@ -442,7 +451,7 @@ extern DLL_GLOBAL const Vector g_vecZero;
 // Un-comment only as needed
 //
 
-enum {
+enum language_setting_e {
 	LANGUAGE_ENGLISH = 0,
 	LANGUAGE_GERMAN = 1,
 	LANGUAGE_FRENCH = 2,
@@ -450,7 +459,7 @@ enum {
 };
 extern DLL_GLOBAL int g_Language;
 
-enum {
+enum amient_sound_e {
 	AMBIENT_SOUND_STATIC = 0,// medium radius attenuation
 	AMBIENT_SOUND_EVERYWHERE = 1,
 	AMBIENT_SOUND_SMALLRADIUS = 2,
@@ -460,24 +469,24 @@ enum {
 	AMBIENT_SOUND_NOT_LOOPING = 32
 };
 
-enum {
+enum speaker_start_e {
 	SPEAKER_START_SILENT = 1 // wait for trigger 'on' to start announcements
 };
 
-enum {	 
+enum sound_cmd_e {	 
 	SND_STOP = (1 << 5),		   // duplicated in protocol.h stop sound
 	SND_CHANGE_VOL = (1 << 6),	   // duplicated in protocol.h change sound vol
 	SND_CHANGE_PITCH = (1 << 7),    // duplicated in protocol.h change sound pitch
 	SND_SPAWNING = (1 << 8)			// duplicated in protocol.h we're spawing, used in some cases for ambients
 };
 
-enum {
+enum lfo_wave_e {
 	LFO_SQUARE = 1,
 	LFO_TRIANGLE = 2,
 	LFO_RANDOM = 3
 };
 
-enum {
+enum sf_brush_e {
 	SF_BRUSH_ROTATE_Y_AXIS = 0,
 	SF_BRUSH_ROTATE_INSTANT = 1,
 	SF_BRUSH_ROTATE_BACKWARDS = 2,
@@ -491,7 +500,7 @@ enum {
 };
 
 
-enum {
+enum push_block_e {
 	PUSH_BLOCK_ONLY_X = 1,
 	PUSH_BLOCK_ONLY_Y = 2
 };
@@ -506,7 +515,7 @@ constexpr Vector VEC_DUCK_HULL_MIN = Vector(-16, -16, -18);
 constexpr Vector VEC_DUCK_HULL_MAX = Vector(16, 16, 18);
 constexpr Vector VEC_DUCK_VIEW = Vector(0, 0, 12);
 
-enum {
+enum svc_type_e {
 	SVC_TEMPENTITY = 23,
 	SVC_INTERMISSION = 30,
 	SVC_CDTRACK = 32,
@@ -517,7 +526,7 @@ enum {
 
 // triggers
 
-enum {
+enum sf_trigger_e {
 	SF_TRIG_PUSH_ONCE = 1,
 	SF_TRIGGER_ALLOWMONSTERS = 1, // monsters allowed to fire this trigger
 	SF_TRIGGER_NOCLIENTS = 2,	   // players not allowed to fire this trigger
@@ -525,7 +534,7 @@ enum {
 };
 
 // func breakable
-enum {
+enum sf_func_breakable_e {
 	SF_BREAK_TRIGGER_ONLY = 1, // may only be broken by trigger
 	SF_BREAK_TOUCH = 2,		// can be 'crashed through' by running player (plate glass)
 	SF_BREAK_PRESSURE = 4,		// can be broken by a player standing on it
@@ -533,18 +542,18 @@ enum {
 	SF_BREAK_CROWBAR = 256	// instant break if hit with crowbar
 };
 
-enum {
+enum sf_light_start_e {
 	SF_LIGHT_START_OFF = 1
 };
 
-enum {
+enum spawnflag_e {
 	SPAWNFLAG_NOMESSAGE = 1,
 	SPAWNFLAG_NOTOUCH = 1,
 	SPAWNFLAG_USEONLY = 1,
 	SPAWNFLAG_DROIDONLY = 4
 };
 
-enum {
+enum teleport_sound_e {
 	TELE_PLAYER_ONLY = 1,
 	TELE_SILENT = 2
 };

From 7920b62491ce799d8d099afc91663061ce054f1d Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 13:30:19 -0400
Subject: [PATCH 199/291] commented out unused macros. changed MAX_ var names
 to fit more standard naming convention

---
 src/game/server/hl/sound.cpp | 22 +++++++++++-----------
 src/game/server/hl/util.h    | 10 +++++++---
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/game/server/hl/sound.cpp b/src/game/server/hl/sound.cpp
index 670e82d9..b530ca3c 100644
--- a/src/game/server/hl/sound.cpp
+++ b/src/game/server/hl/sound.cpp
@@ -1051,7 +1051,7 @@ constexpr unsigned int CSENTENCE_LRU_MAX = 32; // max number of elements per sen
 
 typedef struct sentenceg
 {
-	char szgroupname[CBSENTENCENAME_MAX];
+	char szgroupname[MAX_CBSENTENCENAME];
 	int count;
 	unsigned char rgblru[CSENTENCE_LRU_MAX];
 
@@ -1063,7 +1063,7 @@ constexpr unsigned int CSENTENCEG_MAX = 200; // max number of sentence groups
 SENTENCEG rgsentenceg[CSENTENCEG_MAX];
 bool bSentencesInit = false;
 
-char gszallsentencenames[CVOXFILESENTENCEMAX][CBSENTENCENAME_MAX];
+char gszallsentencenames[MAX_CVOXFILESENTENCE][MAX_CBSENTENCENAME];
 int gcallsentences = 0;
 
 // randomize list of sentence name indices
@@ -1121,7 +1121,7 @@ int USENTENCEG_PickSequential(int isentenceg, char *szfound, int ipick, int fres
 		ipick = count - 1;
 
 	strncpy(szfound, "!", 64);
-	strncat(szfound, szgroupname, CBSENTENCENAME_MAX);	
+	strncat(szfound, szgroupname, MAX_CBSENTENCENAME);	
 	_snprintf(sznum, sizeof(sznum), "%i", ipick);
 	strncat(szfound, sznum, sizeof(sznum));
 
@@ -1181,7 +1181,7 @@ int USENTENCEG_Pick(int isentenceg, char *szfound)
 		else
 		{
 			strncpy(szfound, "!", 64);
-			strncat(szfound, szgroupname, CBSENTENCENAME_MAX);
+			strncat(szfound, szgroupname, MAX_CBSENTENCENAME);
 			_snprintf(sznum, sizeof(sznum), "%i", ipick);
 			strncat(szfound, sznum, sizeof(sznum));
 			return ipick;
@@ -1304,7 +1304,7 @@ void SENTENCEG_Stop(edict_t *entity, int isentenceg, int ipick)
 		return;
 
 	strncpy(buffer, "!", sizeof(buffer));
-	strncat(buffer, rgsentenceg[isentenceg].szgroupname, CBSENTENCENAME_MAX);
+	strncat(buffer, rgsentenceg[isentenceg].szgroupname, MAX_CBSENTENCENAME);
 	_snprintf(sznum, sizeof(sznum), "%i", ipick);
 	strncat(buffer, sznum, sizeof(sznum));
 
@@ -1325,7 +1325,7 @@ void SENTENCEG_Init()
 	if (bSentencesInit)
 		return;
 
-	memset(gszallsentencenames, 0, CVOXFILESENTENCEMAX * CBSENTENCENAME_MAX);
+	memset(gszallsentencenames, 0, MAX_CVOXFILESENTENCE * MAX_CBSENTENCENAME);
 	gcallsentences = 0;
 
 	memset(rgsentenceg, 0, CSENTENCEG_MAX * sizeof(SENTENCEG));
@@ -1359,7 +1359,7 @@ void SENTENCEG_Init()
 		if (!buffer[j])
 			continue;
 
-		if (gcallsentences > CVOXFILESENTENCEMAX)
+		if (gcallsentences > MAX_CVOXFILESENTENCE)
 		{
 			ALERT(at_error, "Too many sentences in sentences.txt!\n");
 			break;
@@ -1369,10 +1369,10 @@ void SENTENCEG_Init()
 		buffer[j] = 0;
 		const char *pString = buffer + i;
 
-		if (strlen(pString) >= CBSENTENCENAME_MAX)
-			ALERT(at_warning, "Sentence %s longer than %d letters\n", pString, CBSENTENCENAME_MAX - 1);
+		if (strlen(pString) >= MAX_CBSENTENCENAME)
+			ALERT(at_warning, "Sentence %s longer than %d letters\n", pString, MAX_CBSENTENCENAME - 1);
 
-		strncpy(gszallsentencenames[gcallsentences++], pString, CBSENTENCENAME_MAX);
+		strncpy(gszallsentencenames[gcallsentences++], pString, MAX_CBSENTENCENAME);
 
 		j--;
 		if (j <= i)
@@ -1403,7 +1403,7 @@ void SENTENCEG_Init()
 				break;
 			}
 
-			strncpy(rgsentenceg[isentencegs].szgroupname, &(buffer[i]), CBSENTENCENAME_MAX);
+			strncpy(rgsentenceg[isentencegs].szgroupname, &(buffer[i]), MAX_CBSENTENCENAME);
 			rgsentenceg[isentencegs].count = 1;
 			strncpy(szgroup, &(buffer[i]), 64);
 
diff --git a/src/game/server/hl/util.h b/src/game/server/hl/util.h
index 0b6f28af..b6c81843 100644
--- a/src/game/server/hl/util.h
+++ b/src/game/server/hl/util.h
@@ -561,10 +561,10 @@ enum teleport_sound_e {
 
 
 // sentence groups
-constexpr int CBSENTENCENAME_MAX = 16;
-constexpr int CVOXFILESENTENCEMAX = 1536;// max number of sentences in game. NOTE: this must match CVOXFILESENTENCEMAX in engine\sound.h!!!
+constexpr int MAX_CBSENTENCENAME = 16;
+constexpr int MAX_CVOXFILESENTENCE = 1536;// max number of sentences in game. NOTE: this must match CVOXFILESENTENCEMAX in engine\sound.h!!!
 
-extern char gszallsentencenames[CVOXFILESENTENCEMAX][CBSENTENCENAME_MAX];
+extern char gszallsentencenames[MAX_CVOXFILESENTENCE][MAX_CBSENTENCENAME];
 extern int gcallsentences;
 
 int USENTENCEG_Pick(int isentenceg, char *szfound);
@@ -638,6 +638,9 @@ void EMIT_SOUND_SUIT(edict_t *entity, const char *sample);
 void EMIT_GROUPID_SUIT(edict_t *entity, int isentenceg);
 void EMIT_GROUPNAME_SUIT(edict_t *entity, const char *groupname);
 
+
+//these don't look used
+/*
 #define PRECACHE_SOUND_ARRAY(a)                \
 	{                                          \
 		for (unsigned int i = 0; i < std::size(a); i++) \
@@ -651,6 +654,7 @@ void EMIT_GROUPNAME_SUIT(edict_t *entity, const char *groupname);
 
 #define PLAYBACK_EVENT(flags, who, index) PLAYBACK_EVENT_FULL(flags, who, index, 0, (float *)&g_vecZero, (float *)&g_vecZero, 0.0, 0.0, 0, 0, 0, 0);
 #define PLAYBACK_EVENT_DELAY(flags, who, index, delay) PLAYBACK_EVENT_FULL(flags, who, index, delay, (float *)&g_vecZero, (float *)&g_vecZero, 0.0, 0.0, 0, 0, 0, 0);
+*/
 
 enum {
 	GROUP_OP_AND = 0,

From 5db3f2e746703f8c82fbb3cd804ad1815732e939 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 13:34:32 -0400
Subject: [PATCH 200/291] changed macrodefine to constexpr

---
 src/game/server/monsters/corpse.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/server/monsters/corpse.h b/src/game/server/monsters/corpse.h
index 21b11093..8ea0b037 100644
--- a/src/game/server/monsters/corpse.h
+++ b/src/game/server/monsters/corpse.h
@@ -1,4 +1,4 @@
-#define SKELETON_MODEL "models/monsters/skeleton.mdl"
+constexpr const char* SKELETON_MODEL = "models/monsters/skeleton.mdl";
 
 class CCorpse : public CMSMonster
 {

From 44ff7c482f1176c98ea3a318b7549bf307ddf6c7 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 13:52:12 -0400
Subject: [PATCH 201/291] changed defines to enums

---
 src/game/shared/ms/storeshared.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/game/shared/ms/storeshared.h b/src/game/shared/ms/storeshared.h
index 3f31e23b..390e0192 100644
--- a/src/game/shared/ms/storeshared.h
+++ b/src/game/shared/ms/storeshared.h
@@ -28,6 +28,8 @@ struct storeitem_t : public containeritem_t
 	float flSellRatio;
 };
 
-#define STORE_BUY	(1<<0)
-#define STORE_SELL	(1<<1)
-#define STORE_INV	(1<<2)
\ No newline at end of file
+enum store_action_e {
+	STORE_BUY	= (1<<0),
+	STORE_SELL	= (1<<1),
+	STORE_INV	= (1<<2)
+};
\ No newline at end of file

From dff449553e8d784c33f0ae7dd2f028c63ce97486 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 13:59:56 -0400
Subject: [PATCH 202/291] ensured RANDOM LONG/FLOAT templated functions were
 static casted to expected type.

---
 src/game/server/enginecallback.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/game/server/enginecallback.h b/src/game/server/enginecallback.h
index 4601f0fe..4829bebc 100644
--- a/src/game/server/enginecallback.h
+++ b/src/game/server/enginecallback.h
@@ -85,10 +85,10 @@ template <typename Type1, typename Type2>
 int32 RANDOM_LONG(const Type1 &lLow, const Type2 &lHigh) {
 
 	if (lLow > lHigh) {
-		return g_engfuncs.pfnRandomLong(lHigh, lLow);
+		return g_engfuncs.pfnRandomLong(static_cast<int32>(lHigh), static_cast<int32>(lLow));
 	}
 
-	return g_engfuncs.pfnRandomLong(lLow, lHigh);
+	return g_engfuncs.pfnRandomLong(static_cast<int32>(lLow), static_cast<int32>(lHigh));
 
 
 }
@@ -98,10 +98,10 @@ template <typename Type1, typename Type2>
 float RANDOM_FLOAT(const Type1 &flLow, const Type2 &flHigh) {
 
 	if (flLow > flHigh) {
-		return g_engfuncs.pfnRandomFloat(flHigh, flLow);
+		return g_engfuncs.pfnRandomFloat( static_cast<float>(flHigh), static_cast<float>(flLow) );
 	}
 	
-	return g_engfuncs.pfnRandomFloat(flLow, flHigh);
+	return g_engfuncs.pfnRandomFloat(static_cast<float>(flLow), static_cast<float>(flHigh));
 
 }
 

From fba89ddc68cc268f3fda596eac61d43bb98e6fa8 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 14:28:25 -0400
Subject: [PATCH 203/291] changed define to enum. moved consts to header

---
 src/game/server/player/player.cpp |  3 ---
 src/game/server/player/player.h   | 35 ++++++++++++++++++-------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/game/server/player/player.cpp b/src/game/server/player/player.cpp
index 0e46ed78..a92e28ef 100644
--- a/src/game/server/player/player.cpp
+++ b/src/game/server/player/player.cpp
@@ -85,9 +85,6 @@ int MapTextureTypeStepType(char chTextureType);
 // the world node graph
 extern CGraph WorldGraph;
 
-#define PLAYER_WALLJUMP_SPEED 300 // how fast we can spring off walls
-#define PLAYER_LONGJUMP_SPEED 350 // how fast we longjump
-
 #define TRAIN_ACTIVE 0x80
 #define TRAIN_NEW 0xc0
 #define TRAIN_OFF 0x00
diff --git a/src/game/server/player/player.h b/src/game/server/player/player.h
index 69a81003..6ff1f3b0 100644
--- a/src/game/server/player/player.h
+++ b/src/game/server/player/player.h
@@ -137,31 +137,36 @@ constexpr const char* PLAYER_SCRIPT = "player/player";
 //#define CHWielded ((Hand[iCurrentHand])?Hand[iCurrentHand]->Wielded:(PlayerHands?PlayerHands->Wielded:false))
 #define CHWielded Wielded(iCurrentHand)*/
 
-constexpr int MAX_PLAYER_HANDS = 2;
-constexpr int MAX_PLAYER_HANDITEMS = 3;
-constexpr int MAX_KEYHISTORY = 10;
-constexpr int MSGFLAG_SPAWN = (1 << 0);
-
+constexpr unsigned int MAX_PLAYER_HANDS = 2;
+constexpr unsigned int MAX_PLAYER_HANDITEMS = 3;
+constexpr unsigned int MAX_KEYHISTORY = 10;
 
+enum ms_flag_e {
+	MSGFLAG_SPAWN = (1 << 0)
+};
 
 //-----------------
 
-constexpr int PLAYER_FATAL_FALL_SPEED = 1024;															  // approx 60 feet
-constexpr int PLAYER_MAX_SAFE_FALL_SPEED = 580;														  // approx 20 feet
+constexpr float PLAYER_FATAL_FALL_SPEED = 1024;															  // approx 60 feet
+constexpr float PLAYER_MAX_SAFE_FALL_SPEED = 580;														  // approx 20 feet
 constexpr float DAMAGE_FOR_FALL_SPEED = 100.0f / (PLAYER_FATAL_FALL_SPEED - PLAYER_MAX_SAFE_FALL_SPEED); // damage per unit per second.
-constexpr int PLAYER_MIN_BOUNCE_SPEED = 200;
+constexpr float PLAYER_MIN_BOUNCE_SPEED = 200;
 constexpr float PLAYER_FALL_PUNCH_THRESHHOLD = 350.0f;// won't punch player's screen/make scrape noise unless player falling at least this fast.
+constexpr float PLAYER_WALLJUMP_SPEED = 300; // how fast we can spring off walls
+constexpr float PLAYER_LONGJUMP_SPEED = 350; // how fast we longjump
 
 //
 // Player PHYSICS FLAGS bits
 //
-constexpr int PFLAG_ONLADDER = (1 << 0);
-constexpr int PFLAG_ONSWING = (1 << 0);
-constexpr int PFLAG_ONTRAIN = (1 << 1);
-constexpr int PFLAG_ONBARNACLE = (1 << 2);
-constexpr int PFLAG_DUCKING = (1 << 3);	// In the process of ducking, but totally squatted yet
-constexpr int PFLAG_USING = (1 << 4);	// Using a continuous entity
-constexpr int PFLAG_OBSERVER = (1 << 5); // player is locked in stationary cam mode. Spectators can move, observers can't.
+enum player_flag_e {
+	PFLAG_ONLADDER = (1 << 0),
+	PFLAG_ONSWING = (1 << 0),
+	PFLAG_ONTRAIN = (1 << 1),
+	PFLAG_ONBARNACLE = (1 << 2),
+	PFLAG_DUCKING = (1 << 3),	// In the process of ducking, but totally squatted yet
+	PFLAG_USING = (1 << 4),	// Using a continuous entity
+	PFLAG_OBSERVER = (1 << 5) // player is locked in stationary cam mode. Spectators can move, observers can't.
+};
 
 //
 // generic player

From fe0ac7edd43033962623ca8fd44a51885639b511 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 14:29:30 -0400
Subject: [PATCH 204/291] removed header include

---
 src/game/server/player/player.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/game/server/player/player.h b/src/game/server/player/player.h
index 6ff1f3b0..93c3dd87 100644
--- a/src/game/server/player/player.h
+++ b/src/game/server/player/player.h
@@ -20,7 +20,6 @@
 #include "monsters/bodyparts/bodyparts_human.h"
 #include "pm_materials.h"
 #include "mscharacter.h"
-#include "iscript.h"
 
 constexpr int MAX_ID_RANGE = 2048;
 constexpr int SBAR_STRING_SIZE = 128;

From cd0461ce2d7a6af9a51d4d058b10abe581a1f4ae Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 15:10:59 -0400
Subject: [PATCH 205/291] changed define to enum, moved to trains header
 changeg defines to const, moved to player header. added if guard to
 bodyparts_human_h

---
 src/game/server/hl/trains.h                       | 13 +++++++++++++
 .../server/monsters/bodyparts/bodyparts_human.h   |  7 +++++--
 src/game/server/player/player.cpp                 | 15 +++------------
 src/game/server/player/player.h                   |  1 +
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/game/server/hl/trains.h b/src/game/server/hl/trains.h
index b168c718..e054da23 100644
--- a/src/game/server/hl/trains.h
+++ b/src/game/server/hl/trains.h
@@ -15,6 +15,19 @@
 #ifndef TRAINS_H
 #define TRAINS_H
 
+enum train_state_e {
+
+	TRAIN_ACTIVE = 0x80,
+	TRAIN_NEW = 0xc0,
+	TRAIN_OFF = 0x00,
+	TRAIN_NEUTRAL = 0x01,
+	TRAIN_SLOW = 0x02,
+	TRAIN_MEDIUM = 0x03,
+	TRAIN_FAST = 0x04,
+	TRAIN_BACK = 0x05
+
+};
+
 // Tracktrain spawn flags
 enum sf_tracktrain_e {
 	SF_TRACKTRAIN_NOPITCH = 0x0001,
diff --git a/src/game/server/monsters/bodyparts/bodyparts_human.h b/src/game/server/monsters/bodyparts/bodyparts_human.h
index 95e4b550..a047cb21 100644
--- a/src/game/server/monsters/bodyparts/bodyparts_human.h
+++ b/src/game/server/monsters/bodyparts/bodyparts_human.h
@@ -1,5 +1,7 @@
-#include "bodyparts.h"
 
+#ifndef BODYPARTS_HUMAN_H
+#include "bodyparts.h"
+#define BODYPARTS_HUMAN_H
 enum
 {
 	//Human bodyparts
@@ -23,4 +25,5 @@ class CHumanBody : public CBaseBody
 	CBaseBody *Duplicate();
 };
 
-int HitGroupToBodyPart(int HitGroup);
\ No newline at end of file
+int HitGroupToBodyPart(int HitGroup);
+#endif
\ No newline at end of file
diff --git a/src/game/server/player/player.cpp b/src/game/server/player/player.cpp
index a92e28ef..54e36a64 100644
--- a/src/game/server/player/player.cpp
+++ b/src/game/server/player/player.cpp
@@ -58,7 +58,7 @@
 #include "fn/FNSharedDefs.h"
 #include "mslogger.h"
 
-#define MAX_ENTITIES_TO_SEARCH 4096
+constexpr unsigned int MAX_ENTITIES_TO_SEARCH = 4096;
 static CBaseEntity* g_pEntitiesInBox[MAX_ENTITIES_TO_SEARCH];
 
 clientitem_t::clientitem_t(class CGenericItem *pItem) : genericitem_t(pItem)
@@ -85,17 +85,9 @@ int MapTextureTypeStepType(char chTextureType);
 // the world node graph
 extern CGraph WorldGraph;
 
-#define TRAIN_ACTIVE 0x80
-#define TRAIN_NEW 0xc0
-#define TRAIN_OFF 0x00
-#define TRAIN_NEUTRAL 0x01
-#define TRAIN_SLOW 0x02
-#define TRAIN_MEDIUM 0x03
-#define TRAIN_FAST 0x04
-#define TRAIN_BACK 0x05
 
-#define FLASH_DRAIN_TIME 1.2  //100 units/3 minutes
-#define FLASH_CHARGE_TIME 0.2 // 100 units/20 seconds  (seconds per unit)
+constexpr float FLASH_DRAIN_TIME = 1.2;  //100 units/3 minutes
+constexpr float FLASH_CHARGE_TIME = 0.2; // 100 units/20 seconds  (seconds per unit)
 
 //#define PLAYER_MAX_SAFE_FALL_DIST	20// falling any farther than this many feet will inflict damage
 //#define	PLAYER_FATAL_FALL_DIST		60// 100% damage inflicted if player falls this many feet
@@ -1094,7 +1086,6 @@ void CBasePlayer::CinematicCamera(BOOL OnorOff, Vector vecPosition, Vector vecVi
 //
 // PlayerUse - handles USE keypress
 //
-#define PLAYER_SEARCH_RADIUS (float)64
 
 void CBasePlayer::PlayerUse(void)
 {
diff --git a/src/game/server/player/player.h b/src/game/server/player/player.h
index 93c3dd87..c0ba645e 100644
--- a/src/game/server/player/player.h
+++ b/src/game/server/player/player.h
@@ -24,6 +24,7 @@
 constexpr int MAX_ID_RANGE = 2048;
 constexpr int SBAR_STRING_SIZE = 128;
 constexpr int NUM_MAX_ITEMS = 100; //Thothie APR2011_28
+constexpr float PLAYER_SEARCH_RADIUS = 64;
 
 // was 1500, but there shouldn't be any issues with increasing.
 constexpr int NUM_MAX_STACK = 9999; //stack is stored as either a unsigned short, so that's the actual max it can be.

From e098e7a93d13e5d34b861f478b64e02f7d900a27 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 15:13:01 -0400
Subject: [PATCH 206/291] changed define to constexpr, moved to header

---
 src/game/server/player/player.cpp |  5 -----
 src/game/server/player/player.h   | 11 ++++++++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/game/server/player/player.cpp b/src/game/server/player/player.cpp
index 54e36a64..a4a0b2da 100644
--- a/src/game/server/player/player.cpp
+++ b/src/game/server/player/player.cpp
@@ -1475,11 +1475,6 @@ void CBasePlayer::UpdateStatusBar()
 	}
 }
 
-#define CLIMB_SHAKE_FREQUENCY 22 // how many frames in between screen shakes when climbing
-#define MAX_CLIMB_SPEED 200		 // fastest vertical climbing speed possible
-#define CLIMB_SPEED_DEC 15		 // climbing deceleration rate
-#define CLIMB_PUNCH_X -7		 // how far to 'punch' client X axis when climbing
-#define CLIMB_PUNCH_Z 7			 // how far to 'punch' client Z axis when climbing
 
 void SetKeys(CBasePlayer *pPlayer);
 
diff --git a/src/game/server/player/player.h b/src/game/server/player/player.h
index c0ba645e..3f96adea 100644
--- a/src/game/server/player/player.h
+++ b/src/game/server/player/player.h
@@ -21,10 +21,15 @@
 #include "pm_materials.h"
 #include "mscharacter.h"
 
-constexpr int MAX_ID_RANGE = 2048;
-constexpr int SBAR_STRING_SIZE = 128;
-constexpr int NUM_MAX_ITEMS = 100; //Thothie APR2011_28
+constexpr unsigned int MAX_ID_RANGE = 2048;
+constexpr unsigned int SBAR_STRING_SIZE = 128;
+constexpr unsigned int NUM_MAX_ITEMS = 100; //Thothie APR2011_28
 constexpr float PLAYER_SEARCH_RADIUS = 64;
+constexpr float CLIMB_SHAKE_FREQUENCY = 22; // how many frames in between screen shakes when climbing
+constexpr float MAX_CLIMB_SPEED = 200;		 // fastest vertical climbing speed possible
+constexpr float CLIMB_SPEED_DEC = 15;		 // climbing deceleration rate
+constexpr float CLIMB_PUNCH_X = -7;		 // how far to 'punch' client X axis when climbing
+constexpr float CLIMB_PUNCH_Z = 7;		 // how far to 'punch' client Z axis when climbing
 
 // was 1500, but there shouldn't be any issues with increasing.
 constexpr int NUM_MAX_STACK = 9999; //stack is stored as either a unsigned short, so that's the actual max it can be.

From b2d2eb03dcba6d13a42372464bf448dc597a09f2 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 15:23:34 -0400
Subject: [PATCH 207/291] moved class defs to header. added include guard for
 global.h

---
 src/game/server/player/player.cpp | 65 +++++++------------------------
 src/game/server/player/player.h   | 51 ++++++++++++++++++++++--
 src/game/shared/ms/global.h       |  8 +++-
 src/game/shared/ms/mscharacter.h  |  5 +++
 4 files changed, 74 insertions(+), 55 deletions(-)

diff --git a/src/game/server/player/player.cpp b/src/game/server/player/player.cpp
index a4a0b2da..a025ae76 100644
--- a/src/game/server/player/player.cpp
+++ b/src/game/server/player/player.cpp
@@ -1923,7 +1923,7 @@ Things powered by the battery
 */
 
 // if in range of radiation source, ping geiger counter
-#define GEIGERDELAY 0.25
+constexpr float GEIGERDELAY = 0.25;
 
 void CBasePlayer ::UpdateGeigerCounter(void)
 {
@@ -2540,15 +2540,6 @@ CBaseEntity *CBasePlayer::FindSpawnSpot()
 	return pSpot;
 }
 
-//Map must have a ms_player_begin in order for people to create characters there!
-class CSpawnPointBegin : public CPointEntity
-{
-	void Spawn()
-	{
-		MSGlobals::CanCreateCharOnMap = true;
-		CPointEntity::Spawn();
-	}
-};
 
 LINK_ENTITY_TO_CLASS(ms_player_spec, CPointEntity);
 LINK_ENTITY_TO_CLASS(ms_player_spawn, CPointEntity);
@@ -4146,19 +4137,19 @@ void CBasePlayer ::EnableControl(BOOL fControl)
 		pev->flags &= ~FL_FROZEN;
 }
 
-#define DOT_1DEGREE 0.9998476951564
-#define DOT_2DEGREE 0.9993908270191
-#define DOT_3DEGREE 0.9986295347546
-#define DOT_4DEGREE 0.9975640502598
-#define DOT_5DEGREE 0.9961946980917
-#define DOT_6DEGREE 0.9945218953683
-#define DOT_7DEGREE 0.9925461516413
-#define DOT_8DEGREE 0.9902680687416
-#define DOT_9DEGREE 0.9876883405951
-#define DOT_10DEGREE 0.9848077530122
-#define DOT_15DEGREE 0.9659258262891
-#define DOT_20DEGREE 0.9396926207859
-#define DOT_25DEGREE 0.9063077870367
+constexpr double DOT_1DEGREE = 0.9998476951564;
+constexpr double DOT_2DEGREE = 0.9993908270191;
+constexpr double DOT_3DEGREE = 0.9986295347546;
+constexpr double DOT_4DEGREE = 0.9975640502598;
+constexpr double DOT_5DEGREE = 0.9961946980917;
+constexpr double DOT_6DEGREE = 0.9945218953683;
+constexpr double DOT_7DEGREE = 0.9925461516413;
+constexpr double DOT_8DEGREE = 0.9902680687416;
+constexpr double DOT_9DEGREE = 0.9876883405951;
+constexpr double DOT_10DEGREE = 0.9848077530122;
+constexpr double DOT_15DEGREE = 0.9659258262891;
+constexpr double DOT_20DEGREE = 0.9396926207859;
+constexpr double DOT_25DEGREE = 0.9063077870367;
 
 //=========================================================
 // Autoaim
@@ -4437,37 +4428,11 @@ void CStripWeapons ::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE
 		pPlayer->RemoveAllItems(false);
 }
 
-class CRevertSaved : public CPointEntity
-{
-public:
-	void Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value);
-	void EXPORT MessageThink(void);
-	void EXPORT LoadThink(void);
-	void KeyValue(KeyValueData *pkvd);
-
-	virtual int Save(CSave &save);
-	virtual int Restore(CRestore &restore);
-	static TYPEDESCRIPTION m_SaveData[];
-
-	inline float Duration(void) { return pev->dmg_take; }
-	inline float HoldTime(void) { return pev->dmg_save; }
-	inline float MessageTime(void) { return m_messageTime; }
-	inline float LoadTime(void) { return m_loadTime; }
-
-	inline void SetDuration(float duration) { pev->dmg_take = duration; }
-	inline void SetHoldTime(float hold) { pev->dmg_save = hold; }
-	inline void SetMessageTime(float time) { m_messageTime = time; }
-	inline void SetLoadTime(float time) { m_loadTime = time; }
-
-private:
-	float m_messageTime;
-	float m_loadTime;
-};
 
 LINK_ENTITY_TO_CLASS(player_loadsaved, CRevertSaved);
 
 TYPEDESCRIPTION CRevertSaved::m_SaveData[] =
-	{
+{
 		DEFINE_FIELD(CRevertSaved, m_messageTime, FIELD_FLOAT), // These are not actual times, but durations, so save as floats
 		DEFINE_FIELD(CRevertSaved, m_loadTime, FIELD_FLOAT),
 };
diff --git a/src/game/server/player/player.h b/src/game/server/player/player.h
index 3f96adea..eb80ed26 100644
--- a/src/game/server/player/player.h
+++ b/src/game/server/player/player.h
@@ -21,6 +21,9 @@
 #include "pm_materials.h"
 #include "mscharacter.h"
 
+#include "global.h"
+
+
 constexpr unsigned int MAX_ID_RANGE = 2048;
 constexpr unsigned int SBAR_STRING_SIZE = 128;
 constexpr unsigned int NUM_MAX_ITEMS = 100; //Thothie APR2011_28
@@ -890,14 +893,54 @@ extern CBasePlayer player;
 extern int playerBodyArray[16];
 #endif
 
-#define AUTOAIM_2DEGREES 0.0348994967025
-#define AUTOAIM_5DEGREES 0.08715574274766
-#define AUTOAIM_8DEGREES 0.1391731009601
-#define AUTOAIM_10DEGREES 0.1736481776669
+constexpr double AUTOAIM_2DEGREES = 0.0348994967025;
+constexpr double AUTOAIM_5DEGREES = 0.08715574274766;
+constexpr double AUTOAIM_8DEGREES = 0.1391731009601;
+constexpr double AUTOAIM_10DEGREES = 0.1736481776669;
 
 extern int gmsgHudText;
 extern BOOL gInitHUD;
 
 const char *GetOtherPlayerTransition(CBasePlayer *pPlayer);
 
+class CRevertSaved : public CPointEntity
+{
+public:
+	void Use(CBaseEntity* pActivator, CBaseEntity* pCaller, USE_TYPE useType, float value);
+	void EXPORT MessageThink(void);
+	void EXPORT LoadThink(void);
+	void KeyValue(KeyValueData* pkvd);
+
+	virtual int Save(CSave& save);
+	virtual int Restore(CRestore& restore);
+	static TYPEDESCRIPTION m_SaveData[];
+
+	inline float Duration(void) { return pev->dmg_take; }
+	inline float HoldTime(void) { return pev->dmg_save; }
+	inline float MessageTime(void) { return m_messageTime; }
+	inline float LoadTime(void) { return m_loadTime; }
+
+	inline void SetDuration(float duration) { pev->dmg_take = duration; }
+	inline void SetHoldTime(float hold) { pev->dmg_save = hold; }
+	inline void SetMessageTime(float time) { m_messageTime = time; }
+	inline void SetLoadTime(float time) { m_loadTime = time; }
+
+private:
+	float m_messageTime;
+	float m_loadTime;
+};
+
+
+class CSpawnPointBegin : public CPointEntity
+{
+	void Spawn()
+	{
+		MSGlobals::CanCreateCharOnMap = true;
+		CPointEntity::Spawn();
+	}
+};
+
+
+//Map must have a ms_player_begin in order for people to create characters there!
+
 #endif // PLAYER_H
diff --git a/src/game/shared/ms/global.h b/src/game/shared/ms/global.h
index b3b53a1b..d2e279a9 100644
--- a/src/game/shared/ms/global.h
+++ b/src/game/shared/ms/global.h
@@ -1,3 +1,7 @@
+
+
+#ifndef GLOBAL_H
+#define GLOBAL_H
 #include "votedefs.h"
 
 //The client calls this once, on DLL load
@@ -92,4 +96,6 @@ enum MusicType {
 	MUSIC_SYSTEM,
 	MUSIC_STOP_COMBAT,//For scripts, stops combat music
 	MUSIC_STOP //For map triggers, stops combat & area music
-};
\ No newline at end of file
+};
+
+#endif
\ No newline at end of file
diff --git a/src/game/shared/ms/mscharacter.h b/src/game/shared/ms/mscharacter.h
index 8c337fca..295bb7f6 100644
--- a/src/game/shared/ms/mscharacter.h
+++ b/src/game/shared/ms/mscharacter.h
@@ -8,6 +8,8 @@
 #include "buildcontrol.h"
 #include "monsters/msmonster.h"
 
+
+
 // Char Files
 enum chardatastatus_e
 {
@@ -202,4 +204,7 @@ class ChooseChar_Interface
 	static void UpdateCharScreen();
 	static void UpdateCharScreenUpload();
 };
+
+
+
 #endif //MSCHARACTER_H

From c3b669a3c9f7cc160631c1c3dc76d8f2a6af9626 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 15:41:27 -0400
Subject: [PATCH 208/291] changed variable name to follow MAX_ prefixing. Moved
 class/structs to header

---
 src/game/server/monsters/npcscript.cpp        |  6 +--
 src/game/server/player/player.cpp             | 47 ++++---------------
 src/game/server/player/player.h               | 44 ++++++++++++++++-
 src/game/server/player/playershared.cpp       |  4 +-
 .../ms/angelscript/ASEntityBindings.cpp       |  2 +-
 5 files changed, 57 insertions(+), 46 deletions(-)

diff --git a/src/game/server/monsters/npcscript.cpp b/src/game/server/monsters/npcscript.cpp
index c920e6c2..bc663c32 100644
--- a/src/game/server/monsters/npcscript.cpp
+++ b/src/game/server/monsters/npcscript.cpp
@@ -644,7 +644,7 @@ bool CMSMonster::Script_ExecuteCmd(CScript *Script, SCRIPT_EVENT &Event, scriptc
 			bool inventory_full = false;
 			if (pPlayer)
 			{
-				if (pPlayer->NumItems() >= NUM_MAX_ITEMS)
+				if (pPlayer->NumItems() >= MAX_NUM_ITEMS)
 					inventory_full = true;
 			}
 
@@ -839,7 +839,7 @@ bool CMSMonster::Script_ExecuteCmd(CScript *Script, SCRIPT_EVENT &Event, scriptc
 			if (pPlayer)
 			{
 				pPlayer->CallScriptEvent("ext_remove_afk"); //flag player as non-afk when first offered store
-				if (pPlayer->NumItems() >= NUM_MAX_ITEMS)
+				if (pPlayer->NumItems() >= MAX_NUM_ITEMS)
 				{
 					inventory_full = true;
 					pPlayer->SendEventMsg(HUDEVENT_UNABLE, "Cannot use stores/chests while inventory full.");
@@ -1020,7 +1020,7 @@ bool CMSMonster::Script_ExecuteCmd(CScript *Script, SCRIPT_EVENT &Event, scriptc
 			CBasePlayer *pPlayer = pTarget ? (pTarget->IsPlayer() ? (CBasePlayer *)pTarget : NULL) : NULL;
 			if (pPlayer)
 			{
-				if (pPlayer->NumItems() < NUM_MAX_ITEMS)
+				if (pPlayer->NumItems() < MAX_NUM_ITEMS)
 				{
 					OpenMenu(pPlayer);
 				}
diff --git a/src/game/server/player/player.cpp b/src/game/server/player/player.cpp
index a025ae76..ae78aefd 100644
--- a/src/game/server/player/player.cpp
+++ b/src/game/server/player/player.cpp
@@ -798,7 +798,7 @@ void CBasePlayer::Killed(entvars_t *pevAttacker, int iGib)
 WaterMove
 ============
 */
-#define AIRTIME 12 // lung full of air lasts this many seconds
+constexpr int AIRTIME = 12; // lung full of air lasts this many seconds
 
 void CBasePlayer::WaterMove()
 {
@@ -3113,18 +3113,7 @@ ulong CBasePlayer::GetPartyID(void)
 	return m_pTeam->m_ID;
 }
 
-//==============================================
-// !!!UNDONE:ultra temporary SprayCan entity to apply
-// decal frame at a time. For PreAlpha CD
-//==============================================
-class CSprayCan : public CBaseEntity
-{
-public:
-	void Spawn(entvars_t *pevOwner);
-	void Think(void);
 
-	virtual int ObjectCaps(void) { return FCAP_DONT_SAVE; }
-};
 
 void CSprayCan::Spawn(entvars_t *pevOwner)
 {
@@ -4496,11 +4485,7 @@ void CRevertSaved ::LoadThink(void)
 //=========================================================
 // Multiplayer intermission spots.
 //=========================================================
-class CInfoIntermission : public CPointEntity
-{
-	void Spawn(void);
-	void Think(void);
-};
+
 
 void CInfoIntermission::Spawn(void)
 {
@@ -4983,27 +4968,11 @@ void CBasePlayer::UpdateMiscPositions(void)
 }
 
 
-struct itemdesc_t
-{
-	unsigned int iEntIndex;
-	CBaseEntity *pItem;
-	itemtype_e ItemType;
-	void *pvExtra;
-	CBasePlayerItem *pGroupList[256];
-	int GroupListEntidx[256];
-	unsigned int iGroupedItems, iGroupedItemTotal;
-};
 
-#define MAX_GET_ITEMS 9
-#define PICKUPITEM_DISTANCE 68.0 //Search and pickup dist might have to be different
-#define SEARCH_DISTANCE 64.0
-struct itemtrans_t
-{
-	transtype_e TransType;
-	unsigned int ItemTotal;
-	itemdesc_t ItemList[MAX_GET_ITEMS];
-	void *pvExtra;
-};
+
+
+
+
 /*
 	GetAnyItems - Look for items in front of you and give a list of them
 */
@@ -5017,7 +4986,7 @@ void CBasePlayer::GetAnyItems()
 
 	strncpy(cItemList,  "Gather items:\n\n", sizeof(cItemList) );
 
-	while (pObject = UTIL_FindEntityInSphere(pObject, EyePosition(), SEARCH_DISTANCE))
+	while (pObject = UTIL_FindEntityInSphere(pObject, EyePosition(), PLAYER_SEARCH_RADIUS))
 	{
 		if (pObject == this || !FVisible(pObject) || !FInViewCone(pObject))
 			continue;
@@ -5421,7 +5390,7 @@ void CBasePlayer::TransactionCallback(CBasePlayer *pPlayer, int slot, TCallbackM
 			break;
 		}
 		CBaseEntity *pObject = NULL;
-		while ((pObject = UTIL_FindEntityInSphere(pObject, Center(), SEARCH_DISTANCE)) != NULL)
+		while ((pObject = UTIL_FindEntityInSphere(pObject, Center(), PLAYER_SEARCH_RADIUS)) != NULL)
 			if (pObject == pEnt)
 				break;
 		if (!pObject)
diff --git a/src/game/server/player/player.h b/src/game/server/player/player.h
index eb80ed26..d4d178a5 100644
--- a/src/game/server/player/player.h
+++ b/src/game/server/player/player.h
@@ -26,7 +26,9 @@
 
 constexpr unsigned int MAX_ID_RANGE = 2048;
 constexpr unsigned int SBAR_STRING_SIZE = 128;
-constexpr unsigned int NUM_MAX_ITEMS = 100; //Thothie APR2011_28
+constexpr unsigned int MAX_NUM_ITEMS = 100; //Thothie APR2011_28
+constexpr unsigned int MAX_GET_ITEMS = 9;
+constexpr float PICKUPITEM_DISTANCE = 68.0; //Search and pickup dist might have to be different
 constexpr float PLAYER_SEARCH_RADIUS = 64;
 constexpr float CLIMB_SHAKE_FREQUENCY = 22; // how many frames in between screen shakes when climbing
 constexpr float MAX_CLIMB_SPEED = 200;		 // fastest vertical climbing speed possible
@@ -940,6 +942,46 @@ class CSpawnPointBegin : public CPointEntity
 	}
 };
 
+//==============================================
+// !!!UNDONE:ultra temporary SprayCan entity to apply
+// decal frame at a time. For PreAlpha CD
+//==============================================
+
+class CSprayCan : public CBaseEntity
+{
+public:
+	void Spawn(entvars_t* pevOwner);
+	void Think(void);
+
+	virtual int ObjectCaps(void) { return FCAP_DONT_SAVE; }
+};
+
+class CInfoIntermission : public CPointEntity
+{
+	void Spawn(void);
+	void Think(void);
+};
+
+struct itemdesc_t
+{
+	unsigned int iEntIndex;
+	CBaseEntity* pItem;
+	itemtype_e ItemType;
+	void* pvExtra;
+	CBasePlayerItem* pGroupList[256];
+	int GroupListEntidx[256];
+	unsigned int iGroupedItems, iGroupedItemTotal;
+};
+
+struct itemtrans_t
+{
+	transtype_e TransType;
+	unsigned int ItemTotal;
+	itemdesc_t ItemList[MAX_GET_ITEMS];
+	void* pvExtra;
+};
+
+
 
 //Map must have a ms_player_begin in order for people to create characters there!
 
diff --git a/src/game/server/player/playershared.cpp b/src/game/server/player/playershared.cpp
index 7c835aed..87e0a1ee 100644
--- a/src/game/server/player/playershared.cpp
+++ b/src/game/server/player/playershared.cpp
@@ -506,8 +506,8 @@ bool CBasePlayer::CanHold(CGenericItem* pItem, bool bVerbose, char* pszErrorStri
 	//Gear.size() returns # packs, not #items
 
 	int TotalItems = NumItems(); //Gear.size() - 1;
-	int MaxItems = NUM_MAX_ITEMS;
-	int WarnItems = NUM_MAX_ITEMS - 5;
+	int MaxItems  = MAX_NUM_ITEMS;
+	int WarnItems = MAX_NUM_ITEMS - 5;
 	/*
 	 for (unsigned int i = 0; i < Gear.size(); i++)
 	{
diff --git a/src/game/shared/ms/angelscript/ASEntityBindings.cpp b/src/game/shared/ms/angelscript/ASEntityBindings.cpp
index 43380358..e769e5d0 100644
--- a/src/game/shared/ms/angelscript/ASEntityBindings.cpp
+++ b/src/game/shared/ms/angelscript/ASEntityBindings.cpp
@@ -752,7 +752,7 @@ namespace ASEntityBindings
         }
         
         // Check inventory full
-        if (pPlayer->NumItems() >= NUM_MAX_ITEMS)
+        if (pPlayer->NumItems() >= MAX_NUM_ITEMS)
         {
             pPlayer->SendEventMsg(HUDEVENT_UNABLE, "Cannot use menus while inventory is full.");
             MS_ANGEL_DEBUG("OpenVoteMenu: Player inventory full");

From c1220a1b54d21c7b8bb952b52b813400754142f3 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 15:42:36 -0400
Subject: [PATCH 209/291] moved comment back to class reference

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

diff --git a/src/game/server/player/player.h b/src/game/server/player/player.h
index d4d178a5..4b679dce 100644
--- a/src/game/server/player/player.h
+++ b/src/game/server/player/player.h
@@ -935,6 +935,8 @@ class CRevertSaved : public CPointEntity
 
 class CSpawnPointBegin : public CPointEntity
 {
+
+	//Map must have a ms_player_begin in order for people to create characters there!
 	void Spawn()
 	{
 		MSGlobals::CanCreateCharOnMap = true;
@@ -983,6 +985,4 @@ struct itemtrans_t
 
 
 
-//Map must have a ms_player_begin in order for people to create characters there!
-
 #endif // PLAYER_H

From e9ac0d2e08c9f48c880b38ebd6164eb258e70b05 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 15:55:04 -0400
Subject: [PATCH 210/291] made const prefixing more consistent. groups consts
 in header

---
 src/game/server/gamerules/multiplay_gamerules.cpp |  2 +-
 src/game/server/player/playershared.cpp           | 12 ++++--------
 src/game/shared/weapons/gipack.cpp                |  8 ++++----
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/game/server/gamerules/multiplay_gamerules.cpp b/src/game/server/gamerules/multiplay_gamerules.cpp
index 9c570dce..3200019e 100644
--- a/src/game/server/gamerules/multiplay_gamerules.cpp
+++ b/src/game/server/gamerules/multiplay_gamerules.cpp
@@ -476,7 +476,7 @@ float CHalfLifeMultiplay::FlPlayerFallDamage( CBasePlayer *pPlayer )
 	{
 	case 1://progressive
 		pPlayer->m_flFallVelocity -= PLAYER_MAX_SAFE_FALL_SPEED;
-		return pPlayer->m_flFallVelocity * DAMAGE_FOR_FALL_SPEED;
+		return pPlayer->m_flFallVelocity * PLAYER_DAMAGE_FOR_FALL_SPEED;
 		break;
 	default:
 	case 0:// fixed
diff --git a/src/game/server/player/playershared.cpp b/src/game/server/player/playershared.cpp
index 87e0a1ee..7bcb4f2b 100644
--- a/src/game/server/player/playershared.cpp
+++ b/src/game/server/player/playershared.cpp
@@ -980,22 +980,18 @@ float CBasePlayer::WalkSpeed(bool fParseSpeed)
 	float fSpeed;
 	float Dex = GetNatStat(NATURAL_DEX);
 
-#define BASE_SPEED 160
-#define WALKSPEED_MAX_WEIGHT_SLOWDOWN 70
-#define WALKSPEED_MAX_DEX 75.0f
-
-	float StatEnhancement = (V_min(Dex, WALKSPEED_MAX_DEX) / WALKSPEED_MAX_DEX) * 100;
+	float StatEnhancement = (V_min(Dex, PLAYER_WALKSPEED_MAX_DEX) / PLAYER_WALKSPEED_MAX_DEX) * 100;
 
 	//Speed detriment - When weight over 50% the volume, speed reduces
 	float VolumeHalf = Volume() / 2.0f;
 
 	float SpeedDetriment = Weight() - VolumeHalf;
-	SpeedDetriment = (V_max(SpeedDetriment, 0) / VolumeHalf) * WALKSPEED_MAX_WEIGHT_SLOWDOWN;
+	SpeedDetriment = (V_max(SpeedDetriment, 0) / VolumeHalf) * PLAYER_WALKSPEED_MAX_WEIGHT_SLOWDOWN;
 
-	SpeedDetriment = V_min(SpeedDetriment, WALKSPEED_MAX_WEIGHT_SLOWDOWN);
+	SpeedDetriment = V_min(SpeedDetriment, PLAYER_WALKSPEED_MAX_WEIGHT_SLOWDOWN);
 	SpeedDetriment = V_max(SpeedDetriment, 0);
 
-	fSpeed = BASE_SPEED + StatEnhancement - SpeedDetriment;
+	fSpeed = PLAYER_BASE_SPEED + StatEnhancement - SpeedDetriment;
 
 	return fParseSpeed ? ParseSpeed(fSpeed) : fSpeed;
 }
diff --git a/src/game/shared/weapons/gipack.cpp b/src/game/shared/weapons/gipack.cpp
index 81c4eec3..b9219218 100644
--- a/src/game/shared/weapons/gipack.cpp
+++ b/src/game/shared/weapons/gipack.cpp
@@ -504,14 +504,14 @@ void CGenericItem::Container_StackItems()
 						if (!FBitSet(pCur->Properties, ITEM_GROUPABLE)) //If it's groupable (Paranoia)
 							continue;
 
-						if (pItem->iQuantity != NUM_MAX_STACK)
+						if (pItem->iQuantity != MAX_NUM_STACK)
 						{
 							pItem->iQuantity += pCur->iQuantity;
-							if (pItem->iQuantity > NUM_MAX_STACK)
+							if (pItem->iQuantity > MAX_NUM_STACK)
 							{
-								int remainder = pItem->iQuantity - NUM_MAX_STACK;
+								int remainder = pItem->iQuantity - MAX_NUM_STACK;
 								pCur->iQuantity = remainder;
-								pItem->iQuantity = NUM_MAX_STACK;
+								pItem->iQuantity = MAX_NUM_STACK;
 							}
 							else
 							{

From 4b7132fddbfbcd77b942e9ff4aaf3a6476d60c57 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 15:55:25 -0400
Subject: [PATCH 211/291] changes from previod commit message

---
 src/game/server/player/player.h | 47 +++++++++++++++++----------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/game/server/player/player.h b/src/game/server/player/player.h
index 4b679dce..365f8efa 100644
--- a/src/game/server/player/player.h
+++ b/src/game/server/player/player.h
@@ -23,21 +23,39 @@
 
 #include "global.h"
 
+#include "sharedmenu.h"
+
+
 
+constexpr const char* VAR_NPC_ANIM_TORSO = "game.monster.torso_anim";
+constexpr const char* VAR_NPC_ANIM_LEGS = "game.monster.legs_anim";
+constexpr const char* PLAYER_SCRIPT = "player/player";
+
+// was 1500, but there shouldn't be any issues with increasing.
+constexpr unsigned int MAX_NUM_STACK = 9999; //stack is stored as either a unsigned short, so that's the actual max it can be.
 constexpr unsigned int MAX_ID_RANGE = 2048;
-constexpr unsigned int SBAR_STRING_SIZE = 128;
 constexpr unsigned int MAX_NUM_ITEMS = 100; //Thothie APR2011_28
 constexpr unsigned int MAX_GET_ITEMS = 9;
-constexpr float PICKUPITEM_DISTANCE = 68.0; //Search and pickup dist might have to be different
+constexpr unsigned int MAX_QUICKSLOTS = 36; //MiB MAR2012 - Increase quickslots
+constexpr unsigned int SBAR_STRING_SIZE = 128;
+constexpr float PLAYER_FATAL_FALL_SPEED = 1024;															  // approx 60 feet
+constexpr float PLAYER_MAX_SAFE_FALL_SPEED = 580;														  // approx 20 feet
+constexpr float PLAYER_DAMAGE_FOR_FALL_SPEED = 100.0f / (PLAYER_FATAL_FALL_SPEED - PLAYER_MAX_SAFE_FALL_SPEED); // damage per unit per second.
+constexpr float PLAYER_MIN_BOUNCE_SPEED = 200;
+constexpr float PLAYER_FALL_PUNCH_THRESHHOLD = 350.0f;// won't punch player's screen/make scrape noise unless player falling at least this fast.
+constexpr float PLAYER_WALLJUMP_SPEED = 300; // how fast we can spring off walls
+constexpr float PLAYER_LONGJUMP_SPEED = 350; // how fast we longjump
 constexpr float PLAYER_SEARCH_RADIUS = 64;
+constexpr float PLAYER_PICKUPITEM_DISTANCE = 68.0; //Search and pickup dist might have to be different
+constexpr float PLAYER_BASE_SPEED = 160;
+constexpr float PLAYER_WALKSPEED_MAX_WEIGHT_SLOWDOWN = 70;
+constexpr float PLAYER_WALKSPEED_MAX_DEX = 75.0f;
 constexpr float CLIMB_SHAKE_FREQUENCY = 22; // how many frames in between screen shakes when climbing
-constexpr float MAX_CLIMB_SPEED = 200;		 // fastest vertical climbing speed possible
+constexpr float CLIMB_MAX_SPEED = 200;		 // fastest vertical climbing speed possible
 constexpr float CLIMB_SPEED_DEC = 15;		 // climbing deceleration rate
 constexpr float CLIMB_PUNCH_X = -7;		 // how far to 'punch' client X axis when climbing
 constexpr float CLIMB_PUNCH_Z = 7;		 // how far to 'punch' client Z axis when climbing
-
-// was 1500, but there shouldn't be any issues with increasing.
-constexpr int NUM_MAX_STACK = 9999; //stack is stored as either a unsigned short, so that's the actual max it can be.
+constexpr float CHAT_INTERVAL = 1.0f;
 
 enum sbar_data
 {
@@ -59,8 +77,6 @@ enum transtype_e
 
 };
 
-
-constexpr float CHAT_INTERVAL = 1.0f;
 //Master Sword
 
 class CStat;
@@ -123,9 +139,6 @@ struct quickslot_t //Quickslots for items, spells
 	quickslottype_e Type;
 	uint ID;
 };
-constexpr int MAX_QUICKSLOTS = 36; //MiB MAR2012 - Increase quickslots
-
-#include "sharedmenu.h"
 
 void SendViewAnim(CBasePlayer *pPlayer, int iAnim, int body = 0);
 //void SetViewModel( const char *pszViewModel );
@@ -137,9 +150,6 @@ void MSGSend_PlayerInfo(CBasePlayer *pSendToPlayer, CBasePlayer *pPlayer);
 //macros (just to shorten things up a bit)
 #define CREATE_ENT(item) (CBaseEntity *)GET_PRIVATE(CREATE_NAMED_ENTITY(MAKE_STRING(item)));
 
-constexpr const char* VAR_NPC_ANIM_TORSO = "game.monster.torso_anim";
-constexpr const char* VAR_NPC_ANIM_LEGS = "game.monster.legs_anim";
-constexpr const char* PLAYER_SCRIPT = "player/player";
 //#define mCH m_pOwner->iCurrentHand
 
 /*//#define Wielded( iHand ) ((Hand[iHand])?Hand[iHand]->Wielded:(PlayerHands?PlayerHands->Wielded:false))
@@ -156,15 +166,6 @@ enum ms_flag_e {
 };
 
 //-----------------
-
-constexpr float PLAYER_FATAL_FALL_SPEED = 1024;															  // approx 60 feet
-constexpr float PLAYER_MAX_SAFE_FALL_SPEED = 580;														  // approx 20 feet
-constexpr float DAMAGE_FOR_FALL_SPEED = 100.0f / (PLAYER_FATAL_FALL_SPEED - PLAYER_MAX_SAFE_FALL_SPEED); // damage per unit per second.
-constexpr float PLAYER_MIN_BOUNCE_SPEED = 200;
-constexpr float PLAYER_FALL_PUNCH_THRESHHOLD = 350.0f;// won't punch player's screen/make scrape noise unless player falling at least this fast.
-constexpr float PLAYER_WALLJUMP_SPEED = 300; // how fast we can spring off walls
-constexpr float PLAYER_LONGJUMP_SPEED = 350; // how fast we longjump
-
 //
 // Player PHYSICS FLAGS bits
 //

From 08cf0d5e559a2b22d01990522e72658a37737660 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 15:57:43 -0400
Subject: [PATCH 212/291] groups const at top of header file.

---
 src/game/server/player/player.h | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/game/server/player/player.h b/src/game/server/player/player.h
index 365f8efa..070ce967 100644
--- a/src/game/server/player/player.h
+++ b/src/game/server/player/player.h
@@ -30,6 +30,7 @@
 constexpr const char* VAR_NPC_ANIM_TORSO = "game.monster.torso_anim";
 constexpr const char* VAR_NPC_ANIM_LEGS = "game.monster.legs_anim";
 constexpr const char* PLAYER_SCRIPT = "player/player";
+constexpr unsigned int SBAR_STRING_SIZE = 128;
 
 // was 1500, but there shouldn't be any issues with increasing.
 constexpr unsigned int MAX_NUM_STACK = 9999; //stack is stored as either a unsigned short, so that's the actual max it can be.
@@ -37,7 +38,9 @@ constexpr unsigned int MAX_ID_RANGE = 2048;
 constexpr unsigned int MAX_NUM_ITEMS = 100; //Thothie APR2011_28
 constexpr unsigned int MAX_GET_ITEMS = 9;
 constexpr unsigned int MAX_QUICKSLOTS = 36; //MiB MAR2012 - Increase quickslots
-constexpr unsigned int SBAR_STRING_SIZE = 128;
+constexpr unsigned int MAX_PLAYER_HANDS = 2;
+constexpr unsigned int MAX_PLAYER_HANDITEMS = 3;
+constexpr unsigned int MAX_KEYHISTORY = 10;
 constexpr float PLAYER_FATAL_FALL_SPEED = 1024;															  // approx 60 feet
 constexpr float PLAYER_MAX_SAFE_FALL_SPEED = 580;														  // approx 20 feet
 constexpr float PLAYER_DAMAGE_FOR_FALL_SPEED = 100.0f / (PLAYER_FATAL_FALL_SPEED - PLAYER_MAX_SAFE_FALL_SPEED); // damage per unit per second.
@@ -56,6 +59,10 @@ constexpr float CLIMB_SPEED_DEC = 15;		 // climbing deceleration rate
 constexpr float CLIMB_PUNCH_X = -7;		 // how far to 'punch' client X axis when climbing
 constexpr float CLIMB_PUNCH_Z = 7;		 // how far to 'punch' client Z axis when climbing
 constexpr float CHAT_INTERVAL = 1.0f;
+constexpr double AUTOAIM_2DEGREES = 0.0348994967025;
+constexpr double AUTOAIM_5DEGREES = 0.08715574274766;
+constexpr double AUTOAIM_8DEGREES = 0.1391731009601;
+constexpr double AUTOAIM_10DEGREES = 0.1736481776669;
 
 enum sbar_data
 {
@@ -157,9 +164,6 @@ void MSGSend_PlayerInfo(CBasePlayer *pSendToPlayer, CBasePlayer *pPlayer);
 //#define CHWielded ((Hand[iCurrentHand])?Hand[iCurrentHand]->Wielded:(PlayerHands?PlayerHands->Wielded:false))
 #define CHWielded Wielded(iCurrentHand)*/
 
-constexpr unsigned int MAX_PLAYER_HANDS = 2;
-constexpr unsigned int MAX_PLAYER_HANDITEMS = 3;
-constexpr unsigned int MAX_KEYHISTORY = 10;
 
 enum ms_flag_e {
 	MSGFLAG_SPAWN = (1 << 0)
@@ -896,11 +900,6 @@ extern CBasePlayer player;
 extern int playerBodyArray[16];
 #endif
 
-constexpr double AUTOAIM_2DEGREES = 0.0348994967025;
-constexpr double AUTOAIM_5DEGREES = 0.08715574274766;
-constexpr double AUTOAIM_8DEGREES = 0.1391731009601;
-constexpr double AUTOAIM_10DEGREES = 0.1736481776669;
-
 extern int gmsgHudText;
 extern BOOL gInitHUD;
 

From a39dbf4cdf5434fdc5897e257c3021f08598f637 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 16:01:33 -0400
Subject: [PATCH 213/291] commented out unused macros

---
 src/game/shared/stream_safe.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/game/shared/stream_safe.h b/src/game/shared/stream_safe.h
index ee5ca53b..4c251b18 100644
--- a/src/game/shared/stream_safe.h
+++ b/src/game/shared/stream_safe.h
@@ -30,7 +30,8 @@
 #undef max
 #endif
 
-#define min(a, b) (((a) < (b)) ? (a) : (b))
-#define max(a, b) (((a) > (b)) ? (a) : (b))
+
+//#define min(a, b) (((a) < (b)) ? (a) : (b))
+//#define max(a, b) (((a) > (b)) ? (a) : (b))
 
 #endif // STREAM_SAFE_H
\ No newline at end of file

From e56024148cae202cde797cac9844c770c8fc6dd0 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 16:27:09 -0400
Subject: [PATCH 214/291] changed defines enums moved some enums to header
 files. grouped constexp

---
 src/common/com_model.h                    |  35 ++---
 src/game/client/render/clrendermirror.cpp |   3 -
 src/game/client/render/studio_util.h      |  19 ++-
 src/game/shared/voice_common.h            |   4 +-
 utils/common/bsplib.h                     | 164 +++++++++++-----------
 5 files changed, 118 insertions(+), 107 deletions(-)

diff --git a/src/common/com_model.h b/src/common/com_model.h
index 0110e972..a0265fea 100644
--- a/src/common/com_model.h
+++ b/src/common/com_model.h
@@ -24,28 +24,31 @@
 #pragma once
 #endif
 
-constexpr int STUDIO_RENDER = 1;
-constexpr int STUDIO_EVENTS = 2;
-constexpr int MAX_MAP_HULLS = 4;
-constexpr int MIPLEVELS = 4;
-constexpr int NUM_AMBIENTS = 4; // automatic ambient sounds
-constexpr int MAXLIGHTMAPS = 4;
-constexpr int PLANE_ANYZ = 5;
-constexpr int MAX_CLIENTS = 32;
-constexpr int MAX_MODEL_NAME = 64;
-constexpr int MAX_EDICTS = 2048;
-
-constexpr int ALIAS_Z_CLIP_PLANE = 5;
+
+constexpr unsigned int MAX_MAP_HULLS = 4;
+constexpr unsigned int MAX_LIGHTMAPS = 4;
+constexpr unsigned int MAX_CLIENTS = 32;
+constexpr unsigned int MAX_MODEL_NAME = 64;
+constexpr unsigned int MAX_EDICTS = 2048;
+constexpr unsigned int MIPLEVELS = 4;
+constexpr unsigned int NUM_AMBIENTS = 4; // automatic ambient sounds
+
 
 // flags in finalvert_t.flags
 
 
-enum {
+enum studio_e {
+    STUDIO_RENDER = 1,
+    STUDIO_EVENTS = 2
+};
+
+enum alias_clip_e {
     ALIAS_LEFT_CLIP = 0x0001,
     ALIAS_TOP_CLIP = 0x0002,
     ALIAS_RIGHT_CLIP = 0x0004,
     ALIAS_BOTTOM_CLIP = 0x0008,
     ALIAS_Z_CLIP = 0x0010,
+    ALIAS_Z_CLIP_PLANE = 5,
     ALIAS_ONSEAM = 0x0020,
     ALIAS_XY_CLIP_MASK = 0x000F
 };
@@ -315,7 +318,7 @@ struct msurface_s
     mtexinfo_t *texinfo;
 
     // lighting info
-    byte styles[MAXLIGHTMAPS]; // index into d_lightstylevalue[] for animated lights
+    byte styles[MAX_LIGHTMAPS]; // index into d_lightstylevalue[] for animated lights
                                // no one surface can be effected by more than 4
                                // animated lights.
     color24 *samples;          // actual light map data for this surface
@@ -357,8 +360,8 @@ typedef struct msurface_s
     int dlightbits;
 
     int lightmaptexturenum;
-    byte styles[MAXLIGHTMAPS];
-    int cached_light[MAXLIGHTMAPS]; // values currently used in lightmap
+    byte styles[MAX_LIGHTMAPS];
+    int cached_light[MAX_LIGHTMAPS]; // values currently used in lightmap
     qboolean cached_dlight;         // true if dynamic light in cache
 
     //  byte        *samples;                   // [numstyles*surfsize]
diff --git a/src/game/client/render/clrendermirror.cpp b/src/game/client/render/clrendermirror.cpp
index 171beb2d..615d9ee7 100644
--- a/src/game/client/render/clrendermirror.cpp
+++ b/src/game/client/render/clrendermirror.cpp
@@ -619,9 +619,6 @@ void CMirrorMgr::SetupNextView()
 	}*/
 }
 
-#define PLANE_X 0
-#define PLANE_Y 1
-#define PLANE_Z 2
 //extern Vector v_origin, v_angles, v_cl_angles, v_sim_org, v_lastAngles;
 bool Mirror_TraverseVis(TraverseInfo_t &Info);
 void DrawVisLeafs(model_t *pModel, mleaf_t *pStartLeaf, TraverseInfo_t &Info);
diff --git a/src/game/client/render/studio_util.h b/src/game/client/render/studio_util.h
index 76c628ff..bde43058 100644
--- a/src/game/client/render/studio_util.h
+++ b/src/game/client/render/studio_util.h
@@ -10,13 +10,22 @@
 #ifndef PITCH
 // MOVEMENT INFO
 // up / down
-constexpr int PITCH = 0;
-// left / right
-constexpr int YAW = 1;
-// fall over
-constexpr int ROLL = 2;
+enum {
+	PITCH = 0,
+	// left / right
+	YAW = 1,
+	// fall over
+	ROLL = 2
+};
 #endif
 
+enum planes_e {
+	PLANE_X = 0,
+	PLANE_Y = 1,
+	PLANE_Z = 2,
+	PLANE_ANYZ = 5,
+};
+
 template <typename Type>
 inline Type FDotProduct(const Type a, const Type b) {
 	return fabs(a[0] * b[0]) + fabs(a[1] * b[1]) + fabs(a[2] * b[2]);
diff --git a/src/game/shared/voice_common.h b/src/game/shared/voice_common.h
index b8f36c48..026f3895 100644
--- a/src/game/shared/voice_common.h
+++ b/src/game/shared/voice_common.h
@@ -13,8 +13,8 @@
 
 #include "bitvec.h"
 
-#define VOICE_MAX_PLAYERS 32 // (todo: this should just be set to MAX_CLIENTS).
-#define VOICE_MAX_PLAYERS_DW ((VOICE_MAX_PLAYERS / 32) + !!(VOICE_MAX_PLAYERS & 31))
+constexpr unsigned int VOICE_MAX_PLAYERS = 32; // (todo: this should just be set to MAX_CLIENTS).
+constexpr unsigned int VOICE_MAX_PLAYERS_DW = ((VOICE_MAX_PLAYERS / 32) + !!(VOICE_MAX_PLAYERS & 31));
 
 typedef CBitVec<VOICE_MAX_PLAYERS> CPlayerBitVec;
 
diff --git a/utils/common/bsplib.h b/utils/common/bsplib.h
index 31fe73e6..91ea3303 100644
--- a/utils/common/bsplib.h
+++ b/utils/common/bsplib.h
@@ -11,34 +11,32 @@
 
 // upper design bounds
 
-#define	MAX_MAP_HULLS		4
-
-#define	MAX_MAP_MODELS		400
-#define	MAX_MAP_BRUSHES		4096
-#define	MAX_MAP_ENTITIES	1024
-#define	MAX_MAP_ENTSTRING	(128*1024)
-
-#define	MAX_MAP_PLANES		32767
-#define	MAX_MAP_NODES		32767		// because negative shorts are contents
-#define	MAX_MAP_CLIPNODES	32767		//
-#define	MAX_MAP_LEAFS		8192
-#define	MAX_MAP_VERTS		65535
-#define	MAX_MAP_FACES		65535
-#define	MAX_MAP_MARKSURFACES 65535
-#define	MAX_MAP_TEXINFO		8192
-#define	MAX_MAP_EDGES		256000
-#define	MAX_MAP_SURFEDGES	512000
-#define	MAX_MAP_TEXTURES	512
-#define	MAX_MAP_MIPTEX		0x200000
-#define	MAX_MAP_LIGHTING	0x200000
-#define	MAX_MAP_VISIBILITY	0x200000
-
-#define	MAX_MAP_PORTALS		65536
+constexpr unsigned int MAX_LIGHTMAPS		= 4;
+constexpr unsigned int MAX_MAP_HULLS		= 4;
+constexpr unsigned int MAX_MAP_MODELS		= 400;
+constexpr unsigned int MAX_MAP_BRUSHES		= 4096;
+constexpr unsigned int MAX_MAP_ENTITIES		= 1024;
+constexpr unsigned int MAX_MAP_ENTSTRING	= (128 * 1024);
+constexpr unsigned int MAX_MAP_PLANES		= 32767;
+constexpr unsigned int MAX_MAP_NODES		= 32767;	// because negative shorts are contents
+constexpr unsigned int MAX_MAP_CLIPNODES	= 32767;	
+constexpr unsigned int MAX_MAP_LEAFS		= 8192;
+constexpr unsigned int MAX_MAP_VERTS		= 65535;
+constexpr unsigned int MAX_MAP_FACES		= 65535;
+constexpr unsigned int MAX_MAP_MARKSURFACES = 65535;
+constexpr unsigned int MAX_MAP_TEXINFO		= 8192;
+constexpr unsigned int MAX_MAP_EDGES		= 256000;
+constexpr unsigned int MAX_MAP_SURFEDGES	= 512000;
+constexpr unsigned int MAX_MAP_TEXTURES		= 512;
+constexpr unsigned int MAX_MAP_MIPTEX		= 0x200000;
+constexpr unsigned int MAX_MAP_LIGHTING		= 0x200000;
+constexpr unsigned int MAX_MAP_VISIBILITY	= 0x200000;
+constexpr unsigned int MAX_MAP_PORTALS		= 65536;
 
 // key / value pair sizes
 
-#define	MAX_KEY		32
-#define	MAX_VALUE	1024
+constexpr unsigned int MAX_KEY		= 32;
+constexpr unsigned int MAX_VALUE	= 1024;
 
 //=============================================================================
 
@@ -52,23 +50,24 @@ typedef struct
 	int		fileofs, filelen;
 } lump_t;
 
-#define	LUMP_ENTITIES	0
-#define	LUMP_PLANES		1
-#define	LUMP_TEXTURES	2
-#define	LUMP_VERTEXES	3
-#define	LUMP_VISIBILITY	4
-#define	LUMP_NODES		5
-#define	LUMP_TEXINFO	6
-#define	LUMP_FACES		7
-#define	LUMP_LIGHTING	8
-#define	LUMP_CLIPNODES	9
-#define	LUMP_LEAFS		10
-#define	LUMP_MARKSURFACES 11
-#define	LUMP_EDGES		12
-#define	LUMP_SURFEDGES	13
-#define	LUMP_MODELS		14
-
-#define	HEADER_LUMPS	15
+enum lump_e {
+	LUMP_ENTITIES		= 0,
+	LUMP_PLANES			= 1,
+	LUMP_TEXTURES		= 2,
+	LUMP_VERTEXES		= 3,
+	LUMP_VISIBILITY		= 4,
+	LUMP_NODES			= 5,
+	LUMP_TEXINFO		= 6,
+	LUMP_FACES			= 7,
+	LUMP_LIGHTING		= 8,
+	LUMP_CLIPNODES		= 9,
+	LUMP_LEAFS			= 10,
+	LUMP_MARKSURFACES	= 11,
+	LUMP_EDGES			= 12,
+	LUMP_SURFEDGES		= 13,
+	LUMP_MODELS			= 14,
+	LUMP_HEADER			= 15
+};
 
 typedef struct
 {
@@ -91,7 +90,7 @@ typedef struct
 	int			dataofs[4];		// [nummiptex]
 } dmiptexlump_t;
 
-#define	MIPLEVELS	4
+constexpr unsigned int	MIPLEVELS = 4;
 typedef struct miptex_s
 {
 	char		name[16];
@@ -106,15 +105,17 @@ typedef struct
 } dvertex_t;
 
 
-// 0-2 are axial planes
-#define	PLANE_X			0
-#define	PLANE_Y			1
-#define	PLANE_Z			2
 
-// 3-5 are non-axial planes snapped to the nearest
-#define	PLANE_ANYX		3
-#define	PLANE_ANYY		4
-#define	PLANE_ANYZ		5
+enum plane_e {
+	// 0-2 are axial planes
+	PLANE_X			= 0,
+	PLANE_Y			= 1,
+	PLANE_Z			= 2,
+	// 3-5 are non-axial planes snapped to the nearest
+	PLANE_ANYX		= 3,
+	PLANE_ANYY		= 4,
+	PLANE_ANYZ		= 5
+};
 
 typedef struct
 {
@@ -123,25 +124,23 @@ typedef struct
 	int		type;		// PLANE_X - PLANE_ANYZ ?remove? trivial to regenerate
 } dplane_t;
 
-
-
-#define	CONTENTS_EMPTY		-1
-#define	CONTENTS_SOLID		-2
-#define	CONTENTS_WATER		-3
-#define	CONTENTS_SLIME		-4
-#define	CONTENTS_LAVA		-5
-#define	CONTENTS_SKY		-6
-#define	CONTENTS_ORIGIN		-7		// removed at csg time
-#define	CONTENTS_CLIP		-8		// changed to contents_solid
-
-#define	CONTENTS_CURRENT_0		-9
-#define	CONTENTS_CURRENT_90		-10
-#define	CONTENTS_CURRENT_180	-11
-#define	CONTENTS_CURRENT_270	-12
-#define	CONTENTS_CURRENT_UP		-13
-#define	CONTENTS_CURRENT_DOWN	-14
-
-#define CONTENTS_TRANSLUCENT	-15
+enum contents_e {
+	CONTENTS_EMPTY			= -1,
+	CONTENTS_SOLID			= -2,
+	CONTENTS_WATER			= -3,
+	CONTENTS_SLIME			= -4,
+	CONTENTS_LAVA			= -5,
+	CONTENTS_SKY			= -6,
+	CONTENTS_ORIGIN			= -7,		// removed at csg time
+	CONTENTS_CLIP			= -8,		// changed to contents_solid
+	CONTENTS_CURRENT_0		= -9,
+	CONTENTS_CURRENT_90		= -10,
+	CONTENTS_CURRENT_180	= -11,
+	CONTENTS_CURRENT_270	= -12,
+	CONTENTS_CURRENT_UP		= -13,
+	CONTENTS_CURRENT_DOWN	= -14,
+	CONTENTS_TRANSLUCENT	= -15
+};
 
 // !!! if this is changed, it must be changed in asm_i386.h too !!!
 typedef struct
@@ -167,8 +166,10 @@ typedef struct texinfo_s
 	int			miptex;
 	int			flags;
 } texinfo_t;
-#define	TEX_SPECIAL		1		// sky or slime, no lightmap or 256 subdivision
 
+enum tex_special_e {
+	TEX_SPECIAL	= 1		// sky or slime, no lightmap or 256 subdivision
+};
 // note that edge 0 is never used, because negative edge nums are used for
 // counterclockwise use of the edge in a face
 typedef struct
@@ -176,7 +177,6 @@ typedef struct
 	unsigned short	v[2];		// vertex numbers
 } dedge_t;
 
-#define	MAXLIGHTMAPS	4
 typedef struct
 {
 	short		planenum;
@@ -192,13 +192,13 @@ typedef struct
 } dface_t;
 
 
-
-#define	AMBIENT_WATER	0
-#define	AMBIENT_SKY		1
-#define	AMBIENT_SLIME	2
-#define	AMBIENT_LAVA	3
-
-#define	NUM_AMBIENTS			4		// automatic ambient sounds
+enum {
+	AMBIENT_WATER	= 0,
+	AMBIENT_SKY		= 1,
+	AMBIENT_SLIME	= 2,
+	AMBIENT_LAVA	= 3
+};
+constexpr unsigned int NUM_AMBIENTS = 4;		// automatic ambient sounds
 
 // leaf 0 is the generic CONTENTS_SOLID leaf, used for all solid areas
 // all other leafs need visibility info
@@ -221,8 +221,10 @@ typedef struct
 
 #ifndef QUAKE_GAME
 
-#define	ANGLE_UP	-1
-#define	ANGLE_DOWN	-2
+enum angle_e {
+	ANGLE_UP	= -1,
+	ANGLE_DOWN	= -2
+};
 
 
 // the utilities get to be lazy and just use large static arrays

From 8a4ceda318a6c75e2052b0ed359b4a5f9cf03873 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 16:27:32 -0400
Subject: [PATCH 215/291] removed unneeded comma

---
 src/game/client/render/studio_util.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/client/render/studio_util.h b/src/game/client/render/studio_util.h
index bde43058..0e892aa1 100644
--- a/src/game/client/render/studio_util.h
+++ b/src/game/client/render/studio_util.h
@@ -23,7 +23,7 @@ enum planes_e {
 	PLANE_X = 0,
 	PLANE_Y = 1,
 	PLANE_Z = 2,
-	PLANE_ANYZ = 5,
+	PLANE_ANYZ = 5
 };
 
 template <typename Type>

From c4d9d559f8e16b41535efaf0256c65a0bcc0e848 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 16:28:01 -0400
Subject: [PATCH 216/291] removed if guard

---
 src/game/client/render/studio_util.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/game/client/render/studio_util.h b/src/game/client/render/studio_util.h
index 0e892aa1..c3dc3ddb 100644
--- a/src/game/client/render/studio_util.h
+++ b/src/game/client/render/studio_util.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#ifndef PITCH
+//#ifndef PITCH
 // MOVEMENT INFO
 // up / down
 enum {
@@ -17,7 +17,7 @@ enum {
 	// fall over
 	ROLL = 2
 };
-#endif
+//#endif
 
 enum planes_e {
 	PLANE_X = 0,

From c4a14fdf1cd65ad31ece0647841faaa57578ef78 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 16:30:38 -0400
Subject: [PATCH 217/291] changed define to constexpr. moved to header.

---
 src/game/shared/voice_gamemgr.cpp | 1 -
 src/game/shared/voice_gamemgr.h   | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/game/shared/voice_gamemgr.cpp b/src/game/shared/voice_gamemgr.cpp
index c45b90fa..f47e754c 100644
--- a/src/game/shared/voice_gamemgr.cpp
+++ b/src/game/shared/voice_gamemgr.cpp
@@ -11,7 +11,6 @@
 #include "msdllheaders.h"
 #include "player.h"
 
-#define UPDATE_INTERVAL 0.3
 
 // These are stored off as CVoiceGameMgr is created and deleted.
 CPlayerBitVec g_PlayerModEnable; // Set to 1 for each player if the player wants to use voice in this mod.
diff --git a/src/game/shared/voice_gamemgr.h b/src/game/shared/voice_gamemgr.h
index f3f6df31..4d130cd8 100644
--- a/src/game/shared/voice_gamemgr.h
+++ b/src/game/shared/voice_gamemgr.h
@@ -11,6 +11,8 @@
 
 #include "voice_common.h"
 
+constexpr float UPDATE_INTERVAL = 0.3;
+
 class CGameRules;
 class CBasePlayer;
 

From 7e8bfff4ab54a0773197d9ef6a85ce1831874d02 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 16:33:45 -0400
Subject: [PATCH 218/291] changed define to constexpr. moved to header.

---
 src/game/shared/voice_status.cpp | 11 -----------
 src/game/shared/voice_status.h   |  6 ++++++
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/game/shared/voice_status.cpp b/src/game/shared/voice_status.cpp
index b364e2f9..3ce22aec 100644
--- a/src/game/shared/voice_status.cpp
+++ b/src/game/shared/voice_status.cpp
@@ -30,16 +30,8 @@ using namespace vgui;
 //extern int cam_thirdperson;
 extern "C" int CL_IsThirdPerson();
 
-
-#define VOICE_MODEL_INTERVAL		0.3
-#define SCOREBOARD_BLINK_FREQUENCY	0.3	// How often to blink the scoreboard icons.
-#define SQUELCHOSCILLATE_PER_SECOND	2.0f
-
-
 extern BitmapTGA *LoadTGA(const char* pImageName);
 
-
-
 // ---------------------------------------------------------------------- //
 // The voice manager for the client.
 // ---------------------------------------------------------------------- //
@@ -50,8 +42,6 @@ CVoiceStatus* GetClientVoiceMgr()
 	return &g_VoiceStatus;
 }
 
-
-
 // ---------------------------------------------------------------------- //
 // CVoiceStatus.
 // ---------------------------------------------------------------------- //
@@ -74,7 +64,6 @@ int __MsgFunc_ReqState(const char *pszName, int iSize, void *pbuf)
 	return 1;
 }
 
-
 int g_BannedPlayerPrintCount;
 void ForEachBannedPlayer(char id[16])
 {
diff --git a/src/game/shared/voice_status.h b/src/game/shared/voice_status.h
index 36fa6eaf..c044f584 100644
--- a/src/game/shared/voice_status.h
+++ b/src/game/shared/voice_status.h
@@ -21,6 +21,12 @@
 #include "vgui_checkbutton2.h"
 #include "vgui_defaultinputsignal.h"
 
+
+
+constexpr float VOICE_MODEL_INTERVAL = 0.3;
+constexpr float SCOREBOARD_BLINK_FREQUENCY = 0.3;	// How often to blink the scoreboard icons.
+constexpr float SQUELCHOSCILLATE_PER_SECOND = 2.0f;
+
 class CVoiceStatus;
 
 class CVoiceLabel

From 966730f69c015555f77c3fadf2861d66ac3dd80f Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 16:40:30 -0400
Subject: [PATCH 219/291] removed whitespace

---
 src/game/shared/voice_status.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/game/shared/voice_status.h b/src/game/shared/voice_status.h
index c044f584..68a436fe 100644
--- a/src/game/shared/voice_status.h
+++ b/src/game/shared/voice_status.h
@@ -21,8 +21,6 @@
 #include "vgui_checkbutton2.h"
 #include "vgui_defaultinputsignal.h"
 
-
-
 constexpr float VOICE_MODEL_INTERVAL = 0.3;
 constexpr float SCOREBOARD_BLINK_FREQUENCY = 0.3;	// How often to blink the scoreboard icons.
 constexpr float SQUELCHOSCILLATE_PER_SECOND = 2.0f;
@@ -210,7 +208,7 @@ class CVoiceStatus : public CHudBase, public vgui::CDefaultInputSignal
 	CVoiceLabel m_Labels[MAX_VOICE_SPEAKERS];
 
 	// Cache the game directory for use when we shut down
-	char *m_pchGameDir;
+	char* m_pchGameDir;
 };
 
 class CHLVoiceStatusHelper : public IVoiceStatusHelper

From f6940bb35b80ab5fcd9fc63a8cc56ccc059cb992 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 16:40:48 -0400
Subject: [PATCH 220/291] changed define to constexpr. moved to header.
 commented out pragma disable.

---
 src/game/shared/movement/pm_debug.cpp | 6 +++---
 src/game/shared/movement/pm_debug.h   | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/game/shared/movement/pm_debug.cpp b/src/game/shared/movement/pm_debug.cpp
index 96e55fe6..7f458e78 100644
--- a/src/game/shared/movement/pm_debug.cpp
+++ b/src/game/shared/movement/pm_debug.cpp
@@ -24,13 +24,13 @@
 
 #include <string.h>
 
-#pragma warning(disable : 4244)
-#pragma warning(disable : 4305)
+//#pragma warning(disable : 4244)
+//#pragma warning(disable : 4305)
 
 extern playermove_t* pmove;
 
 // Expand debugging BBOX particle hulls by this many units.
-#define BOX_GAP 0.0f
+
 
 static int PM_boxpnt[6][4] =
 	{
diff --git a/src/game/shared/movement/pm_debug.h b/src/game/shared/movement/pm_debug.h
index de42ae64..8f2e61aa 100644
--- a/src/game/shared/movement/pm_debug.h
+++ b/src/game/shared/movement/pm_debug.h
@@ -13,6 +13,7 @@
 *
 ****/
 #pragma once
+constexpr float BOX_GAP = 0.0f;
 
 void PM_ViewEntity(void);
 void PM_DrawBBox(Vector  mins, Vector  maxs, Vector  origin, int pcolor, float life);

From 193d7dc1ea6c0535baed2140598b634b97463169 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 16:43:01 -0400
Subject: [PATCH 221/291] named enum moved include to of file. moved unneeded
 nested ifdef.

---
 src/game/shared/movement/pm_defs.h | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/game/shared/movement/pm_defs.h b/src/game/shared/movement/pm_defs.h
index 21e92939..eadcdb0a 100644
--- a/src/game/shared/movement/pm_defs.h
+++ b/src/game/shared/movement/pm_defs.h
@@ -13,27 +13,31 @@
 *
 ****/
 // pm_defs.h
+
+#if !defined(USERCMD_H)
+#include "usercmd.h"
+#endif
+
 #if !defined(PM_DEFSH)
 #define PM_DEFSH
 #pragma once
 
-constexpr int MAX_PHYSENTS = 600; // Must have room for all entities in the world.
-constexpr int MAX_MOVEENTS = 64;
-constexpr int MAX_CLIP_PLANES = 5;
-// Values for flags parameter of PM_TraceLine
-enum {
-	PM_TRACELINE_PHYSENTSONLY = 0,
-	PM_TRACELINE_ANYVISIBLE = 1
-};
 
 #include "pm_info.h"
 
 // PM_PlayerTrace results.
 #include "pmtrace.h"
 
-#if !defined(USERCMD_H)
-#include "usercmd.h"
-#endif
+
+constexpr unsigned int MAX_PHYSENTS = 600; // Must have room for all entities in the world.
+constexpr unsigned int MAX_MOVEENTS = 64;
+constexpr unsigned int MAX_CLIP_PLANES = 5;
+
+// Values for flags parameter of PM_TraceLine
+enum pm_traceline_e {
+	PM_TRACELINE_PHYSENTSONLY = 0,
+	PM_TRACELINE_ANYVISIBLE = 1
+};
 
 // physent_t
 typedef struct physent_s

From 7412833711d610a1f07c1e71253b996a92c819bc Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 16:52:48 -0400
Subject: [PATCH 222/291] renamed constexpr to MAX_ prefixing. moved CHAR_TEXT
 snow constexpr to enum

---
 src/game/client/ev_hldm.cpp             |  2 +-
 src/game/server/hl/sound.cpp            | 12 +++++-------
 src/game/server/hl/util.h               |  2 +-
 src/game/server/player/player.cpp       |  2 +-
 src/game/server/player/player.h         |  2 +-
 src/game/shared/movement/pm_materials.h |  8 +++++---
 src/game/shared/movement/pm_shared.cpp  | 22 +++++++++++-----------
 7 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/game/client/ev_hldm.cpp b/src/game/client/ev_hldm.cpp
index c30baf22..162de8e4 100644
--- a/src/game/client/ev_hldm.cpp
+++ b/src/game/client/ev_hldm.cpp
@@ -117,7 +117,7 @@ float EV_HLDM_PlayTextureSound(int idx, pmtrace_t *ptr, float *vecSrc, float *ve
 
 			// '}}'
 			strncpy(szbuffer,  pTextureName, sizeof(szbuffer));
-			szbuffer[CBTEXTURENAMEMAX - 1] = 0;
+			szbuffer[MAX_CBTEXTURENAME - 1] = 0;
 
 			// get texture type
 			chTextureType = PM_FindTextureType(szbuffer);
diff --git a/src/game/server/hl/sound.cpp b/src/game/server/hl/sound.cpp
index b530ca3c..8b60c2c4 100644
--- a/src/game/server/hl/sound.cpp
+++ b/src/game/server/hl/sound.cpp
@@ -17,8 +17,6 @@
 //=========================================================
 
 #define VALVE_DLL 1
-constexpr char CHAR_TEX_SNOW = 'N';
-
 #include "msdllheaders.h"
 #include "weapons.h"
 #include "player.h"
@@ -1528,11 +1526,11 @@ void EMIT_GROUPNAME_SUIT(edict_t *entity, const char *groupname)
 // Used to detect the texture the player is standing on, map the
 // texture name to a material type.  Play footstep sound based
 // on material type.
-constexpr unsigned int CTEXTURESMAX = 512; // max number of textures loaded
+constexpr unsigned int MAX_CTEXTURES = 512; // max number of textures loaded
 
 unsigned int gcTextures = 0;
-char grgszTextureName[CTEXTURESMAX][CBTEXTURENAMEMAX]; // texture names
-char grgchTextureType[CTEXTURESMAX];				   // parallel array of texture types
+char grgszTextureName[MAX_CTEXTURES][MAX_CBTEXTURENAME]; // texture names
+char grgchTextureType[MAX_CTEXTURES];				   // parallel array of texture types
 
 // given texture name, find texture type
 // if not found, return type 'concrete'
@@ -1546,7 +1544,7 @@ char TEXTURETYPE_Find(char *name)
 
 	for (unsigned int i = 0; i < gcTextures; i++)
 	{
-		if (!_strnicmp(name, &(grgszTextureName[i][0]), CBTEXTURENAMEMAX - 1))
+		if (!_strnicmp(name, &(grgszTextureName[i][0]), MAX_CBTEXTURENAME - 1))
 			return (grgchTextureType[i]);
 	}
 
@@ -1609,7 +1607,7 @@ float TEXTURETYPE_PlaySound(TraceResult *ptr, Vector vecSrc, Vector vecEnd, int
 				pTextureName++;
 			// '}}'
 			 strncpy(szbuffer,  pTextureName, sizeof(szbuffer) );
-			szbuffer[CBTEXTURENAMEMAX - 1] = 0;
+			szbuffer[MAX_CBTEXTURENAME - 1] = 0;
 
 			// ALERT ( at_console, "texture hit: %s\n", szbuffer);
 
diff --git a/src/game/server/hl/util.h b/src/game/server/hl/util.h
index b6c81843..0a655766 100644
--- a/src/game/server/hl/util.h
+++ b/src/game/server/hl/util.h
@@ -582,7 +582,7 @@ int SENTENCEG_Lookup(const char *sample, char *sentencenum);
 char TEXTURETYPE_Find(char *name);
 float TEXTURETYPE_PlaySound(TraceResult *ptr, Vector vecSrc, Vector vecEnd, int iBulletType);
 
-/*#define CBTEXTURENAMEMAX	13			// only load first n chars of name
+/*#define MAX_CBTEXTURENAME	13			// only load first n chars of name
 
 #define CHAR_TEX_CONCRETE	'C'			// texture types
 #define CHAR_TEX_METAL		'M'
diff --git a/src/game/server/player/player.cpp b/src/game/server/player/player.cpp
index ae78aefd..945643bc 100644
--- a/src/game/server/player/player.cpp
+++ b/src/game/server/player/player.cpp
@@ -157,7 +157,7 @@ constexpr float FLASH_CHARGE_TIME = 0.2; // 100 units/20 seconds  (seconds per u
 	//DEFINE_FIELD( CBasePlayer, m_flgeigerDelay, FIELD_FLOAT ),	// Don't restore, reset in Precache()
 	//DEFINE_FIELD( CBasePlayer, m_igeigerRangePrev, FIELD_FLOAT ),	// Don't restore, reset in Precache()
 	//DEFINE_FIELD( CBasePlayer, m_iStepLeft, FIELD_INTEGER ), // Don't need to restore
-	//DEFINE_ARRAY( CBasePlayer, m_szTextureName, FIELD_CHARACTER, CBTEXTURENAMEMAX ), // Don't need to restore
+	//DEFINE_ARRAY( CBasePlayer, m_szTextureName, FIELD_CHARACTER, MAX_CBTEXTURENAME ), // Don't need to restore
 	//DEFINE_FIELD( CBasePlayer, m_chTextureType, FIELD_CHARACTER ), // Don't need to restore
 	//DEFINE_FIELD( CBasePlayer, m_fNoPlayerSound, FIELD_BOOLEAN ), // Don't need to restore, debug
 	//DEFINE_FIELD( CBasePlayer, m_iUpdateTime, FIELD_INTEGER ), // Don't need to restore
diff --git a/src/game/server/player/player.h b/src/game/server/player/player.h
index 070ce967..029a9a9f 100644
--- a/src/game/server/player/player.h
+++ b/src/game/server/player/player.h
@@ -740,7 +740,7 @@ class CBasePlayer : public CMSMonster
 	float m_flgeigerDelay; // delay per update of range msg to client
 	int m_igeigerRangePrev;
 	int m_iStepLeft;						// alternate left/right foot stepping sound
-	char m_szTextureName[CBTEXTURENAMEMAX]; // current texture name we're standing on
+	char m_szTextureName[MAX_CBTEXTURENAME]; // current texture name we're standing on
 	char m_chTextureType;					// current texture type
 
 	int m_idrowndmg;	  // track drowning damage taken
diff --git a/src/game/shared/movement/pm_materials.h b/src/game/shared/movement/pm_materials.h
index 327c87fd..c618c047 100644
--- a/src/game/shared/movement/pm_materials.h
+++ b/src/game/shared/movement/pm_materials.h
@@ -16,9 +16,9 @@
 #define PM_MATERIALSH
 #pragma once
 
-inline constexpr int CBTEXTURENAMEMAX = 13; // only load first n chars of name
+inline constexpr unsigned int MAX_CBTEXTURENAME = 13; // only load first n chars of name
 
-enum {
+enum char_texture_e {
 	CHAR_TEX_CONCRETE = 'C', // texture types
 	CHAR_TEX_METAL = 'M',
 	CHAR_TEX_DIRT = 'D',
@@ -29,7 +29,9 @@ enum {
 	CHAR_TEX_WOOD = 'W',
 	CHAR_TEX_COMPUTER = 'P',
 	CHAR_TEX_GLASS = 'Y',
-	CHAR_TEX_FLESH = 'F'
+	CHAR_TEX_FLESH = 'F',
+	CHAR_TEX_SNOW = 'N'
+
 };
 
 #endif // !PM_MATERIALSH
diff --git a/src/game/shared/movement/pm_shared.cpp b/src/game/shared/movement/pm_shared.cpp
index 57f8b5b7..b07b6dad 100644
--- a/src/game/shared/movement/pm_shared.cpp
+++ b/src/game/shared/movement/pm_shared.cpp
@@ -108,7 +108,7 @@ typedef struct hull_s
 #define	DIST_EPSILON 0.125f	// Max error from network coordinate quantization
 
 #define CTEXTURESMAX 512	// max number of textures loaded
-#define CBTEXTURENAMEMAX 13 // only load first n chars of name
+#define MAX_CBTEXTURENAME 13 // only load first n chars of name
 
 #define CHAR_TEX_CONCRETE 'C' // texture types
 #define CHAR_TEX_METAL 'M'
@@ -174,7 +174,7 @@ static int rgStuckLast[MAX_CLIENTS][2];
 static bool bTextureTypeInit = false;
 
 static int gcTextures = 0;
-static char grgszTextureName[CTEXTURESMAX][CBTEXTURENAMEMAX];
+static char grgszTextureName[CTEXTURESMAX][MAX_CBTEXTURENAME];
 static char grgchTextureType[CTEXTURESMAX];
 
 int g_onladder = 0;
@@ -233,15 +233,15 @@ char* memfgets(const byte* pMemFile, std::size_t fileSize, std::size_t& filePos,
 void PM_SwapTextures(int i, int j)
 {
 	char chTemp;
-	char szTemp[CBTEXTURENAMEMAX];
+	char szTemp[MAX_CBTEXTURENAME];
 
-	strncpy(szTemp, grgszTextureName[i], CBTEXTURENAMEMAX);
+	strncpy(szTemp, grgszTextureName[i], MAX_CBTEXTURENAME);
 	chTemp = grgchTextureType[i];
 
-	strncpy(grgszTextureName[i], grgszTextureName[j], CBTEXTURENAMEMAX);
+	strncpy(grgszTextureName[i], grgszTextureName[j], MAX_CBTEXTURENAME);
 	grgchTextureType[i] = grgchTextureType[j];
 
-	strncpy(grgszTextureName[j], szTemp, CBTEXTURENAMEMAX);
+	strncpy(grgszTextureName[j], szTemp, MAX_CBTEXTURENAME);
 	grgchTextureType[j] = chTemp;
 }
 
@@ -273,7 +273,7 @@ void PM_InitTextureTypes()
 	if (bTextureTypeInit)
 		return;
 
-	memset(&(grgszTextureName[0][0]), 0, CTEXTURESMAX * CBTEXTURENAMEMAX);
+	memset(&(grgszTextureName[0][0]), 0, CTEXTURESMAX * MAX_CBTEXTURENAME);
 	memset(grgchTextureType, 0, CTEXTURESMAX);
 
 	gcTextures = 0;
@@ -320,9 +320,9 @@ void PM_InitTextureTypes()
 			continue;
 
 		// null-terminate name and save in sentences array
-		j = V_min(j, CBTEXTURENAMEMAX - 1 + i);
+		j = V_min(j, MAX_CBTEXTURENAME - 1 + i);
 		buffer[j] = 0;
-		strncpy(&(grgszTextureName[gcTextures++][0]), &(buffer[i]), CBTEXTURENAMEMAX);
+		strncpy(&(grgszTextureName[gcTextures++][0]), &(buffer[i]), MAX_CBTEXTURENAME);
 	}
 
 	PM_SortTextures();
@@ -344,7 +344,7 @@ char PM_FindTextureType(char *name)
 	{
 		pivot = (left + right) / 2;
 
-		val = _strnicmp(name, grgszTextureName[pivot], CBTEXTURENAMEMAX - 1);
+		val = _strnicmp(name, grgszTextureName[pivot], MAX_CBTEXTURENAME - 1);
 		if (val == 0)
 		{
 			return grgchTextureType[pivot];
@@ -662,7 +662,7 @@ void PM_CatagorizeTextureType(void)
 	// '}}'
 
 	strncpy(pmove->sztexturename,  pTextureName, sizeof(pmove->sztexturename) );
-	pmove->sztexturename[CBTEXTURENAMEMAX - 1] = 0;
+	pmove->sztexturename[MAX_CBTEXTURENAME - 1] = 0;
 
 	// get texture type
 	pmove->chtexturetype = PM_FindTextureType(pmove->sztexturename);

From d72660c833e3018fbdb40c5ab723570694568fa9 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 16:53:56 -0400
Subject: [PATCH 223/291] renamed const to MAX_ prefixing. Moved to header

---
 src/game/server/hl/sound.cpp         | 6 ++----
 src/game/shared/movement/pm_shared.h | 2 ++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/game/server/hl/sound.cpp b/src/game/server/hl/sound.cpp
index 8b60c2c4..0c7d3c94 100644
--- a/src/game/server/hl/sound.cpp
+++ b/src/game/server/hl/sound.cpp
@@ -78,11 +78,9 @@ typedef struct dynpitchvol
 
 } dynpitchvol_t;
 
-constexpr unsigned int CDPVPRESETMAX = 27;
-
 // presets for runtime pitch and vol modulation of ambient sounds
 
-dynpitchvol_t rgdpvpreset[CDPVPRESETMAX] =
+dynpitchvol_t rgdpvpreset[MAX_CDPVPRESET] =
 	{
 		// pitch	pstart	spinup	spindwn	volrun	volstrt	fadein	fadeout	lfotype	lforate	modptch modvol	cspnup
 		{1, 255, 75, 95, 95, 10, 1, 50, 95, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
@@ -460,7 +458,7 @@ void CAmbientGeneric ::InitModulationParms(void)
 		m_dpv.volrun = 0;
 
 	// get presets
-	if (m_dpv.preset != 0 && m_dpv.preset <= CDPVPRESETMAX)
+	if (m_dpv.preset != 0 && m_dpv.preset <= MAX_CDPVPRESET)
 	{
 		// load preset values
 		m_dpv = rgdpvpreset[m_dpv.preset - 1];
diff --git a/src/game/shared/movement/pm_shared.h b/src/game/shared/movement/pm_shared.h
index 1428cbae..23213f95 100644
--- a/src/game/shared/movement/pm_shared.h
+++ b/src/game/shared/movement/pm_shared.h
@@ -20,6 +20,8 @@
 #define PM_SHAREDH
 #pragma once
 
+constexpr unsigned int MAX_CDPVPRESET = 27;
+
 void PM_Init(struct playermove_s *ppmove);
 void PM_Move(struct playermove_s *ppmove, qboolean server);
 char PM_FindTextureType(char *name);

From 7165500fcb0fdc174b1130831d285c4ce93567c6 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 16:54:34 -0400
Subject: [PATCH 224/291] reverted last commit

---
 src/game/server/hl/sound.cpp         | 3 +++
 src/game/shared/movement/pm_shared.h | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/game/server/hl/sound.cpp b/src/game/server/hl/sound.cpp
index 0c7d3c94..3b1e56bf 100644
--- a/src/game/server/hl/sound.cpp
+++ b/src/game/server/hl/sound.cpp
@@ -28,6 +28,9 @@
 #include <stdlib.h>
 #endif
 
+constexpr unsigned int MAX_CDPVPRESET = 27;
+constexpr unsigned int MAX_CDPVPRESET = 27;
+
 // ==================== GENERIC AMBIENT SOUND ======================================
 // THOTHIE: I cut and pasted from the original HL1SDK's SOUND.CPP the entire Ambient Generic section in an effort to restore functionality
 // THOTHIE: Just the ambient_generic entity, I left the rest alone
diff --git a/src/game/shared/movement/pm_shared.h b/src/game/shared/movement/pm_shared.h
index 23213f95..0bc78b8d 100644
--- a/src/game/shared/movement/pm_shared.h
+++ b/src/game/shared/movement/pm_shared.h
@@ -20,7 +20,7 @@
 #define PM_SHAREDH
 #pragma once
 
-constexpr unsigned int MAX_CDPVPRESET = 27;
+
 
 void PM_Init(struct playermove_s *ppmove);
 void PM_Move(struct playermove_s *ppmove, qboolean server);

From 742e27918caa8f20019d33d6ef3d864b2a1df152 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 16:54:44 -0400
Subject: [PATCH 225/291] remove doubled value

---
 src/game/server/hl/sound.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/game/server/hl/sound.cpp b/src/game/server/hl/sound.cpp
index 3b1e56bf..4d38d63b 100644
--- a/src/game/server/hl/sound.cpp
+++ b/src/game/server/hl/sound.cpp
@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #endif
 
-constexpr unsigned int MAX_CDPVPRESET = 27;
 constexpr unsigned int MAX_CDPVPRESET = 27;
 
 // ==================== GENERIC AMBIENT SOUND ======================================

From e23b4f0f7c150146ad753980d70a2bb71d1b7572 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 16:56:53 -0400
Subject: [PATCH 226/291] changed pitch yaw roll to enum

---
 src/game/shared/movement/pm_math.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/game/shared/movement/pm_math.cpp b/src/game/shared/movement/pm_math.cpp
index 095ac6db..8b5a64ef 100644
--- a/src/game/shared/movement/pm_math.cpp
+++ b/src/game/shared/movement/pm_math.cpp
@@ -18,14 +18,16 @@
 #include "mathlib.h"
 #include "const.h"
 
-// up / down
-constexpr int PITCH = 0;
+enum {
+	// up / down
+	PITCH = 0,
 // left / right
-constexpr int YAW = 1;
+	YAW = 1,
 // fall over
-constexpr int ROLL = 2;
+	ROLL = 2
+};
 
-#pragma warning(disable : 4244)
+//#pragma warning(disable : 4244)
 
 float anglemod(float a)
 {

From 81f36146e86cd09be3a710319b896233f7410a1e Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 16:59:33 -0400
Subject: [PATCH 227/291] removed unneeded defines

---
 src/game/shared/movement/pm_shared.cpp | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/game/shared/movement/pm_shared.cpp b/src/game/shared/movement/pm_shared.cpp
index b07b6dad..8b8f5d9b 100644
--- a/src/game/shared/movement/pm_shared.cpp
+++ b/src/game/shared/movement/pm_shared.cpp
@@ -52,12 +52,12 @@ extern "C"
 }
 #endif
 
-IScripted *PMScript = NULL;
+IScripted* PMScript = nullptr;
 //------------------
 
 static bool pm_shared_initialized = false;
 
-#pragma warning(disable : 4305)
+//#pragma warning(disable : 4305)
 
 typedef enum
 {
@@ -67,7 +67,7 @@ typedef enum
 	mod_studio
 } modtype_t;
 
-extern "C" playermove_t *pmove = NULL;
+extern "C" playermove_t *pmove = nullptr;
 
 typedef struct
 {
@@ -95,6 +95,7 @@ typedef struct hull_s
 } hull_t;
 
 // Ducking time
+
 #define TIME_TO_DUCK 0.4
 #undef VEC_DUCK_VIEW
 #define VEC_DUCK_VIEW 12
@@ -110,19 +111,6 @@ typedef struct hull_s
 #define CTEXTURESMAX 512	// max number of textures loaded
 #define MAX_CBTEXTURENAME 13 // only load first n chars of name
 
-#define CHAR_TEX_CONCRETE 'C' // texture types
-#define CHAR_TEX_METAL 'M'
-#define CHAR_TEX_DIRT 'D'
-#define CHAR_TEX_VENT 'V'
-#define CHAR_TEX_GRATE 'G'
-#define CHAR_TEX_TILE 'T'
-#define CHAR_TEX_SLOSH 'S'
-#define CHAR_TEX_WOOD 'W'
-#define CHAR_TEX_COMPUTER 'P'
-#define CHAR_TEX_GLASS 'Y'
-#define CHAR_TEX_FLESH 'F'
-#define CHAR_TEX_SNOW 'N' //MAR2008a Thothie - for Crow
-
 #define STEP_CONCRETE 0 // default step sound
 #define STEP_METAL 1	// metal floor
 #define STEP_DIRT 2		// dirt, sand, rock

From d39652c32cc058e42cb03a7f24561d343ee9aacd Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 17:09:40 -0400
Subject: [PATCH 228/291] Removed duplicate stuct defs. Added com_model.h
 include.

---
 src/common/const.h                     |  3 +--
 src/game/shared/movement/pm_shared.cpp | 36 ++++++++++----------------
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/src/common/const.h b/src/common/const.h
index 8b1ac42d..620ab2ea 100644
--- a/src/common/const.h
+++ b/src/common/const.h
@@ -621,7 +621,7 @@ enum {
 	CONTENTS_SLIME = -4,
 	CONTENTS_LAVA = -5,
 	CONTENTS_SKY = -6,
-	/* These additional contents constants are defined in bspfile.h
+	//These additional contents constants are defined in bspfile.h
 	CONTENTS_ORIGIN	=	-7,		// removed at csg time
 	CONTENTS_CLIP =		-8,		// changed to contents_solid
 	CONTENTS_CURRENT_0 =	-9,
@@ -631,7 +631,6 @@ enum {
 	CONTENTS_CURRENT_UP	=	-13,
 	CONTENTS_CURRENT_DOWN =	-14,
 	CONTENTS_TRANSLUCENT =	-15,
-	*/
 	CONTENTS_LADDER = -16,
 	CONTENTS_FLYFIELD = -17,
 	CONTENTS_GRAVITY_FLYFIELD = -18,
diff --git a/src/game/shared/movement/pm_shared.cpp b/src/game/shared/movement/pm_shared.cpp
index 8b8f5d9b..46605fe8 100644
--- a/src/game/shared/movement/pm_shared.cpp
+++ b/src/game/shared/movement/pm_shared.cpp
@@ -33,6 +33,9 @@
 #include "player/player.h"
 #include "filesystem_shared.h"
 #include "mathlib.h"
+
+#include "com_model.h"
+
 //-----------------------------
 
 //Master Sword -----
@@ -59,16 +62,9 @@ static bool pm_shared_initialized = false;
 
 //#pragma warning(disable : 4305)
 
-typedef enum
-{
-	mod_brush,
-	mod_sprite,
-	mod_alias,
-	mod_studio
-} modtype_t;
-
 extern "C" playermove_t *pmove = nullptr;
 
+/*
 typedef struct
 {
 	int planenum;
@@ -93,6 +89,7 @@ typedef struct hull_s
 	Vector clip_mins;
 	Vector clip_maxs;
 } hull_t;
+*/
 
 // Ducking time
 
@@ -133,25 +130,18 @@ typedef struct hull_s
 #define PLAYER_MOVE_NODUCK (1 << 5)
 
 // double to float warning
-#pragma warning(disable : 4244)
-
-#define MAX_CLIENTS 32
-
-#define CONTENTS_CURRENT_0 -9
-#define CONTENTS_CURRENT_90 -10
-#define CONTENTS_CURRENT_180 -11
-#define CONTENTS_CURRENT_270 -12
-#define CONTENTS_CURRENT_UP -13
-#define CONTENTS_CURRENT_DOWN -14
+//#pragma warning(disable : 4244)
 
-#define CONTENTS_TRANSLUCENT -15
+//#define MAX_CLIENTS 32
 
-// up / down
-#define PITCH 0
+enum {
+	// up / down
+	PITCH = 0,
 // left / right
-#define YAW 1
+	YAW = 1,
 // fall over
-#define ROLL 2
+	ROLL = 2
+};
 
 Vector vec3_origin(0,0,0);
 

From 243f78c90cf489c72286360facaea9ea962da21b Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 17:15:38 -0400
Subject: [PATCH 229/291] changed define to enum, moved to header

---
 src/game/shared/movement/pm_shared.cpp | 40 ++------------------------
 src/game/shared/movement/pm_shared.h   | 18 +++++++++++-
 2 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/src/game/shared/movement/pm_shared.cpp b/src/game/shared/movement/pm_shared.cpp
index 46605fe8..864428fc 100644
--- a/src/game/shared/movement/pm_shared.cpp
+++ b/src/game/shared/movement/pm_shared.cpp
@@ -36,6 +36,8 @@
 
 #include "com_model.h"
 
+
+
 //-----------------------------
 
 //Master Sword -----
@@ -64,35 +66,9 @@ static bool pm_shared_initialized = false;
 
 extern "C" playermove_t *pmove = nullptr;
 
-/*
-typedef struct
-{
-	int planenum;
-	short children[2]; // negative numbers are contents
-} dclipnode_t;
-
-typedef struct mplane_s
-{
-	Vector normal; // surface normal
-	float dist;	   // closest appoach to origin
-	byte type;	   // for texture axis selection and fast side tests
-	byte signbits; // signx + signy<<1 + signz<<1
-	byte pad[2];
-} mplane_t;
-
-typedef struct hull_s
-{
-	dclipnode_t *clipnodes;
-	mplane_t *planes;
-	int firstclipnode;
-	int lastclipnode;
-	Vector clip_mins;
-	Vector clip_maxs;
-} hull_t;
-*/
-
 // Ducking time
 
+
 #define TIME_TO_DUCK 0.4
 #undef VEC_DUCK_VIEW
 #define VEC_DUCK_VIEW 12
@@ -108,16 +84,6 @@ typedef struct hull_s
 #define CTEXTURESMAX 512	// max number of textures loaded
 #define MAX_CBTEXTURENAME 13 // only load first n chars of name
 
-#define STEP_CONCRETE 0 // default step sound
-#define STEP_METAL 1	// metal floor
-#define STEP_DIRT 2		// dirt, sand, rock
-#define STEP_VENT 3		// ventillation duct
-#define STEP_GRATE 4	// metal grating
-#define STEP_TILE 5		// floor tiles
-#define STEP_SLOSH 6	// shallow liquid puddle
-#define STEP_WADE 7		// wading in liquid
-#define STEP_LADDER 8	// climbing ladder
-#define STEP_SNOW 9		// MAR2008a snow
 
 #define PLAYER_FATAL_FALL_SPEED 1024															  // approx 60 feet
 #define PLAYER_MAX_SAFE_FALL_SPEED 580															  // approx 20 feet
diff --git a/src/game/shared/movement/pm_shared.h b/src/game/shared/movement/pm_shared.h
index 0bc78b8d..a638a776 100644
--- a/src/game/shared/movement/pm_shared.h
+++ b/src/game/shared/movement/pm_shared.h
@@ -34,7 +34,7 @@ bool PM_GetHullBounds(int hullnumber, float* mins, float* maxs);
 char* memfgets(const byte* pMemFile, std::size_t fileSize, std::size_t& filePos, char* pBuffer, std::size_t bufferSize);
 
 // Spectator Movement modes (stored in pev->iuser1, so the physics code can get at them)
-enum {
+enum obs_type_e {
 
 	OBS_NONE = 0,
 	OBS_CHASE_LOCKED = 1,
@@ -48,4 +48,20 @@ enum {
 
 inline bool g_CheckForPlayerStuck = false;
 
+enum step_surface_e {
+
+	STEP_CONCRETE = 0, // default step sound
+	STEP_METAL = 1,	// metal floor
+	STEP_DIRT = 2,		// dirt, sand, rock
+	STEP_VENT = 3,		// ventillation duct
+	STEP_GRATE = 4,	// metal grating
+	STEP_TILE = 5,		// floor tiles
+	STEP_SLOSH = 6,	// shallow liquid puddle
+	STEP_WADE = 7,		// wading in liquid
+	STEP_LADDER = 8,	// climbing ladder
+	STEP_SNOW = 9		// MAR2008a snow
+
+};
+
+
 #endif

From cbefe7948472f9bbdcdd045eef7f80a6f7bcfa99 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 17:22:40 -0400
Subject: [PATCH 230/291] moved max clib speed to player.h. removed duplicate
 referenced, name to default CLIMB_ value

---
 src/game/server/player/player.h        |  3 ++-
 src/game/shared/movement/pm_shared.cpp | 26 ++++++++++++++------------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/game/server/player/player.h b/src/game/server/player/player.h
index 029a9a9f..1eed65aa 100644
--- a/src/game/server/player/player.h
+++ b/src/game/server/player/player.h
@@ -41,6 +41,7 @@ constexpr unsigned int MAX_QUICKSLOTS = 36; //MiB MAR2012 - Increase quickslots
 constexpr unsigned int MAX_PLAYER_HANDS = 2;
 constexpr unsigned int MAX_PLAYER_HANDITEMS = 3;
 constexpr unsigned int MAX_KEYHISTORY = 10;
+constexpr unsigned int CLIMB_MAX_SPEED = 200; 
 constexpr float PLAYER_FATAL_FALL_SPEED = 1024;															  // approx 60 feet
 constexpr float PLAYER_MAX_SAFE_FALL_SPEED = 580;														  // approx 20 feet
 constexpr float PLAYER_DAMAGE_FOR_FALL_SPEED = 100.0f / (PLAYER_FATAL_FALL_SPEED - PLAYER_MAX_SAFE_FALL_SPEED); // damage per unit per second.
@@ -54,7 +55,7 @@ constexpr float PLAYER_BASE_SPEED = 160;
 constexpr float PLAYER_WALKSPEED_MAX_WEIGHT_SLOWDOWN = 70;
 constexpr float PLAYER_WALKSPEED_MAX_DEX = 75.0f;
 constexpr float CLIMB_SHAKE_FREQUENCY = 22; // how many frames in between screen shakes when climbing
-constexpr float CLIMB_MAX_SPEED = 200;		 // fastest vertical climbing speed possible
+//constexpr float CLIMB_MAX_SPEED = 200;		 // fastest vertical climbing speed possible
 constexpr float CLIMB_SPEED_DEC = 15;		 // climbing deceleration rate
 constexpr float CLIMB_PUNCH_X = -7;		 // how far to 'punch' client X axis when climbing
 constexpr float CLIMB_PUNCH_Z = 7;		 // how far to 'punch' client Z axis when climbing
diff --git a/src/game/shared/movement/pm_shared.cpp b/src/game/shared/movement/pm_shared.cpp
index 864428fc..46782f9c 100644
--- a/src/game/shared/movement/pm_shared.cpp
+++ b/src/game/shared/movement/pm_shared.cpp
@@ -38,6 +38,7 @@
 
 
 
+
 //-----------------------------
 
 //Master Sword -----
@@ -69,11 +70,12 @@ extern "C" playermove_t *pmove = nullptr;
 // Ducking time
 
 
-#define TIME_TO_DUCK 0.4
-#undef VEC_DUCK_VIEW
-#define VEC_DUCK_VIEW 12
-#define PM_DEAD_VIEWHEIGHT -8
-#define MAX_CLIMB_SPEED 200
+constexpr float TIME_TO_DUCK = 0.4;
+constexpr float PM_DEAD_VIEWHEIGHT = -8;
+
+//#undef VEC_DUCK_VIEW
+//#define VEC_DUCK_VIEW 12
+
 #define STUCK_MOVEUP 1
 #define STUCK_MOVEDOWN -1
 #undef VEC_VIEW
@@ -2169,7 +2171,7 @@ void PM_Duck(void)
 					(pmove->onground == -1))
 				{
 					pmove->usehull = 1;
-					pmove->view_ofs[2] = VEC_DUCK_VIEW;
+					pmove->view_ofs[2] = VEC_DUCK_VIEW.z;
 					pmove->flags |= FL_DUCKING;
 					pmove->bInDuck = false;
 
@@ -2193,7 +2195,7 @@ void PM_Duck(void)
 
 					// Calc parametric time
 					duckFraction = PM_SplineFraction(time, (1.0 / TIME_TO_DUCK));
-					pmove->view_ofs[2] = ((VEC_DUCK_VIEW - fMore) * duckFraction) + (VEC_VIEW * (1 - duckFraction));
+					pmove->view_ofs[2] = ((VEC_DUCK_VIEW.z - fMore) * duckFraction) + (VEC_VIEW * (1 - duckFraction));
 				}
 			}
 		}
@@ -2242,13 +2244,13 @@ void PM_LadderMove(physent_t *pLadder)
 
 		AngleVectors(pmove->angles, &vpn, &v_right, NULL);
 		if (pmove->cmd.buttons & IN_BACK)
-			forward -= MAX_CLIMB_SPEED;
+			forward -= CLIMB_MAX_SPEED;
 		if (pmove->cmd.buttons & IN_FORWARD)
-			forward += MAX_CLIMB_SPEED;
+			forward += CLIMB_MAX_SPEED;
 		if (pmove->cmd.buttons & IN_MOVELEFT)
-			right -= MAX_CLIMB_SPEED;
+			right -= CLIMB_MAX_SPEED;
 		if (pmove->cmd.buttons & IN_MOVERIGHT)
-			right += MAX_CLIMB_SPEED;
+			right += CLIMB_MAX_SPEED;
 
 		if (pmove->cmd.buttons & IN_JUMP)
 		{
@@ -2294,7 +2296,7 @@ void PM_LadderMove(physent_t *pLadder)
 				VectorMA(lateral, -normal, tmp, pmove->velocity);
 				if (onFloor && normal > 0) // On ground moving away from the ladder
 				{
-					VectorMA(pmove->velocity, MAX_CLIMB_SPEED, trace.plane.normal, pmove->velocity);
+					VectorMA(pmove->velocity, CLIMB_MAX_SPEED, trace.plane.normal, pmove->velocity);
 				}
 				//pev->velocity = lateral - (CrossProduct( trace.vecPlaneNormal, perp ) * normal);
 			}

From c8f9de172578fdbc502766b2b40c64b433a754fe Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 17:24:44 -0400
Subject: [PATCH 231/291] fixed typing. moved enum to headr

---
 src/game/server/player/player.h        | 11 +++++++++--
 src/game/shared/movement/pm_shared.cpp |  5 +----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/game/server/player/player.h b/src/game/server/player/player.h
index 1eed65aa..af9f843b 100644
--- a/src/game/server/player/player.h
+++ b/src/game/server/player/player.h
@@ -41,7 +41,6 @@ constexpr unsigned int MAX_QUICKSLOTS = 36; //MiB MAR2012 - Increase quickslots
 constexpr unsigned int MAX_PLAYER_HANDS = 2;
 constexpr unsigned int MAX_PLAYER_HANDITEMS = 3;
 constexpr unsigned int MAX_KEYHISTORY = 10;
-constexpr unsigned int CLIMB_MAX_SPEED = 200; 
 constexpr float PLAYER_FATAL_FALL_SPEED = 1024;															  // approx 60 feet
 constexpr float PLAYER_MAX_SAFE_FALL_SPEED = 580;														  // approx 20 feet
 constexpr float PLAYER_DAMAGE_FOR_FALL_SPEED = 100.0f / (PLAYER_FATAL_FALL_SPEED - PLAYER_MAX_SAFE_FALL_SPEED); // damage per unit per second.
@@ -55,16 +54,24 @@ constexpr float PLAYER_BASE_SPEED = 160;
 constexpr float PLAYER_WALKSPEED_MAX_WEIGHT_SLOWDOWN = 70;
 constexpr float PLAYER_WALKSPEED_MAX_DEX = 75.0f;
 constexpr float CLIMB_SHAKE_FREQUENCY = 22; // how many frames in between screen shakes when climbing
-//constexpr float CLIMB_MAX_SPEED = 200;		 // fastest vertical climbing speed possible
 constexpr float CLIMB_SPEED_DEC = 15;		 // climbing deceleration rate
 constexpr float CLIMB_PUNCH_X = -7;		 // how far to 'punch' client X axis when climbing
 constexpr float CLIMB_PUNCH_Z = 7;		 // how far to 'punch' client Z axis when climbing
+constexpr float CLIMB_MAX_SPEED = 200;
 constexpr float CHAT_INTERVAL = 1.0f;
+constexpr float TIME_TO_DUCK = 0.4;
+constexpr float PM_DEAD_VIEWHEIGHT = -8;
+
 constexpr double AUTOAIM_2DEGREES = 0.0348994967025;
 constexpr double AUTOAIM_5DEGREES = 0.08715574274766;
 constexpr double AUTOAIM_8DEGREES = 0.1391731009601;
 constexpr double AUTOAIM_10DEGREES = 0.1736481776669;
 
+enum player_stuck_move {
+	STUCK_MOVEUP = 1,
+	STUCK_MOVEDOWN = -1
+};
+
 enum sbar_data
 {
 	SBAR_ID_TARGETNAME = 1,
diff --git a/src/game/shared/movement/pm_shared.cpp b/src/game/shared/movement/pm_shared.cpp
index 46782f9c..6abb35af 100644
--- a/src/game/shared/movement/pm_shared.cpp
+++ b/src/game/shared/movement/pm_shared.cpp
@@ -70,14 +70,11 @@ extern "C" playermove_t *pmove = nullptr;
 // Ducking time
 
 
-constexpr float TIME_TO_DUCK = 0.4;
-constexpr float PM_DEAD_VIEWHEIGHT = -8;
+
 
 //#undef VEC_DUCK_VIEW
 //#define VEC_DUCK_VIEW 12
 
-#define STUCK_MOVEUP 1
-#define STUCK_MOVEDOWN -1
 #undef VEC_VIEW
 #define VEC_VIEW 28
 #define STOP_EPSILON 0.1

From cb19f7297efc9c6d0b789f0bbbbe375a6d1b3640 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 17:25:17 -0400
Subject: [PATCH 232/291] added breaks for variable groupings.

---
 src/game/server/player/player.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/game/server/player/player.h b/src/game/server/player/player.h
index af9f843b..c8570f85 100644
--- a/src/game/server/player/player.h
+++ b/src/game/server/player/player.h
@@ -41,6 +41,7 @@ constexpr unsigned int MAX_QUICKSLOTS = 36; //MiB MAR2012 - Increase quickslots
 constexpr unsigned int MAX_PLAYER_HANDS = 2;
 constexpr unsigned int MAX_PLAYER_HANDITEMS = 3;
 constexpr unsigned int MAX_KEYHISTORY = 10;
+
 constexpr float PLAYER_FATAL_FALL_SPEED = 1024;															  // approx 60 feet
 constexpr float PLAYER_MAX_SAFE_FALL_SPEED = 580;														  // approx 20 feet
 constexpr float PLAYER_DAMAGE_FOR_FALL_SPEED = 100.0f / (PLAYER_FATAL_FALL_SPEED - PLAYER_MAX_SAFE_FALL_SPEED); // damage per unit per second.
@@ -53,11 +54,13 @@ constexpr float PLAYER_PICKUPITEM_DISTANCE = 68.0; //Search and pickup dist migh
 constexpr float PLAYER_BASE_SPEED = 160;
 constexpr float PLAYER_WALKSPEED_MAX_WEIGHT_SLOWDOWN = 70;
 constexpr float PLAYER_WALKSPEED_MAX_DEX = 75.0f;
+
 constexpr float CLIMB_SHAKE_FREQUENCY = 22; // how many frames in between screen shakes when climbing
 constexpr float CLIMB_SPEED_DEC = 15;		 // climbing deceleration rate
 constexpr float CLIMB_PUNCH_X = -7;		 // how far to 'punch' client X axis when climbing
 constexpr float CLIMB_PUNCH_Z = 7;		 // how far to 'punch' client Z axis when climbing
 constexpr float CLIMB_MAX_SPEED = 200;
+
 constexpr float CHAT_INTERVAL = 1.0f;
 constexpr float TIME_TO_DUCK = 0.4;
 constexpr float PM_DEAD_VIEWHEIGHT = -8;

From 020da4b1f585843f079527e53280c0b8d2e51f18 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 17:26:53 -0400
Subject: [PATCH 233/291] removed defined. changed referenze to constexpr
 Vector

---
 src/game/shared/movement/pm_shared.cpp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/game/shared/movement/pm_shared.cpp b/src/game/shared/movement/pm_shared.cpp
index 6abb35af..f84d2726 100644
--- a/src/game/shared/movement/pm_shared.cpp
+++ b/src/game/shared/movement/pm_shared.cpp
@@ -69,14 +69,6 @@ extern "C" playermove_t *pmove = nullptr;
 
 // Ducking time
 
-
-
-
-//#undef VEC_DUCK_VIEW
-//#define VEC_DUCK_VIEW 12
-
-#undef VEC_VIEW
-#define VEC_VIEW 28
 #define STOP_EPSILON 0.1
 #define	DIST_EPSILON 0.125f	// Max error from network coordinate quantization
 
@@ -2099,7 +2091,7 @@ void PM_UnDuck(void)
 
 		pmove->flags &= ~FL_DUCKING;
 		pmove->bInDuck = false;
-		pmove->view_ofs[2] = VEC_VIEW;
+		pmove->view_ofs[2] = VEC_VIEW.z;
 		pmove->flDuckTime = 0;
 
 		VectorCopy(newOrigin, pmove->origin);
@@ -2192,7 +2184,7 @@ void PM_Duck(void)
 
 					// Calc parametric time
 					duckFraction = PM_SplineFraction(time, (1.0 / TIME_TO_DUCK));
-					pmove->view_ofs[2] = ((VEC_DUCK_VIEW.z - fMore) * duckFraction) + (VEC_VIEW * (1 - duckFraction));
+					pmove->view_ofs[2] = ((VEC_DUCK_VIEW.z - fMore) * duckFraction) + (VEC_VIEW.z * (1 - duckFraction));
 				}
 			}
 		}

From 75e1953381f7751c21e10b8b928b5f0adc09520f Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 17:27:48 -0400
Subject: [PATCH 234/291] changed define to constexpr moved to header

---
 src/game/shared/movement/pm_shared.cpp | 3 ---
 src/game/shared/movement/pm_shared.h   | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/game/shared/movement/pm_shared.cpp b/src/game/shared/movement/pm_shared.cpp
index f84d2726..5e42d9ca 100644
--- a/src/game/shared/movement/pm_shared.cpp
+++ b/src/game/shared/movement/pm_shared.cpp
@@ -69,9 +69,6 @@ extern "C" playermove_t *pmove = nullptr;
 
 // Ducking time
 
-#define STOP_EPSILON 0.1
-#define	DIST_EPSILON 0.125f	// Max error from network coordinate quantization
-
 #define CTEXTURESMAX 512	// max number of textures loaded
 #define MAX_CBTEXTURENAME 13 // only load first n chars of name
 
diff --git a/src/game/shared/movement/pm_shared.h b/src/game/shared/movement/pm_shared.h
index a638a776..f06ea63e 100644
--- a/src/game/shared/movement/pm_shared.h
+++ b/src/game/shared/movement/pm_shared.h
@@ -20,7 +20,8 @@
 #define PM_SHAREDH
 #pragma once
 
-
+constexpr float STOP_EPSILON = 0.1;
+constexpr float DIST_EPSILON = 0.125f;	// Max error from network coordinate quantization
 
 void PM_Init(struct playermove_s *ppmove);
 void PM_Move(struct playermove_s *ppmove, qboolean server);

From 26d98358732d4f28e4c2a76c24bea4f2fe3e4c18 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 17:30:40 -0400
Subject: [PATCH 235/291] changed define to constexpr. removed unneeded define.

---
 src/game/shared/movement/pm_shared.cpp | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/game/shared/movement/pm_shared.cpp b/src/game/shared/movement/pm_shared.cpp
index 5e42d9ca..1fff5fa0 100644
--- a/src/game/shared/movement/pm_shared.cpp
+++ b/src/game/shared/movement/pm_shared.cpp
@@ -69,8 +69,7 @@ extern "C" playermove_t *pmove = nullptr;
 
 // Ducking time
 
-#define CTEXTURESMAX 512	// max number of textures loaded
-#define MAX_CBTEXTURENAME 13 // only load first n chars of name
+constexpr unsigned int MAX_CTEXTURES = 512;	// max number of textures loaded
 
 
 #define PLAYER_FATAL_FALL_SPEED 1024															  // approx 60 feet
@@ -106,8 +105,8 @@ static int rgStuckLast[MAX_CLIENTS][2];
 static bool bTextureTypeInit = false;
 
 static int gcTextures = 0;
-static char grgszTextureName[CTEXTURESMAX][MAX_CBTEXTURENAME];
-static char grgchTextureType[CTEXTURESMAX];
+static char grgszTextureName[MAX_CTEXTURES][MAX_CBTEXTURENAME];
+static char grgchTextureType[MAX_CTEXTURES];
 
 int g_onladder = 0;
 
@@ -200,13 +199,13 @@ void PM_SortTextures(void)
 void PM_InitTextureTypes()
 {
 	char buffer[512];
-	int i, j;
+	unsigned int i, j;
 
 	if (bTextureTypeInit)
 		return;
 
-	memset(&(grgszTextureName[0][0]), 0, CTEXTURESMAX * MAX_CBTEXTURENAME);
-	memset(grgchTextureType, 0, CTEXTURESMAX);
+	memset(&(grgszTextureName[0][0]), 0, MAX_CTEXTURES * MAX_CBTEXTURENAME);
+	memset(grgchTextureType, 0, MAX_CTEXTURES);
 
 	gcTextures = 0;
 	memset(buffer, 0, 512);
@@ -219,7 +218,7 @@ void PM_InitTextureTypes()
 	std::size_t filePos = 0;
 
 	// for each line in the file...
-	while (memfgets(fileContents.data(), fileContents.size(), filePos, buffer, 511) != NULL && (gcTextures < CTEXTURESMAX))
+	while (memfgets(fileContents.data(), fileContents.size(), filePos, buffer, 511) != NULL && (gcTextures < MAX_CTEXTURES))
 	{
 		// skip whitespace
 		i = 0;

From ac623caf1b6fe874b0075f8ba8bf4c08b7263e1c Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 17:31:37 -0400
Subject: [PATCH 236/291] Removed redefinition of constexpr.

---
 src/game/server/hl/sound.cpp           | 2 --
 src/game/shared/movement/pm_shared.cpp | 1 -
 src/game/shared/movement/pm_shared.h   | 1 +
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/game/server/hl/sound.cpp b/src/game/server/hl/sound.cpp
index 4d38d63b..3a3183b3 100644
--- a/src/game/server/hl/sound.cpp
+++ b/src/game/server/hl/sound.cpp
@@ -1526,8 +1526,6 @@ void EMIT_GROUPNAME_SUIT(edict_t *entity, const char *groupname)
 // Used to detect the texture the player is standing on, map the
 // texture name to a material type.  Play footstep sound based
 // on material type.
-constexpr unsigned int MAX_CTEXTURES = 512; // max number of textures loaded
-
 unsigned int gcTextures = 0;
 char grgszTextureName[MAX_CTEXTURES][MAX_CBTEXTURENAME]; // texture names
 char grgchTextureType[MAX_CTEXTURES];				   // parallel array of texture types
diff --git a/src/game/shared/movement/pm_shared.cpp b/src/game/shared/movement/pm_shared.cpp
index 1fff5fa0..2b2bd7c6 100644
--- a/src/game/shared/movement/pm_shared.cpp
+++ b/src/game/shared/movement/pm_shared.cpp
@@ -69,7 +69,6 @@ extern "C" playermove_t *pmove = nullptr;
 
 // Ducking time
 
-constexpr unsigned int MAX_CTEXTURES = 512;	// max number of textures loaded
 
 
 #define PLAYER_FATAL_FALL_SPEED 1024															  // approx 60 feet
diff --git a/src/game/shared/movement/pm_shared.h b/src/game/shared/movement/pm_shared.h
index f06ea63e..004b3653 100644
--- a/src/game/shared/movement/pm_shared.h
+++ b/src/game/shared/movement/pm_shared.h
@@ -22,6 +22,7 @@
 
 constexpr float STOP_EPSILON = 0.1;
 constexpr float DIST_EPSILON = 0.125f;	// Max error from network coordinate quantization
+constexpr unsigned int MAX_CTEXTURES = 512;	// max number of textures loaded
 
 void PM_Init(struct playermove_s *ppmove);
 void PM_Move(struct playermove_s *ppmove, qboolean server);

From 6f536e1183556a3d23da31b8f37df982257a1636 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 17:42:43 -0400
Subject: [PATCH 237/291] combined split enum using same flagset to same enum.
 renamed to follow other enums conventions.

---
 src/game/server/monsters/corpse.h        |  2 +-
 src/game/server/msitemdefs.h             | 14 +++++---------
 src/game/server/shield.cpp               |  2 +-
 src/game/server/shield.h                 |  2 +-
 src/game/shared/ms/msmonstershared.cpp   |  2 +-
 src/game/shared/weapons/giprojectile.cpp |  2 +-
 6 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/game/server/monsters/corpse.h b/src/game/server/monsters/corpse.h
index 8ea0b037..b326e1ab 100644
--- a/src/game/server/monsters/corpse.h
+++ b/src/game/server/monsters/corpse.h
@@ -9,7 +9,7 @@ class CCorpse : public CMSMonster
 	CBasePlayer* pPlayerSource;
 	//Overridden
 	int ObjectCaps(void) { return FCAP_DONT_SAVE; }
-	int MSProperties() { return MS_CORPSE; }
+	int MSProperties() { return ITEM_MS_CORPSE; }
 	void Spawn();
 	bool AddItem(CGenericItem* pItem, bool ToHand, bool CheckWeight, int ForceHand = -1);
 	bool RemoveItem(CGenericItem* pItem);
diff --git a/src/game/server/msitemdefs.h b/src/game/server/msitemdefs.h
index a1a3e736..e2c06bc1 100644
--- a/src/game/server/msitemdefs.h
+++ b/src/game/server/msitemdefs.h
@@ -102,18 +102,14 @@ enum {
 	ITEM_DRINKABLE = (1 << 7),
 	ITEM_PERISHABLE = (1 << 8),
 	ITEM_SPELL = (1 << 9),
+	ITEM_MS_BODYPART = (1 << 10),
+	ITEM_MS_NPC = (1 << 11),
+	ITEM_MS_PLAYER = (1 << 12),
+	ITEM_MS_CORPSE = (1 << 13),
+	ITEM_MS_SHIELD = (1 << 14),
 	ITEM_NOPICKUP = (1 << 15) //MIB FEB2010_13 [thothie: 1<<10 is taken below - switched to 1<<15]
 };
 
-//***** Others *****
-enum {
-	MS_BODYPART = (1 << 10),
-	MS_NPC = (1 << 11),
-	MS_PLAYER = (1 << 12),
-	MS_CORPSE = (1 << 13),
-	MS_SHIELD = (1 << 14)
-};
-
 //Shield Sounds
 constexpr const char* SOUND_IRONSHIELD_HIT1 = "weapons/cbar_hit1.wav"; //global sounds
 constexpr const char* SOUND_IRONSHIELD_HIT2 = "weapons/cbar_hit2.wav";
diff --git a/src/game/server/shield.cpp b/src/game/server/shield.cpp
index de54cd7a..a47fb241 100644
--- a/src/game/server/shield.cpp
+++ b/src/game/server/shield.cpp
@@ -64,7 +64,7 @@ void G_SolidifyEnts(bool fEnable, bool fSolidShields, bool fEnableCorpses, bool
 			//CMSMonster *pMonster = (CMSMonster *)pEnt;
 			//if( !pMonster->Skin ) continue;
 		}
-		else if (!fSolidShields || pEnt->MSProperties() != MS_SHIELD)
+		else if (!fSolidShields || pEnt->MSProperties() != ITEM_MS_SHIELD)
 			continue;
 
 		pEnt->pev->solid = fEnable ? SOLID_BBOX : SOLID_NOT;
diff --git a/src/game/server/shield.h b/src/game/server/shield.h
index aa8fd5a5..8c195cb0 100644
--- a/src/game/server/shield.h
+++ b/src/game/server/shield.h
@@ -3,7 +3,7 @@ class CShieldArea : public CBaseEntity
 {
 public:
 	CShieldArea *pNext;
-	int MSProperties() { return MS_SHIELD; }
+	int MSProperties() { return ITEM_MS_SHIELD; }
 	void Spawn();
 	float TraceAttack(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType, int iAccuracyRoll);
 	void FollowThink();
diff --git a/src/game/shared/ms/msmonstershared.cpp b/src/game/shared/ms/msmonstershared.cpp
index 6e3a0291..40c837d8 100644
--- a/src/game/shared/ms/msmonstershared.cpp
+++ b/src/game/shared/ms/msmonstershared.cpp
@@ -45,7 +45,7 @@ CMSMonster::~CMSMonster()
 }
 
 CMSMonster::CMSMonster() {}
-int CMSMonster::MSProperties() { return MS_NPC; }
+int CMSMonster::MSProperties() { return ITEM_MS_NPC; }
 
 bool CMSMonster::IsActing()
 {
diff --git a/src/game/shared/weapons/giprojectile.cpp b/src/game/shared/weapons/giprojectile.cpp
index 0118eece..1e7dfc00 100644
--- a/src/game/shared/weapons/giprojectile.cpp
+++ b/src/game/shared/weapons/giprojectile.cpp
@@ -291,7 +291,7 @@ void CGenericItem::Projectile_CheckHit(void)
 		CBaseEntity *pEntity = MSInstance(tr.pHit);
 		if (pEntity)
 		{
-			/*if( pEntity->MSProperties() == MS_SHIELD ) 
+			/*if( pEntity->MSProperties() == ITEM_MS_SHIELD ) 
 			{
 				CGenericItem *pShield = (CGenericItem *)CBaseEntity::Instance(pEntity->pev->owner);
 				CBasePlayer *pPlayer = pShield->m_pPlayer->IsPlayer() ? pShield->m_pPlayer : NULL;

From a85793796f5d357f9a6198f5c92b785361a8b562 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 17:46:49 -0400
Subject: [PATCH 238/291] Removed unneeded defines. Mvoed enum to player.h

---
 src/game/server/msitemdefs.h           | 14 --------------
 src/game/server/player/player.h        | 15 +++++++++++++++
 src/game/shared/movement/pm_shared.cpp | 20 +++++++-------------
 3 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/src/game/server/msitemdefs.h b/src/game/server/msitemdefs.h
index e2c06bc1..3babe216 100644
--- a/src/game/server/msitemdefs.h
+++ b/src/game/server/msitemdefs.h
@@ -71,20 +71,6 @@ enum {
 
 //These are for CBasePlayer::m_StatusFlags
 
-enum {
-	PLAYER_MOVE_RUNNING = (1 << 0),
-	PLAYER_MOVE_ATTACKING = (1 << 1),
-	PLAYER_MOVE_JUMPING = (1 << 2),
-	PLAYER_MOVE_SWIMMING = (1 << 3) ,//Set by script.. really just an indicator for the client that it should rotate the model by pitch
-	PLAYER_MOVE_NORUN = (1 << 3),
-	PLAYER_MOVE_NOJUMP = (1 << 4),
-	PLAYER_MOVE_NODUCK = (1 << 5),
-	PLAYER_MOVE_NOATTACK = (1 << 6),
-	PLAYER_MOVE_NOMOVE = (1 << 7),
-	PLAYER_MOVE_SITTING = (1 << 8), //JAN2010_09 Thothie - Attempting to allow inventory access while sittin again
-	PLAYER_MOVE_STOPRUN = (1 << 9)
-};
-
 //#define PLAYER_MOVE_SPECTATE		(1<<3)
 //#define PLAYER_MOVE_SPECTATE_MOVE	(1<<4)
 //#define PLAYER_MOVE_STUNNED		(1<<3)
diff --git a/src/game/server/player/player.h b/src/game/server/player/player.h
index c8570f85..029cd53e 100644
--- a/src/game/server/player/player.h
+++ b/src/game/server/player/player.h
@@ -104,6 +104,21 @@ class CTeam;
 struct TCallbackMenu;
 class CGenericItem;
 
+enum {
+	PLAYER_MOVE_RUNNING = (1 << 0),
+	PLAYER_MOVE_ATTACKING = (1 << 1),
+	PLAYER_MOVE_JUMPING = (1 << 2),
+	PLAYER_MOVE_SWIMMING = (1 << 3),//Set by script.. really just an indicator for the client that it should rotate the model by pitch
+	PLAYER_MOVE_NORUN = (1 << 3),
+	PLAYER_MOVE_NOJUMP = (1 << 4),
+	PLAYER_MOVE_NODUCK = (1 << 5),
+	PLAYER_MOVE_NOATTACK = (1 << 6),
+	PLAYER_MOVE_NOMOVE = (1 << 7),
+	PLAYER_MOVE_SITTING = (1 << 8), //JAN2010_09 Thothie - Attempting to allow inventory access while sittin again
+	PLAYER_MOVE_STOPRUN = (1 << 9)
+};
+
+
 enum EMapStatus
 {
 	UNDEFINED_MAP, //Just joined, and map info hasn't been sent yet
diff --git a/src/game/shared/movement/pm_shared.cpp b/src/game/shared/movement/pm_shared.cpp
index 2b2bd7c6..5e013b64 100644
--- a/src/game/shared/movement/pm_shared.cpp
+++ b/src/game/shared/movement/pm_shared.cpp
@@ -67,19 +67,13 @@ static bool pm_shared_initialized = false;
 
 extern "C" playermove_t *pmove = nullptr;
 
-// Ducking time
-
-
-
-#define PLAYER_FATAL_FALL_SPEED 1024															  // approx 60 feet
-#define PLAYER_MAX_SAFE_FALL_SPEED 580															  // approx 20 feet
-#define DAMAGE_FOR_FALL_SPEED (float)100 / (PLAYER_FATAL_FALL_SPEED - PLAYER_MAX_SAFE_FALL_SPEED) // damage per unit per second.
-#define PLAYER_MIN_BOUNCE_SPEED 200
-#define PLAYER_FALL_PUNCH_THRESHHOLD (float)350 // won't punch player's screen/make scrape noise unless player falling at least this fast.
-
-#define PLAYER_LONGJUMP_SPEED 350 // how fast we longjump
-
-#define PLAYER_MOVE_NODUCK (1 << 5)
+//#define PLAYER_FATAL_FALL_SPEED 1024															  // approx 60 feet
+//#define PLAYER_MAX_SAFE_FALL_SPEED 580															  // approx 20 feet
+//#define DAMAGE_FOR_FALL_SPEED (float)100 / (PLAYER_FATAL_FALL_SPEED - PLAYER_MAX_SAFE_FALL_SPEED) // damage per unit per second.
+//#define PLAYER_MIN_BOUNCE_SPEED 200
+//#define PLAYER_FALL_PUNCH_THRESHHOLD (float)350 // won't punch player's screen/make scrape noise unless player falling at least this fast.
+//#define PLAYER_LONGJUMP_SPEED 350 // how fast we longjump
+//#define PLAYER_MOVE_NODUCK (1 << 5)
 
 // double to float warning
 //#pragma warning(disable : 4244)

From d320f3babc7b6e1d3aff425516282469c4d5fe00 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 17:50:48 -0400
Subject: [PATCH 239/291] changed define to constexpr

---
 src/game/shared/movement/pm_shared.cpp | 18 ++----------------
 src/game/shared/movement/pm_shared.h   |  1 +
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/game/shared/movement/pm_shared.cpp b/src/game/shared/movement/pm_shared.cpp
index 5e013b64..27794fc9 100644
--- a/src/game/shared/movement/pm_shared.cpp
+++ b/src/game/shared/movement/pm_shared.cpp
@@ -67,19 +67,6 @@ static bool pm_shared_initialized = false;
 
 extern "C" playermove_t *pmove = nullptr;
 
-//#define PLAYER_FATAL_FALL_SPEED 1024															  // approx 60 feet
-//#define PLAYER_MAX_SAFE_FALL_SPEED 580															  // approx 20 feet
-//#define DAMAGE_FOR_FALL_SPEED (float)100 / (PLAYER_FATAL_FALL_SPEED - PLAYER_MAX_SAFE_FALL_SPEED) // damage per unit per second.
-//#define PLAYER_MIN_BOUNCE_SPEED 200
-//#define PLAYER_FALL_PUNCH_THRESHHOLD (float)350 // won't punch player's screen/make scrape noise unless player falling at least this fast.
-//#define PLAYER_LONGJUMP_SPEED 350 // how fast we longjump
-//#define PLAYER_MOVE_NODUCK (1 << 5)
-
-// double to float warning
-//#pragma warning(disable : 4244)
-
-//#define MAX_CLIENTS 32
-
 enum {
 	// up / down
 	PITCH = 0,
@@ -1731,7 +1718,6 @@ try nudging slightly on all axis to
 allow for the cut precision of the net coordinates
 =================
 */
-#define PM_CHECKSTUCK_MINTIME 0.05 // Don't check again too quickly.
 
 bool PM_TryToUnstuck(Vector base)
 {
@@ -2527,7 +2513,7 @@ void PM_NoClip()
 }
 
 // Only allow bunny jumping up to 1.7x server / player maxspeed setting
-#define BUNNYJUMP_MAX_SPEED_FACTOR 1.7f
+constexpr float  MAX_BUNNYJUMP_SPEED_FACTOR = 1.7f;
 
 //-----------------------------------------------------------------------------
 // Purpose: Corrects bunny jumping ( where player initiates a bunny jump before other
@@ -2544,7 +2530,7 @@ void PM_PreventMegaBunnyJumping(void)
 	// Speed at which bunny jumping is limited
 	float maxscaledspeed;
 
-	maxscaledspeed = BUNNYJUMP_MAX_SPEED_FACTOR * pmove->maxspeed;
+	maxscaledspeed = MAX_BUNNYJUMP_SPEED_FACTOR * pmove->maxspeed;
 
 	// Don't divide by zero
 	if (maxscaledspeed <= 0.0f)
diff --git a/src/game/shared/movement/pm_shared.h b/src/game/shared/movement/pm_shared.h
index 004b3653..42cbddc0 100644
--- a/src/game/shared/movement/pm_shared.h
+++ b/src/game/shared/movement/pm_shared.h
@@ -27,6 +27,7 @@ constexpr unsigned int MAX_CTEXTURES = 512;	// max number of textures loaded
 void PM_Init(struct playermove_s *ppmove);
 void PM_Move(struct playermove_s *ppmove, qboolean server);
 char PM_FindTextureType(char *name);
+constexpr float PM_CHECKSTUCK_MINTIME = 0.05; // Don't check again too quickly.
 
 /**
 *	@brief Engine calls this to enumerate player collision hulls, for prediction. Return false if the hullnumber doesn't exist.

From 71243479c7bcce09b51b00edfeb2234a9fb2e011 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 17:52:51 -0400
Subject: [PATCH 240/291] changed  literal define to constexpr

---
 src/game/shared/ms/findentities.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/shared/ms/findentities.cpp b/src/game/shared/ms/findentities.cpp
index 5ebcb25a..3a234ff9 100644
--- a/src/game/shared/ms/findentities.cpp
+++ b/src/game/shared/ms/findentities.cpp
@@ -5,7 +5,7 @@
 #else
 #include "inc_huditem.h"
 #include "movement/pm_defs.h"
-#define MAX_SEARCH_ENTITIES 1500 // TODO
+constexpr unsigned int MAX_SEARCH_ENTITIES = 1500; // TODO
 #endif
 
 int UtilFindEntities(mslist<CFindEntity>& rFound, const mslist<CEntityFilter *>& vFilters, CFindEntity::YWrapType * pIgnoreEntity, int vMax)

From 1b47c882783fd738313df25270f208b341f148b1 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 17:53:35 -0400
Subject: [PATCH 241/291] added comment for keeping one as define

---
 src/game/shared/ms/findentities.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/shared/ms/findentities.cpp b/src/game/shared/ms/findentities.cpp
index 3a234ff9..3f74d7eb 100644
--- a/src/game/shared/ms/findentities.cpp
+++ b/src/game/shared/ms/findentities.cpp
@@ -1,7 +1,7 @@
 #include "findentities.h"
 #ifdef VALVE_DLL
 #include "cbase.h"
-#define MAX_SEARCH_ENTITIES gpGlobals->maxEntities
+#define MAX_SEARCH_ENTITIES gpGlobals->maxEntities //dont think can be changed to constexpr
 #else
 #include "inc_huditem.h"
 #include "movement/pm_defs.h"

From 5515b0b1e5a2c90bc3f209a4e1c452719bd44ce8 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 17:56:49 -0400
Subject: [PATCH 242/291] changed macro to function

---
 src/game/shared/ms/globalmem.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/game/shared/ms/globalmem.cpp b/src/game/shared/ms/globalmem.cpp
index a16fd9c7..9718389e 100644
--- a/src/game/shared/ms/globalmem.cpp
+++ b/src/game/shared/ms/globalmem.cpp
@@ -21,7 +21,9 @@ void EnableAllocateTrace() { AllocationStack--; }
 #endif
 #endif
 
-#define MS_FATAL_ERROR_MEM(MemErrMsg) Print("%s\n", MemErrMsg);
+void MS_FATAL_ERROR_MEM(const char * MemErrMsg) {
+	Print("%s\n", MemErrMsg);
+}
 
 #ifdef DEV_BUILD
 void* operator new(size_t size, const char* pszSourceFile, int LineNum)

From 661dd1dd1f6df8b315563fded89a527420cff6c4 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 17:57:28 -0400
Subject: [PATCH 243/291] changed function to static

---
 src/game/shared/ms/globalmem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/shared/ms/globalmem.cpp b/src/game/shared/ms/globalmem.cpp
index 9718389e..2f129bcc 100644
--- a/src/game/shared/ms/globalmem.cpp
+++ b/src/game/shared/ms/globalmem.cpp
@@ -21,7 +21,7 @@ void EnableAllocateTrace() { AllocationStack--; }
 #endif
 #endif
 
-void MS_FATAL_ERROR_MEM(const char * MemErrMsg) {
+static void MS_FATAL_ERROR_MEM(const char * MemErrMsg) {
 	Print("%s\n", MemErrMsg);
 }
 

From f9a027a77da8777f699abba61366ed2e578a05f6 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 17:58:52 -0400
Subject: [PATCH 244/291] moved constexpr to top of file

---
 src/game/shared/ms/iscript.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/game/shared/ms/iscript.h b/src/game/shared/ms/iscript.h
index e36c2c8b..5a27180d 100644
--- a/src/game/shared/ms/iscript.h
+++ b/src/game/shared/ms/iscript.h
@@ -22,6 +22,10 @@ typedef unsigned long ulong;
 #endif
 
 
+constexpr const char* SKIP_STR = " \t"; //Whitespace characters
+constexpr int DEFAULT_SCRIPT_ID = -1;
+constexpr int PLAYER_SCRIPT_ID = -2;
+
 struct scriptvar_t
 {
 	scriptvar_t() {}
@@ -189,10 +193,6 @@ class IScripted
 	mslist<CScript *> m_Scripts;		   //List of scripts
 	msstring m_ReturnData;				   //Data returned from an event.  Reset at next CallScriptEvent()
 };
-constexpr const char* SKIP_STR = " \t"; //Whitespace characters
-
-constexpr int DEFAULT_SCRIPT_ID = -1;
-constexpr int PLAYER_SCRIPT_ID = -2;
 
 // MiB 30NOV_2014 - Template structure for script function pointers
 // Keeps track of whether or not it's a conditional command and how many times it's been referenced (for testing and curiosity)

From 943b305dcc13c1b2eb7adba4d126007266cd790b Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 18:01:00 -0400
Subject: [PATCH 245/291] named enums

---
 src/game/shared/ms/mscharacter.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/game/shared/ms/mscharacter.h b/src/game/shared/ms/mscharacter.h
index 295bb7f6..3bc4720a 100644
--- a/src/game/shared/ms/mscharacter.h
+++ b/src/game/shared/ms/mscharacter.h
@@ -65,7 +65,7 @@ struct charinfo_base_t
 	}
 };
 
-enum {
+enum gear_flag_location_e {
 	GEARFL_COVER_HEAD = (1 << 0),
 	GEARFL_COVER_TORSO = (1 << 1),
 	GEARFL_COVER_ARMS = (1 << 2),
@@ -126,7 +126,7 @@ struct spellskillstat_t
 	long Exp[STAT_PROP_TOTAL];
 };
 
-enum {
+enum savechar_version_e {
 	SAVECHAR_VERSION_MSC = 11, // Legacy MS: Classic
 	SAVECHAR_VERSION_MSR = 12, // MS Rebirth and up.
 	SAVECHAR_VERSION = SAVECHAR_VERSION_MSR
@@ -136,7 +136,7 @@ enum {
 //The old headers are kept so the game knows when it is encountering an old save file
 //and can call the legacy code for converison to the new format.
 
-enum
+enum char_data_type_e
 {
 	CHARDATA_HEADER1 = 0,
 	CHARDATA_MAPSVISITED1,

From a0d39792762f4e0f4ecf4fc8d83b0090136e199d Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 18:04:21 -0400
Subject: [PATCH 246/291] changed BACKUP_NAME macro to function.

---
 src/game/shared/ms/msfileio.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/game/shared/ms/msfileio.h b/src/game/shared/ms/msfileio.h
index 450afc0e..dd087560 100644
--- a/src/game/shared/ms/msfileio.h
+++ b/src/game/shared/ms/msfileio.h
@@ -88,4 +88,12 @@ class CPlayer_DataBuffer : public CMemFile
 	bool ReadFromFile(const char* pszFileName, const char* OpenFlags, bool ReadBackup);
 };
 
-#define BACKUP_NAME(a) (msstring(a) + ".backup")
\ No newline at end of file
+
+inline msstring BACKUP_NAME(const char* string) {
+	msstring Result = string;
+	Result += ".backup";
+	return Result;
+
+}
+
+//#define BACKUP_NAME(a) (msstring(a) + ".backup")
\ No newline at end of file

From fa58a74b3e8953b078fb1c90350cc923f0d927c6 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 18:06:09 -0400
Subject: [PATCH 247/291] named enum

---
 src/game/shared/ms/msdebug.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/shared/ms/msdebug.h b/src/game/shared/ms/msdebug.h
index 844ab78f..023781a7 100644
--- a/src/game/shared/ms/msdebug.h
+++ b/src/game/shared/ms/msdebug.h
@@ -22,7 +22,7 @@ struct sharedtrace_t
 	int Hitgroup;
 };
 
-enum {
+enum pm_type_e {
 	PM_NORMAL = 0x00000000,
 	PM_STUDIO_IGNORE = 0x00000001,	// Skip studio models
 	PM_STUDIO_BOX = 0x00000002,		// Use boxes for non-complex studio models (even in traceline)

From 6eae0a0dce8ab3247253224b6ca33d9ccf1d092b Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 18:09:39 -0400
Subject: [PATCH 248/291] changed defines to constexpr

---
 src/game/shared/ms/music.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/game/shared/ms/music.h b/src/game/shared/ms/music.h
index 0a7e6a11..6b37b7a3 100644
--- a/src/game/shared/ms/music.h
+++ b/src/game/shared/ms/music.h
@@ -1,8 +1,8 @@
 #ifndef MUSIC_H
 #define MUSIC_H
 
-#define MUSIC_PATH "music/"
-#define MAX_SONGS 256
+constexpr const char* MUSIC_PATH = "music/";
+constexpr unsigned int MAX_SONGS = 256;
 
 struct song_t
 {

From 23be53e16630f0135c27e9e0f43b7f512cda538c Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 18:14:03 -0400
Subject: [PATCH 249/291] changed defines to constexpr

---
 src/game/shared/ms/netcodeshared.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/game/shared/ms/netcodeshared.cpp b/src/game/shared/ms/netcodeshared.cpp
index 1e7a3a97..3b46ebc5 100644
--- a/src/game/shared/ms/netcodeshared.cpp
+++ b/src/game/shared/ms/netcodeshared.cpp
@@ -20,7 +20,7 @@
 #include "parsemsg.h"
 #endif
 
-#define UUENC_OFS 'A'
+constexpr char UUENC_OFS = 'A';
 
 //Send char to client or to server (client-side characters only)
 //Send to server at client connect
@@ -118,11 +118,11 @@ void MSChar_Interface::Think_SendChar(CBasePlayer *pPlayer)
 #endif
 
 #ifdef VALVE_DLL
-#define MAX_UL_SIZE 150
-#define SEND_DELAY 0.8f
+	constexpr int MAX_UL_SIZE = 150;
+	constexpr float SEND_DELAY = 0.8f;
 #else
-#define MAX_UL_SIZE 64
-#define SEND_DELAY 0.4f
+	constexpr int MAX_UL_SIZE = 64;
+	constexpr float SEND_DELAY = 0.4f;
 #endif
 
 	charsendinfo_t &SendInfo = pPlayer->m_CharSend;

From 1adab06024b301aa34e2fbe08abb252d478550c0 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 18:34:26 -0400
Subject: [PATCH 250/291] removed unneeded macro. changed macros to class
 member functions.

---
 src/game/shared/ms/script.cpp | 41 +++++++++++++++++++++++------------
 src/game/shared/ms/script.h   | 10 +++++----
 2 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/src/game/shared/ms/script.cpp b/src/game/shared/ms/script.cpp
index eef2e4fd..b95712c3 100644
--- a/src/game/shared/ms/script.cpp
+++ b/src/game/shared/ms/script.cpp
@@ -34,11 +34,24 @@ bool GetModelBounds(CBaseEntity* pEntity, Vector Bounds[2]);
 #include <unordered_set>
 //#include <unordered_map>
 
-#undef SCRIPTVAR
-#define SCRIPTVAR GetVar								//A script-wide or global variable
-#define SCRIPTCONST( a ) SCRIPTVAR(GetConst(a))			//A const, script-wide, or global variable - loadtime only
-#define GETCONST_COMPATIBLE( a ) ( a.c_str()[0] == '$' ? GetConst(a) : SCRIPTCONST(a) )			//Loadtime - Only parse it as a var if it's not a $parser
-//int CountPlayers( void );
+const char* CScript::SCRIPTCONST(const char* var) {
+	//A const, script-wide, or global variable - loadtime only
+	return GetVar(GetConst(var));
+}
+
+
+const char * CScript::GETCONST_COMPATIBLE(const char* var) { 
+	//Loadtime - Only parse it as a var if it's not a $parser
+
+	if (var[0] == '$') {
+		return GetConst(var);
+	}
+	else {
+		return GetVar(GetConst(var));
+	}
+}
+
+
 bool FindSkyHeight(Vector Origin, float& SkyHeight);
 bool UnderSky(Vector Origin); //Thothie AUG2010_03
 const char* PM_GetValue(msstringlist& Params);
@@ -459,7 +472,7 @@ msstring CScript::ScriptGetter_Conjunction(msstring& FullName, msstring& ParserN
 		for (unsigned int i = 0; i < Params.size(); i++)
 		{
 			// Allow shortcutting
-			if (atoi(SCRIPTVAR(Params[i])))
+			if (atoi(GetVar(Params[i])))
 			{
 				if (bIsOr)
 				{
@@ -4417,7 +4430,7 @@ const char* CScript::GetVar(const char* pszText)
 	{
 		BreakUpLine(FullName, ParserName, Params);
 		for (unsigned int i = 0; i < Params.size(); i++)
-			Params[i] = SCRIPTVAR(Params[i]);
+			Params[i] = GetVar(Params[i]);
 
 		//Handle entity-specific parser
 		if (m.pScriptedInterface && m.pScriptedInterface->GetScriptVar(ParserName, Params, this, Return))
@@ -4745,13 +4758,13 @@ const char* CScript::GetVar(const char* pszText)
 
 Vector CScript::StringToVec(const char* String)
 {
-	msstring Inside = SCRIPTVAR(msstring(String).thru_char(")"));
+	msstring Inside = GetVar(msstring(String).thru_char(")"));
 
-	msstring X = SCRIPTVAR(Inside.substr(1).thru_char(" ,"));
+	msstring X = GetVar(Inside.substr(1).thru_char(" ,"));
 	Inside = msstring(Inside.findchar_str(" ,")).skip(" ,");
-	msstring Y = SCRIPTVAR(Inside.thru_char(" ,"));
+	msstring Y = GetVar(Inside.thru_char(" ,"));
 	Inside = msstring(Inside.findchar_str(" ,")).skip(" ,");
-	msstring Z = SCRIPTVAR(Inside.thru_char(" )"));
+	msstring Z = GetVar(Inside.thru_char(" )"));
 
 	return Vector(atof(X), atof(Y), atof(Z));
 }
@@ -4808,7 +4821,7 @@ float GetNumeric(const char* pszText) {
 }
 const char* CScript::GetScriptVar(const char* VarName)
 {
-	return SCRIPTVAR(VarName);
+	return GetVar(VarName);
 }
 
 
@@ -5371,7 +5384,7 @@ int CScript::ParseLine(const char* pszCommandLine, int LineNum, SCRIPT_EVENT** p
 	else if (!_stricmp(TestCommand, "repeatdelay"))
 	{
 		sscanf(CmdLineTmp, "%s", cBuffer);
-		CurrentEvent->fRepeatDelay = atof(SCRIPTCONST(cBuffer));
+		CurrentEvent->fRepeatDelay = atof(GetVar(GetConst(cBuffer)));
 		CurrentEvent->fNextExecutionTime = gpGlobals->time + CurrentEvent->fRepeatDelay;
 		KeepCmd = true;
 	}
@@ -5508,7 +5521,7 @@ int CScript::ParseLine(const char* pszCommandLine, int LineNum, SCRIPT_EVENT** p
 
 			if (!SkipFirst || ResourceIdx)
 			{
-				msstring Resolved = SCRIPTCONST(cBuffer);
+				msstring Resolved = GetVar(GetConst(cBuffer));
 				if (!strcmp(TestCommand, "say"))
 				{
 					Resolved = Resolved.thru_char("[");
diff --git a/src/game/shared/ms/script.h b/src/game/shared/ms/script.h
index 3851775c..48a197b5 100644
--- a/src/game/shared/ms/script.h
+++ b/src/game/shared/ms/script.h
@@ -100,6 +100,8 @@ class CScript : public IVariables
 	scriptvar_t *FindVar( const char *pszName );
 	const char* GetVar(const char* pszText );
 	bool VarExists(const char* pszText );
+	const char* SCRIPTCONST(const char* var);
+	const char* GETCONST_COMPATIBLE(const char* var);
 	scriptvar_t *SetVar( const char *pszVarName, const char *pszValue, bool fGlobal = false );
 	scriptvar_t *SetVar( const char *pszVarName, const char *pszValue, LegacyScriptEvent &Event );
 	scriptvar_t *SetVar( const char *pszVarName, int iValue, bool fGlobal = false );
@@ -406,13 +408,13 @@ struct globalscriptinfo_t
 };
 
 extern globalscriptinfo_t *g_MSScriptInfo;
-#define FILE_DEV_ITEMLIST "scripts/items.txt"
-#define FILE_ITEMLIST "items.txt"
+constexpr const char * FILE_DEV_ITEMLIST = "scripts/items.txt";
+constexpr const char* FILE_ITEMLIST = "items.txt";
 
 #ifdef VALVE_DLL
-	#define SCRIPT_ID_START 0		//Server: ID of last script sent to a client
+	constexpr unsigned int SCRIPT_ID_START = 0;		//Server: ID of last script sent to a client
 #else
-	#define SCRIPT_ID_START 10000	//Client: ID of next script to be created
+	constexpr unsigned int SCRIPT_ID_START = 10000;	//Client: ID of next script to be created
 #endif
 
 

From 082fa98e8364d43d736c3872a0942b73946484d4 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 18:40:17 -0400
Subject: [PATCH 251/291] Removed macro deifne and replaced with function call.

---
 src/game/shared/ms/scriptcmds.cpp | 101 ++++++++++++++----------------
 1 file changed, 48 insertions(+), 53 deletions(-)

diff --git a/src/game/shared/ms/scriptcmds.cpp b/src/game/shared/ms/scriptcmds.cpp
index 792e71dc..34bdee66 100644
--- a/src/game/shared/ms/scriptcmds.cpp
+++ b/src/game/shared/ms/scriptcmds.cpp
@@ -31,11 +31,6 @@
 #include "angelscript/ASEngineEventManager.h"
 #endif
 
-
-
-
-#undef SCRIPTVAR
-#define SCRIPTVAR GetVar								//A script-wide or global variable
 #define ERROR_MISSING_PARMS MS_ERROR("ExecuteScriptCmd: Script: %s, %s - not enough parameters!", m.ScriptFile.c_str(), Cmd.Name().c_str())
 void Player_UseStamina(float flAddAmt);
 extern "C" playermove_t *pmove;
@@ -1757,7 +1752,7 @@ bool CScript::ScriptCmd_LocalPanel(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstri
 	}
 	else if (Cmd.Name() == "registerlocal.menu")
 	{
-		msstring sTitle = SCRIPTVAR("reg.local.menu.title");
+		msstring sTitle = GetVar("reg.local.menu.title");
 #ifdef VALVE_DLL
 		MESSAGE_BEGIN( MSG_ONE, g_netmsg[NETMSG_LOCALPANEL], NULL, pPlayer->pev );
 		WRITE_BYTE( 3 );
@@ -1770,18 +1765,18 @@ bool CScript::ScriptCmd_LocalPanel(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstri
 	}
 	else if (Cmd.Name() == "registerlocal.button")
 	{
-		msstring sText = SCRIPTVAR("reg.local.button.text");
-		bool bCloseOnClick = atoi(SCRIPTVAR("reg.local.button.closeonclick")) ? true : false;
-		bool bEnabled = atoi(SCRIPTVAR("reg.local.button.enabled")) ? true : false;
-		int	cbType = atoi(SCRIPTVAR("reg.local.button.docallback")) ?
+		msstring sText = GetVar("reg.local.button.text");
+		bool bCloseOnClick = atoi(GetVar("reg.local.button.closeonclick")) ? true : false;
+		bool bEnabled = atoi(GetVar("reg.local.button.enabled")) ? true : false;
+		int	cbType = atoi(GetVar("reg.local.button.docallback")) ?
 #ifdef VALVE_DLL
 			1  // Server
 #else
 			2  // Client
 #endif
 			: 0; // None
-		msstring sCallBack = cbType ? SCRIPTVAR("reg.local.button.callback") : "";
-		msstring sCallBackData = SCRIPTVAR("reg.local.button.data");
+		msstring sCallBack = cbType ? GetVar("reg.local.button.callback") : "";
+		msstring sCallBackData = GetVar("reg.local.button.data");
 		if (sCallBackData == "reg.local.button.callback")
 		{
 			sCallBackData = "";
@@ -1803,8 +1798,8 @@ bool CScript::ScriptCmd_LocalPanel(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstri
 	}
 	else if (Cmd.Name() == "registerlocal.paragraph")
 	{
-		msstring srcType = SCRIPTVAR("reg.local.paragraph.source.type");
-		msstring src = SCRIPTVAR("reg.local.paragraph.source");
+		msstring srcType = GetVar("reg.local.paragraph.source.type");
+		msstring src = GetVar("reg.local.paragraph.source");
 
 #ifdef VALVE_DLL
 		MESSAGE_BEGIN( MSG_ONE, g_netmsg[NETMSG_LOCALPANEL], NULL, pPlayer->pev );
@@ -1844,11 +1839,11 @@ bool CScript::ScriptCmd_LocalPanel(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstri
 	else if (Cmd.Name() == "registerlocal.image")
 	{
 		// MIB FEB2019_22 [LOCAL_PANEL_IMAGE]
-		msstring	vName = SCRIPTVAR("reg.local.image.name");
-		bool        bIsTga = atoi(SCRIPTVAR("reg.local.image.tga")) == 1;
+		msstring	vName = GetVar("reg.local.image.name");
+		bool        bIsTga = atoi(GetVar("reg.local.image.tga")) == 1;
 
-		int			vFrame = atoi(SCRIPTVAR("reg.local.image.frame"));
-		bool		bBorder = atoi(SCRIPTVAR("reg.local.image.border")) == 1;
+		int			vFrame = atoi(GetVar("reg.local.image.frame"));
+		bool		bBorder = atoi(GetVar("reg.local.image.border")) == 1;
 
 #ifdef VALVE_DLL
 		MESSAGE_BEGIN( MSG_ONE, g_netmsg[NETMSG_LOCALPANEL], NULL, pPlayer->pev );
@@ -4041,7 +4036,7 @@ bool CScript::ScriptCmd_If(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstringlist &
 		if (Params[0].c_str()[0] == '!')
 		{
 			Opposite = true;
-			Value = SCRIPTVAR(Params[0].substr(1));	//The '!' interferes with the default variable resolution, so remove it and resolve the variable again
+			Value = GetVar(Params[0].substr(1));	//The '!' interferes with the default variable resolution, so remove it and resolve the variable again
 		}
 
 		ConditionsMet = atoi(Value) ? true : false;
@@ -4984,26 +4979,26 @@ bool CScript::ScriptCmd_RegisterDefaults(SCRIPT_EVENT &Event, scriptcmd_t &Cmd,
 	MSGlobals::DefaultWeapons.clearitems();
 	MSGlobals::DefaultFreeItems.clearitems();
 
-	TokenizeString(SCRIPTVAR("reg.newchar.weaponlist"), MSGlobals::DefaultWeapons);
-	TokenizeString(SCRIPTVAR("reg.newchar.freeitems"), MSGlobals::DefaultFreeItems);
-	MSGlobals::DefaultGold = atoi(SCRIPTVAR("reg.newchar.gold"));
-	MSGlobals::DefaultSpawnBoxModel = SCRIPTVAR("reg.hud.spawnbox");
+	TokenizeString(GetVar("reg.newchar.weaponlist"), MSGlobals::DefaultWeapons);
+	TokenizeString(GetVar("reg.newchar.freeitems"), MSGlobals::DefaultFreeItems);
+	MSGlobals::DefaultGold = atoi(GetVar("reg.newchar.gold"));
+	MSGlobals::DefaultSpawnBoxModel = GetVar("reg.hud.spawnbox");
 #ifdef VALVE_DLL
 	PRECACHE_MODEL( MSGlobals::DefaultSpawnBoxModel );
 #else
-	MSCLGlobals::DefaultHUDCharAnims.Idle_Weapon = SCRIPTVAR("reg.hud.char.active_weapon");
-	MSCLGlobals::DefaultHUDCharAnims.Idle_NoWeapon = SCRIPTVAR("reg.hud.char.active_noweap");
-	MSCLGlobals::DefaultHUDCharAnims.Fidget = SCRIPTVAR("reg.hud.char.figet");
-	MSCLGlobals::DefaultHUDCharAnims.Highlighted = SCRIPTVAR("reg.hud.char.highlight");
-	MSCLGlobals::DefaultHUDCharAnims.Uploading = SCRIPTVAR("reg.hud.char.upload");
-	MSCLGlobals::DefaultHUDCharAnims.Inactive = SCRIPTVAR("reg.hud.char.inactive");
-
-	MSCLGlobals::DefaultHUDSounds.QuickSlot_Select = SCRIPTVAR("reg.hud.quickslot.select");
-	MSCLGlobals::DefaultHUDSounds.QuickSlot_Confirm = SCRIPTVAR("reg.hud.quickslot.confirm");
-	MSCLGlobals::DefaultHUDSounds.QuickSlot_Assign = SCRIPTVAR("reg.hud.quickslot.assign");
-
-	MSCLGlobals::DefaultHUDCoords.ItemDesc_X = atof(SCRIPTVAR("reg.hud.desctext.x"));
-	MSCLGlobals::DefaultHUDCoords.ItemDesc_Y = atof(SCRIPTVAR("reg.hud.desctext.y"));
+	MSCLGlobals::DefaultHUDCharAnims.Idle_Weapon = GetVar("reg.hud.char.active_weapon");
+	MSCLGlobals::DefaultHUDCharAnims.Idle_NoWeapon = GetVar("reg.hud.char.active_noweap");
+	MSCLGlobals::DefaultHUDCharAnims.Fidget = GetVar("reg.hud.char.figet");
+	MSCLGlobals::DefaultHUDCharAnims.Highlighted = GetVar("reg.hud.char.highlight");
+	MSCLGlobals::DefaultHUDCharAnims.Uploading = GetVar("reg.hud.char.upload");
+	MSCLGlobals::DefaultHUDCharAnims.Inactive = GetVar("reg.hud.char.inactive");
+
+	MSCLGlobals::DefaultHUDSounds.QuickSlot_Select = GetVar("reg.hud.quickslot.select");
+	MSCLGlobals::DefaultHUDSounds.QuickSlot_Confirm = GetVar("reg.hud.quickslot.confirm");
+	MSCLGlobals::DefaultHUDSounds.QuickSlot_Assign = GetVar("reg.hud.quickslot.assign");
+
+	MSCLGlobals::DefaultHUDCoords.ItemDesc_X = atof(GetVar("reg.hud.desctext.x"));
+	MSCLGlobals::DefaultHUDCoords.ItemDesc_Y = atof(GetVar("reg.hud.desctext.y"));
 #endif
 
 	return true;
@@ -5017,10 +5012,10 @@ bool CScript::ScriptCmd_RegisterEffect(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, ms
 #ifdef VALVE_DLL
 	globalscripteffect_t Effect;
 
-	Effect.m_Name = SCRIPTVAR("reg.effect.name");
-	Effect.m_ScriptName = SCRIPTVAR("reg.effect.script");
+	Effect.m_Name = GetVar("reg.effect.name");
+	Effect.m_ScriptName = GetVar("reg.effect.script");
 
-	msstring Flags = SCRIPTVAR("reg.effect.flags");
+	msstring Flags = GetVar("reg.effect.flags");
 
 	Effect.m_Flags = SCRIPTEFFECT_NORMAL;
 	if( Flags.contains("player_action") )	SetBits( Effect.m_Flags, SCRIPTEFFECT_PLAYERACTION );
@@ -5039,10 +5034,10 @@ bool CScript::ScriptCmd_RegisterRace(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msst
 {
 #ifdef VALVE_DLL
 	race_t NewRace;
-	NewRace.Name = SCRIPTVAR("reg.race.name");
-	TokenizeString( SCRIPTVAR("reg.race.enemies"), NewRace.Enemies );
-	TokenizeString( SCRIPTVAR("reg.race.allies"), NewRace.Allies );
-	TokenizeString( SCRIPTVAR("reg.race.wary"), NewRace.Wary );
+	NewRace.Name = GetVar("reg.race.name");
+	TokenizeString( GetVar("reg.race.enemies"), NewRace.Enemies );
+	TokenizeString( GetVar("reg.race.allies"), NewRace.Allies );
+	TokenizeString( GetVar("reg.race.wary"), NewRace.Wary );
 
 	CRaceManager::AddRace( NewRace );
 #endif
@@ -5060,26 +5055,26 @@ bool CScript::ScriptCmd_RegisterTexture(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, m
 	clrmem(NewTexture);
 
 	//Load settings
-	NewTexture.Name = SCRIPTVAR("reg.texture.name");
+	NewTexture.Name = GetVar("reg.texture.name");
 
 	msstringlist ColorParts;
-	NewTexture.IsReflective = atoi(SCRIPTVAR("reg.texture.reflect")) ? true : false;
-	NewTexture.IsWater = atoi(SCRIPTVAR("reg.texture.water")) ? true : false;
+	NewTexture.IsReflective = atoi(GetVar("reg.texture.reflect")) ? true : false;
+	NewTexture.IsWater = atoi(GetVar("reg.texture.water")) ? true : false;
 
 	//Reflection settings
-	NewTexture.Mirror.Blending = atoi(SCRIPTVAR("reg.texture.reflect.blend")) ? true : false;
-	TokenizeString(SCRIPTVAR("reg.texture.reflect.color"), ColorParts);
+	NewTexture.Mirror.Blending = atoi(GetVar("reg.texture.reflect.blend")) ? true : false;
+	TokenizeString(GetVar("reg.texture.reflect.color"), ColorParts);
 	for(unsigned int i = 0; i < ColorParts.size(); i++)
 	{
 		if (i == 4) break;	//Too many elements specified - a color only has 4 elements
 		NewTexture.Mirror.Color[i] = atof(ColorParts[i]);
 	}
-	NewTexture.Mirror.Blending = atoi(SCRIPTVAR("reg.texture.reflect.blend")) ? true : false;
-	NewTexture.Mirror.Range = atof(SCRIPTVAR("reg.texture.reflect.range"));
+	NewTexture.Mirror.Blending = atoi(GetVar("reg.texture.reflect.blend")) ? true : false;
+	NewTexture.Mirror.Range = atof(GetVar("reg.texture.reflect.range"));
 	if (VarExists("reg.texture.reflect.world"))	//Check var existence, because the default is "1"
-		NewTexture.Mirror.NoWorld = !atoi(SCRIPTVAR("reg.texture.reflect.world"));
+		NewTexture.Mirror.NoWorld = !atoi(GetVar("reg.texture.reflect.world"));
 	if (VarExists("reg.texture.reflect.ents"))
-		NewTexture.Mirror.NoEnts = !atoi(SCRIPTVAR("reg.texture.reflect.ents"));
+		NewTexture.Mirror.NoEnts = !atoi(GetVar("reg.texture.reflect.ents"));
 
 	MSCLGlobals::Textures.add(NewTexture);
 #endif
@@ -5116,7 +5111,7 @@ bool CScript::ScriptCmd_RegisterTitle(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, mss
 		int SKILL_FAILURE = -1;
 		for (unsigned int s = 0; s < Skills.size(); s++)
 		{
-			int Skill = GetSkillStatByName(SCRIPTVAR(Skills[s]));
+			int Skill = GetSkillStatByName(GetVar(Skills[s]));
 			if (Skill == SKILL_FAILURE)
 			{
 				SkillSuccess = false;

From 896987aab1d37058ddf085f9a2e472ed0c57d753 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 18:46:15 -0400
Subject: [PATCH 252/291] moved defines to header. changed defines to
 enum/constexpr.

---
 src/game/shared/ms/scriptcmds.cpp      | 24 +++++++++++++-----------
 src/game/shared/ms/scriptedeffects.cpp |  3 ---
 src/game/shared/ms/scriptedeffects.h   | 14 +++++++++++---
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/game/shared/ms/scriptcmds.cpp b/src/game/shared/ms/scriptcmds.cpp
index 34bdee66..b66a79d6 100644
--- a/src/game/shared/ms/scriptcmds.cpp
+++ b/src/game/shared/ms/scriptcmds.cpp
@@ -283,18 +283,20 @@ void CScript::Script_Setup()
 
 //MIB MAR2019_31 Internal Script Debug
 #ifdef VALVE_DLL
-#define DBGALL          (1 << 0)
-#define DBGTARGET       (1 << 1)
-#define DBGITEMS        (1 << 2)
-#define DBGHANDACTIVE   (1 << 3)
-#define DBGHANDOFF      (1 << 4)
-#define DBGPLAYERS      (1 << 5)
-#define DBGWORLD        (1 << 6)
-#define DBGGM           (1 << 7)
-#define DBGINDEX        (1 << 8)
-#define DBGSCRIPTNAME   (1 << 9)
-#define DBGNPCS         (1 << 10)
 
+enum server_debug_target_e {
+	DBGALL          = (1 << 0),
+	DBGTARGET       = (1 << 1),
+	DBGITEMS        = (1 << 2),
+	DBGHANDACTIVE   = (1 << 3),
+	DBGHANDOFF      = (1 << 4),
+	DBGPLAYERS      = (1 << 5),
+	DBGWORLD        = (1 << 6),
+	DBGGM           = (1 << 7),
+	DBGINDEX        = (1 << 8),
+	DBGSCRIPTNAME   = (1 << 9),
+	DBGNPCS         = (1 << 10)
+};
 struct SDebugInfo
 {
 	// Info for finding entities
diff --git a/src/game/shared/ms/scriptedeffects.cpp b/src/game/shared/ms/scriptedeffects.cpp
index bf6a5ba2..761ca80c 100644
--- a/src/game/shared/ms/scriptedeffects.cpp
+++ b/src/game/shared/ms/scriptedeffects.cpp
@@ -31,9 +31,6 @@ CScript *CGlobalScriptedEffects::ApplyEffect(const char* ScriptName, IScripted *
 
 	Script->RunScriptEvents(); //Initialize 'game.effect.X'
 
-#define EFFECT_ID "game.effect.id"
-#define EFFECT_FLAGS "game.effect.flags"
-
 	//Check if this effect is being stacked
 	if (Script->VarExists(EFFECT_ID))
 		for (unsigned int i = 0; i < pScriptTarget->m_Scripts.size(); i++)
diff --git a/src/game/shared/ms/scriptedeffects.h b/src/game/shared/ms/scriptedeffects.h
index 6a8c9305..20ef1c53 100644
--- a/src/game/shared/ms/scriptedeffects.h
+++ b/src/game/shared/ms/scriptedeffects.h
@@ -1,9 +1,17 @@
 //Scripted effects
 
 //Flags
-#define SCRIPTEFFECT_NORMAL (0)
-#define SCRIPTEFFECT_PLAYERACTION (1 << 0)
-#define SCRIPTEFFECT_NOSTACK (1 << 1)
+
+constexpr const char* EFFECT_ID		= "game.effect.id";
+constexpr const char* EFFECT_FLAGS	= "game.effect.flags";
+
+
+enum scripteffect_e {
+	SCRIPTEFFECT_NORMAL = (0),
+	SCRIPTEFFECT_PLAYERACTION = (1 << 0),
+	SCRIPTEFFECT_NOSTACK = (1 << 1)
+};
+
 
 //Interface for monsters, items, etc.
 /*class IScriptedEffect

From ce2d754605686f799a22e2d42dbf3681d7ac9cf4 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 18:48:22 -0400
Subject: [PATCH 253/291] named enum

---
 src/game/shared/ms/vgui_menudefsshared.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/shared/ms/vgui_menudefsshared.h b/src/game/shared/ms/vgui_menudefsshared.h
index b479124b..a73f246e 100644
--- a/src/game/shared/ms/vgui_menudefsshared.h
+++ b/src/game/shared/ms/vgui_menudefsshared.h
@@ -1,4 +1,4 @@
-enum
+enum vgui_menu_defs_e
 { // VGUI Menu definitions
 	MENU_DEFAULT = 1,
 	MENU_INTRO,

From 8896e31078f00ce15f59c829c81cc7ce7ecbdcd5 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 18:53:30 -0400
Subject: [PATCH 254/291] changed macro to function. moved function to global.h
 header.

---
 src/game/shared/ms/global.h   | 4 ++++
 src/game/shared/ms/votedefs.h | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/game/shared/ms/global.h b/src/game/shared/ms/global.h
index d2e279a9..42cb873a 100644
--- a/src/game/shared/ms/global.h
+++ b/src/game/shared/ms/global.h
@@ -98,4 +98,8 @@ enum MusicType {
 	MUSIC_STOP //For map triggers, stops combat & area music
 };
 
+inline bool PlayerVotedYes(int idx) {
+	return MSGlobals::CurrentVote.VoteTally & (1 << (idx - 1));
+};
+
 #endif
\ No newline at end of file
diff --git a/src/game/shared/ms/votedefs.h b/src/game/shared/ms/votedefs.h
index 08aaf2cc..0ef03ca2 100644
--- a/src/game/shared/ms/votedefs.h
+++ b/src/game/shared/ms/votedefs.h
@@ -1,7 +1,8 @@
+
+
 #ifndef VOTE_H
 #define VOTE_H
 
-
 struct vote_t
 {
 	bool fActive;		//If a current vote is active
@@ -18,6 +19,6 @@ struct vote_t
 	static msstringlist VotesTypesAllowed; //The vote types that are allowed
 };
 
-#define PlayerVotedYes(idx) (MSGlobals::CurrentVote.VoteTally & (1 << (idx - 1)))
+
 
 #endif //VOTE_H
\ No newline at end of file

From 88206ee5e81d4757ec386b9ef9994bc5e117e1c9 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 18:56:18 -0400
Subject: [PATCH 255/291] changed defines to constexpr

---
 src/game/shared/ms/crc/checksum_crc.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/game/shared/ms/crc/checksum_crc.cpp b/src/game/shared/ms/crc/checksum_crc.cpp
index 27d7ec3a..5e801688 100644
--- a/src/game/shared/ms/crc/checksum_crc.cpp
+++ b/src/game/shared/ms/crc/checksum_crc.cpp
@@ -6,10 +6,10 @@
 
 #include "checksum_crc.h"
 
-#define CRC32_INIT_VALUE 0xFFFFFFFFUL
-#define CRC32_XOR_VALUE  0xFFFFFFFFUL
+constexpr unsigned long CRC32_INIT_VALUE = 0xFFFFFFFFUL;
+constexpr unsigned long CRC32_XOR_VALUE = 0xFFFFFFFFUL;
 
-#define NUM_BYTES 256
+constexpr unsigned int NUM_BYTES = 256;
 static const VCRC32_t pulCRCTable[NUM_BYTES] =
 {
 	0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,

From 83861c00fe68eaeda78dde934a0627dd2e45d697 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 18:59:09 -0400
Subject: [PATCH 256/291] renamed consts for MAX_ prefixing

---
 src/game/server/monsters/msmonsterserver.cpp | 4 ++--
 src/game/server/monsters/npcscript.cpp       | 2 +-
 src/game/shared/ms/scriptcmds.cpp            | 2 +-
 src/game/shared/stats/statdefs.h             | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/game/server/monsters/msmonsterserver.cpp b/src/game/server/monsters/msmonsterserver.cpp
index 89c9989d..8d07556d 100644
--- a/src/game/server/monsters/msmonsterserver.cpp
+++ b/src/game/server/monsters/msmonsterserver.cpp
@@ -2760,8 +2760,8 @@ std::tuple<bool, int> CMSMonster::LearnSkill(int iStat, int iStatType, int Enemy
 		return std::make_tuple(false, iExpRemaining);
 
 	SubStat.Value += 1;
-	if (SubStat.Value > STAT_PROP_MAX_VALUE)
-		SubStat.Value = STAT_PROP_MAX_VALUE;
+	if (SubStat.Value > MAX_STAT_PROPVALUE)
+		SubStat.Value = MAX_STAT_PROPVALUE;
 	SubStat.Exp = 0;
 
 	//Thothie - why's this here twice? I dont see where oldval could change.
diff --git a/src/game/server/monsters/npcscript.cpp b/src/game/server/monsters/npcscript.cpp
index bc663c32..95086d4d 100644
--- a/src/game/server/monsters/npcscript.cpp
+++ b/src/game/server/monsters/npcscript.cpp
@@ -1345,7 +1345,7 @@ bool CMSMonster::Script_ExecuteCmd(CScript *Script, SCRIPT_EVENT &Event, scriptc
 						if (iProp > -1)
 						{
 							int value = atoi(Params[1]);
-							pStat->m_SubStats[iProp].Value = V_min(value, STAT_PROP_MAX_VALUE);
+							pStat->m_SubStats[iProp].Value = V_min(value, MAX_STAT_PROPVALUE);
 						}
 					}
 				}
diff --git a/src/game/shared/ms/scriptcmds.cpp b/src/game/shared/ms/scriptcmds.cpp
index b66a79d6..a08c4728 100644
--- a/src/game/shared/ms/scriptcmds.cpp
+++ b/src/game/shared/ms/scriptcmds.cpp
@@ -1672,7 +1672,7 @@ const char* CBaseEntity::GetProp(CBaseEntity* pTarget, msstring& FullParams, mss
 					else if (Prop.contains(".divination"))	SubSkill = STAT_MAGIC_DIVINATION;
 					else if (Prop.contains(".affliction"))	SubSkill = STAT_MAGIC_AFFLICTION;
 
-					int Max = (SubSkill > -1) ? (int)STAT_PROP_MAX_VALUE : (int)STAT_MAX_VALUE;
+					int Max = (SubSkill > -1) ? (int)MAX_STAT_PROPVALUE : (int)MAX_STAT_VALUE;
 
 					if (Prop.contains(".max")) return RETURN_INT(Max);
 					else
diff --git a/src/game/shared/stats/statdefs.h b/src/game/shared/stats/statdefs.h
index 47a95d90..1f4a4d1c 100644
--- a/src/game/shared/stats/statdefs.h
+++ b/src/game/shared/stats/statdefs.h
@@ -58,7 +58,7 @@ enum
 	STAT_PROP_TOTAL,
 
 	STAT_MAGIC_FIRE = 0, //Magic.  These override the above properties for spellcasting
-	STAT_MAGIC_ICE,
+	STAT_MAGIC_ICE ,
 	STAT_MAGIC_LIGHTNING,
 	STAT_MAGIC_DIVINATION,
 	STAT_MAGIC_AFFLICTION,
@@ -72,8 +72,8 @@ int GetNatStatByName(const char *pszName);					 //Returns -1 if not found
 void GetStatIndices(const char *Name, int &Stat, int &Prop); //Converts stat.prop into valid indices
 const char *GetSkillName(int Skill);						 //Looks any skill
 
-constexpr float STAT_MAX_VALUE = 300.0f;
-constexpr float STAT_PROP_MAX_VALUE = 100.0f;
+constexpr float MAX_STAT_VALUE = 300.0f;
+constexpr float MAX_STAT_PROPVALUE = 100.0f;
 	//level cap
 
 //For MSMonster::m_PlayerDamage

From 1a9be377fa29974799c91a251d1463854857980b Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 19:08:05 -0400
Subject: [PATCH 257/291] unrolled and removed SPEECH_ macros. changed final
 references of STAT_PROP to MAX_ prefix

---
 src/game/client/ms/hudmisc.cpp           |  4 +--
 src/game/server/player/player.cpp        | 28 +++++++++----------
 src/game/server/player/playershared.cpp  | 34 ++++++++++++------------
 src/game/shared/syntax/syntax.h          |  4 +--
 src/game/shared/weapons/genericitem.cpp  |  8 +++---
 src/game/shared/weapons/giattack.cpp     |  6 ++---
 src/game/shared/weapons/giprojectile.cpp |  2 +-
 src/game/shared/weapons/gispell.cpp      |  4 +--
 8 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/src/game/client/ms/hudmisc.cpp b/src/game/client/ms/hudmisc.cpp
index e63e7e30..c620b7af 100644
--- a/src/game/client/ms/hudmisc.cpp
+++ b/src/game/client/ms/hudmisc.cpp
@@ -209,7 +209,7 @@ void CHudMisc ::UserCmd_RemovePack(void)
 			continue;
 
 		msstring ItemName;
-		ItemName += SPEECH_GetItemName(pGearItem);
+		ItemName += SPEECH::ItemName(pGearItem);
 
 		msstring SendString;
 		int Size = m_RemoveList.size();
@@ -320,7 +320,7 @@ void CHudMisc ::UserCmd_Offer(void)
 		if (!player.Hand(i))
 			continue;
 
-		const char *arg = UTIL_VarArgs("%i. %s hand: %s\n", r + 2, SPEECH_IntToHand(i, true), SPEECH::ItemName(player.Hand(i), true));
+		const char *arg = UTIL_VarArgs("%i. %s hand: %s\n", r + 2, SPEECH::HandName(i, true), SPEECH::ItemName(player.Hand(i), true));
 		strncat(MenuText, arg, strlen(arg));
 		m_OfferInfo.OfferItem[r] = i;
 		iBitsValid |= (1 << (++r)); //Starts at 1
diff --git a/src/game/server/player/player.cpp b/src/game/server/player/player.cpp
index 945643bc..51a39885 100644
--- a/src/game/server/player/player.cpp
+++ b/src/game/server/player/player.cpp
@@ -5119,7 +5119,7 @@ void CBasePlayer::GetAnyItems()
 			if ((!FBitSet(pItem->MSProperties(), ITEM_GROUPABLE) || itItemTransaction.ItemList[0].iGroupedItems == 0))
 			{
 				if (pItem->GiveTo(this))
-					SendInfoMsg("You pick up %s", SPEECH_GetItemName(pItem));
+					SendInfoMsg("You pick up %s", SPEECH::ItemName(pItem));
 				return;
 			}
 		}
@@ -5141,7 +5141,7 @@ void CBasePlayer::GetAnyItems()
 			itItemTransaction.ItemList[i].iGroupedItemTotal += pItem->iQuantity;
 			int iSave = pItem->iQuantity;
 			pItem->iQuantity = itItemTransaction.ItemList[i].iGroupedItemTotal;
-			 _snprintf(cTemp, sizeof(cTemp),  "%i. %s\n",  ++MenuCount,  SPEECH_GetItemName(pItem,  true) );
+			 _snprintf(cTemp, sizeof(cTemp),  "%i. %s\n",  ++MenuCount,  SPEECH::ItemName(pItem,  true) );
 			pItem->iQuantity = iSave;
 			strcat(cItemList, cTemp);
 		}
@@ -5235,7 +5235,7 @@ void CBasePlayer ::StealAnyItems(CBaseEntity *pVictim)
 		//			pItemDesc->pItem = pItem;
 		//			pItemDesc->ItemType = ITEM_NORMAL;
 		//			sprintf( cTemp, "%i. %s (%s hand)\n", MenuCount+1,
-		//				SPEECH_GetItemName(pItem), (i < MAX_PLAYER_HANDS) ? SPEECH_IntToHand(i) : "other" );
+		//				SPEECH::ItemName(pItem), (i < MAX_PLAYER_HANDS) ? SPEECH_IntToHand(i) : "other" );
 		//			strcat( cItemList, cTemp );
 		//			itItemTransaction.ItemTotal++;
 		//			MenuCount++;
@@ -5246,7 +5246,7 @@ void CBasePlayer ::StealAnyItems(CBaseEntity *pVictim)
 			pItemDesc->iEntIndex = pItem->entindex();
 			pItemDesc->pItem = pItem;
 			pItemDesc->ItemType = ITEM_NORMAL;
-			 _snprintf(cTemp, sizeof(cTemp),  "%i. %s\n",  MenuCount+1,  SPEECH_GetItemName(pItem) );
+			 _snprintf(cTemp, sizeof(cTemp),  "%i. %s\n",  MenuCount+1,  SPEECH::ItemName(pItem) );
 			strcat( cItemList, cTemp );
 			itItemTransaction.ItemTotal++;
 			if( itItemTransaction.ItemTotal >= MAX_GET_ITEMS ) break; //max of 10 items
@@ -5280,7 +5280,7 @@ void CBasePlayer ::StealAnyItems(CBaseEntity *pVictim)
 				pItemDesc->iEntIndex = pItem->entindex();
 				pItemDesc->pItem = pItem;
 				pItemDesc->ItemType = ITEM_NORMAL;
-				 _snprintf(cTemp, sizeof(cTemp),  "%i. %s\n",  MenuCount+1,  SPEECH_GetItemName(pItem) );
+				 _snprintf(cTemp, sizeof(cTemp),  "%i. %s\n",  MenuCount+1,  SPEECH::ItemName(pItem) );
 				strcat( cItemList, cTemp );
 				itItemTransaction.ItemTotal++;
 				if( itItemTransaction.ItemTotal >= MAX_GET_ITEMS ) break; //max of 10 items
@@ -5351,7 +5351,7 @@ void CBasePlayer ::OfferItem(offerinfo_t &OfferInfo)
 	else if (OfferInfo.ItemType == ITEM_NORMAL)
 	{
 		if (pDestPlayer)
-			pDestPlayer->SendHUDMsg("Receive Item", msstring(DisplayName()) + " offers you " + SPEECH_GetItemName((CGenericItem *)OfferInfo.pItemData2) + ".\nPress enter (accept) to recieve them.");
+			pDestPlayer->SendHUDMsg("Receive Item", msstring(DisplayName()) + " offers you " + SPEECH::ItemName((CGenericItem *)OfferInfo.pItemData2) + ".\nPress enter (accept) to recieve them.");
 		else
 		{
 			pMonster->StoreEntity(this, ENT_LASTOFFERITEM);
@@ -5416,7 +5416,7 @@ void CBasePlayer::TransactionCallback(CBasePlayer *pPlayer, int slot, TCallbackM
 
 		if (pItem->GiveTo(this))
 		{
-			SendInfoMsg("You pick up %s", SPEECH_GetItemName(pItem));
+			SendInfoMsg("You pick up %s", SPEECH::ItemName(pItem));
 
 			if (pItemDesc->iGroupedItems)
 				for (unsigned int i = 0; i < pItemDesc->iGroupedItems; i++)
@@ -5513,7 +5513,7 @@ void CBasePlayer::TransactionCallback(CBasePlayer *pPlayer, int slot, TCallbackM
 		else
 		{
 		pItem->GiveTo( this, false );
-		SendInfoMsg( "You steal %s from %s\n", SPEECH_GetItemName(pItem), STRING(pMonster->DisplayName) );
+		SendInfoMsg( "You steal %s from %s\n", SPEECH::ItemName(pItem), STRING(pMonster->DisplayName) );
 		StealNoticeCheck( this, pMonster, true );
 		m_TimeCanSteal = gpGlobals->time + 3.0;
 		}
@@ -5813,7 +5813,7 @@ tradeinfo_t *CBasePlayer::TradeItem(tradeinfo_t *ptiTradeInfo)
 						fCanGetItem = false;
 					if (m_Gold < ptiTradeAnswer->iPrice)
 					{
-						SendEventMsg(HUDEVENT_UNABLE, msstring("You can't afford ") + SPEECH_GetItemName(ptiTradeAnswer->pItem) + ".");
+						SendEventMsg(HUDEVENT_UNABLE, msstring("You can't afford ") + SPEECH::ItemName(ptiTradeAnswer->pItem) + ".");
 						fCanGetItem = false;
 					}
 
@@ -5822,14 +5822,14 @@ tradeinfo_t *CBasePlayer::TradeItem(tradeinfo_t *ptiTradeInfo)
 					{
 						if (ptiTradeAnswer->psiStoreItem->Quantity <= 0)
 						{
-							SendEventMsg(HUDEVENT_UNABLE, msstring("Vendor out of item: ") + SPEECH_GetItemName(ptiTradeAnswer->pItem) + ".");
+							SendEventMsg(HUDEVENT_UNABLE, msstring("Vendor out of item: ") + SPEECH::ItemName(ptiTradeAnswer->pItem) + ".");
 							fCanGetItem = false;
 						}
 					}
 
 					if (fCanGetItem)
 					{
-						SendInfoMsg("You receive %s.", SPEECH_GetItemName(ptiTradeAnswer->pItem));
+						SendInfoMsg("You receive %s.", SPEECH::ItemName(ptiTradeAnswer->pItem));
 						ptiTradeAnswer->pItem->GiveTo(this);
 						GiveGold(-ptiTradeAnswer->iPrice, false);
 						ptiTradeAnswer->psiStoreItem->Quantity -= V_max(ptiTradeAnswer->pItem->iQuantity, (unsigned int)1);
@@ -5875,7 +5875,7 @@ tradeinfo_t *CBasePlayer::TradeItem(tradeinfo_t *ptiTradeInfo)
 					goto EndTrade;
 
 				unsigned int Minimum = 1;
-				SendInfoMsg("You sell %s for %i gold.", SPEECH_GetItemName(ptiTradeAnswer->pItem), ptiTradeAnswer->iPrice);
+				SendInfoMsg("You sell %s for %i gold.", SPEECH::ItemName(ptiTradeAnswer->pItem), ptiTradeAnswer->iPrice);
 				GiveGold(ptiTradeAnswer->iPrice, false);
 				ptiTradeAnswer->psiStoreItem->Quantity += (short)V_max(ptiTradeAnswer->pItem->iQuantity, Minimum);
 				RemoveItem(ptiTradeAnswer->pItem);
@@ -5910,8 +5910,8 @@ bool CBasePlayer ::AcceptOffer()
 	if (OfferInfo.ItemType == ITEM_NORMAL)
 	{
 		if (pPlayer)
-			pPlayer->SendInfoMsg("%s accepts your %s", DisplayName(), SPEECH_GetItemName((CGenericItem *)OfferInfo.pItemData2));
-		SendInfoMsg("You recieve %s from %s", SPEECH_GetItemName((CGenericItem *)OfferInfo.pItemData2), pMonster->DisplayName());
+			pPlayer->SendInfoMsg("%s accepts your %s", DisplayName(), SPEECH::ItemName((CGenericItem *)OfferInfo.pItemData2));
+		SendInfoMsg("You recieve %s from %s", SPEECH::ItemName((CGenericItem *)OfferInfo.pItemData2), pMonster->DisplayName());
 	}
 	else if (OfferInfo.ItemType == ITEM_GOLD)
 	{
diff --git a/src/game/server/player/playershared.cpp b/src/game/server/player/playershared.cpp
index 7bcb4f2b..b074d57f 100644
--- a/src/game/server/player/playershared.cpp
+++ b/src/game/server/player/playershared.cpp
@@ -466,7 +466,7 @@ int CBasePlayer::NewItemHand(CGenericItem* pItem, bool CheckWeight, bool bVerbos
 		else
 		{
 			if (bVerbose)
-				_snprintf(cErrorString, sizeof(cErrorString), "You can't get %s because %s!", SPEECH_GetItemName(pItem), cHandStr);
+				_snprintf(cErrorString, sizeof(cErrorString), "You can't get %s because %s!", SPEECH::ItemName(pItem), cHandStr);
 			iAddHand = -2;
 		}
 	}
@@ -640,7 +640,7 @@ bool CBasePlayer::PutInPack(int iHand, CGenericItem* pContainer, bool bVerbose)
 	if (!Hand(iHand))
 	{
 		if (bVerbose)
-			SendInfoMsg("There is nothing in your %s hand.\n", SPEECH_IntToHand(iHand));
+			SendInfoMsg("There is nothing in your %s hand.\n", SPEECH::HandName(iHand));
 		return false;
 	}
 
@@ -658,7 +658,7 @@ bool CBasePlayer::PutInPack(CGenericItem* pItem, CGenericItem* pContainer, bool
 				if (!RANDOM_LONG(0, 1))
 					SendInfoMsg("Your %s can't fit that!\n", pContainer->DisplayName());
 				else
-					SendInfoMsg("You try to stuff %s into your %s, but to no avail.\n", SPEECH_GetItemName(pItem), pContainer->DisplayName());
+					SendInfoMsg("You try to stuff %s into your %s, but to no avail.\n", SPEECH::ItemName(pItem), pContainer->DisplayName());
 			}
 		}
 		return false;
@@ -666,9 +666,9 @@ bool CBasePlayer::PutInPack(CGenericItem* pItem, CGenericItem* pContainer, bool
 
 	//RemovePlayerItem() gets called from the Item's PutInPack( ) function
 	char sz[32];
-	strncpy(sz, SPEECH_GetItemName(pItem), sizeof(sz));
+	strncpy(sz, SPEECH::ItemName(pItem), sizeof(sz));
 	if (bVerbose)
-		SendInfoMsg("You put %s in %s\n", sz, SPEECH_GetItemName(pContainer));
+		SendInfoMsg("You put %s in %s\n", sz, SPEECH::ItemName(pContainer));
 #ifndef VALVE_DLL
 	ContainerWindowUpdate();
 #endif
@@ -704,7 +704,7 @@ bool CBasePlayer::PutInAnyPack(CGenericItem* pItem, bool bVerbose)
 		//No packs or all packs full
 		if (!pItem->SpellData) //Spells don't give error messages
 			//Give a generic error message
-			SendEventMsg(HUDEVENT_UNABLE, msstring(SPEECH_GetItemName(pItem)) + " won't fit into any of your packs");
+			SendEventMsg(HUDEVENT_UNABLE, msstring(SPEECH::ItemName(pItem)) + " won't fit into any of your packs");
 	}
 	return false;
 }
@@ -760,7 +760,7 @@ bool CBasePlayer::UseItem(int iHand, bool bVerbose)
 
 			return true;
 		}
-		else if( bVerbose ) SendEventMsg( HUDEVENT_UNABLE, msstring("There is nothing in your ") + SPEECH_IntToHand(iUseHand) + " hand" );
+		else if( bVerbose ) SendEventMsg( HUDEVENT_UNABLE, msstring("There is nothing in your ") + SPEECH::HandName(iUseHand) + " hand" );
 
 		return false;
 	}*/
@@ -769,12 +769,12 @@ bool CBasePlayer::UseItem(int iHand, bool bVerbose)
 
 	if (pUse && !pUse->UseItem(bVerbose))
 	{
-		//if( bVerbose ) SendInfoMsg( "You cannot use %s\n", SPEECH_GetItemName( Hand[iUseHand] ) );
+		//if( bVerbose ) SendInfoMsg( "You cannot use %s\n", SPEECH::ItemName( Hand[iUseHand] ) );
 		return false;
 	}
 
 	if (pUse && pUse->SpellData)
-		SendEventMsg(HUDEVENT_NORMAL, msstring("The ") + SPEECH_GetItemName(pUse) + " spell is canceled");
+		SendEventMsg(HUDEVENT_NORMAL, msstring("The ") + SPEECH::ItemName(pUse) + " spell is canceled");
 
 	return true;
 }
@@ -903,7 +903,7 @@ void CBasePlayer::RemoveAllItems(bool fDead, bool fDeleteItems)
 	if( !Hand(DropHand) ) {
 		#ifndef VALVE_DLL
 			if( !ForceDrop )
-				SendEventMsg( HUDEVENT_UNABLE, msstring("There is nothing in your ") + SPEECH_IntToHand(m_CurrentHand) + " hand to drop." );
+				SendEventMsg( HUDEVENT_UNABLE, msstring("There is nothing in your ") + SPEECH::HandName(m_CurrentHand) + " hand to drop." );
 		#endif
 		return false;
 	}
@@ -928,12 +928,12 @@ bool CBasePlayer::DropItem(CGenericItem* pDropItem, bool ForceDrop, bool Verbose
 			if (Verbose)
 			{
 				if (FBitSet(pDropItem->MSProperties(), ITEM_SPELL))
-					SendEventMsg(HUDEVENT_NORMAL, msstring("The ") + SPEECH_GetItemName(pDropItem) + " spell is canceled");
+					SendEventMsg(HUDEVENT_NORMAL, msstring("The ") + SPEECH::ItemName(pDropItem) + " spell is canceled");
 				else if (pDropItem->bDropAttempted) {
-					SendEventMsg(HUDEVENT_NORMAL, msstring("You drop ") + SPEECH_GetItemName(pDropItem));
+					SendEventMsg(HUDEVENT_NORMAL, msstring("You drop ") + SPEECH::ItemName(pDropItem));
 				}
 				else {
-					//SendEventMsg(HUDEVENT_NORMAL, msstring("Press again to drop ") + SPEECH_GetItemName(pDropItem));
+					//SendEventMsg(HUDEVENT_NORMAL, msstring("Press again to drop ") + SPEECH::ItemName(pDropItem));
 				}
 			}
 
@@ -946,7 +946,7 @@ bool CBasePlayer::DropItem(CGenericItem* pDropItem, bool ForceDrop, bool Verbose
 		else
 		{
 			if (Verbose && !FBitSet(pDropItem->MSProperties(), ITEM_SPELL) && pDropItem->m_PrefHand != HAND_PLAYERHANDS)
-				SendEventMsg(HUDEVENT_UNABLE, msstring("You cannot drop ") + SPEECH_GetItemName(pDropItem) + " right now");
+				SendEventMsg(HUDEVENT_UNABLE, msstring("You cannot drop ") + SPEECH::ItemName(pDropItem) + " right now");
 			return false;
 		}
 	}
@@ -1205,14 +1205,14 @@ bool CBasePlayer::SwitchHands(int iHand, bool bVerbose)
 	if (!pNewItem)
 	{
 		if (bVerbose)
-			SendEventMsg(HUDEVENT_UNABLE, msstring("You aren't holding anything in your ") + SPEECH_IntToHand(iHand) + " hand.");
+			SendEventMsg(HUDEVENT_UNABLE, msstring("You aren't holding anything in your ") + SPEECH::HandName(iHand) + " hand.");
 		return false;
 	}
 
 	if (!pNewItem->CanDeploy())
 	{
 		if (bVerbose)
-			SendEventMsg(HUDEVENT_UNABLE, msstring("Can't switch to your ") + SPEECH_IntToHand(iHand) + " hand.");
+			SendEventMsg(HUDEVENT_UNABLE, msstring("Can't switch to your ") + SPEECH::HandName(iHand) + " hand.");
 		return false;
 	}
 
@@ -1224,7 +1224,7 @@ bool CBasePlayer::SwitchHands(int iHand, bool bVerbose)
 
 		//if (!pPrevActiveItem->CanHolster()) //I dont think this is needed, as the item is already in the players hands. Ends up introducing a bug
 		//{
-			//if( bVerbose ) SendInfoMsg( "Can't switch to your %s hand.\n", SPEECH_IntToHand(iHand) );
+			//if( bVerbose ) SendInfoMsg( "Can't switch to your %s hand.\n", SPEECH::HandName(iHand) );
 		//	return false;
 		//}
 		//pPrevActiveItem->Holster();
diff --git a/src/game/shared/syntax/syntax.h b/src/game/shared/syntax/syntax.h
index f18a01fe..ad1df5ea 100644
--- a/src/game/shared/syntax/syntax.h
+++ b/src/game/shared/syntax/syntax.h
@@ -10,7 +10,7 @@ class SPEECH
 	static const char *HandName(int iHand, bool fCapital = false);
 };
 
-#define SPEECH_GetItemName SPEECH::ItemName
-#define SPEECH_IntToHand SPEECH::HandName
+//#define SPEECH_GetItemName SPEECH::ItemName
+//#define SPEECH_IntToHand SPEECH::HandName
 //int SPEECH_HandToInt( char *Hand );
 //void SPEECH_GetItemList ( CBasePlayerItem *FirstItem, char *ReturnString );
diff --git a/src/game/shared/weapons/genericitem.cpp b/src/game/shared/weapons/genericitem.cpp
index a100f227..a1caf2ea 100644
--- a/src/game/shared/weapons/genericitem.cpp
+++ b/src/game/shared/weapons/genericitem.cpp
@@ -1027,7 +1027,7 @@ bool CGenericItem::CanWearItem()
 			if (!pPlayerPos)
 			{
 				if (Verbose)
-					m_pPlayer->SendInfoMsg("You can't wear %s\n", SPEECH_GetItemName(this));
+					m_pPlayer->SendInfoMsg("You can't wear %s\n", SPEECH::ItemName(this));
 				return false; //Couldn't find position on player (the position's name isn't defined)
 			}
 
@@ -1063,14 +1063,14 @@ bool CGenericItem::CanWearItem()
 				{
 					if (PlayerPos.MaxAmt == 0)
 					{
-						m_pPlayer->SendInfoMsg("You can't wear %s\n", SPEECH_GetItemName(this));
+						m_pPlayer->SendInfoMsg("You can't wear %s\n", SPEECH::ItemName(this));
 					}
 					else if (PlayerPos.MaxAmt == 1)
 					{
 						if (pItemConflict)
-							m_pPlayer->SendInfoMsg("You have no more %s slots\n", PlayerPos.Name.c_str()); //Thothie DEC2007a - was "You've are already wearing a %s\n", SPEECH_GetItemName(pItemConflict)
+							m_pPlayer->SendInfoMsg("You have no more %s slots\n", PlayerPos.Name.c_str()); //Thothie DEC2007a - was "You've are already wearing a %s\n", SPEECH::ItemName(pItemConflict)
 						else
-							m_pPlayer->SendInfoMsg("You can't wear %s\n", SPEECH_GetItemName(this));
+							m_pPlayer->SendInfoMsg("You can't wear %s\n", SPEECH::ItemName(this));
 					}
 					else
 						m_pPlayer->SendInfoMsg("You have no more %s slots\n", PlayerPos.Name.c_str());
diff --git a/src/game/shared/weapons/giattack.cpp b/src/game/shared/weapons/giattack.cpp
index 9fe3b6a3..62d0c201 100644
--- a/src/game/shared/weapons/giattack.cpp
+++ b/src/game/shared/weapons/giattack.cpp
@@ -753,7 +753,7 @@ void CGenericItem::StrikeLand()
 	long randomMulti = RANDOM_LONG(0, CurrentAttack->flDamageRange);
 	float flDamage = CurrentAttack->flDamage + randomMulti; //fine even if 0.
 
-	flDamageFraction = CurrentAttackBalance / STAT_PROP_MAX_VALUE;
+	flDamageFraction = CurrentAttackBalance / MAX_STAT_PROPVALUE;
 	flDamageFraction = V_max(flDamageFraction, 0);
 
 	std::string szDamage = std::to_string(flDamage);
@@ -764,7 +764,7 @@ void CGenericItem::StrikeLand()
 	//UTIL_ClientPrintAll(HUD_PRINTCONSOLE, "Balance: %s : Fraction : %s", szBalance.c_str(), szFraction.c_str());
 
 	//fraction based on balance. Power stat for weapon -> 45? Multiplier is 0.45
-	flDamageFraction = CurrentAttackPower / STAT_PROP_MAX_VALUE;
+	flDamageFraction = CurrentAttackPower / MAX_STAT_PROPVALUE;
 	flDamageFraction = V_max(flDamageFraction, 0.001f); //why is this 0.001f?
 
 	std::string szPower = std::to_string(CurrentAttackPower);
@@ -1041,7 +1041,7 @@ void CGenericItem::ChargeThrowProj()
 		flTimeHeldAdjusted = CurrentAttack->tMaxHold ? (flTimeHeldAdjusted / CurrentAttack->tMaxHold) : 0; //[0.0 to 1.0]
 
 		//Shoot more accurately for higher skill
-		float flAccFraction = m_pOwner->GetSkillStat(CurrentAttack->StatBalance, CurrentAttack->PropBalance) / STAT_PROP_MAX_VALUE;
+		float flAccFraction = m_pOwner->GetSkillStat(CurrentAttack->StatBalance, CurrentAttack->PropBalance) / MAX_STAT_PROPVALUE;
 		flAccFraction = 1 - V_min(V_max(flAccFraction, 0.0f), 1.0f);
 
 		//Shoot more accurately for drawing the bow back longer
diff --git a/src/game/shared/weapons/giprojectile.cpp b/src/game/shared/weapons/giprojectile.cpp
index 1e7dfc00..a2292f76 100644
--- a/src/game/shared/weapons/giprojectile.cpp
+++ b/src/game/shared/weapons/giprojectile.cpp
@@ -150,7 +150,7 @@ void CGenericItem::ProjectileTouch(CBaseEntity *pOther)
 		if (pOwner->IsPlayer())
 		{
 			CMSMonster *pMonsterOwner = (CMSMonster *)pOwner;
-			dmgMultiplier = pMonsterOwner->GetSkillStat(ProjectileData->StatPower, ProjectileData->PropPower) / STAT_PROP_MAX_VALUE;
+			dmgMultiplier = pMonsterOwner->GetSkillStat(ProjectileData->StatPower, ProjectileData->PropPower) / MAX_STAT_PROPVALUE;
 			dmgMultiplier = V_max(dmgMultiplier, 0.001f);
 		}
 
diff --git a/src/game/shared/weapons/gispell.cpp b/src/game/shared/weapons/gispell.cpp
index f9101654..c7162028 100644
--- a/src/game/shared/weapons/gispell.cpp
+++ b/src/game/shared/weapons/gispell.cpp
@@ -55,7 +55,7 @@ void CGenericItem::Spell_Think()
 	if (gpGlobals->time >= Spell_TimeCast + SpellData->TimeFizzle)
 	{
 		if (m_pPlayer)
-			m_pPlayer->SendEventMsg(HUDEVENT_NORMAL, msstring("The ") + SPEECH_GetItemName(this) + " spell’s duration ends");
+			m_pPlayer->SendEventMsg(HUDEVENT_NORMAL, msstring("The ") + SPEECH::ItemName(this) + " spell’s duration ends");
 		DelayedRemove();
 	}
 }
@@ -67,7 +67,7 @@ bool CGenericItem::Spell_Prepare()
 
 	Spell_TimeCast = gpGlobals->time;
 
-	float OwnerPercent = m_pOwner->GetSkillStat(SKILL_SPELLCASTING) / STAT_MAX_VALUE;
+	float OwnerPercent = m_pOwner->GetSkillStat(SKILL_SPELLCASTING) / MAX_STAT_VALUE;
 	float Number = SpellData->CastSuccess + (100.0f - SpellData->CastSuccess) * OwnerPercent;
 	if (RANDOM_LONG(0, 100) > (int)Number)
 	{

From dcb48433b6e24a6845a6d159d00b0492a1e00693 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 19:19:53 -0400
Subject: [PATCH 258/291] changed define to reference pointer to array
 location. odd location in if else required multiple initializations.

---
 src/game/shared/weapons/genericitem.cpp | 15 +++++++++------
 src/game/shared/weapons/genericitem.h   |  6 ++++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/game/shared/weapons/genericitem.cpp b/src/game/shared/weapons/genericitem.cpp
index a1caf2ea..bf6b840d 100644
--- a/src/game/shared/weapons/genericitem.cpp
+++ b/src/game/shared/weapons/genericitem.cpp
@@ -1590,6 +1590,7 @@ void CGenericItem::Script_Setup()
 
 bool CGenericItem::Script_ExecuteCmd(CScript* Script, SCRIPT_EVENT& Event, scriptcmd_t& Cmd, msstringlist& Params)
 {
+
 	//Parse one command
 	msstring sTemp;
 
@@ -2128,18 +2129,18 @@ bool CGenericItem::Script_ExecuteCmd(CScript* Script, SCRIPT_EVENT& Event, scrip
 
 	//This is handled here for the client-side entities.  This returns false and handles it again in CScript for the server side
 	//******************************* SETMODEL ****************************
-#define m_ClEntNormal m_ClEntity[ITEMENT_NORMAL]
 	else if (Cmd.Name() == "setmodel")
 	{
+		cl_entity_t* m_ClEntNormal = &m_ClEntity[ITEMENT_NORMAL];
 		if (Params.size() >= 1)
 		{
 			if (Params[0] == "none")
-				m_ClEntNormal.model = NULL;
+				m_ClEntNormal->model = NULL;
 			else
 			{
 				sTemp = "models/";
 				sTemp += Params[0];
-				m_ClEntNormal.model = IEngineStudio.Mod_ForName(sTemp, 0);
+				m_ClEntNormal->model = IEngineStudio.Mod_ForName(sTemp, 0);
 			}
 		}
 		return false;
@@ -2147,12 +2148,13 @@ bool CGenericItem::Script_ExecuteCmd(CScript* Script, SCRIPT_EVENT& Event, scrip
 	//****************************** SETMODELBODY ************************
 	else if (Cmd.Name() == "setmodelbody")
 	{
+		cl_entity_t* m_ClEntNormal = &m_ClEntity[ITEMENT_NORMAL];
 		if (Params.size() >= 2)
-			if (m_ClEntNormal.model)
+			if (m_ClEntNormal->model)
 			{
 				int iGroup = atoi(Params[0]);
 				int iValue = atoi(Params[1]);
-				m_ClEntNormal.SetBody(iGroup, iValue);
+				m_ClEntNormal->SetBody(iGroup, iValue);
 			}
 		return false;
 	}
@@ -2160,8 +2162,9 @@ bool CGenericItem::Script_ExecuteCmd(CScript* Script, SCRIPT_EVENT& Event, scrip
 	//****************************** SETMODELSKIN ************************
 	else if (Cmd.Name() == "setmodelskin")
 	{
+		cl_entity_t* m_ClEntNormal = &m_ClEntity[ITEMENT_NORMAL];
 		if (Params.size() >= 1)
-			m_ClEntNormal.curstate.skin = atoi(Params[0]);
+			m_ClEntNormal->curstate.skin = atoi(Params[0]);
 		return false;
 	}
 	else if (Cmd.Name() == "setviewmodelskin")
diff --git a/src/game/shared/weapons/genericitem.h b/src/game/shared/weapons/genericitem.h
index c6e2d8c0..106f9e89 100644
--- a/src/game/shared/weapons/genericitem.h
+++ b/src/game/shared/weapons/genericitem.h
@@ -168,8 +168,10 @@ CGenericItem *MSUtil_GetItemByID(ulong m_iId, CMSMonster *pOwner); //Retreives a
 #endif
 
 //Various properties
-#define GI_JUSTSPAWNED (1 << 0)
-#define GI_INPACK (1 << 1)
+enum  generic_item_properties_e {
+	GI_JUSTSPAWNED = (1 << 0),
+	GI_INPACK = (1 << 1)
+};
 
 struct drinkdata_t {
 	int Type, Intensity, IdleAnim;

From eef5f3f76e7e29952936c38cba016565cdbd63a4 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 19:22:25 -0400
Subject: [PATCH 259/291] removed TypeCheck Macros

---
 src/game/shared/weapons/giarmor.cpp      |  4 ----
 src/game/shared/weapons/giprojectile.cpp | 16 +++++++++-------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/game/shared/weapons/giarmor.cpp b/src/game/shared/weapons/giarmor.cpp
index d890e7a1..5ff07b3a 100644
--- a/src/game/shared/weapons/giarmor.cpp
+++ b/src/game/shared/weapons/giarmor.cpp
@@ -12,10 +12,6 @@
 
 #include "inc_weapondefs.h"
 
-#define TypeCheck   \
-	if (!ArmorData) \
-	return
-
 void CGenericItem::RegisterArmor()
 {
 	if (ArmorData)
diff --git a/src/game/shared/weapons/giprojectile.cpp b/src/game/shared/weapons/giprojectile.cpp
index a2292f76..e7ccd5e6 100644
--- a/src/game/shared/weapons/giprojectile.cpp
+++ b/src/game/shared/weapons/giprojectile.cpp
@@ -16,10 +16,6 @@
 #include "stats/stats.h"
 #include "stats/statdefs.h"
 
-#define TypeCheck        \
-	if (!ProjectileData) \
-	return
-
 void CGenericItem::RegisterProjectile()
 {
 	if (ProjectileData)
@@ -40,7 +36,9 @@ void CGenericItem::RegisterProjectile()
 }
 void CGenericItem::TossProjectile(CBaseEntity *pTossDevice, Vector &vOrigin, Vector &vVelocity, float flDamage, int iStat, int iProp)
 {
-	TypeCheck;
+	if (!ProjectileData) {
+		return;
+	}
 	if (!pTossDevice)
 		return;
 
@@ -118,7 +116,9 @@ void CGenericItem::ProjectileTouch(CBaseEntity *pOther)
 {
 	//if ( ProjectileData->IgnoreNPC ) return;
 
-	TypeCheck;
+	if (!ProjectileData) {
+		return;
+	}
 
 	if (pev->owner == pOther->edict() || pOther->MSMoveType == MOVETYPE_ARROW || !FBitSet(MSProperties(), ITEM_PROJECTILE))
 		return;
@@ -242,7 +242,9 @@ void CGenericItem::ProjectileTouch(CBaseEntity *pOther)
 
 void CGenericItem::Projectile_Move()
 {
-	TypeCheck;
+	if (!ProjectileData) {
+		return;
+	}
 
 	if (MSMoveType == MOVETYPE_ARROW)
 	{

From caebe64b61098580422059143b5c41c08fe0e46e Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 19:38:08 -0400
Subject: [PATCH 260/291] removbed macro and changed to class memberfunction

---
 src/game/shared/weapons/genericitem.h |  7 +++++--
 src/game/shared/weapons/giattack.cpp  | 23 +++++++++++++++--------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/game/shared/weapons/genericitem.h b/src/game/shared/weapons/genericitem.h
index 106f9e89..0fb4c2cf 100644
--- a/src/game/shared/weapons/genericitem.h
+++ b/src/game/shared/weapons/genericitem.h
@@ -96,8 +96,10 @@ struct attackdata_t
 	msstring sProjectile; //Name of the next projectile item to be fired
 };
 
-#define GET_CHARGE_FROM_TIME(a) (a + V_max(a - 1, 0) * .5)
 
+inline float GET_CHARGE_FROM_TIME(float flTime) {
+	return flTime + V_max(flTime - 1.0f, 0.0f) * 0.5;
+}
 // Global GenericItem
 class CGenericItem;
 class CScript;
@@ -277,7 +279,7 @@ class CGenericItem : public CBasePlayerItem
 	virtual bool Attack_CanAttack();
 	virtual float Attack_Charge();
 	virtual float GetHighestAttackCharge();
-
+	
 	float m_TimeChargeStart; //Time I started charging for a special attack.  0 - not charging
 	float m_LastChargedAmt;	 //Last amount charged up
 	damage_t *m_CurrentDamage;
@@ -424,6 +426,7 @@ class CGenericItem : public CBasePlayerItem
 	void FallThink();
 	void Think(void);
 	void SUB_Remove(void);
+	void ReadStat(const char* Name, int& StatVar, int& PropVar);
 
 	//IScripted
 	void Script_Setup();																				  //Ties m_pScriptActions and m_pScriptConditions to
diff --git a/src/game/shared/weapons/giattack.cpp b/src/game/shared/weapons/giattack.cpp
index 62d0c201..f4505a85 100644
--- a/src/game/shared/weapons/giattack.cpp
+++ b/src/game/shared/weapons/giattack.cpp
@@ -24,18 +24,25 @@
 #include "soundent.h"
 #endif
 
+#include "iscript.h"
+
 //extern iBeam;
+class IScripted;
+
 bool GetString(char *Return, size_t size, const char *sentence, int start, const char *endchars);
-#define ReadStat(Name, StatVar, PropVar)            \
-	{                                               \
-		Temp = GetFirstScriptVar(Name);             \
-		if (Temp != Name)                           \
-		{                                           \
-			StatVar = 0, PropVar = -1;              \
-			GetStatIndices(Temp, StatVar, PropVar); \
-		}                                           \
+
+
+
+void CGenericItem::ReadStat(const char* Name, int& StatVar, int& PropVar) {
+	const char* Temp = IScripted::GetFirstScriptVar(Name);
+	if (Temp != Name)
+	{
+		StatVar = 0, PropVar = -1;
+		GetStatIndices(Temp, StatVar, PropVar);
 	}
 
+};
+
 bool CGenericItem::CheckKeys(attackdata_t *pAttData)
 {
 #ifndef VALVE_DLL

From a39733d5ec209d7f6b3b7b3a6fcee56763ebfe75 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 19:40:36 -0400
Subject: [PATCH 261/291] unrolled and removed macro

---
 src/game/shared/weapons/gidrinkable.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/game/shared/weapons/gidrinkable.cpp b/src/game/shared/weapons/gidrinkable.cpp
index 2fc45186..f00179a2 100644
--- a/src/game/shared/weapons/gidrinkable.cpp
+++ b/src/game/shared/weapons/gidrinkable.cpp
@@ -17,8 +17,6 @@
 	#include "cl_util.h"
 #endif
 
-#define DrinkableCheck if( !DrinkData ) return
-
 void CGenericItem::RegisterDrinkable( )
 {
 	if( DrinkData ) delete DrinkData;
@@ -36,9 +34,9 @@ void CGenericItem::RegisterDrinkable( )
 
 	SetBits( Properties, ITEM_DRINKABLE );
 }
-void CGenericItem::Drink( )
-{
-	DrinkableCheck;
+void CGenericItem::Drink( ) { 
+
+	if (!DrinkData) return;
 
 	//The server *only* calls this when told, from the client
 	if( DrinkData->fDrinking || !m_pOwner )
@@ -61,7 +59,7 @@ void CGenericItem::Drink( )
 }
 void CGenericItem::DrinkThink( )
 {
-	DrinkableCheck;
+	if (!DrinkData) return;
 
 	if( !DrinkData->fDrinking ) return;
 
@@ -95,14 +93,14 @@ void CGenericItem::DrinkThink( )
 }
 void CGenericItem::DrinkCancel( )
 {
-	DrinkableCheck;
+	if (!DrinkData) return;
 
 	DrinkData->fDrinking = false;
 }
 
 void CGenericItem::DrinkSetAmt( int iAmount )
 {
-	DrinkableCheck;
+	if (!DrinkData) return;
 
 	Quality = iAmount;
 }

From 9116473651025407f7c2af4a381ea012a18bed04 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 19:42:26 -0400
Subject: [PATCH 262/291] moved defines as const char * as class member
 variables

---
 src/game/shared/weapons/genericitem.h | 3 ++-
 src/game/shared/weapons/gipack.cpp    | 6 +-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/game/shared/weapons/genericitem.h b/src/game/shared/weapons/genericitem.h
index 0fb4c2cf..d905f06b 100644
--- a/src/game/shared/weapons/genericitem.h
+++ b/src/game/shared/weapons/genericitem.h
@@ -228,7 +228,8 @@ class CGenericItem : public CBasePlayerItem
 	struct armordata_t *ArmorData = nullptr;
 	struct projectiledata_t *ProjectileData = nullptr;
 	struct spelldata_t *SpellData = nullptr;
-
+	const char* CONTAINER_ITEM_ACCEPT = "reg.container.accept_mask";
+	const char* CONTAINER_ITEM_REJECT = "reg.container.reject_mask";
 	int m_Location,																	 //Location of the item on the monster (Hands, back, etc)
 		m_Hand;																		 //The hand I'm in... if I'm in a hand
 	float m_TimeExpire;																 //Time the item should be deleted
diff --git a/src/game/shared/weapons/gipack.cpp b/src/game/shared/weapons/gipack.cpp
index b9219218..eaa2a919 100644
--- a/src/game/shared/weapons/gipack.cpp
+++ b/src/game/shared/weapons/gipack.cpp
@@ -9,7 +9,7 @@
 //////////////////////////////////
 //	Special container behavior  //
 //////////////////////////////////
-#pragma warning(disable : 4800) // forcing int to bool
+//#pragma warning(disable : 4800) // forcing int to bool
 
 #include "inc_weapondefs.h"
 #include "vgui_menudefsshared.h"
@@ -57,10 +57,6 @@ void CGenericItem::RegisterContainer()
 	PackData->fCanClose = (bool)atoi(GetFirstScriptVar("reg.container.canclose"));
 	PackData->iLockStrength = atof(GetFirstScriptVar("reg.container.lock_str"));
 	PackData->MaxItems = atof(GetFirstScriptVar("reg.container.maxitem"));
-
-#define CONTAINER_ITEM_ACCEPT "reg.container.accept_mask"
-#define CONTAINER_ITEM_REJECT "reg.container.reject_mask"
-
 	const char *pszItemList = "";
 	if (strcmp(pszItemList = GetFirstScriptVar(CONTAINER_ITEM_ACCEPT), CONTAINER_ITEM_ACCEPT))
 		TokenizeString(pszItemList, PackData->AcceptItemsTypes);

From 3ab4e86487bdfc7a66a333e14ca07f1be8e41e35 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 19:45:26 -0400
Subject: [PATCH 263/291] removed / unrolled macro

---
 src/game/shared/weapons/gispell.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/game/shared/weapons/gispell.cpp b/src/game/shared/weapons/gispell.cpp
index c7162028..e0276756 100644
--- a/src/game/shared/weapons/gispell.cpp
+++ b/src/game/shared/weapons/gispell.cpp
@@ -14,10 +14,6 @@ struct spelldata_t
 	float TimeFizzle;  //Fizzle after this amount of time
 };
 
-#define SpellCheck  \
-	if (!SpellData) \
-	return
-
 void CGenericItem::RegisterSpell()
 {
 	Spell_Deactivate();
@@ -50,7 +46,7 @@ bool CGenericItem::Spell_LearnSpell(const char *pszSpellName)
 
 void CGenericItem::Spell_Think()
 {
-	SpellCheck;
+	if (!SpellData) return;
 
 	if (gpGlobals->time >= Spell_TimeCast + SpellData->TimeFizzle)
 	{

From 6425cb466b9c397f6f91f85ee01980dfd8c0df8e Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 19:46:32 -0400
Subject: [PATCH 264/291] changed int to unsigned int

---
 src/game/shared/weapons/weapons.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/shared/weapons/weapons.cpp b/src/game/shared/weapons/weapons.cpp
index 075857a6..a75c010b 100644
--- a/src/game/shared/weapons/weapons.cpp
+++ b/src/game/shared/weapons/weapons.cpp
@@ -48,7 +48,7 @@
 extern CGraph WorldGraph;
 extern int gEvilImpulse101;
 
-constexpr int NOT_USED = 255;
+constexpr unsigned int NOT_USED = 255;
 
 //DLL_GLOBAL	short	g_sModelIndexLaser;// holds the index for the laser beam
 //DLL_GLOBAL  const char *g_pModelNameLaser = "sprites/laserbeam.spr";

From c3659a4365d5afbf9eeb335a285823d322db48a7 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 19:50:10 -0400
Subject: [PATCH 265/291] Removed unused macros named some enums

---
 src/game/shared/weapons/weapons.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/game/shared/weapons/weapons.h b/src/game/shared/weapons/weapons.h
index ed9d4e59..da2b6b40 100644
--- a/src/game/shared/weapons/weapons.h
+++ b/src/game/shared/weapons/weapons.h
@@ -20,13 +20,11 @@
 extern int gmsgWeapPickup;
 
 //Master Sword
-#define MakeAnim(ref) strncpy(m_pOwner->m_szAnimExtention, ref, 32)
-#define MakeAnimLR(ref) strncpy(m_pOwner->m_szAnimExtention, UTIL_VarArgs("%s_%s", ref, (m_pOwner->iCurrentHand == 0) ? "L" : "R"), 32)
 
 #ifdef VALVE_DLL
 void G_SolidifyEnts(bool fEnable, bool fSolidShields, bool fEnableCorpses, bool fEnlargeboxes);
 
-enum {
+enum mstrace_target_e {
 	MSTRACE_SOLIDSHIELDS = (1 << 0),
 	MSTRACE_LARGEHITBOXES = (1 << 1),
 	MSTRACE_HITCORPSES = (1 << 2)
@@ -108,14 +106,14 @@ class CGrenade : public CBaseMonster
 };
 
 // constant items
-enum {
+enum constant_items_e {
 	ITEM_HEALTHKIT = 1,
 	ITEM_ANTIDOTE = 2,
 	ITEM_SECURITY = 3,
 	ITEM_BATTERY = 4
 };
 
-enum {
+enum weapon_type_e {
 	WEAPON_NONE = 0,
 	WEAPON_CROWBAR = 1,
 	WEAPON_GLOCK = 2,
@@ -369,7 +367,7 @@ typedef struct
 
 extern MULTIDAMAGE gMultiDamage;
 
-enum {
+enum weapon_volume_e {
 	LOUD_GUN_VOLUME = 1000,
 	NORMAL_GUN_VOLUME = 600,
 	QUIET_GUN_VOLUME = 200,

From b37e4a40128041f536366de7d37fe6e4c7d82c4e Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 19:53:24 -0400
Subject: [PATCH 266/291] named some enums changed define to constexpr

---
 src/game/server/hl/cbase.h | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/game/server/hl/cbase.h b/src/game/server/hl/cbase.h
index 2f519e67..552e89b1 100644
--- a/src/game/server/hl/cbase.h
+++ b/src/game/server/hl/cbase.h
@@ -30,7 +30,7 @@ CBaseEntity
 constexpr int MAX_PATH_SIZE = 10; // max number of nodes available for a path.
 
 // These are caps bits to indicate what an object's capabilities (currently used for save/restore and level transitions)
-enum {
+enum fcap_bits_e {
 	FCAP_CUSTOMSAVE = 0x00000001,
 	FCAP_ACROSS_TRANSITION = 0x00000002,// should transfer between transitions
 	FCAP_MUST_SPAWN = 0x00000004,		// Spawn after restore
@@ -45,16 +45,12 @@ enum {
 	FCAP_FORCE_TRANSITION = 0x00000080 // ALWAYS goes across transitions
 };
 
-
-
-
-
 #include "iscript.h"
 
 #include "archtypes.h"     // DAL
 
 //Master Sword - no save/restore in client dll
-constexpr int MAXPLAYERS = 32;
+constexpr unsigned int MAXPLAYERS = 32;
 #ifdef VALVE_DLL
 #include "saverestore.h"
 #else
@@ -123,7 +119,7 @@ typedef void (CBaseEntity::*USEPTR)(CBaseEntity *pActivator, CBaseEntity *pCalle
 
 // Master Sword - New CLASS defs:
 
-enum {
+enum class_entity_e {
 	CLASS_NONE = 0,
 	CLASS_MACHINE = 1,
 	CLASS_PLAYER = 2,
@@ -150,16 +146,13 @@ enum {
 	CLASS_VEHICLE = 16, // we use 16 because of MS class defines.
 };
 
-constexpr int CHAR_LEVEL_CAP = 45;		  // MiB JAN2010_15 Global Level Cap
+constexpr unsigned int CHAR_LEVEL_CAP = 45;		  // MiB JAN2010_15 Global Level Cap
 
 class CBaseEntity;
 class CBaseMonster;
 class CBasePlayerItem;
 class CSquadMonster;
 
-
-
-
 //
 // EHANDLE. Safe way to point to CBaseEntities who may die between frames
 //
@@ -854,7 +847,7 @@ constexpr int GIB_HEALTH_VALUE = -30;
 constexpr int ROUTE_SIZE = 8;	  // how many waypoints a monster can store at one time
 constexpr int MAX_OLD_ENEMIES = 4; // how many old enemies to remember
 
-enum {
+enum bits_cap_e {
 	bits_CAP_DUCK = (1 << 0),		 // crouch
 	bits_CAP_JUMP = (1 << 1),		 // jump/leap
 	bits_CAP_STRAFE = (1 << 2),		// strafe ( walk/run sideways)
@@ -877,7 +870,7 @@ enum {
 
 // instant damage
 	
-enum {
+enum dmg_type_e {
 	DMG_GENERIC = (0 << 0),			 // generic damage was done
 	DMG_CRUSH = (1 << 0),		 // crushed by falling or moving object
 	DMG_BULLET = (1 << 1),		 // shot
@@ -945,7 +938,7 @@ constexpr float SLOWBURN_DAMAGE = 1.0;
 constexpr int   SLOWFREEZE_DURATION = 2;
 constexpr float SLOWFREEZE_DAMAGE = 1.0;
 
-enum {
+enum dot_type_e {
 	itbd_Paralyze = 0,
 	itbd_NerveGas = 1,
 	itbd_Poison = 2,
@@ -960,7 +953,7 @@ enum {
 // when calling KILLED(), a value that governs gib behavior is expected to be
 // one of these three values
 
-enum {
+enum gib_setting_e {
 	GIB_NORMAL = 0, // gib if entity was overkilled
 	GIB_NEVER = 1,	 // never gib, no matter how much death damage is done ( freezing, etc )
 	GIB_ALWAYS = 2 // always gib ( Houndeye Shock, Barnacle Bite )
@@ -1035,7 +1028,7 @@ class CBaseButton : public CBaseToggle
 // Weapons
 //
 
-#define BAD_WEAPON 0x00007FFF
+constexpr unsigned int BAD_WEAPON = 0x00007FFF;
 
 //
 // Converts a entvars_t * to a class pointer

From 22cf2777004ef417e5476751f72d3ab5f67b2fd4 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 20:12:08 -0400
Subject: [PATCH 267/291] removed reference to _s functions preventing linux
 compile

---
 src/game/client/hud_spectator.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/game/client/hud_spectator.cpp b/src/game/client/hud_spectator.cpp
index 31ee8cd7..295405c3 100644
--- a/src/game/client/hud_spectator.cpp
+++ b/src/game/client/hud_spectator.cpp
@@ -179,7 +179,7 @@ void UTIL_StringToVector(float *pVector, const char *pString)
 	char* pstr, * pfront, tempString[bufferLength] = { 0 };
 	int j;
 
-	strcpy_s(tempString, sizeof(tempString), pString);
+	strcpy(tempString, pString);
 	pstr = tempString;
 	pfront = tempString;
 
@@ -448,7 +448,7 @@ int CHudSpectator::Draw(float flTime)
 		color = GetClientColor(i + 1);
 
 		// draw the players name and health underneath
-		 _snprintf_s(string, sizeof(string),  "%s",  g_PlayerInfoList[i + 1].name );
+		 _snprintf(string, sizeof(string),  "%s",  g_PlayerInfoList[i + 1].name );
 
 		lx = strlen(string) * 3; // 3 is avg. character length :)
 
@@ -872,8 +872,8 @@ void CHudSpectator::SetModes(int iNewMainMode, int iNewInsetMode)
 		}
 
 		char string[128];
-		 _snprintf_s(string, sizeof(string),  "#Spec_Mode%d",  g_iUser1 );
-		 _snprintf_s(string, sizeof(string),  "%c%s",  HUD_PRINTCENTER,  CHudTextMessage::BufferedLocaliseTextString(string) );
+		 _snprintf(string, sizeof(string),  "#Spec_Mode%d",  g_iUser1 );
+		 _snprintf(string, sizeof(string),  "%c%s",  HUD_PRINTCENTER,  CHudTextMessage::BufferedLocaliseTextString(string) );
 		gHUD.m_TextMessage.MsgFunc_TextMsg(NULL, strlen(string) + 1, string);
 	}
 

From c55feff005e7bb703c79d0f89cbaae138857c486 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 20:14:51 -0400
Subject: [PATCH 268/291] removed reference to _s function preventing linux
 compile

---
 src/game/client/text_message.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/client/text_message.cpp b/src/game/client/text_message.cpp
index 3e88de3c..8296b862 100644
--- a/src/game/client/text_message.cpp
+++ b/src/game/client/text_message.cpp
@@ -223,6 +223,6 @@ int CHudTextMessage::MsgFunc_TextMsg(const char *pszName, int iSize, void *pbuf)
 void PrintNotifyMsg(char *pszmsg)
 {
 	static char string[1024];
-	_snprintf_s(string, sizeof(string), "%c%s", HUD_PRINTNOTIFY, pszmsg);
+	_snprintf(string, sizeof(string), "%c%s", HUD_PRINTNOTIFY, pszmsg);
 	gHUD.m_TextMessage.MsgFunc_TextMsg(string, strlen(string), &string[0]);
 }
\ No newline at end of file

From de7069744bf687009614690ad5dd7370913e64ed Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 20:18:23 -0400
Subject: [PATCH 269/291] removed reference to _s functions preventing linux
 compile.

---
 src/game/client/ms/hudmisc.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/game/client/ms/hudmisc.cpp b/src/game/client/ms/hudmisc.cpp
index c620b7af..11a03abb 100644
--- a/src/game/client/ms/hudmisc.cpp
+++ b/src/game/client/ms/hudmisc.cpp
@@ -199,7 +199,7 @@ void CHudMisc ::UserCmd_RemovePack(void)
 	int test = *(int *)&m_RemoveList;
 	int test2 = m_RemoveList.size();
 
-	 strncpy_s(MenuText,  "Remove item:\n\n", sizeof(MenuText) );
+	 strncpy(MenuText, "Remove item:\n\n", sizeof(MenuText) );
 
 	m_RemoveList.clear();
 	for (unsigned int i = 0; i < player.Gear.size(); i++)
@@ -305,7 +305,7 @@ void CHudMisc ::UserCmd_Offer(void)
 	clrmem(m_OfferInfo);
 	//bool fOfferedSomething = false;
 
-	 _snprintf_s(MenuText, sizeof(MenuText),  "Offer to %s:\n",  pEntInfo->Name.c_str() );
+	 _snprintf(MenuText, sizeof(MenuText),  "Offer to %s:\n",  pEntInfo->Name.c_str() );
 
 	//if( player.m_Gold )
 	{

From 3c8e63c3539bfaf3af2f8253341c44c8af01b460 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 20:22:10 -0400
Subject: [PATCH 270/291] removed _s from function preventing linux compile.

---
 src/game/shared/ms/sharedutil.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/shared/ms/sharedutil.cpp b/src/game/shared/ms/sharedutil.cpp
index 22ac8dc7..ffbb49f2 100644
--- a/src/game/shared/ms/sharedutil.cpp
+++ b/src/game/shared/ms/sharedutil.cpp
@@ -70,7 +70,7 @@ Color4F StringToColor(const char* String) //Converts a string of the format "(r,
 {
 	Color4F Color(0, 0, 0, 0);
 
-	sscanf_s(String, "(%f,%f,%f,%f)", &Color.r, &Color.g, &Color.b, &Color.a);
+	sscanf(String, "(%f,%f,%f,%f)", &Color.r, &Color.g, &Color.b, &Color.a);
 	return Color;
 }
 

From ffcb6866dccaf61dadd3beb9e6896d6aa36f52b5 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 20:32:16 -0400
Subject: [PATCH 271/291] changed includes to match other include formats for
 vector.h in two files.

---
 src/game/server/hl/extdll.h  | 2 +-
 src/game/shared/ms/iscript.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/game/server/hl/extdll.h b/src/game/server/hl/extdll.h
index 20faf64e..7b737363 100644
--- a/src/game/server/hl/extdll.h
+++ b/src/game/server/hl/extdll.h
@@ -45,7 +45,7 @@ typedef int BOOL;
 #include "math.h"
 
 // Vector class
-#include "../../shared/hl/vector.h"
+#include "hl/vector.h"
 
 // Shared engine/DLL constants
 #include "const.h"
diff --git a/src/game/shared/ms/iscript.h b/src/game/shared/ms/iscript.h
index 5a27180d..a0b3c0cb 100644
--- a/src/game/shared/ms/iscript.h
+++ b/src/game/shared/ms/iscript.h
@@ -11,7 +11,7 @@ class CBaseEntity;
 #include "../../../public/archtypes.h"  // For ulong typedef
 
 #ifndef VECTOR_H
-#include "..\shared\hl\vector.h"
+#include "hl/vector.h"
 #endif
 
 // Add Windows-specific ulong definition if not already defined

From 27df7706e6d4fc082c37e7f498fce879b8555b2b Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 20:38:48 -0400
Subject: [PATCH 272/291] Added include to vector.h for cmath

---
 src/game/shared/hl/vector.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/game/shared/hl/vector.h b/src/game/shared/hl/vector.h
index 29e9826b..e7637d43 100644
--- a/src/game/shared/hl/vector.h
+++ b/src/game/shared/hl/vector.h
@@ -16,6 +16,7 @@
 typedef float vec_t;
 #endif
 
+#include <cmath>
 #ifndef VECTOR_H
 #define VECTOR_H
 

From 7ef185f13712489f0a29d47ef3950e688de8cf61 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 20:44:45 -0400
Subject: [PATCH 273/291] changes TRUE to true for BOOL implicit conversion

---
 src/game/server/hl/saverestore.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/server/hl/saverestore.h b/src/game/server/hl/saverestore.h
index 53e61678..f5593f96 100644
--- a/src/game/server/hl/saverestore.h
+++ b/src/game/server/hl/saverestore.h
@@ -85,7 +85,7 @@ class CRestore : public CSaveRestoreBuffer
 	CRestore(SAVERESTOREDATA *pdata) : CSaveRestoreBuffer(pdata)
 	{
 		m_global = 0;
-		m_precache = TRUE;
+		m_precache = true;
 	}
 
 	int ReadEntVars(const char *pname, entvars_t *pev); // entvars_t

From 582969428ffcf48ea5d03705f84c5ea5da99ea79 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 20:51:10 -0400
Subject: [PATCH 274/291] removed _s compile preventing linux compilation

---
 src/game/server/client.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/game/server/client.cpp b/src/game/server/client.cpp
index c9b70d2c..8b9a0313 100644
--- a/src/game/server/client.cpp
+++ b/src/game/server/client.cpp
@@ -365,9 +365,9 @@ void Host_Say(edict_t *pEntity, int teamonly)
 
 	// turn on color set 2  (color on,  no sound)
 	if (teamonly)
-		_snprintf_s(text, sizeof(text), "%c(TEAM) %s: ",  2, STRING(pEntity->v.netname) );
+		_snprintf(text, sizeof(text), "%c(TEAM) %s: ",  2, STRING(pEntity->v.netname) );
 	else
-		_snprintf_s(text, sizeof(text), "%c%s: ",  2, STRING(pEntity->v.netname) );
+		_snprintf(text, sizeof(text), "%c%s: ",  2, STRING(pEntity->v.netname) );
 
 	j = sizeof(text) - 2 - strlen(text); // -2 for /n and null terminator
 	if ((int)strlen(p) > j)

From 158e9f34aa739f2c52e758558cf3fcbb26847544 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 20:56:28 -0400
Subject: [PATCH 275/291] changed FALSE to false

---
 src/game/server/hl/items.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/server/hl/items.h b/src/game/server/hl/items.h
index 2a2f7f72..82cc2558 100644
--- a/src/game/server/hl/items.h
+++ b/src/game/server/hl/items.h
@@ -22,7 +22,7 @@ class CItem : public CBaseEntity
 	CBaseEntity *Respawn(void);
 	void EXPORT ItemTouch(CBaseEntity *pOther);
 	void EXPORT Materialize(void);
-	virtual BOOL MyTouch(CBasePlayer *pPlayer) { return FALSE; };
+	virtual BOOL MyTouch(CBasePlayer *pPlayer) { return false; };
 };
 
 #endif // ITEMS_H

From 77644917284e8a4f3a0bf920e0a05d95615c9176 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 21:03:14 -0400
Subject: [PATCH 276/291] added parenthesis around cast statement preventing
 linux compile

---
 src/game/server/hl/nodes.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/server/hl/nodes.cpp b/src/game/server/hl/nodes.cpp
index 71722d79..2ada603d 100644
--- a/src/game/server/hl/nodes.cpp
+++ b/src/game/server/hl/nodes.cpp
@@ -538,7 +538,7 @@ int CGraph::NextNodeInRoute(int iCurrentNode, int iDest, int iHull, int iCap)
 
 			// Repeat phrase
 			//
-			if (nCount <= unsigned char(ch + 1))
+			if (nCount <= (unsigned char)(ch + 1))
 			{
 				iNext = iCurrentNode + *pRoute;
 				if (iNext >= m_cNodes)

From b7928543fcb069fa257ca14f075e8720ec417ae1 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 26 Mar 2026 02:02:54 -0400
Subject: [PATCH 277/291] Reverted changes to all files in the src/[public
 folder. re-added typedef for vec3_t into vector.h

---
 src/game/shared/hl/vector.h  |   2 +-
 src/public/engine/cdll_int.h |   8 +-
 src/public/engine/eiface.h   |  31 +++---
 src/public/engine/progdefs.h |  64 ++++++------
 src/public/engine/shake.h    |  12 +--
 src/public/engine/studio.h   | 161 ++++++++++++++--------------
 src/public/interface.h       |   2 +-
 src/public/keydefs.h         | 197 ++++++++++++++++++-----------------
 8 files changed, 234 insertions(+), 243 deletions(-)

diff --git a/src/game/shared/hl/vector.h b/src/game/shared/hl/vector.h
index e7637d43..4f2da586 100644
--- a/src/game/shared/hl/vector.h
+++ b/src/game/shared/hl/vector.h
@@ -149,6 +149,6 @@ inline float DotProduct(const Vector &a, const Vector &b) { return (a.x * b.x +
 //};
 
 inline Vector CrossProduct(const Vector &a, const Vector &b) { return Vector(a.y * b.z - a.z * b.y, a.z * b.x - a.x * b.z, a.x * b.y - a.y * b.x); }
-
+typedef Vector vec3_t;// temporary until we change all the files to use Vector.
 
 #endif
\ No newline at end of file
diff --git a/src/public/engine/cdll_int.h b/src/public/engine/cdll_int.h
index fb937c1c..90e7ae93 100644
--- a/src/public/engine/cdll_int.h
+++ b/src/public/engine/cdll_int.h
@@ -33,10 +33,8 @@
 
 typedef int HLSPRITE; // handle to a graphic
 
-enum {
-	SCRINFO_SCREENFLASH = 1,
-	SCRINFO_STRETCHED = 2
-};
+#define SCRINFO_SCREENFLASH 1
+#define SCRINFO_STRETCHED 2
 
 typedef struct SCREENINFO_s
 {
@@ -88,7 +86,7 @@ typedef struct hud_player_info_s
 
 #include "in_buttons.h"
 
-constexpr int CLDLL_INTERFACE_VERSION = 7;
+#define CLDLL_INTERFACE_VERSION 7
 
 //#include "server.h" // server_static_t define for apiproxy
 #include "APIProxy.h"
diff --git a/src/public/engine/eiface.h b/src/public/engine/eiface.h
index 0af3ba2f..90be08d4 100644
--- a/src/public/engine/eiface.h
+++ b/src/public/engine/eiface.h
@@ -76,7 +76,7 @@ typedef struct
 	int		fInOpen;
 	int		fInWater;
 	float	flFraction;			// time completed, 1.0 = didn't hit anything
-	Vector 	vecEndPos;			// final position
+	Vector vecEndPos;			// final position
 	float	flPlaneDist;
 	Vector 	vecPlaneNormal;		// surface normal at impact
 	edict_t	*pHit;				// entity the surface is on
@@ -120,7 +120,7 @@ typedef struct enginefuncs_s
 	int			(*pfnGetEntityIllum)		(edict_t* pEnt);
 	edict_t*	(*pfnFindEntityInSphere)	(edict_t *pEdictStartSearchAfter, const float *org, float rad);
 	edict_t*	(*pfnFindClientInPVS)		(edict_t *pEdict);
-	edict_t*    (*pfnEntitiesInPVS)			(edict_t *pplayer);
+	edict_t* (*pfnEntitiesInPVS)			(edict_t *pplayer);
 	void		(*pfnMakeVectors)			(const float *rgflVector);
 	void		(*pfnAngleVectors)			(const float *rgflVector, float *forward, float *right, float *up);
 	edict_t*	(*pfnCreateEntity)			(void);
@@ -169,7 +169,7 @@ typedef struct enginefuncs_s
 	void*		(*pfnPvEntPrivateData)		(edict_t *pEdict);
 	void		(*pfnFreeEntPrivateData)	(edict_t *pEdict);
 	const char*	(*pfnSzFromIndex)			(int iString);
-	unsigned int		(*pfnAllocString)			(const char *szValue);
+	unsigned int			(*pfnAllocString)			(const char *szValue);
 	struct entvars_s*	(*pfnGetVarsOfEnt)			(edict_t *pEdict);
 	edict_t*	(*pfnPEntityOfEntOffset)	(int iEntOffset);
 	int			(*pfnEntOffsetOfPEntity)	(const edict_t *pEdict);
@@ -219,7 +219,7 @@ typedef struct enginefuncs_s
 	void		(*pfnBuildSoundMsg)			(edict_t *entity, int channel, const char *sample, /*int*/float volume, float attenuation, int fFlags, int pitch, int msg_dest, int msg_type, const float *pOrigin, edict_t *ed);
 	int			(*pfnIsDedicatedServer)		(void);// is this a dedicated server?
 	cvar_t		*(*pfnCVarGetPointer)		(const char *szVarName);
-	int (*pfnGetPlayerWONId)				(edict_t *e); // returns the server assigned WONid for this player.  useful for logging frags, etc.  returns -1 if the edict couldn't be found in the list of clients
+	unsigned int (*pfnGetPlayerWONId)		(edict_t *e); // returns the server assigned WONid for this player.  useful for logging frags, etc.  returns -1 if the edict couldn't be found in the list of clients
 
 	// YWB 8/1/99 TFF Physics additions
 	void		(*pfnInfo_RemoveKey)		(const char* s, const char *key );
@@ -281,9 +281,9 @@ typedef struct
 	char		mapName[ 32 ];
 	char		landmarkName[ 32 ];
 	edict_t	*pentLandmark;
-	Vector 		vecLandmarkOrigin;
+	Vector		vecLandmarkOrigin;
 } LEVELLIST;
-constexpr unsigned int MAX_LEVEL_CONNECTIONS = 16;		// These are encoded in the lower 16bits of ENTITYTABLE->flags
+#define MAX_LEVEL_CONNECTIONS	16		// These are encoded in the lower 16bits of ENTITYTABLE->flags
 
 typedef struct 
 {
@@ -297,12 +297,10 @@ typedef struct
 
 } ENTITYTABLE;
 
-enum fent_table_e {
-	FENTTABLE_PLAYER		= 0x80000000,
-	FENTTABLE_REMOVED		= 0x40000000,
-	FENTTABLE_MOVEABLE		= 0x20000000,
-	FENTTABLE_GLOBAL		= 0x10000000
-};
+#define FENTTABLE_PLAYER		0x80000000
+#define FENTTABLE_REMOVED		0x40000000
+#define FENTTABLE_MOVEABLE		0x20000000
+#define FENTTABLE_GLOBAL		0x10000000
 
 typedef struct saverestore_s SAVERESTOREDATA;
 
@@ -316,7 +314,7 @@ struct saverestore_s
 	int			size;			// Current data size
 	int			bufferSize;		// Total space for data
 	int			tokenSize;		// Size of the linear list of tokens
-	unsigned int			tokenCount;		// Number of elements in the pTokens table
+	int			tokenCount;		// Number of elements in the pTokens table
 	char		**pTokens;		// Hash table of entity strings (sparse)
 	int			currentIndex;	// Holds a global entity table ID
 	int			tableCount;		// Number of elements in the entity table
@@ -372,9 +370,8 @@ typedef enum _fieldtypes
 #define DEFINE_ENTITY_GLOBAL_FIELD(name,fieldtype)	_FIELD(entvars_t, name, fieldtype, 1, FTYPEDESC_GLOBAL )
 #define DEFINE_GLOBAL_FIELD(type,name,fieldtype)	_FIELD(type, name, fieldtype, 1, FTYPEDESC_GLOBAL )
 
-enum g_ftype_desc_e {
-	FTYPEDESC_GLOBAL = 0x0001		// This field is masked for global entity save/restore
-};
+
+#define FTYPEDESC_GLOBAL			0x0001		// This field is masked for global entity save/restore
 
 typedef struct 
 {
@@ -444,7 +441,7 @@ typedef struct
 	void			(*pfnSetupVisibility)( struct edict_s *pViewEntity, struct edict_s *pClient, unsigned char **pvs, unsigned char **pas );
 	void			(*pfnUpdateClientData) ( const struct edict_s *ent, int sendweapons, struct clientdata_s *cd );
 	int				(*pfnAddToFullPack)( struct entity_state_s *state, int e, edict_t *ent, edict_t *host, int hostflags, int player, unsigned char *pSet );
-	void			(*pfnCreateBaseline) ( int player, int eindex, struct entity_state_s *baseline, struct edict_s *entity, int playermodelindex, Vector  player_mins, Vector  player_maxs );
+	void			(*pfnCreateBaseline) ( int player, int eindex, struct entity_state_s *baseline, struct edict_s *entity, int playermodelindex, vec3_t player_mins, vec3_t player_maxs );
 	void			(*pfnRegisterEncoders)	( void );
 	int				(*pfnGetWeaponData)		( struct edict_s *player, struct weapon_data_s *info );
 
diff --git a/src/public/engine/progdefs.h b/src/public/engine/progdefs.h
index 9205278e..10041d28 100644
--- a/src/public/engine/progdefs.h
+++ b/src/public/engine/progdefs.h
@@ -30,14 +30,14 @@ typedef struct
 	float		teamplay;
 	float		serverflags;
 	float		found_secrets;
-	Vector 		v_forward;
-	Vector 		v_up;
-	Vector 		v_right;
+	vec3_t		v_forward;
+	vec3_t		v_up;
+	vec3_t		v_right;
 	float		trace_allsolid;
 	float		trace_startsolid;
 	float		trace_fraction;
-	Vector 		trace_endpos;
-	Vector 		trace_plane_normal;
+	vec3_t		trace_endpos;
+	vec3_t		trace_plane_normal;
 	float		trace_plane_dist;
 	edict_t		*trace_ent;
 	float		trace_inopen;
@@ -46,13 +46,13 @@ typedef struct
 	int			trace_flags;
 	int			msg_entity;
 	int			cdAudioTrack;
-	unsigned int maxClients;
+	int			maxClients;
 	//int			PreCount;
-	unsigned int maxEntities;
+	int			maxEntities;
 	const char	*pStringBase;
 
 	void		*pSaveData;
-	Vector 		vecLandmarkOffset;
+	vec3_t		vecLandmarkOffset;
 } globalvars_t;
 
 
@@ -61,22 +61,22 @@ typedef struct entvars_s
 	string_t	classname;
 	string_t	globalname;
 
-	Vector 		origin;
-	Vector 		oldorigin;
-	Vector 		velocity;
-	Vector 		basevelocity;
-	Vector      clbasevelocity;  // Base velocity that was passed in to server physics so 
+	vec3_t		origin;
+	vec3_t		oldorigin;
+	vec3_t		velocity;
+	vec3_t		basevelocity;
+	vec3_t      clbasevelocity;  // Base velocity that was passed in to server physics so 
 							     //  client can predict conveyors correctly.  Server zeroes it, so we need to store here, too.
-	Vector 		movedir;
+	vec3_t		movedir;
 
-	Vector 		angles;			// Model angles
-	Vector 		avelocity;		// angle velocity (degrees per second)
-	Vector 		punchangle;		// auto-decaying view angle adjustment
-	Vector 		v_angle;		// Viewing angle (player only)
+	vec3_t		angles;			// Model angles
+	vec3_t		avelocity;		// angle velocity (degrees per second)
+	vec3_t		punchangle;		// auto-decaying view angle adjustment
+	vec3_t		v_angle;		// Viewing angle (player only)
 
 	// For parametric entities
-	Vector 		endpos;
-	Vector 		startpos;
+	vec3_t		endpos;
+	vec3_t		startpos;
 	float		impacttime;
 	float		starttime;
 
@@ -92,11 +92,11 @@ typedef struct entvars_s
 	int			viewmodel;		// player's viewmodel
 	int			weaponmodel;	// what other players see
 	
-	Vector 		absmin;		// BB max translated to world coord
-	Vector 		absmax;		// BB max translated to world coord
-	Vector 		mins;		// local BB min
-	Vector 		maxs;		// local BB max
-	Vector 		size;		// maxs - mins
+	vec3_t		absmin;		// BB max translated to world coord
+	vec3_t		absmax;		// BB max translated to world coord
+	vec3_t		mins;		// local BB min
+	vec3_t		maxs;		// local BB max
+	vec3_t		size;		// maxs - mins
 
 	float		ltime;
 	float		nextthink;
@@ -113,7 +113,7 @@ typedef struct entvars_s
 	
 	int			light_level;
 
-	unsigned int			sequence;		// animation sequence
+	int			sequence;		// animation sequence
 	int			gaitsequence;	// movement animation sequence for player (0 for none)
 	float		frame;			// % playback position in animation sequences (0..255)
 	float		animtime;		// world time when frame was set
@@ -125,7 +125,7 @@ typedef struct entvars_s
 
 	int			rendermode;
 	float		renderamt;
-	Vector 		rendercolor;
+	vec3_t		rendercolor;
 	int			renderfx;
 
 	float		health;
@@ -134,7 +134,7 @@ typedef struct entvars_s
 	float		takedamage;
 
 	int			deadflag;
-	Vector 		view_ofs;	// eye position
+	vec3_t		view_ofs;	// eye position
 
 	int			button;
 	int			impulse;
@@ -211,10 +211,10 @@ typedef struct entvars_s
 	float		fuser2;
 	float		fuser3;
 	float		fuser4;
-	Vector 		vuser1;
-	Vector 		vuser2;
-	Vector 		vuser3;
-	Vector 		vuser4;
+	vec3_t		vuser1;
+	vec3_t		vuser2;
+	vec3_t		vuser3;
+	vec3_t		vuser4;
 	edict_t		*euser1;
 	edict_t		*euser2;
 	edict_t		*euser3;
diff --git a/src/public/engine/shake.h b/src/public/engine/shake.h
index c18bdc54..a18ddc25 100644
--- a/src/public/engine/shake.h
+++ b/src/public/engine/shake.h
@@ -36,12 +36,12 @@ extern int V_ScreenFade( const char *pszName, int iSize, void *pbuf );
 
 // Fade in/out
 extern int gmsgFade;
-enum {
-	FFADE_IN			= 0x0000,		// Just here so we don't pass 0 into the function
-	FFADE_OUT			= 0x0001,		// Fade out (not in)
-	FFADE_MODULATE		= 0x0002,		// Modulate (don't blend)
-	FFADE_STAYOUT		= 0x0004		// ignores the duration, stays faded out until new ScreenFade message received
-};
+
+#define FFADE_IN			0x0000		// Just here so we don't pass 0 into the function
+#define FFADE_OUT			0x0001		// Fade out (not in)
+#define FFADE_MODULATE		0x0002		// Modulate (don't blend)
+#define FFADE_STAYOUT		0x0004		// ignores the duration, stays faded out until new ScreenFade message received
+
 // This structure is sent over the net to describe a screen fade event
 typedef struct
 {
diff --git a/src/public/engine/studio.h b/src/public/engine/studio.h
index 94d5228b..8cee1d4d 100644
--- a/src/public/engine/studio.h
+++ b/src/public/engine/studio.h
@@ -29,20 +29,20 @@ Studio models are position independent, so the cache manager can move them.
 */
 
 
-constexpr int MAXSTUDIOTRIANGLES	= 20000;	// TODO: tune this
-constexpr int MAXSTUDIOVERTS		= 2048;		// TODO: tune this
-constexpr int MAXSTUDIOSEQUENCES	= 2048;		// total animation sequences
-constexpr int MAXSTUDIOSKINS		= 100;		// total textures
-constexpr int MAXSTUDIOSRCBONES		= 512;		// bones allowed at source movement
-constexpr int MAXSTUDIOBONES		= 128;		// total bones actually used
-constexpr int MAXSTUDIOMODELS		= 32;		// sub-models per model
-constexpr int MAXSTUDIOBODYPARTS	= 32;
-constexpr int MAXSTUDIOGROUPS		= 16;
-constexpr int MAXSTUDIOANIMATIONS	= 2048;		// per sequence
-constexpr int MAXSTUDIOMESHES		= 256;
-constexpr int MAXSTUDIOEVENTS		= 1024;
-constexpr int MAXSTUDIOPIVOTS		= 256;
-constexpr int MAXSTUDIOCONTROLLERS	= 8;
+#define MAXSTUDIOTRIANGLES	20000	// TODO: tune this
+#define MAXSTUDIOVERTS		2048	// TODO: tune this
+#define MAXSTUDIOSEQUENCES	2048	// total animation sequences
+#define MAXSTUDIOSKINS		100		// total textures
+#define MAXSTUDIOSRCBONES	512		// bones allowed at source movement
+#define MAXSTUDIOBONES		128		// total bones actually used
+#define MAXSTUDIOMODELS		32		// sub-models per model
+#define MAXSTUDIOBODYPARTS	32
+#define MAXSTUDIOGROUPS		16
+#define MAXSTUDIOANIMATIONS	2048	// per sequence
+#define MAXSTUDIOMESHES		256
+#define MAXSTUDIOEVENTS		1024
+#define MAXSTUDIOPIVOTS		256
+#define MAXSTUDIOCONTROLLERS 8
 
 typedef struct 
 {
@@ -52,12 +52,12 @@ typedef struct
 	char				name[64];
 	int					length;
 
-	Vector 				eyeposition;	// ideal eye position
-	Vector 				min;			// ideal movement hull size
-	Vector 				max;			
+	vec3_t				eyeposition;	// ideal eye position
+	vec3_t				min;			// ideal movement hull size
+	vec3_t				max;			
 
-	Vector 				bbmin;			// clipping bounding box
-	Vector 				bbmax;		
+	vec3_t				bbmin;			// clipping bounding box
+	vec3_t				bbmax;		
 
 	int					flags;
 
@@ -70,7 +70,7 @@ typedef struct
 	int					numhitboxes;			// complex bounding boxes
 	int					hitboxindex;			
 	
-	unsigned int					numseq;				// animation sequences
+	int					numseq;				// animation sequences
 	int					seqindex;
 
 	int					numseqgroups;		// demand loaded sequences
@@ -137,8 +137,8 @@ typedef struct
 {
 	int					bone;
 	int					group;			// intersection group
-	Vector 				bbmin;		// bounding box
-	Vector 				bbmax;		
+	vec3_t				bbmin;		// bounding box
+	vec3_t				bbmax;		
 } mstudiobbox_t;
 
 #if !defined( CACHE_USER ) && !defined( QUAKEDEF_H )
@@ -169,7 +169,7 @@ typedef struct
 	int					activity;
 	int					actweight;
 
-	unsigned int		numevents;
+	int					numevents;
 	int					eventindex;
 
 	int					numframes;	// number of frames per sequence
@@ -179,12 +179,12 @@ typedef struct
 
 	int					motiontype;	
 	int					motionbone;
-	Vector 				linearmovement;
+	vec3_t				linearmovement;
 	int					automoveposindex;
 	int					automoveangleindex;
 
-	Vector 				bbmin;		// per sequence bounding box
-	Vector 				bbmax;		
+	vec3_t				bbmin;		// per sequence bounding box
+	vec3_t				bbmax;		
 
 	int					numblends;
 	int					animindex;		// mstudioanim_t pointer relative to start of sequence group data
@@ -219,7 +219,7 @@ typedef struct
 // pivots
 typedef struct 
 {
-	Vector 				org;	// pivot point
+	vec3_t				org;	// pivot point
 	int					start;
 	int					end;
 } mstudiopivot_t;
@@ -230,8 +230,8 @@ typedef struct
 	char				name[32];
 	int					type;
 	int					bone;
-	Vector 				org;	// attachment point
-	Vector 				vectors[3];
+	vec3_t				org;	// attachment point
+	vec3_t				vectors[3];
 } mstudioattachment_t;
 
 typedef struct
@@ -290,17 +290,17 @@ typedef struct
 
 	int					numverts;		// number of unique vertices
 	int					vertinfoindex;	// vertex bone info
-	int					vertindex;		// vertex Vector 
+	int					vertindex;		// vertex vec3_t
 	int					numnorms;		// number of unique surface normals
 	int					norminfoindex;	// normal bone info
-	int					normindex;		// normal Vector 
+	int					normindex;		// normal vec3_t
 
 	int					numgroups;		// deformation groups
 	int					groupindex;
 } mstudiomodel_t;
 
 
-// Vector 	boundingbox[model][bone][2];	// complex intersection info
+// vec3_t	boundingbox[model][bone][2];	// complex intersection info
 
 
 // meshes
@@ -310,7 +310,7 @@ typedef struct
 	int					triindex;
 	int					skinref;
 	int					numnorms;		// per mesh normals
-	int					normindex;		// normal Vector 
+	int					normindex;		// normal vec3_t
 } mstudiomesh_t;
 
 // triangles
@@ -324,58 +324,53 @@ typedef struct
 #endif
 
 // model flags
-enum {
-	EF_ROCKET	= 1,
-	EF_GRENADE	= 2,
-	EF_GIB		= 4,
-	EF_ROTATE	= 8,
-	EF_TRACER	= 16,
-	EF_ZOMGIB	= 32,
-	EF_TRACER2	= 64,
-	EF_TRACER3	= 128
-};
+#define	EF_ROCKET	1
+#define	EF_GRENADE	2
+#define	EF_GIB		4
+#define	EF_ROTATE	8
+#define	EF_TRACER	16
+#define	EF_ZOMGIB	32
+#define	EF_TRACER2	64
+#define	EF_TRACER3	128
+
 // lighting options
+#define STUDIO_NF_FLATSHADE		0x0001
+#define STUDIO_NF_CHROME		0x0002
+#define STUDIO_NF_FULLBRIGHT	0x0004
+#define STUDIO_NF_NOMIPS        0x0008
+#define STUDIO_NF_ALPHA         0x0010
+#define STUDIO_NF_ADDITIVE      0x0020
+#define STUDIO_NF_MASKED        0x0040
 
-enum {
-	STUDIO_NF_FLATSHADE		= 0x0001,
-	STUDIO_NF_CHROME		= 0x0002,
-	STUDIO_NF_FULLBRIGHT	= 0x0004,
-	STUDIO_NF_NOMIPS        = 0x0008,
-	STUDIO_NF_ALPHA         = 0x0010,
-	STUDIO_NF_ADDITIVE      = 0x0020,
-	STUDIO_NF_MASKED        = 0x0040
-};
 // motion flags
-enum {
-	STUDIO_X = 0x0001,
-	STUDIO_Y = 0x0002,
-	STUDIO_Z = 0x0004,
-	STUDIO_XR = 0x0008,
-	STUDIO_YR = 0x0010,
-	STUDIO_ZR = 0x0020,
-	STUDIO_LX = 0x0040,
-	STUDIO_LY = 0x0080,
-	STUDIO_LZ = 0x0100,
-	STUDIO_AX = 0x0200,
-	STUDIO_AY = 0x0400,
-	STUDIO_AZ = 0x0800,
-	STUDIO_AXR = 0x1000,
-	STUDIO_AYR = 0x2000,
-	STUDIO_AZR = 0x4000,
-	STUDIO_TYPES = 0x7FFF,
-	STUDIO_RLOOP = 0x8000,		// controller that wraps shortest distance
-	// sequence flags
-	STUDIO_LOOPING = 0x0001,
-};
-
-enum {
+#define STUDIO_X		0x0001
+#define STUDIO_Y		0x0002	
+#define STUDIO_Z		0x0004
+#define STUDIO_XR		0x0008
+#define STUDIO_YR		0x0010
+#define STUDIO_ZR		0x0020
+#define STUDIO_LX		0x0040
+#define STUDIO_LY		0x0080
+#define STUDIO_LZ		0x0100
+#define STUDIO_AX		0x0200
+#define STUDIO_AY		0x0400
+#define STUDIO_AZ		0x0800
+#define STUDIO_AXR		0x1000
+#define STUDIO_AYR		0x2000
+#define STUDIO_AZR		0x4000
+#define STUDIO_TYPES	0x7FFF
+#define STUDIO_RLOOP	0x8000	// controller that wraps shortest distance
+
+// sequence flags
+#define STUDIO_LOOPING	0x0001
+
 // bone flags
-	STUDIO_HAS_NORMALS	= 0x0001,
-	STUDIO_HAS_VERTICES = 0x0002,
-	STUDIO_HAS_BBOX		= 0x0004,
-	STUDIO_HAS_CHROME	= 0x0008		// if any of the textures have chrome on them
-};
-
-constexpr float RAD_TO_STUDIO		= (32768.0/PI);
-constexpr float STUDIO_TO_RAD		= (PI / 32768.0);
+#define STUDIO_HAS_NORMALS	0x0001
+#define STUDIO_HAS_VERTICES 0x0002
+#define STUDIO_HAS_BBOX		0x0004
+#define STUDIO_HAS_CHROME	0x0008	// if any of the textures have chrome on them
+
+#define RAD_TO_STUDIO		(32768.0/M_PI)
+#define STUDIO_TO_RAD		(M_PI/32768.0)
+
 #endif
diff --git a/src/public/interface.h b/src/public/interface.h
index 39cc0bf8..82b8fe04 100644
--- a/src/public/interface.h
+++ b/src/public/interface.h
@@ -43,8 +43,8 @@ class IBaseInterface
 	virtual			~IBaseInterface() {}
 };
 
-constexpr const char* CREATEINTERFACE_PROCNAME = "CreateInterface";
 
+#define CREATEINTERFACE_PROCNAME	"CreateInterface"
 typedef IBaseInterface* (*CreateInterfaceFn)(const char *pName, int *pReturnCode);
 
 
diff --git a/src/public/keydefs.h b/src/public/keydefs.h
index d5cc651c..590367b4 100644
--- a/src/public/keydefs.h
+++ b/src/public/keydefs.h
@@ -5,119 +5,120 @@
 #pragma once
 #endif
 
-
-enum {
-	//
-	// these are the key numbers that should be passed to Key_Event
-	//
-	K_TAB			= 9,
-	K_ENTER			= 13,
-	K_ESCAPE		= 27,
-	K_SPACE			= 32,
+//
+// these are the key numbers that should be passed to Key_Event
+//
+#define	K_TAB			9
+#define	K_ENTER			13
+#define	K_ESCAPE		27
+#define	K_SPACE			32
 
 // normal keys should be passed as lowercased ascii
 
-	K_BACKSPACE		= 127,
-	K_UPARROW		= 128,
-	K_DOWNARROW		= 129,
-	K_LEFTARROW		= 130,
-	K_RIGHTARROW	= 131,
-	K_ALT			= 132,
-	K_CTRL			= 133,
-	K_SHIFT			= 134,
-	K_F1			= 135,
-	K_F2			= 136,
-	K_F3			= 137,
-	K_F4			= 138,
-	K_F5			= 139,
-	K_F6			= 140,
-	K_F7			= 141,
-	K_F8			= 142,
-	K_F9			= 143,
-	K_F10			= 144,
-	K_F11			= 145,
-	K_F12			= 146,
-	K_INS			= 147,
-	K_DEL			= 148,
-	K_PGDN			= 149,
-	K_PGUP			= 150,
-	K_HOME			= 151,
-	K_END			= 152,
-	K_KP_HOME		= 160,
-	K_KP_UPARROW	= 161,
-	K_KP_PGUP		= 162,
-	K_KP_LEFTARROW	= 163,
-	K_KP_5			= 164,
-	K_KP_RIGHTARROW	= 165,
-	K_KP_END		= 166,
-	K_KP_DOWNARROW	= 167,
-	K_KP_PGDN		= 168,
-	K_KP_ENTER		= 169,
-	K_KP_INS   		= 170,
-	K_KP_DEL		= 171,
-	K_KP_SLASH		= 172,
-	K_KP_MINUS		= 173,
-	K_KP_PLUS		= 174,
-	K_CAPSLOCK		= 175,
-	K_KP_MUL		= 176,
-	K_WIN			= 177,
+#define	K_BACKSPACE		127
+#define	K_UPARROW		128
+#define	K_DOWNARROW		129
+#define	K_LEFTARROW		130
+#define	K_RIGHTARROW	131
+
+#define	K_ALT			132
+#define	K_CTRL			133
+#define	K_SHIFT			134
+#define	K_F1			135
+#define	K_F2			136
+#define	K_F3			137
+#define	K_F4			138
+#define	K_F5			139
+#define	K_F6			140
+#define	K_F7			141
+#define	K_F8			142
+#define	K_F9			143
+#define	K_F10			144
+#define	K_F11			145
+#define	K_F12			146
+#define	K_INS			147
+#define	K_DEL			148
+#define	K_PGDN			149
+#define	K_PGUP			150
+#define	K_HOME			151
+#define	K_END			152
+
+#define K_KP_HOME		160
+#define K_KP_UPARROW	161
+#define K_KP_PGUP		162
+#define	K_KP_LEFTARROW	163
+#define K_KP_5			164
+#define K_KP_RIGHTARROW	165
+#define K_KP_END		166
+#define K_KP_DOWNARROW	167
+#define K_KP_PGDN		168
+#define	K_KP_ENTER		169
+#define K_KP_INS   		170
+#define	K_KP_DEL		171
+#define K_KP_SLASH		172
+#define K_KP_MINUS		173
+#define K_KP_PLUS		174
+#define K_CAPSLOCK		175
+#define K_KP_MUL		176
+#define K_WIN			177
 
 
 //
 // joystick buttons
 //
-	K_JOY1			= 203,
-	K_JOY2			= 204,
-	K_JOY3			= 205,
-	K_JOY4			= 206,
+#define	K_JOY1			203
+#define	K_JOY2			204
+#define	K_JOY3			205
+#define	K_JOY4			206
 
 //
 // aux keys are for multi-buttoned joysticks to generate so they can use
 // the normal binding process
 //
-	K_AUX1			= 207,
-	K_AUX2			= 208,
-	K_AUX3			= 209,
-	K_AUX4			= 210,
-	K_AUX5			= 211,
-	K_AUX6			= 212,
-	K_AUX7			= 213,
-	K_AUX8			= 214,
-	K_AUX9			= 215,
-	K_AUX10			= 216,
-	K_AUX11			= 217,
-	K_AUX12			= 218,
-	K_AUX13			= 219,
-	K_AUX14			= 220,
-	K_AUX15			= 221,
-	K_AUX16			= 222,
-	K_AUX17			= 223,
-	K_AUX18			= 224,
-	K_AUX19			= 225,
-	K_AUX20			= 226,
-	K_AUX21			= 227,
-	K_AUX22			= 228,
-	K_AUX23			= 229,
-	K_AUX24			= 230,
-	K_AUX25			= 231,
-	K_AUX26			= 232,
-	K_AUX27			= 233,
-	K_AUX28			= 234,
-	K_AUX29			= 235,
-	K_AUX30			= 236,
-	K_AUX31			= 237,
-	K_AUX32			= 238,
-	K_MWHEELDOWN	= 239,
-	K_MWHEELUP		= 240,
-	K_PAUSE			= 255,
+#define	K_AUX1			207
+#define	K_AUX2			208
+#define	K_AUX3			209
+#define	K_AUX4			210
+#define	K_AUX5			211
+#define	K_AUX6			212
+#define	K_AUX7			213
+#define	K_AUX8			214
+#define	K_AUX9			215
+#define	K_AUX10			216
+#define	K_AUX11			217
+#define	K_AUX12			218
+#define	K_AUX13			219
+#define	K_AUX14			220
+#define	K_AUX15			221
+#define	K_AUX16			222
+#define	K_AUX17			223
+#define	K_AUX18			224
+#define	K_AUX19			225
+#define	K_AUX20			226
+#define	K_AUX21			227
+#define	K_AUX22			228
+#define	K_AUX23			229
+#define	K_AUX24			230
+#define	K_AUX25			231
+#define	K_AUX26			232
+#define	K_AUX27			233
+#define	K_AUX28			234
+#define	K_AUX29			235
+#define	K_AUX30			236
+#define	K_AUX31			237
+#define	K_AUX32			238
+#define K_MWHEELDOWN	239
+#define K_MWHEELUP		240
+
+#define K_PAUSE			255
 
 //
 // mouse buttons generate virtual keys
 //
-	K_MOUSE1		= 241,
-	K_MOUSE2		= 242,
-	K_MOUSE3		= 243,
-	K_MOUSE4		= 244,
-	K_MOUSE5		= 245
-};
+#define	K_MOUSE1		241
+#define	K_MOUSE2		242
+#define	K_MOUSE3		243
+#define K_MOUSE4		244
+#define K_MOUSE5		245
+
 #endif // KEYDEFS_H
\ No newline at end of file

From a9c9fa90988adbe6e51da09c17f1fde470aa42aa Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 26 Mar 2026 02:05:53 -0400
Subject: [PATCH 278/291] Revert "Reverted changes to all files in the
 src/[public folder."

This reverts commit b7928543fcb069fa257ca14f075e8720ec417ae1.
---
 src/game/shared/hl/vector.h  |   2 +-
 src/public/engine/cdll_int.h |   8 +-
 src/public/engine/eiface.h   |  31 +++---
 src/public/engine/progdefs.h |  64 ++++++------
 src/public/engine/shake.h    |  12 +--
 src/public/engine/studio.h   | 161 ++++++++++++++--------------
 src/public/interface.h       |   2 +-
 src/public/keydefs.h         | 197 +++++++++++++++++------------------
 8 files changed, 243 insertions(+), 234 deletions(-)

diff --git a/src/game/shared/hl/vector.h b/src/game/shared/hl/vector.h
index 4f2da586..e7637d43 100644
--- a/src/game/shared/hl/vector.h
+++ b/src/game/shared/hl/vector.h
@@ -149,6 +149,6 @@ inline float DotProduct(const Vector &a, const Vector &b) { return (a.x * b.x +
 //};
 
 inline Vector CrossProduct(const Vector &a, const Vector &b) { return Vector(a.y * b.z - a.z * b.y, a.z * b.x - a.x * b.z, a.x * b.y - a.y * b.x); }
-typedef Vector vec3_t;// temporary until we change all the files to use Vector.
+
 
 #endif
\ No newline at end of file
diff --git a/src/public/engine/cdll_int.h b/src/public/engine/cdll_int.h
index 90e7ae93..fb937c1c 100644
--- a/src/public/engine/cdll_int.h
+++ b/src/public/engine/cdll_int.h
@@ -33,8 +33,10 @@
 
 typedef int HLSPRITE; // handle to a graphic
 
-#define SCRINFO_SCREENFLASH 1
-#define SCRINFO_STRETCHED 2
+enum {
+	SCRINFO_SCREENFLASH = 1,
+	SCRINFO_STRETCHED = 2
+};
 
 typedef struct SCREENINFO_s
 {
@@ -86,7 +88,7 @@ typedef struct hud_player_info_s
 
 #include "in_buttons.h"
 
-#define CLDLL_INTERFACE_VERSION 7
+constexpr int CLDLL_INTERFACE_VERSION = 7;
 
 //#include "server.h" // server_static_t define for apiproxy
 #include "APIProxy.h"
diff --git a/src/public/engine/eiface.h b/src/public/engine/eiface.h
index 90be08d4..0af3ba2f 100644
--- a/src/public/engine/eiface.h
+++ b/src/public/engine/eiface.h
@@ -76,7 +76,7 @@ typedef struct
 	int		fInOpen;
 	int		fInWater;
 	float	flFraction;			// time completed, 1.0 = didn't hit anything
-	Vector vecEndPos;			// final position
+	Vector 	vecEndPos;			// final position
 	float	flPlaneDist;
 	Vector 	vecPlaneNormal;		// surface normal at impact
 	edict_t	*pHit;				// entity the surface is on
@@ -120,7 +120,7 @@ typedef struct enginefuncs_s
 	int			(*pfnGetEntityIllum)		(edict_t* pEnt);
 	edict_t*	(*pfnFindEntityInSphere)	(edict_t *pEdictStartSearchAfter, const float *org, float rad);
 	edict_t*	(*pfnFindClientInPVS)		(edict_t *pEdict);
-	edict_t* (*pfnEntitiesInPVS)			(edict_t *pplayer);
+	edict_t*    (*pfnEntitiesInPVS)			(edict_t *pplayer);
 	void		(*pfnMakeVectors)			(const float *rgflVector);
 	void		(*pfnAngleVectors)			(const float *rgflVector, float *forward, float *right, float *up);
 	edict_t*	(*pfnCreateEntity)			(void);
@@ -169,7 +169,7 @@ typedef struct enginefuncs_s
 	void*		(*pfnPvEntPrivateData)		(edict_t *pEdict);
 	void		(*pfnFreeEntPrivateData)	(edict_t *pEdict);
 	const char*	(*pfnSzFromIndex)			(int iString);
-	unsigned int			(*pfnAllocString)			(const char *szValue);
+	unsigned int		(*pfnAllocString)			(const char *szValue);
 	struct entvars_s*	(*pfnGetVarsOfEnt)			(edict_t *pEdict);
 	edict_t*	(*pfnPEntityOfEntOffset)	(int iEntOffset);
 	int			(*pfnEntOffsetOfPEntity)	(const edict_t *pEdict);
@@ -219,7 +219,7 @@ typedef struct enginefuncs_s
 	void		(*pfnBuildSoundMsg)			(edict_t *entity, int channel, const char *sample, /*int*/float volume, float attenuation, int fFlags, int pitch, int msg_dest, int msg_type, const float *pOrigin, edict_t *ed);
 	int			(*pfnIsDedicatedServer)		(void);// is this a dedicated server?
 	cvar_t		*(*pfnCVarGetPointer)		(const char *szVarName);
-	unsigned int (*pfnGetPlayerWONId)		(edict_t *e); // returns the server assigned WONid for this player.  useful for logging frags, etc.  returns -1 if the edict couldn't be found in the list of clients
+	int (*pfnGetPlayerWONId)				(edict_t *e); // returns the server assigned WONid for this player.  useful for logging frags, etc.  returns -1 if the edict couldn't be found in the list of clients
 
 	// YWB 8/1/99 TFF Physics additions
 	void		(*pfnInfo_RemoveKey)		(const char* s, const char *key );
@@ -281,9 +281,9 @@ typedef struct
 	char		mapName[ 32 ];
 	char		landmarkName[ 32 ];
 	edict_t	*pentLandmark;
-	Vector		vecLandmarkOrigin;
+	Vector 		vecLandmarkOrigin;
 } LEVELLIST;
-#define MAX_LEVEL_CONNECTIONS	16		// These are encoded in the lower 16bits of ENTITYTABLE->flags
+constexpr unsigned int MAX_LEVEL_CONNECTIONS = 16;		// These are encoded in the lower 16bits of ENTITYTABLE->flags
 
 typedef struct 
 {
@@ -297,10 +297,12 @@ typedef struct
 
 } ENTITYTABLE;
 
-#define FENTTABLE_PLAYER		0x80000000
-#define FENTTABLE_REMOVED		0x40000000
-#define FENTTABLE_MOVEABLE		0x20000000
-#define FENTTABLE_GLOBAL		0x10000000
+enum fent_table_e {
+	FENTTABLE_PLAYER		= 0x80000000,
+	FENTTABLE_REMOVED		= 0x40000000,
+	FENTTABLE_MOVEABLE		= 0x20000000,
+	FENTTABLE_GLOBAL		= 0x10000000
+};
 
 typedef struct saverestore_s SAVERESTOREDATA;
 
@@ -314,7 +316,7 @@ struct saverestore_s
 	int			size;			// Current data size
 	int			bufferSize;		// Total space for data
 	int			tokenSize;		// Size of the linear list of tokens
-	int			tokenCount;		// Number of elements in the pTokens table
+	unsigned int			tokenCount;		// Number of elements in the pTokens table
 	char		**pTokens;		// Hash table of entity strings (sparse)
 	int			currentIndex;	// Holds a global entity table ID
 	int			tableCount;		// Number of elements in the entity table
@@ -370,8 +372,9 @@ typedef enum _fieldtypes
 #define DEFINE_ENTITY_GLOBAL_FIELD(name,fieldtype)	_FIELD(entvars_t, name, fieldtype, 1, FTYPEDESC_GLOBAL )
 #define DEFINE_GLOBAL_FIELD(type,name,fieldtype)	_FIELD(type, name, fieldtype, 1, FTYPEDESC_GLOBAL )
 
-
-#define FTYPEDESC_GLOBAL			0x0001		// This field is masked for global entity save/restore
+enum g_ftype_desc_e {
+	FTYPEDESC_GLOBAL = 0x0001		// This field is masked for global entity save/restore
+};
 
 typedef struct 
 {
@@ -441,7 +444,7 @@ typedef struct
 	void			(*pfnSetupVisibility)( struct edict_s *pViewEntity, struct edict_s *pClient, unsigned char **pvs, unsigned char **pas );
 	void			(*pfnUpdateClientData) ( const struct edict_s *ent, int sendweapons, struct clientdata_s *cd );
 	int				(*pfnAddToFullPack)( struct entity_state_s *state, int e, edict_t *ent, edict_t *host, int hostflags, int player, unsigned char *pSet );
-	void			(*pfnCreateBaseline) ( int player, int eindex, struct entity_state_s *baseline, struct edict_s *entity, int playermodelindex, vec3_t player_mins, vec3_t player_maxs );
+	void			(*pfnCreateBaseline) ( int player, int eindex, struct entity_state_s *baseline, struct edict_s *entity, int playermodelindex, Vector  player_mins, Vector  player_maxs );
 	void			(*pfnRegisterEncoders)	( void );
 	int				(*pfnGetWeaponData)		( struct edict_s *player, struct weapon_data_s *info );
 
diff --git a/src/public/engine/progdefs.h b/src/public/engine/progdefs.h
index 10041d28..9205278e 100644
--- a/src/public/engine/progdefs.h
+++ b/src/public/engine/progdefs.h
@@ -30,14 +30,14 @@ typedef struct
 	float		teamplay;
 	float		serverflags;
 	float		found_secrets;
-	vec3_t		v_forward;
-	vec3_t		v_up;
-	vec3_t		v_right;
+	Vector 		v_forward;
+	Vector 		v_up;
+	Vector 		v_right;
 	float		trace_allsolid;
 	float		trace_startsolid;
 	float		trace_fraction;
-	vec3_t		trace_endpos;
-	vec3_t		trace_plane_normal;
+	Vector 		trace_endpos;
+	Vector 		trace_plane_normal;
 	float		trace_plane_dist;
 	edict_t		*trace_ent;
 	float		trace_inopen;
@@ -46,13 +46,13 @@ typedef struct
 	int			trace_flags;
 	int			msg_entity;
 	int			cdAudioTrack;
-	int			maxClients;
+	unsigned int maxClients;
 	//int			PreCount;
-	int			maxEntities;
+	unsigned int maxEntities;
 	const char	*pStringBase;
 
 	void		*pSaveData;
-	vec3_t		vecLandmarkOffset;
+	Vector 		vecLandmarkOffset;
 } globalvars_t;
 
 
@@ -61,22 +61,22 @@ typedef struct entvars_s
 	string_t	classname;
 	string_t	globalname;
 
-	vec3_t		origin;
-	vec3_t		oldorigin;
-	vec3_t		velocity;
-	vec3_t		basevelocity;
-	vec3_t      clbasevelocity;  // Base velocity that was passed in to server physics so 
+	Vector 		origin;
+	Vector 		oldorigin;
+	Vector 		velocity;
+	Vector 		basevelocity;
+	Vector      clbasevelocity;  // Base velocity that was passed in to server physics so 
 							     //  client can predict conveyors correctly.  Server zeroes it, so we need to store here, too.
-	vec3_t		movedir;
+	Vector 		movedir;
 
-	vec3_t		angles;			// Model angles
-	vec3_t		avelocity;		// angle velocity (degrees per second)
-	vec3_t		punchangle;		// auto-decaying view angle adjustment
-	vec3_t		v_angle;		// Viewing angle (player only)
+	Vector 		angles;			// Model angles
+	Vector 		avelocity;		// angle velocity (degrees per second)
+	Vector 		punchangle;		// auto-decaying view angle adjustment
+	Vector 		v_angle;		// Viewing angle (player only)
 
 	// For parametric entities
-	vec3_t		endpos;
-	vec3_t		startpos;
+	Vector 		endpos;
+	Vector 		startpos;
 	float		impacttime;
 	float		starttime;
 
@@ -92,11 +92,11 @@ typedef struct entvars_s
 	int			viewmodel;		// player's viewmodel
 	int			weaponmodel;	// what other players see
 	
-	vec3_t		absmin;		// BB max translated to world coord
-	vec3_t		absmax;		// BB max translated to world coord
-	vec3_t		mins;		// local BB min
-	vec3_t		maxs;		// local BB max
-	vec3_t		size;		// maxs - mins
+	Vector 		absmin;		// BB max translated to world coord
+	Vector 		absmax;		// BB max translated to world coord
+	Vector 		mins;		// local BB min
+	Vector 		maxs;		// local BB max
+	Vector 		size;		// maxs - mins
 
 	float		ltime;
 	float		nextthink;
@@ -113,7 +113,7 @@ typedef struct entvars_s
 	
 	int			light_level;
 
-	int			sequence;		// animation sequence
+	unsigned int			sequence;		// animation sequence
 	int			gaitsequence;	// movement animation sequence for player (0 for none)
 	float		frame;			// % playback position in animation sequences (0..255)
 	float		animtime;		// world time when frame was set
@@ -125,7 +125,7 @@ typedef struct entvars_s
 
 	int			rendermode;
 	float		renderamt;
-	vec3_t		rendercolor;
+	Vector 		rendercolor;
 	int			renderfx;
 
 	float		health;
@@ -134,7 +134,7 @@ typedef struct entvars_s
 	float		takedamage;
 
 	int			deadflag;
-	vec3_t		view_ofs;	// eye position
+	Vector 		view_ofs;	// eye position
 
 	int			button;
 	int			impulse;
@@ -211,10 +211,10 @@ typedef struct entvars_s
 	float		fuser2;
 	float		fuser3;
 	float		fuser4;
-	vec3_t		vuser1;
-	vec3_t		vuser2;
-	vec3_t		vuser3;
-	vec3_t		vuser4;
+	Vector 		vuser1;
+	Vector 		vuser2;
+	Vector 		vuser3;
+	Vector 		vuser4;
 	edict_t		*euser1;
 	edict_t		*euser2;
 	edict_t		*euser3;
diff --git a/src/public/engine/shake.h b/src/public/engine/shake.h
index a18ddc25..c18bdc54 100644
--- a/src/public/engine/shake.h
+++ b/src/public/engine/shake.h
@@ -36,12 +36,12 @@ extern int V_ScreenFade( const char *pszName, int iSize, void *pbuf );
 
 // Fade in/out
 extern int gmsgFade;
-
-#define FFADE_IN			0x0000		// Just here so we don't pass 0 into the function
-#define FFADE_OUT			0x0001		// Fade out (not in)
-#define FFADE_MODULATE		0x0002		// Modulate (don't blend)
-#define FFADE_STAYOUT		0x0004		// ignores the duration, stays faded out until new ScreenFade message received
-
+enum {
+	FFADE_IN			= 0x0000,		// Just here so we don't pass 0 into the function
+	FFADE_OUT			= 0x0001,		// Fade out (not in)
+	FFADE_MODULATE		= 0x0002,		// Modulate (don't blend)
+	FFADE_STAYOUT		= 0x0004		// ignores the duration, stays faded out until new ScreenFade message received
+};
 // This structure is sent over the net to describe a screen fade event
 typedef struct
 {
diff --git a/src/public/engine/studio.h b/src/public/engine/studio.h
index 8cee1d4d..94d5228b 100644
--- a/src/public/engine/studio.h
+++ b/src/public/engine/studio.h
@@ -29,20 +29,20 @@ Studio models are position independent, so the cache manager can move them.
 */
 
 
-#define MAXSTUDIOTRIANGLES	20000	// TODO: tune this
-#define MAXSTUDIOVERTS		2048	// TODO: tune this
-#define MAXSTUDIOSEQUENCES	2048	// total animation sequences
-#define MAXSTUDIOSKINS		100		// total textures
-#define MAXSTUDIOSRCBONES	512		// bones allowed at source movement
-#define MAXSTUDIOBONES		128		// total bones actually used
-#define MAXSTUDIOMODELS		32		// sub-models per model
-#define MAXSTUDIOBODYPARTS	32
-#define MAXSTUDIOGROUPS		16
-#define MAXSTUDIOANIMATIONS	2048	// per sequence
-#define MAXSTUDIOMESHES		256
-#define MAXSTUDIOEVENTS		1024
-#define MAXSTUDIOPIVOTS		256
-#define MAXSTUDIOCONTROLLERS 8
+constexpr int MAXSTUDIOTRIANGLES	= 20000;	// TODO: tune this
+constexpr int MAXSTUDIOVERTS		= 2048;		// TODO: tune this
+constexpr int MAXSTUDIOSEQUENCES	= 2048;		// total animation sequences
+constexpr int MAXSTUDIOSKINS		= 100;		// total textures
+constexpr int MAXSTUDIOSRCBONES		= 512;		// bones allowed at source movement
+constexpr int MAXSTUDIOBONES		= 128;		// total bones actually used
+constexpr int MAXSTUDIOMODELS		= 32;		// sub-models per model
+constexpr int MAXSTUDIOBODYPARTS	= 32;
+constexpr int MAXSTUDIOGROUPS		= 16;
+constexpr int MAXSTUDIOANIMATIONS	= 2048;		// per sequence
+constexpr int MAXSTUDIOMESHES		= 256;
+constexpr int MAXSTUDIOEVENTS		= 1024;
+constexpr int MAXSTUDIOPIVOTS		= 256;
+constexpr int MAXSTUDIOCONTROLLERS	= 8;
 
 typedef struct 
 {
@@ -52,12 +52,12 @@ typedef struct
 	char				name[64];
 	int					length;
 
-	vec3_t				eyeposition;	// ideal eye position
-	vec3_t				min;			// ideal movement hull size
-	vec3_t				max;			
+	Vector 				eyeposition;	// ideal eye position
+	Vector 				min;			// ideal movement hull size
+	Vector 				max;			
 
-	vec3_t				bbmin;			// clipping bounding box
-	vec3_t				bbmax;		
+	Vector 				bbmin;			// clipping bounding box
+	Vector 				bbmax;		
 
 	int					flags;
 
@@ -70,7 +70,7 @@ typedef struct
 	int					numhitboxes;			// complex bounding boxes
 	int					hitboxindex;			
 	
-	int					numseq;				// animation sequences
+	unsigned int					numseq;				// animation sequences
 	int					seqindex;
 
 	int					numseqgroups;		// demand loaded sequences
@@ -137,8 +137,8 @@ typedef struct
 {
 	int					bone;
 	int					group;			// intersection group
-	vec3_t				bbmin;		// bounding box
-	vec3_t				bbmax;		
+	Vector 				bbmin;		// bounding box
+	Vector 				bbmax;		
 } mstudiobbox_t;
 
 #if !defined( CACHE_USER ) && !defined( QUAKEDEF_H )
@@ -169,7 +169,7 @@ typedef struct
 	int					activity;
 	int					actweight;
 
-	int					numevents;
+	unsigned int		numevents;
 	int					eventindex;
 
 	int					numframes;	// number of frames per sequence
@@ -179,12 +179,12 @@ typedef struct
 
 	int					motiontype;	
 	int					motionbone;
-	vec3_t				linearmovement;
+	Vector 				linearmovement;
 	int					automoveposindex;
 	int					automoveangleindex;
 
-	vec3_t				bbmin;		// per sequence bounding box
-	vec3_t				bbmax;		
+	Vector 				bbmin;		// per sequence bounding box
+	Vector 				bbmax;		
 
 	int					numblends;
 	int					animindex;		// mstudioanim_t pointer relative to start of sequence group data
@@ -219,7 +219,7 @@ typedef struct
 // pivots
 typedef struct 
 {
-	vec3_t				org;	// pivot point
+	Vector 				org;	// pivot point
 	int					start;
 	int					end;
 } mstudiopivot_t;
@@ -230,8 +230,8 @@ typedef struct
 	char				name[32];
 	int					type;
 	int					bone;
-	vec3_t				org;	// attachment point
-	vec3_t				vectors[3];
+	Vector 				org;	// attachment point
+	Vector 				vectors[3];
 } mstudioattachment_t;
 
 typedef struct
@@ -290,17 +290,17 @@ typedef struct
 
 	int					numverts;		// number of unique vertices
 	int					vertinfoindex;	// vertex bone info
-	int					vertindex;		// vertex vec3_t
+	int					vertindex;		// vertex Vector 
 	int					numnorms;		// number of unique surface normals
 	int					norminfoindex;	// normal bone info
-	int					normindex;		// normal vec3_t
+	int					normindex;		// normal Vector 
 
 	int					numgroups;		// deformation groups
 	int					groupindex;
 } mstudiomodel_t;
 
 
-// vec3_t	boundingbox[model][bone][2];	// complex intersection info
+// Vector 	boundingbox[model][bone][2];	// complex intersection info
 
 
 // meshes
@@ -310,7 +310,7 @@ typedef struct
 	int					triindex;
 	int					skinref;
 	int					numnorms;		// per mesh normals
-	int					normindex;		// normal vec3_t
+	int					normindex;		// normal Vector 
 } mstudiomesh_t;
 
 // triangles
@@ -324,53 +324,58 @@ typedef struct
 #endif
 
 // model flags
-#define	EF_ROCKET	1
-#define	EF_GRENADE	2
-#define	EF_GIB		4
-#define	EF_ROTATE	8
-#define	EF_TRACER	16
-#define	EF_ZOMGIB	32
-#define	EF_TRACER2	64
-#define	EF_TRACER3	128
-
+enum {
+	EF_ROCKET	= 1,
+	EF_GRENADE	= 2,
+	EF_GIB		= 4,
+	EF_ROTATE	= 8,
+	EF_TRACER	= 16,
+	EF_ZOMGIB	= 32,
+	EF_TRACER2	= 64,
+	EF_TRACER3	= 128
+};
 // lighting options
-#define STUDIO_NF_FLATSHADE		0x0001
-#define STUDIO_NF_CHROME		0x0002
-#define STUDIO_NF_FULLBRIGHT	0x0004
-#define STUDIO_NF_NOMIPS        0x0008
-#define STUDIO_NF_ALPHA         0x0010
-#define STUDIO_NF_ADDITIVE      0x0020
-#define STUDIO_NF_MASKED        0x0040
 
+enum {
+	STUDIO_NF_FLATSHADE		= 0x0001,
+	STUDIO_NF_CHROME		= 0x0002,
+	STUDIO_NF_FULLBRIGHT	= 0x0004,
+	STUDIO_NF_NOMIPS        = 0x0008,
+	STUDIO_NF_ALPHA         = 0x0010,
+	STUDIO_NF_ADDITIVE      = 0x0020,
+	STUDIO_NF_MASKED        = 0x0040
+};
 // motion flags
-#define STUDIO_X		0x0001
-#define STUDIO_Y		0x0002	
-#define STUDIO_Z		0x0004
-#define STUDIO_XR		0x0008
-#define STUDIO_YR		0x0010
-#define STUDIO_ZR		0x0020
-#define STUDIO_LX		0x0040
-#define STUDIO_LY		0x0080
-#define STUDIO_LZ		0x0100
-#define STUDIO_AX		0x0200
-#define STUDIO_AY		0x0400
-#define STUDIO_AZ		0x0800
-#define STUDIO_AXR		0x1000
-#define STUDIO_AYR		0x2000
-#define STUDIO_AZR		0x4000
-#define STUDIO_TYPES	0x7FFF
-#define STUDIO_RLOOP	0x8000	// controller that wraps shortest distance
-
-// sequence flags
-#define STUDIO_LOOPING	0x0001
-
+enum {
+	STUDIO_X = 0x0001,
+	STUDIO_Y = 0x0002,
+	STUDIO_Z = 0x0004,
+	STUDIO_XR = 0x0008,
+	STUDIO_YR = 0x0010,
+	STUDIO_ZR = 0x0020,
+	STUDIO_LX = 0x0040,
+	STUDIO_LY = 0x0080,
+	STUDIO_LZ = 0x0100,
+	STUDIO_AX = 0x0200,
+	STUDIO_AY = 0x0400,
+	STUDIO_AZ = 0x0800,
+	STUDIO_AXR = 0x1000,
+	STUDIO_AYR = 0x2000,
+	STUDIO_AZR = 0x4000,
+	STUDIO_TYPES = 0x7FFF,
+	STUDIO_RLOOP = 0x8000,		// controller that wraps shortest distance
+	// sequence flags
+	STUDIO_LOOPING = 0x0001,
+};
+
+enum {
 // bone flags
-#define STUDIO_HAS_NORMALS	0x0001
-#define STUDIO_HAS_VERTICES 0x0002
-#define STUDIO_HAS_BBOX		0x0004
-#define STUDIO_HAS_CHROME	0x0008	// if any of the textures have chrome on them
-
-#define RAD_TO_STUDIO		(32768.0/M_PI)
-#define STUDIO_TO_RAD		(M_PI/32768.0)
-
+	STUDIO_HAS_NORMALS	= 0x0001,
+	STUDIO_HAS_VERTICES = 0x0002,
+	STUDIO_HAS_BBOX		= 0x0004,
+	STUDIO_HAS_CHROME	= 0x0008		// if any of the textures have chrome on them
+};
+
+constexpr float RAD_TO_STUDIO		= (32768.0/PI);
+constexpr float STUDIO_TO_RAD		= (PI / 32768.0);
 #endif
diff --git a/src/public/interface.h b/src/public/interface.h
index 82b8fe04..39cc0bf8 100644
--- a/src/public/interface.h
+++ b/src/public/interface.h
@@ -43,8 +43,8 @@ class IBaseInterface
 	virtual			~IBaseInterface() {}
 };
 
+constexpr const char* CREATEINTERFACE_PROCNAME = "CreateInterface";
 
-#define CREATEINTERFACE_PROCNAME	"CreateInterface"
 typedef IBaseInterface* (*CreateInterfaceFn)(const char *pName, int *pReturnCode);
 
 
diff --git a/src/public/keydefs.h b/src/public/keydefs.h
index 590367b4..d5cc651c 100644
--- a/src/public/keydefs.h
+++ b/src/public/keydefs.h
@@ -5,120 +5,119 @@
 #pragma once
 #endif
 
-//
-// these are the key numbers that should be passed to Key_Event
-//
-#define	K_TAB			9
-#define	K_ENTER			13
-#define	K_ESCAPE		27
-#define	K_SPACE			32
-
-// normal keys should be passed as lowercased ascii
 
-#define	K_BACKSPACE		127
-#define	K_UPARROW		128
-#define	K_DOWNARROW		129
-#define	K_LEFTARROW		130
-#define	K_RIGHTARROW	131
+enum {
+	//
+	// these are the key numbers that should be passed to Key_Event
+	//
+	K_TAB			= 9,
+	K_ENTER			= 13,
+	K_ESCAPE		= 27,
+	K_SPACE			= 32,
 
-#define	K_ALT			132
-#define	K_CTRL			133
-#define	K_SHIFT			134
-#define	K_F1			135
-#define	K_F2			136
-#define	K_F3			137
-#define	K_F4			138
-#define	K_F5			139
-#define	K_F6			140
-#define	K_F7			141
-#define	K_F8			142
-#define	K_F9			143
-#define	K_F10			144
-#define	K_F11			145
-#define	K_F12			146
-#define	K_INS			147
-#define	K_DEL			148
-#define	K_PGDN			149
-#define	K_PGUP			150
-#define	K_HOME			151
-#define	K_END			152
+// normal keys should be passed as lowercased ascii
 
-#define K_KP_HOME		160
-#define K_KP_UPARROW	161
-#define K_KP_PGUP		162
-#define	K_KP_LEFTARROW	163
-#define K_KP_5			164
-#define K_KP_RIGHTARROW	165
-#define K_KP_END		166
-#define K_KP_DOWNARROW	167
-#define K_KP_PGDN		168
-#define	K_KP_ENTER		169
-#define K_KP_INS   		170
-#define	K_KP_DEL		171
-#define K_KP_SLASH		172
-#define K_KP_MINUS		173
-#define K_KP_PLUS		174
-#define K_CAPSLOCK		175
-#define K_KP_MUL		176
-#define K_WIN			177
+	K_BACKSPACE		= 127,
+	K_UPARROW		= 128,
+	K_DOWNARROW		= 129,
+	K_LEFTARROW		= 130,
+	K_RIGHTARROW	= 131,
+	K_ALT			= 132,
+	K_CTRL			= 133,
+	K_SHIFT			= 134,
+	K_F1			= 135,
+	K_F2			= 136,
+	K_F3			= 137,
+	K_F4			= 138,
+	K_F5			= 139,
+	K_F6			= 140,
+	K_F7			= 141,
+	K_F8			= 142,
+	K_F9			= 143,
+	K_F10			= 144,
+	K_F11			= 145,
+	K_F12			= 146,
+	K_INS			= 147,
+	K_DEL			= 148,
+	K_PGDN			= 149,
+	K_PGUP			= 150,
+	K_HOME			= 151,
+	K_END			= 152,
+	K_KP_HOME		= 160,
+	K_KP_UPARROW	= 161,
+	K_KP_PGUP		= 162,
+	K_KP_LEFTARROW	= 163,
+	K_KP_5			= 164,
+	K_KP_RIGHTARROW	= 165,
+	K_KP_END		= 166,
+	K_KP_DOWNARROW	= 167,
+	K_KP_PGDN		= 168,
+	K_KP_ENTER		= 169,
+	K_KP_INS   		= 170,
+	K_KP_DEL		= 171,
+	K_KP_SLASH		= 172,
+	K_KP_MINUS		= 173,
+	K_KP_PLUS		= 174,
+	K_CAPSLOCK		= 175,
+	K_KP_MUL		= 176,
+	K_WIN			= 177,
 
 
 //
 // joystick buttons
 //
-#define	K_JOY1			203
-#define	K_JOY2			204
-#define	K_JOY3			205
-#define	K_JOY4			206
+	K_JOY1			= 203,
+	K_JOY2			= 204,
+	K_JOY3			= 205,
+	K_JOY4			= 206,
 
 //
 // aux keys are for multi-buttoned joysticks to generate so they can use
 // the normal binding process
 //
-#define	K_AUX1			207
-#define	K_AUX2			208
-#define	K_AUX3			209
-#define	K_AUX4			210
-#define	K_AUX5			211
-#define	K_AUX6			212
-#define	K_AUX7			213
-#define	K_AUX8			214
-#define	K_AUX9			215
-#define	K_AUX10			216
-#define	K_AUX11			217
-#define	K_AUX12			218
-#define	K_AUX13			219
-#define	K_AUX14			220
-#define	K_AUX15			221
-#define	K_AUX16			222
-#define	K_AUX17			223
-#define	K_AUX18			224
-#define	K_AUX19			225
-#define	K_AUX20			226
-#define	K_AUX21			227
-#define	K_AUX22			228
-#define	K_AUX23			229
-#define	K_AUX24			230
-#define	K_AUX25			231
-#define	K_AUX26			232
-#define	K_AUX27			233
-#define	K_AUX28			234
-#define	K_AUX29			235
-#define	K_AUX30			236
-#define	K_AUX31			237
-#define	K_AUX32			238
-#define K_MWHEELDOWN	239
-#define K_MWHEELUP		240
-
-#define K_PAUSE			255
+	K_AUX1			= 207,
+	K_AUX2			= 208,
+	K_AUX3			= 209,
+	K_AUX4			= 210,
+	K_AUX5			= 211,
+	K_AUX6			= 212,
+	K_AUX7			= 213,
+	K_AUX8			= 214,
+	K_AUX9			= 215,
+	K_AUX10			= 216,
+	K_AUX11			= 217,
+	K_AUX12			= 218,
+	K_AUX13			= 219,
+	K_AUX14			= 220,
+	K_AUX15			= 221,
+	K_AUX16			= 222,
+	K_AUX17			= 223,
+	K_AUX18			= 224,
+	K_AUX19			= 225,
+	K_AUX20			= 226,
+	K_AUX21			= 227,
+	K_AUX22			= 228,
+	K_AUX23			= 229,
+	K_AUX24			= 230,
+	K_AUX25			= 231,
+	K_AUX26			= 232,
+	K_AUX27			= 233,
+	K_AUX28			= 234,
+	K_AUX29			= 235,
+	K_AUX30			= 236,
+	K_AUX31			= 237,
+	K_AUX32			= 238,
+	K_MWHEELDOWN	= 239,
+	K_MWHEELUP		= 240,
+	K_PAUSE			= 255,
 
 //
 // mouse buttons generate virtual keys
 //
-#define	K_MOUSE1		241
-#define	K_MOUSE2		242
-#define	K_MOUSE3		243
-#define K_MOUSE4		244
-#define K_MOUSE5		245
-
+	K_MOUSE1		= 241,
+	K_MOUSE2		= 242,
+	K_MOUSE3		= 243,
+	K_MOUSE4		= 244,
+	K_MOUSE5		= 245
+};
 #endif // KEYDEFS_H
\ No newline at end of file

From e1ca1eacd9df81731bc6c06d34c79907a5f2ee52 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 26 Mar 2026 02:09:25 -0400
Subject: [PATCH 279/291] Reverted changeds to cdll_int.h

---
 src/public/engine/cdll_int.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/public/engine/cdll_int.h b/src/public/engine/cdll_int.h
index fb937c1c..90e7ae93 100644
--- a/src/public/engine/cdll_int.h
+++ b/src/public/engine/cdll_int.h
@@ -33,10 +33,8 @@
 
 typedef int HLSPRITE; // handle to a graphic
 
-enum {
-	SCRINFO_SCREENFLASH = 1,
-	SCRINFO_STRETCHED = 2
-};
+#define SCRINFO_SCREENFLASH 1
+#define SCRINFO_STRETCHED 2
 
 typedef struct SCREENINFO_s
 {
@@ -88,7 +86,7 @@ typedef struct hud_player_info_s
 
 #include "in_buttons.h"
 
-constexpr int CLDLL_INTERFACE_VERSION = 7;
+#define CLDLL_INTERFACE_VERSION 7
 
 //#include "server.h" // server_static_t define for apiproxy
 #include "APIProxy.h"

From e54d19c7043aa886af0d3d7eb5120095bf66250c Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 26 Mar 2026 02:18:07 -0400
Subject: [PATCH 280/291] Reverting changes to shake.h

---
 src/public/engine/shake.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/public/engine/shake.h b/src/public/engine/shake.h
index c18bdc54..a18ddc25 100644
--- a/src/public/engine/shake.h
+++ b/src/public/engine/shake.h
@@ -36,12 +36,12 @@ extern int V_ScreenFade( const char *pszName, int iSize, void *pbuf );
 
 // Fade in/out
 extern int gmsgFade;
-enum {
-	FFADE_IN			= 0x0000,		// Just here so we don't pass 0 into the function
-	FFADE_OUT			= 0x0001,		// Fade out (not in)
-	FFADE_MODULATE		= 0x0002,		// Modulate (don't blend)
-	FFADE_STAYOUT		= 0x0004		// ignores the duration, stays faded out until new ScreenFade message received
-};
+
+#define FFADE_IN			0x0000		// Just here so we don't pass 0 into the function
+#define FFADE_OUT			0x0001		// Fade out (not in)
+#define FFADE_MODULATE		0x0002		// Modulate (don't blend)
+#define FFADE_STAYOUT		0x0004		// ignores the duration, stays faded out until new ScreenFade message received
+
 // This structure is sent over the net to describe a screen fade event
 typedef struct
 {

From ae9fe79ed5689114562cd70f924da69c60078d9c Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 26 Mar 2026 02:18:42 -0400
Subject: [PATCH 281/291] reverting changes to two files.

---
 src/public/interface.h |   2 +-
 src/public/keydefs.h   | 197 +++++++++++++++++++++--------------------
 2 files changed, 100 insertions(+), 99 deletions(-)

diff --git a/src/public/interface.h b/src/public/interface.h
index 39cc0bf8..82b8fe04 100644
--- a/src/public/interface.h
+++ b/src/public/interface.h
@@ -43,8 +43,8 @@ class IBaseInterface
 	virtual			~IBaseInterface() {}
 };
 
-constexpr const char* CREATEINTERFACE_PROCNAME = "CreateInterface";
 
+#define CREATEINTERFACE_PROCNAME	"CreateInterface"
 typedef IBaseInterface* (*CreateInterfaceFn)(const char *pName, int *pReturnCode);
 
 
diff --git a/src/public/keydefs.h b/src/public/keydefs.h
index d5cc651c..590367b4 100644
--- a/src/public/keydefs.h
+++ b/src/public/keydefs.h
@@ -5,119 +5,120 @@
 #pragma once
 #endif
 
-
-enum {
-	//
-	// these are the key numbers that should be passed to Key_Event
-	//
-	K_TAB			= 9,
-	K_ENTER			= 13,
-	K_ESCAPE		= 27,
-	K_SPACE			= 32,
+//
+// these are the key numbers that should be passed to Key_Event
+//
+#define	K_TAB			9
+#define	K_ENTER			13
+#define	K_ESCAPE		27
+#define	K_SPACE			32
 
 // normal keys should be passed as lowercased ascii
 
-	K_BACKSPACE		= 127,
-	K_UPARROW		= 128,
-	K_DOWNARROW		= 129,
-	K_LEFTARROW		= 130,
-	K_RIGHTARROW	= 131,
-	K_ALT			= 132,
-	K_CTRL			= 133,
-	K_SHIFT			= 134,
-	K_F1			= 135,
-	K_F2			= 136,
-	K_F3			= 137,
-	K_F4			= 138,
-	K_F5			= 139,
-	K_F6			= 140,
-	K_F7			= 141,
-	K_F8			= 142,
-	K_F9			= 143,
-	K_F10			= 144,
-	K_F11			= 145,
-	K_F12			= 146,
-	K_INS			= 147,
-	K_DEL			= 148,
-	K_PGDN			= 149,
-	K_PGUP			= 150,
-	K_HOME			= 151,
-	K_END			= 152,
-	K_KP_HOME		= 160,
-	K_KP_UPARROW	= 161,
-	K_KP_PGUP		= 162,
-	K_KP_LEFTARROW	= 163,
-	K_KP_5			= 164,
-	K_KP_RIGHTARROW	= 165,
-	K_KP_END		= 166,
-	K_KP_DOWNARROW	= 167,
-	K_KP_PGDN		= 168,
-	K_KP_ENTER		= 169,
-	K_KP_INS   		= 170,
-	K_KP_DEL		= 171,
-	K_KP_SLASH		= 172,
-	K_KP_MINUS		= 173,
-	K_KP_PLUS		= 174,
-	K_CAPSLOCK		= 175,
-	K_KP_MUL		= 176,
-	K_WIN			= 177,
+#define	K_BACKSPACE		127
+#define	K_UPARROW		128
+#define	K_DOWNARROW		129
+#define	K_LEFTARROW		130
+#define	K_RIGHTARROW	131
+
+#define	K_ALT			132
+#define	K_CTRL			133
+#define	K_SHIFT			134
+#define	K_F1			135
+#define	K_F2			136
+#define	K_F3			137
+#define	K_F4			138
+#define	K_F5			139
+#define	K_F6			140
+#define	K_F7			141
+#define	K_F8			142
+#define	K_F9			143
+#define	K_F10			144
+#define	K_F11			145
+#define	K_F12			146
+#define	K_INS			147
+#define	K_DEL			148
+#define	K_PGDN			149
+#define	K_PGUP			150
+#define	K_HOME			151
+#define	K_END			152
+
+#define K_KP_HOME		160
+#define K_KP_UPARROW	161
+#define K_KP_PGUP		162
+#define	K_KP_LEFTARROW	163
+#define K_KP_5			164
+#define K_KP_RIGHTARROW	165
+#define K_KP_END		166
+#define K_KP_DOWNARROW	167
+#define K_KP_PGDN		168
+#define	K_KP_ENTER		169
+#define K_KP_INS   		170
+#define	K_KP_DEL		171
+#define K_KP_SLASH		172
+#define K_KP_MINUS		173
+#define K_KP_PLUS		174
+#define K_CAPSLOCK		175
+#define K_KP_MUL		176
+#define K_WIN			177
 
 
 //
 // joystick buttons
 //
-	K_JOY1			= 203,
-	K_JOY2			= 204,
-	K_JOY3			= 205,
-	K_JOY4			= 206,
+#define	K_JOY1			203
+#define	K_JOY2			204
+#define	K_JOY3			205
+#define	K_JOY4			206
 
 //
 // aux keys are for multi-buttoned joysticks to generate so they can use
 // the normal binding process
 //
-	K_AUX1			= 207,
-	K_AUX2			= 208,
-	K_AUX3			= 209,
-	K_AUX4			= 210,
-	K_AUX5			= 211,
-	K_AUX6			= 212,
-	K_AUX7			= 213,
-	K_AUX8			= 214,
-	K_AUX9			= 215,
-	K_AUX10			= 216,
-	K_AUX11			= 217,
-	K_AUX12			= 218,
-	K_AUX13			= 219,
-	K_AUX14			= 220,
-	K_AUX15			= 221,
-	K_AUX16			= 222,
-	K_AUX17			= 223,
-	K_AUX18			= 224,
-	K_AUX19			= 225,
-	K_AUX20			= 226,
-	K_AUX21			= 227,
-	K_AUX22			= 228,
-	K_AUX23			= 229,
-	K_AUX24			= 230,
-	K_AUX25			= 231,
-	K_AUX26			= 232,
-	K_AUX27			= 233,
-	K_AUX28			= 234,
-	K_AUX29			= 235,
-	K_AUX30			= 236,
-	K_AUX31			= 237,
-	K_AUX32			= 238,
-	K_MWHEELDOWN	= 239,
-	K_MWHEELUP		= 240,
-	K_PAUSE			= 255,
+#define	K_AUX1			207
+#define	K_AUX2			208
+#define	K_AUX3			209
+#define	K_AUX4			210
+#define	K_AUX5			211
+#define	K_AUX6			212
+#define	K_AUX7			213
+#define	K_AUX8			214
+#define	K_AUX9			215
+#define	K_AUX10			216
+#define	K_AUX11			217
+#define	K_AUX12			218
+#define	K_AUX13			219
+#define	K_AUX14			220
+#define	K_AUX15			221
+#define	K_AUX16			222
+#define	K_AUX17			223
+#define	K_AUX18			224
+#define	K_AUX19			225
+#define	K_AUX20			226
+#define	K_AUX21			227
+#define	K_AUX22			228
+#define	K_AUX23			229
+#define	K_AUX24			230
+#define	K_AUX25			231
+#define	K_AUX26			232
+#define	K_AUX27			233
+#define	K_AUX28			234
+#define	K_AUX29			235
+#define	K_AUX30			236
+#define	K_AUX31			237
+#define	K_AUX32			238
+#define K_MWHEELDOWN	239
+#define K_MWHEELUP		240
+
+#define K_PAUSE			255
 
 //
 // mouse buttons generate virtual keys
 //
-	K_MOUSE1		= 241,
-	K_MOUSE2		= 242,
-	K_MOUSE3		= 243,
-	K_MOUSE4		= 244,
-	K_MOUSE5		= 245
-};
+#define	K_MOUSE1		241
+#define	K_MOUSE2		242
+#define	K_MOUSE3		243
+#define K_MOUSE4		244
+#define K_MOUSE5		245
+
 #endif // KEYDEFS_H
\ No newline at end of file

From 3035f9dd33c606fa88d1f183f0d91b2c15827010 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 26 Mar 2026 02:27:35 -0400
Subject: [PATCH 282/291] Reverted macro #define changes. Added using statement
 for vec3_t / Vector equivalence.

---
 src/public/engine/eiface.h   |  37 ++++----
 src/public/engine/progdefs.h |  66 +++++++-------
 src/public/engine/studio.h   | 164 +++++++++++++++++------------------
 3 files changed, 132 insertions(+), 135 deletions(-)

diff --git a/src/public/engine/eiface.h b/src/public/engine/eiface.h
index 0af3ba2f..dc187d2e 100644
--- a/src/public/engine/eiface.h
+++ b/src/public/engine/eiface.h
@@ -42,6 +42,8 @@
 #endif
 */
 
+using vec3_t = Vector;
+
 typedef enum
 	{
 	at_notice,
@@ -76,9 +78,9 @@ typedef struct
 	int		fInOpen;
 	int		fInWater;
 	float	flFraction;			// time completed, 1.0 = didn't hit anything
-	Vector 	vecEndPos;			// final position
+	vec3_t	vecEndPos;			// final position
 	float	flPlaneDist;
-	Vector 	vecPlaneNormal;		// surface normal at impact
+	vec3_t	vecPlaneNormal;		// surface normal at impact
 	edict_t	*pHit;				// entity the surface is on
 	int		iHitgroup;			// 0 == generic, non zero is specific body part
 	} TraceResult;
@@ -120,7 +122,7 @@ typedef struct enginefuncs_s
 	int			(*pfnGetEntityIllum)		(edict_t* pEnt);
 	edict_t*	(*pfnFindEntityInSphere)	(edict_t *pEdictStartSearchAfter, const float *org, float rad);
 	edict_t*	(*pfnFindClientInPVS)		(edict_t *pEdict);
-	edict_t*    (*pfnEntitiesInPVS)			(edict_t *pplayer);
+	edict_t* (*pfnEntitiesInPVS)			(edict_t *pplayer);
 	void		(*pfnMakeVectors)			(const float *rgflVector);
 	void		(*pfnAngleVectors)			(const float *rgflVector, float *forward, float *right, float *up);
 	edict_t*	(*pfnCreateEntity)			(void);
@@ -169,7 +171,7 @@ typedef struct enginefuncs_s
 	void*		(*pfnPvEntPrivateData)		(edict_t *pEdict);
 	void		(*pfnFreeEntPrivateData)	(edict_t *pEdict);
 	const char*	(*pfnSzFromIndex)			(int iString);
-	unsigned int		(*pfnAllocString)			(const char *szValue);
+	unsigned int			(*pfnAllocString)			(const char *szValue);
 	struct entvars_s*	(*pfnGetVarsOfEnt)			(edict_t *pEdict);
 	edict_t*	(*pfnPEntityOfEntOffset)	(int iEntOffset);
 	int			(*pfnEntOffsetOfPEntity)	(const edict_t *pEdict);
@@ -219,7 +221,7 @@ typedef struct enginefuncs_s
 	void		(*pfnBuildSoundMsg)			(edict_t *entity, int channel, const char *sample, /*int*/float volume, float attenuation, int fFlags, int pitch, int msg_dest, int msg_type, const float *pOrigin, edict_t *ed);
 	int			(*pfnIsDedicatedServer)		(void);// is this a dedicated server?
 	cvar_t		*(*pfnCVarGetPointer)		(const char *szVarName);
-	int (*pfnGetPlayerWONId)				(edict_t *e); // returns the server assigned WONid for this player.  useful for logging frags, etc.  returns -1 if the edict couldn't be found in the list of clients
+	unsigned int (*pfnGetPlayerWONId)		(edict_t *e); // returns the server assigned WONid for this player.  useful for logging frags, etc.  returns -1 if the edict couldn't be found in the list of clients
 
 	// YWB 8/1/99 TFF Physics additions
 	void		(*pfnInfo_RemoveKey)		(const char* s, const char *key );
@@ -281,9 +283,9 @@ typedef struct
 	char		mapName[ 32 ];
 	char		landmarkName[ 32 ];
 	edict_t	*pentLandmark;
-	Vector 		vecLandmarkOrigin;
+	vec3_t		vecLandmarkOrigin;
 } LEVELLIST;
-constexpr unsigned int MAX_LEVEL_CONNECTIONS = 16;		// These are encoded in the lower 16bits of ENTITYTABLE->flags
+#define MAX_LEVEL_CONNECTIONS	16		// These are encoded in the lower 16bits of ENTITYTABLE->flags
 
 typedef struct 
 {
@@ -297,12 +299,10 @@ typedef struct
 
 } ENTITYTABLE;
 
-enum fent_table_e {
-	FENTTABLE_PLAYER		= 0x80000000,
-	FENTTABLE_REMOVED		= 0x40000000,
-	FENTTABLE_MOVEABLE		= 0x20000000,
-	FENTTABLE_GLOBAL		= 0x10000000
-};
+#define FENTTABLE_PLAYER		0x80000000
+#define FENTTABLE_REMOVED		0x40000000
+#define FENTTABLE_MOVEABLE		0x20000000
+#define FENTTABLE_GLOBAL		0x10000000
 
 typedef struct saverestore_s SAVERESTOREDATA;
 
@@ -316,7 +316,7 @@ struct saverestore_s
 	int			size;			// Current data size
 	int			bufferSize;		// Total space for data
 	int			tokenSize;		// Size of the linear list of tokens
-	unsigned int			tokenCount;		// Number of elements in the pTokens table
+	int			tokenCount;		// Number of elements in the pTokens table
 	char		**pTokens;		// Hash table of entity strings (sparse)
 	int			currentIndex;	// Holds a global entity table ID
 	int			tableCount;		// Number of elements in the entity table
@@ -327,7 +327,7 @@ struct saverestore_s
 	// smooth transition
 	int			fUseLandmark;
 	char		szLandmarkName[20];// landmark we'll spawn near in next level
-	Vector 		vecLandmarkOffset;// for landmark transitions
+	vec3_t		vecLandmarkOffset;// for landmark transitions
 	float		time;
 	char		szCurrentMapName[32];	// To check global entities
 
@@ -372,9 +372,8 @@ typedef enum _fieldtypes
 #define DEFINE_ENTITY_GLOBAL_FIELD(name,fieldtype)	_FIELD(entvars_t, name, fieldtype, 1, FTYPEDESC_GLOBAL )
 #define DEFINE_GLOBAL_FIELD(type,name,fieldtype)	_FIELD(type, name, fieldtype, 1, FTYPEDESC_GLOBAL )
 
-enum g_ftype_desc_e {
-	FTYPEDESC_GLOBAL = 0x0001		// This field is masked for global entity save/restore
-};
+
+#define FTYPEDESC_GLOBAL			0x0001		// This field is masked for global entity save/restore
 
 typedef struct 
 {
@@ -444,7 +443,7 @@ typedef struct
 	void			(*pfnSetupVisibility)( struct edict_s *pViewEntity, struct edict_s *pClient, unsigned char **pvs, unsigned char **pas );
 	void			(*pfnUpdateClientData) ( const struct edict_s *ent, int sendweapons, struct clientdata_s *cd );
 	int				(*pfnAddToFullPack)( struct entity_state_s *state, int e, edict_t *ent, edict_t *host, int hostflags, int player, unsigned char *pSet );
-	void			(*pfnCreateBaseline) ( int player, int eindex, struct entity_state_s *baseline, struct edict_s *entity, int playermodelindex, Vector  player_mins, Vector  player_maxs );
+	void			(*pfnCreateBaseline) ( int player, int eindex, struct entity_state_s *baseline, struct edict_s *entity, int playermodelindex, vec3_t player_mins, vec3_t player_maxs );
 	void			(*pfnRegisterEncoders)	( void );
 	int				(*pfnGetWeaponData)		( struct edict_s *player, struct weapon_data_s *info );
 
diff --git a/src/public/engine/progdefs.h b/src/public/engine/progdefs.h
index 9205278e..f77f3aee 100644
--- a/src/public/engine/progdefs.h
+++ b/src/public/engine/progdefs.h
@@ -18,6 +18,8 @@
 #pragma once
 #endif
 
+using vec3_t = Vector;
+
 typedef struct
 {	
 	float		time;
@@ -30,14 +32,14 @@ typedef struct
 	float		teamplay;
 	float		serverflags;
 	float		found_secrets;
-	Vector 		v_forward;
-	Vector 		v_up;
-	Vector 		v_right;
+	vec3_t		v_forward;
+	vec3_t		v_up;
+	vec3_t		v_right;
 	float		trace_allsolid;
 	float		trace_startsolid;
 	float		trace_fraction;
-	Vector 		trace_endpos;
-	Vector 		trace_plane_normal;
+	vec3_t		trace_endpos;
+	vec3_t		trace_plane_normal;
 	float		trace_plane_dist;
 	edict_t		*trace_ent;
 	float		trace_inopen;
@@ -46,13 +48,13 @@ typedef struct
 	int			trace_flags;
 	int			msg_entity;
 	int			cdAudioTrack;
-	unsigned int maxClients;
+	int			maxClients;
 	//int			PreCount;
-	unsigned int maxEntities;
+	int			maxEntities;
 	const char	*pStringBase;
 
 	void		*pSaveData;
-	Vector 		vecLandmarkOffset;
+	vec3_t		vecLandmarkOffset;
 } globalvars_t;
 
 
@@ -61,22 +63,22 @@ typedef struct entvars_s
 	string_t	classname;
 	string_t	globalname;
 
-	Vector 		origin;
-	Vector 		oldorigin;
-	Vector 		velocity;
-	Vector 		basevelocity;
-	Vector      clbasevelocity;  // Base velocity that was passed in to server physics so 
+	vec3_t		origin;
+	vec3_t		oldorigin;
+	vec3_t		velocity;
+	vec3_t		basevelocity;
+	vec3_t      clbasevelocity;  // Base velocity that was passed in to server physics so 
 							     //  client can predict conveyors correctly.  Server zeroes it, so we need to store here, too.
-	Vector 		movedir;
+	vec3_t		movedir;
 
-	Vector 		angles;			// Model angles
-	Vector 		avelocity;		// angle velocity (degrees per second)
-	Vector 		punchangle;		// auto-decaying view angle adjustment
-	Vector 		v_angle;		// Viewing angle (player only)
+	vec3_t		angles;			// Model angles
+	vec3_t		avelocity;		// angle velocity (degrees per second)
+	vec3_t		punchangle;		// auto-decaying view angle adjustment
+	vec3_t		v_angle;		// Viewing angle (player only)
 
 	// For parametric entities
-	Vector 		endpos;
-	Vector 		startpos;
+	vec3_t		endpos;
+	vec3_t		startpos;
 	float		impacttime;
 	float		starttime;
 
@@ -92,11 +94,11 @@ typedef struct entvars_s
 	int			viewmodel;		// player's viewmodel
 	int			weaponmodel;	// what other players see
 	
-	Vector 		absmin;		// BB max translated to world coord
-	Vector 		absmax;		// BB max translated to world coord
-	Vector 		mins;		// local BB min
-	Vector 		maxs;		// local BB max
-	Vector 		size;		// maxs - mins
+	vec3_t		absmin;		// BB max translated to world coord
+	vec3_t		absmax;		// BB max translated to world coord
+	vec3_t		mins;		// local BB min
+	vec3_t		maxs;		// local BB max
+	vec3_t		size;		// maxs - mins
 
 	float		ltime;
 	float		nextthink;
@@ -113,7 +115,7 @@ typedef struct entvars_s
 	
 	int			light_level;
 
-	unsigned int			sequence;		// animation sequence
+	int			sequence;		// animation sequence
 	int			gaitsequence;	// movement animation sequence for player (0 for none)
 	float		frame;			// % playback position in animation sequences (0..255)
 	float		animtime;		// world time when frame was set
@@ -125,7 +127,7 @@ typedef struct entvars_s
 
 	int			rendermode;
 	float		renderamt;
-	Vector 		rendercolor;
+	vec3_t		rendercolor;
 	int			renderfx;
 
 	float		health;
@@ -134,7 +136,7 @@ typedef struct entvars_s
 	float		takedamage;
 
 	int			deadflag;
-	Vector 		view_ofs;	// eye position
+	vec3_t		view_ofs;	// eye position
 
 	int			button;
 	int			impulse;
@@ -211,10 +213,10 @@ typedef struct entvars_s
 	float		fuser2;
 	float		fuser3;
 	float		fuser4;
-	Vector 		vuser1;
-	Vector 		vuser2;
-	Vector 		vuser3;
-	Vector 		vuser4;
+	vec3_t		vuser1;
+	vec3_t		vuser2;
+	vec3_t		vuser3;
+	vec3_t		vuser4;
 	edict_t		*euser1;
 	edict_t		*euser2;
 	edict_t		*euser3;
diff --git a/src/public/engine/studio.h b/src/public/engine/studio.h
index 94d5228b..29e03839 100644
--- a/src/public/engine/studio.h
+++ b/src/public/engine/studio.h
@@ -28,21 +28,22 @@ Studio models are position independent, so the cache manager can move them.
 ==============================================================================
 */
 
-
-constexpr int MAXSTUDIOTRIANGLES	= 20000;	// TODO: tune this
-constexpr int MAXSTUDIOVERTS		= 2048;		// TODO: tune this
-constexpr int MAXSTUDIOSEQUENCES	= 2048;		// total animation sequences
-constexpr int MAXSTUDIOSKINS		= 100;		// total textures
-constexpr int MAXSTUDIOSRCBONES		= 512;		// bones allowed at source movement
-constexpr int MAXSTUDIOBONES		= 128;		// total bones actually used
-constexpr int MAXSTUDIOMODELS		= 32;		// sub-models per model
-constexpr int MAXSTUDIOBODYPARTS	= 32;
-constexpr int MAXSTUDIOGROUPS		= 16;
-constexpr int MAXSTUDIOANIMATIONS	= 2048;		// per sequence
-constexpr int MAXSTUDIOMESHES		= 256;
-constexpr int MAXSTUDIOEVENTS		= 1024;
-constexpr int MAXSTUDIOPIVOTS		= 256;
-constexpr int MAXSTUDIOCONTROLLERS	= 8;
+using vec3_t = Vector;
+
+#define MAXSTUDIOTRIANGLES	20000	// TODO: tune this
+#define MAXSTUDIOVERTS		2048	// TODO: tune this
+#define MAXSTUDIOSEQUENCES	2048	// total animation sequences
+#define MAXSTUDIOSKINS		100		// total textures
+#define MAXSTUDIOSRCBONES	512		// bones allowed at source movement
+#define MAXSTUDIOBONES		128		// total bones actually used
+#define MAXSTUDIOMODELS		32		// sub-models per model
+#define MAXSTUDIOBODYPARTS	32
+#define MAXSTUDIOGROUPS		16
+#define MAXSTUDIOANIMATIONS	2048	// per sequence
+#define MAXSTUDIOMESHES		256
+#define MAXSTUDIOEVENTS		1024
+#define MAXSTUDIOPIVOTS		256
+#define MAXSTUDIOCONTROLLERS 8
 
 typedef struct 
 {
@@ -52,12 +53,12 @@ typedef struct
 	char				name[64];
 	int					length;
 
-	Vector 				eyeposition;	// ideal eye position
-	Vector 				min;			// ideal movement hull size
-	Vector 				max;			
+	vec3_t				eyeposition;	// ideal eye position
+	vec3_t				min;			// ideal movement hull size
+	vec3_t				max;			
 
-	Vector 				bbmin;			// clipping bounding box
-	Vector 				bbmax;		
+	vec3_t				bbmin;			// clipping bounding box
+	vec3_t				bbmax;		
 
 	int					flags;
 
@@ -70,7 +71,7 @@ typedef struct
 	int					numhitboxes;			// complex bounding boxes
 	int					hitboxindex;			
 	
-	unsigned int					numseq;				// animation sequences
+	int					numseq;				// animation sequences
 	int					seqindex;
 
 	int					numseqgroups;		// demand loaded sequences
@@ -137,8 +138,8 @@ typedef struct
 {
 	int					bone;
 	int					group;			// intersection group
-	Vector 				bbmin;		// bounding box
-	Vector 				bbmax;		
+	vec3_t				bbmin;		// bounding box
+	vec3_t				bbmax;		
 } mstudiobbox_t;
 
 #if !defined( CACHE_USER ) && !defined( QUAKEDEF_H )
@@ -169,7 +170,7 @@ typedef struct
 	int					activity;
 	int					actweight;
 
-	unsigned int		numevents;
+	int					numevents;
 	int					eventindex;
 
 	int					numframes;	// number of frames per sequence
@@ -179,12 +180,12 @@ typedef struct
 
 	int					motiontype;	
 	int					motionbone;
-	Vector 				linearmovement;
+	vec3_t				linearmovement;
 	int					automoveposindex;
 	int					automoveangleindex;
 
-	Vector 				bbmin;		// per sequence bounding box
-	Vector 				bbmax;		
+	vec3_t				bbmin;		// per sequence bounding box
+	vec3_t				bbmax;		
 
 	int					numblends;
 	int					animindex;		// mstudioanim_t pointer relative to start of sequence group data
@@ -219,7 +220,7 @@ typedef struct
 // pivots
 typedef struct 
 {
-	Vector 				org;	// pivot point
+	vec3_t				org;	// pivot point
 	int					start;
 	int					end;
 } mstudiopivot_t;
@@ -230,8 +231,8 @@ typedef struct
 	char				name[32];
 	int					type;
 	int					bone;
-	Vector 				org;	// attachment point
-	Vector 				vectors[3];
+	vec3_t				org;	// attachment point
+	vec3_t				vectors[3];
 } mstudioattachment_t;
 
 typedef struct
@@ -290,17 +291,17 @@ typedef struct
 
 	int					numverts;		// number of unique vertices
 	int					vertinfoindex;	// vertex bone info
-	int					vertindex;		// vertex Vector 
+	int					vertindex;		// vertex vec3_t
 	int					numnorms;		// number of unique surface normals
 	int					norminfoindex;	// normal bone info
-	int					normindex;		// normal Vector 
+	int					normindex;		// normal vec3_t
 
 	int					numgroups;		// deformation groups
 	int					groupindex;
 } mstudiomodel_t;
 
 
-// Vector 	boundingbox[model][bone][2];	// complex intersection info
+// vec3_t	boundingbox[model][bone][2];	// complex intersection info
 
 
 // meshes
@@ -310,7 +311,7 @@ typedef struct
 	int					triindex;
 	int					skinref;
 	int					numnorms;		// per mesh normals
-	int					normindex;		// normal Vector 
+	int					normindex;		// normal vec3_t
 } mstudiomesh_t;
 
 // triangles
@@ -324,58 +325,53 @@ typedef struct
 #endif
 
 // model flags
-enum {
-	EF_ROCKET	= 1,
-	EF_GRENADE	= 2,
-	EF_GIB		= 4,
-	EF_ROTATE	= 8,
-	EF_TRACER	= 16,
-	EF_ZOMGIB	= 32,
-	EF_TRACER2	= 64,
-	EF_TRACER3	= 128
-};
+#define	EF_ROCKET	1
+#define	EF_GRENADE	2
+#define	EF_GIB		4
+#define	EF_ROTATE	8
+#define	EF_TRACER	16
+#define	EF_ZOMGIB	32
+#define	EF_TRACER2	64
+#define	EF_TRACER3	128
+
 // lighting options
+#define STUDIO_NF_FLATSHADE		0x0001
+#define STUDIO_NF_CHROME		0x0002
+#define STUDIO_NF_FULLBRIGHT	0x0004
+#define STUDIO_NF_NOMIPS        0x0008
+#define STUDIO_NF_ALPHA         0x0010
+#define STUDIO_NF_ADDITIVE      0x0020
+#define STUDIO_NF_MASKED        0x0040
 
-enum {
-	STUDIO_NF_FLATSHADE		= 0x0001,
-	STUDIO_NF_CHROME		= 0x0002,
-	STUDIO_NF_FULLBRIGHT	= 0x0004,
-	STUDIO_NF_NOMIPS        = 0x0008,
-	STUDIO_NF_ALPHA         = 0x0010,
-	STUDIO_NF_ADDITIVE      = 0x0020,
-	STUDIO_NF_MASKED        = 0x0040
-};
 // motion flags
-enum {
-	STUDIO_X = 0x0001,
-	STUDIO_Y = 0x0002,
-	STUDIO_Z = 0x0004,
-	STUDIO_XR = 0x0008,
-	STUDIO_YR = 0x0010,
-	STUDIO_ZR = 0x0020,
-	STUDIO_LX = 0x0040,
-	STUDIO_LY = 0x0080,
-	STUDIO_LZ = 0x0100,
-	STUDIO_AX = 0x0200,
-	STUDIO_AY = 0x0400,
-	STUDIO_AZ = 0x0800,
-	STUDIO_AXR = 0x1000,
-	STUDIO_AYR = 0x2000,
-	STUDIO_AZR = 0x4000,
-	STUDIO_TYPES = 0x7FFF,
-	STUDIO_RLOOP = 0x8000,		// controller that wraps shortest distance
-	// sequence flags
-	STUDIO_LOOPING = 0x0001,
-};
-
-enum {
+#define STUDIO_X		0x0001
+#define STUDIO_Y		0x0002	
+#define STUDIO_Z		0x0004
+#define STUDIO_XR		0x0008
+#define STUDIO_YR		0x0010
+#define STUDIO_ZR		0x0020
+#define STUDIO_LX		0x0040
+#define STUDIO_LY		0x0080
+#define STUDIO_LZ		0x0100
+#define STUDIO_AX		0x0200
+#define STUDIO_AY		0x0400
+#define STUDIO_AZ		0x0800
+#define STUDIO_AXR		0x1000
+#define STUDIO_AYR		0x2000
+#define STUDIO_AZR		0x4000
+#define STUDIO_TYPES	0x7FFF
+#define STUDIO_RLOOP	0x8000	// controller that wraps shortest distance
+
+// sequence flags
+#define STUDIO_LOOPING	0x0001
+
 // bone flags
-	STUDIO_HAS_NORMALS	= 0x0001,
-	STUDIO_HAS_VERTICES = 0x0002,
-	STUDIO_HAS_BBOX		= 0x0004,
-	STUDIO_HAS_CHROME	= 0x0008		// if any of the textures have chrome on them
-};
-
-constexpr float RAD_TO_STUDIO		= (32768.0/PI);
-constexpr float STUDIO_TO_RAD		= (PI / 32768.0);
+#define STUDIO_HAS_NORMALS	0x0001
+#define STUDIO_HAS_VERTICES 0x0002
+#define STUDIO_HAS_BBOX		0x0004
+#define STUDIO_HAS_CHROME	0x0008	// if any of the textures have chrome on them
+
+#define RAD_TO_STUDIO		(32768.0/M_PI)
+#define STUDIO_TO_RAD		(M_PI/32768.0)
+
 #endif

From 7f9eeecb5aa351ea6681c897f0b677372ee4064a Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 26 Mar 2026 02:52:38 -0400
Subject: [PATCH 283/291] unsigned/signed mismatch error present in base types
 within src/public sdk files. 3 int in progdefs.h and 3 ints in studio.h
 changed to unsigned int.

---
 src/game/server/hl/util.cpp  | 4 ++--
 src/public/engine/progdefs.h | 6 +++---
 src/public/engine/studio.h   | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/game/server/hl/util.cpp b/src/game/server/hl/util.cpp
index c46acc3f..5906610d 100644
--- a/src/game/server/hl/util.cpp
+++ b/src/game/server/hl/util.cpp
@@ -2182,7 +2182,7 @@ unsigned short CSaveRestoreBuffer ::TokenHash(const char *pszToken)
 		ALERT(at_error, "No token table array in TokenHash()!");
 #endif
 
-	for (unsigned int i = 0; i < m_pdata->tokenCount; i++)
+	for (int i = 0; i < m_pdata->tokenCount; i++)
 	{
 #if _DEBUG
 		static qboolean beentheredonethat = false;
@@ -2193,7 +2193,7 @@ unsigned short CSaveRestoreBuffer ::TokenHash(const char *pszToken)
 		}
 #endif
 
-		unsigned int index = hash + i;
+		int index = hash + i;
 		if (index >= m_pdata->tokenCount)
 			index -= m_pdata->tokenCount;
 
diff --git a/src/public/engine/progdefs.h b/src/public/engine/progdefs.h
index f77f3aee..bfb16c68 100644
--- a/src/public/engine/progdefs.h
+++ b/src/public/engine/progdefs.h
@@ -48,9 +48,9 @@ typedef struct
 	int			trace_flags;
 	int			msg_entity;
 	int			cdAudioTrack;
-	int			maxClients;
+	unsigned int			maxClients;
 	//int			PreCount;
-	int			maxEntities;
+	unsigned int			maxEntities;
 	const char	*pStringBase;
 
 	void		*pSaveData;
@@ -115,7 +115,7 @@ typedef struct entvars_s
 	
 	int			light_level;
 
-	int			sequence;		// animation sequence
+	unsigned int			sequence;		// animation sequence
 	int			gaitsequence;	// movement animation sequence for player (0 for none)
 	float		frame;			// % playback position in animation sequences (0..255)
 	float		animtime;		// world time when frame was set
diff --git a/src/public/engine/studio.h b/src/public/engine/studio.h
index 29e03839..676411a5 100644
--- a/src/public/engine/studio.h
+++ b/src/public/engine/studio.h
@@ -71,7 +71,7 @@ typedef struct
 	int					numhitboxes;			// complex bounding boxes
 	int					hitboxindex;			
 	
-	int					numseq;				// animation sequences
+	unsigned int	    numseq;				// animation sequences
 	int					seqindex;
 
 	int					numseqgroups;		// demand loaded sequences
@@ -170,8 +170,8 @@ typedef struct
 	int					activity;
 	int					actweight;
 
-	int					numevents;
-	int					eventindex;
+	unsigned int					numevents;
+	unsigned int					eventindex;
 
 	int					numframes;	// number of frames per sequence
 

From 5bdb45341c1003916d207333bc8a9cb43ab33edd Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 26 Mar 2026 15:35:36 -0400
Subject: [PATCH 284/291] changed files back to vanilla

---
 src/public/engine/eiface.h   | 3 ---
 src/public/engine/progdefs.h | 8 +++-----
 src/public/engine/studio.h   | 8 +++-----
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/public/engine/eiface.h b/src/public/engine/eiface.h
index dc187d2e..b84d34b1 100644
--- a/src/public/engine/eiface.h
+++ b/src/public/engine/eiface.h
@@ -41,9 +41,6 @@
 #define DLLEXPORT  __attribute__ ((visibility("default")))
 #endif
 */
-
-using vec3_t = Vector;
-
 typedef enum
 	{
 	at_notice,
diff --git a/src/public/engine/progdefs.h b/src/public/engine/progdefs.h
index bfb16c68..10041d28 100644
--- a/src/public/engine/progdefs.h
+++ b/src/public/engine/progdefs.h
@@ -18,8 +18,6 @@
 #pragma once
 #endif
 
-using vec3_t = Vector;
-
 typedef struct
 {	
 	float		time;
@@ -48,9 +46,9 @@ typedef struct
 	int			trace_flags;
 	int			msg_entity;
 	int			cdAudioTrack;
-	unsigned int			maxClients;
+	int			maxClients;
 	//int			PreCount;
-	unsigned int			maxEntities;
+	int			maxEntities;
 	const char	*pStringBase;
 
 	void		*pSaveData;
@@ -115,7 +113,7 @@ typedef struct entvars_s
 	
 	int			light_level;
 
-	unsigned int			sequence;		// animation sequence
+	int			sequence;		// animation sequence
 	int			gaitsequence;	// movement animation sequence for player (0 for none)
 	float		frame;			// % playback position in animation sequences (0..255)
 	float		animtime;		// world time when frame was set
diff --git a/src/public/engine/studio.h b/src/public/engine/studio.h
index 676411a5..8dc172d7 100644
--- a/src/public/engine/studio.h
+++ b/src/public/engine/studio.h
@@ -28,8 +28,6 @@ Studio models are position independent, so the cache manager can move them.
 ==============================================================================
 */
 
-using vec3_t = Vector;
-
 #define MAXSTUDIOTRIANGLES	20000	// TODO: tune this
 #define MAXSTUDIOVERTS		2048	// TODO: tune this
 #define MAXSTUDIOSEQUENCES	2048	// total animation sequences
@@ -71,7 +69,7 @@ typedef struct
 	int					numhitboxes;			// complex bounding boxes
 	int					hitboxindex;			
 	
-	unsigned int	    numseq;				// animation sequences
+	int				    numseq;				// animation sequences
 	int					seqindex;
 
 	int					numseqgroups;		// demand loaded sequences
@@ -170,8 +168,8 @@ typedef struct
 	int					activity;
 	int					actweight;
 
-	unsigned int					numevents;
-	unsigned int					eventindex;
+	int					numevents;
+	int					eventindex;
 
 	int					numframes;	// number of frames per sequence
 

From aa11f53fb2b78efdd536c7201340c206394acc64 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 26 Mar 2026 15:37:15 -0400
Subject: [PATCH 285/291] fixed header include order causing issues with file.
 (should probably be ext_dll.h?)

---
 src/game/server/hl/animation.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/game/server/hl/animation.cpp b/src/game/server/hl/animation.cpp
index 36db1bad..4acfb05b 100644
--- a/src/game/server/hl/animation.cpp
+++ b/src/game/server/hl/animation.cpp
@@ -22,15 +22,14 @@ typedef bool BOOL;
 // hack into header files that we can ship
 typedef int qboolean;
 typedef unsigned char byte;
-#include "../utils/common/mathlib.h"
+//#include "../utils/common/mathlib.h"
+#include "hl/vector.h"
 #include "const.h"
-
+#include "mathlib.h"
 #include "progdefs.h"
 #include "edict.h"
 #include "eiface.h"
-
 #include "studio.h"
-
 #include "../engine/studio.h"
 
 #ifndef ACTIVITY_H

From 7c18aa60b7579a935be1ceefc2fb394a5129e62a Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 26 Mar 2026 15:37:51 -0400
Subject: [PATCH 286/291] changed define  of vec3_t to c++ standard of using
 statement within Vector header.

---
 src/game/shared/hl/vector.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/game/shared/hl/vector.h b/src/game/shared/hl/vector.h
index e7637d43..9ce2517e 100644
--- a/src/game/shared/hl/vector.h
+++ b/src/game/shared/hl/vector.h
@@ -20,7 +20,7 @@ typedef float vec_t;
 #ifndef VECTOR_H
 #define VECTOR_H
 
-
+#undef DotProduct
 
 
 //=========================================================
@@ -148,7 +148,8 @@ inline float DotProduct(const Vector &a, const Vector &b) { return (a.x * b.x +
 	//return (x[0] * y[0]) + (x[1] * y[1]) + (x[2] + y[2]);
 //};
 
-inline Vector CrossProduct(const Vector &a, const Vector &b) { return Vector(a.y * b.z - a.z * b.y, a.z * b.x - a.x * b.z, a.x * b.y - a.y * b.x); }
+inline Vector CrossProduct(const Vector& a, const Vector& b) { return Vector{ a.y * b.z - a.z * b.y, a.z * b.x - a.x * b.z, a.x * b.y - a.y * b.x }; }
 
 
-#endif
\ No newline at end of file
+using vec3_t = Vector;
+#endif

From 4e8f1a0962f3cc87b4a5211f8ef50ea999f6a5b5 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 26 Mar 2026 15:57:32 -0400
Subject: [PATCH 287/291] Fixed error 4018 after changing SDK files back to
 base version

---
 src/game/client/render/clrenderent.cpp        |    2 +-
 .../client/render/studiomodelrenderer.cpp     |   12 +-
 .../server/angelscript/ASServerEngineImpl.cpp |    8 +-
 src/game/server/client.cpp                    |    8 +-
 src/game/server/effects/mseffects.cpp         |    2 +-
 .../server/gamerules/multiplay_gamerules.cpp  |   22 +-
 src/game/server/gamerules/team.cpp            |    4 +-
 src/game/server/hl/animation.cpp              |   17 +-
 src/game/server/hl/animation.h                |    2 +-
 src/game/server/hl/soundent.cpp               |    2 +-
 src/game/server/hl/util.cpp                   |   28 +-
 src/game/server/msmapents.cpp                 | 4280 ++++++++---------
 src/game/server/player/player.cpp             |    2 +-
 src/game/server/player/playershared.cpp       |    2 +-
 src/game/server/shield.cpp                    |    2 +-
 src/game/server/svglobals.cpp                 |    6 +-
 src/game/server/triggers.cpp                  |    2 +-
 .../ms/angelscript/ASBuiltinFunctions.cpp     |   14 +-
 .../ms/angelscript/ASEntityBindings.cpp       |    6 +-
 src/game/shared/ms/findentities.cpp           |    2 +-
 src/game/shared/ms/script.cpp                 |    4 +-
 src/game/shared/ms/scriptcmds.cpp             |   20 +-
 src/game/shared/voice_gamemgr.cpp             |    2 +-
 23 files changed, 2225 insertions(+), 2224 deletions(-)

diff --git a/src/game/client/render/clrenderent.cpp b/src/game/client/render/clrenderent.cpp
index 5d74afe0..dd029cc8 100644
--- a/src/game/client/render/clrenderent.cpp
+++ b/src/game/client/render/clrenderent.cpp
@@ -108,7 +108,7 @@ bool cl_entity_s::PlayAnim(const char* Anim)
 
 	pseqdesc = (mstudioseqdesc_t *)((byte *)pstudiohdr + pstudiohdr->seqindex);
 
-	for (unsigned int i = 0; i < pstudiohdr->numseq; i++)
+	for (int i = 0; i < pstudiohdr->numseq; i++)
 	{
 		if (_stricmp(pseqdesc[i].label, Anim) != 0)
 			continue;
diff --git a/src/game/client/render/studiomodelrenderer.cpp b/src/game/client/render/studiomodelrenderer.cpp
index ec827048..2323e3db 100644
--- a/src/game/client/render/studiomodelrenderer.cpp
+++ b/src/game/client/render/studiomodelrenderer.cpp
@@ -928,7 +928,7 @@ void CStudioModelRenderer::StudioSetupBones(void)
 	static vec4_t q4[MAXSTUDIOBONES];
 	cl_entity_t& Ent = *m_pCurrentEntity;
 
-	if (Ent.curstate.sequence >= m_pStudioHeader->numseq)
+	if (Ent.curstate.sequence >= static_cast<unsigned int>(m_pStudioHeader->numseq))
 	{
 		Ent.curstate.sequence = 0;
 	}
@@ -984,7 +984,7 @@ void CStudioModelRenderer::StudioSetupBones(void)
 		static vec4_t q1b[MAXSTUDIOBONES];
 		float s;
 
-		if (Ent.latched.prevsequence >= m_pStudioHeader->numseq)
+		if (Ent.latched.prevsequence >= static_cast<unsigned int>(m_pStudioHeader->numseq))
 			Ent.latched.prevsequence = 0;
 
 		pseqdesc = (mstudioseqdesc_t*)((byte*)m_pStudioHeader + m_pStudioHeader->seqindex) + Ent.latched.prevsequence;
@@ -1028,7 +1028,7 @@ void CStudioModelRenderer::StudioSetupBones(void)
 	pbones = (mstudiobone_t*)((byte*)m_pStudioHeader + m_pStudioHeader->boneindex);
 
 	// bounds checking
-	if (m_pPlayerInfo && (m_pPlayerInfo->gaitsequence >= m_pStudioHeader->numseq))
+	if (m_pPlayerInfo && (m_pPlayerInfo->gaitsequence >= static_cast<unsigned int>(m_pStudioHeader->numseq)))
 		m_pPlayerInfo->gaitsequence = 0;
 
 	// calc gait animation
@@ -1137,7 +1137,7 @@ void CStudioModelRenderer::StudioMergeBones(model_t* m_pSubModel)
 	float bonematrix[3][4];
 	static vec4_t q[MAXSTUDIOBONES];
 
-	if (Ent.curstate.sequence >= m_pStudioHeader->numseq)
+	if (Ent.curstate.sequence >= static_cast<unsigned int>(m_pStudioHeader->numseq))
 	{
 		Ent.curstate.sequence = 0;
 	}
@@ -1738,7 +1738,7 @@ void CStudioModelRenderer::StudioProcessGait(entity_state_t* pplayer)
 	float flYaw = 0; // view direction relative to movement
 	float frametime = 0;
 
-	if (m_pCurrentEntity->curstate.sequence >= m_pStudioHeader->numseq)
+	if (m_pCurrentEntity->curstate.sequence >= static_cast<unsigned int>(m_pStudioHeader->numseq))
 		m_pCurrentEntity->curstate.sequence = 0;
 
 	pseqdesc = (mstudioseqdesc_t*)((byte*)m_pStudioHeader + m_pStudioHeader->seqindex) + m_pCurrentEntity->curstate.sequence;
@@ -1817,7 +1817,7 @@ void CStudioModelRenderer::StudioProcessGait(entity_state_t* pplayer)
 		m_pCurrentEntity->latched.prevcontroller[3] = m_pCurrentEntity->curstate.controller[3];
 	}
 
-	if (pplayer->gaitsequence >= m_pStudioHeader->numseq)
+	if (pplayer->gaitsequence >= static_cast<unsigned int>(m_pStudioHeader->numseq))
 		pplayer->gaitsequence = 0;
 
 	pseqdesc = (mstudioseqdesc_t*)((byte*)m_pStudioHeader + m_pStudioHeader->seqindex) + pplayer->gaitsequence;
diff --git a/src/game/server/angelscript/ASServerEngineImpl.cpp b/src/game/server/angelscript/ASServerEngineImpl.cpp
index 22c2b768..b2749bf0 100644
--- a/src/game/server/angelscript/ASServerEngineImpl.cpp
+++ b/src/game/server/angelscript/ASServerEngineImpl.cpp
@@ -244,7 +244,7 @@ bool ASServerEngine::IsValidPlayerImpl(void* player) const
     MinimalEntity* pEntity = (MinimalEntity*)player;
     if (pEntity && pEntity->edict_ptr) {
         int index = g_engfuncs.pfnIndexOfEdict(pEntity->edict_ptr);
-        return (index > 0 && (unsigned int)index <= gpGlobals->maxClients);
+        return (index > 0 && index <= gpGlobals->maxClients);
     }
     return false;
 }
@@ -317,7 +317,7 @@ void* ASServerEngine::GetEdict(void* entity) const
 int ASServerEngine::GetPlayerCountImpl() const
 {
     int count = 0;
-    for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
+    for (int i = 1; i <= gpGlobals->maxClients; i++)
     {
         CBasePlayer* pPlayer = static_cast<CBasePlayer*>(UTIL_PlayerByIndex(i));
         if (pPlayer && IsValidPlayerImpl(pPlayer))
@@ -546,7 +546,7 @@ void* ASServerEngine::FindPlayerBySteamID(const std::string& steamID) const
 {
     if (steamID.empty()) return nullptr;
     
-    for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
+    for (int i = 1; i <= gpGlobals->maxClients; i++)
     {
         CBasePlayer* pPlayer = static_cast<CBasePlayer*>(UTIL_PlayerByIndex(i));
         if (!pPlayer || !IsValidPlayerImpl(pPlayer)) continue;
@@ -567,7 +567,7 @@ void* ASServerEngine::FindPlayerByName(const std::string& playerName) const
 {
     if (playerName.empty()) return nullptr;
     
-    for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
+    for (int i = 1; i <= gpGlobals->maxClients; i++)
     {
         CBasePlayer* pPlayer = static_cast<CBasePlayer*>(UTIL_PlayerByIndex(i));
         if (!pPlayer || !IsValidPlayerImpl(pPlayer)) continue;
diff --git a/src/game/server/client.cpp b/src/game/server/client.cpp
index 8b9a0313..31e53e1f 100644
--- a/src/game/server/client.cpp
+++ b/src/game/server/client.cpp
@@ -187,7 +187,7 @@ void ClientDisconnect(edict_t *pEntity)
 		// Try to get Steam ID from client info
 		int iPlayerIndex = ENTINDEX(pEntity) - 1;
 
-		if (iPlayerIndex >= 0 && (unsigned int)iPlayerIndex < gpGlobals->maxClients)
+		if (iPlayerIndex >= 0 && iPlayerIndex < gpGlobals->maxClients)
 		{
 			clientaddr_t &ClientInfo = g_NewClients[iPlayerIndex];
 			if (ClientInfo.Addr[0])
@@ -625,7 +625,7 @@ void ClientCommand2(edict_t *pEntity)
 				ALERT(at_console, "[AS_RELOAD_SCRIPTS] Script hot-reload completed successfully\n");
 				
 				// Send notification to all players
-				for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
+				for (int i = 1; i <= gpGlobals->maxClients; i++)
 				{
 					CBasePlayer* pOtherPlayer = (CBasePlayer*)UTIL_PlayerByIndex(i);
 					if (pOtherPlayer && pOtherPlayer != pPlayer && pOtherPlayer->m_Initialized)
@@ -1474,7 +1474,7 @@ void ClientCommand2(edict_t *pEntity)
 	else if (FStrEq(pcmd, "entcount"))
 	{
 		int e = 0;
-		for (unsigned int i = 0; i < gpGlobals->maxEntities; i++)
+		for (int i = 0; i < gpGlobals->maxEntities; i++)
 		{
 			edict_t *pEdict = g_engfuncs.pfnPEntityOfEntIndex(i);
 			if (!pEdict)
@@ -2536,7 +2536,7 @@ int AddToFullPack(struct entity_state_s *state, int e, edict_t *ent, edict_t *ho
 	state->owner = 0;
 	if (ent->v.owner)
 	{
-		unsigned int owner = ENTINDEX(ent->v.owner);
+		int owner = ENTINDEX(ent->v.owner);
 
 		// Only care if owned by a player or using special follow
 		if ((owner >= 1 && owner <= gpGlobals->maxClients))
diff --git a/src/game/server/effects/mseffects.cpp b/src/game/server/effects/mseffects.cpp
index 6ff8a9d5..43c38a10 100644
--- a/src/game/server/effects/mseffects.cpp
+++ b/src/game/server/effects/mseffects.cpp
@@ -400,7 +400,7 @@ class CMSChangeLevel : public CBaseEntity
 	string_t sDestMap, sDestTrans;
 	void Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value)
 	{
-		for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
+		for (int i = 1; i <= gpGlobals->maxClients; i++)
 		{
 			CBasePlayer *pPlayer = (CBasePlayer *)UTIL_PlayerByIndex(i);
 			if (!pPlayer)
diff --git a/src/game/server/gamerules/multiplay_gamerules.cpp b/src/game/server/gamerules/multiplay_gamerules.cpp
index 3200019e..0bed2c09 100644
--- a/src/game/server/gamerules/multiplay_gamerules.cpp
+++ b/src/game/server/gamerules/multiplay_gamerules.cpp
@@ -240,7 +240,7 @@ void CHalfLifeMultiplay::Think( void )
 
 bool CHalfLifeMultiplay::IsAnyPlayerAllowedInMap()
 {
-	for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
+	for (int i = 1; i <= gpGlobals->maxClients; i++)
 	{
 		CBasePlayer* pPlayer = (CBasePlayer*)UTIL_PlayerByIndex(i);
 		if (!pPlayer) continue;
@@ -366,7 +366,7 @@ void CHalfLifeMultiplay::InitHUD( CBasePlayer *pPlayer )
 	//Notify all the entities with scripts
 	CBaseEntity *pEntity = NULL;
 	edict_t		*pEdict = NULL;
-	for( unsigned int i = 1; i < gpGlobals->maxEntities; i++ )
+	for(int i = 1; i < gpGlobals->maxEntities; i++ )
 	{
 		pEdict = g_engfuncs.pfnPEntityOfEntIndex( i );
 
@@ -396,7 +396,7 @@ void CHalfLifeMultiplay::InitHUD( CBasePlayer *pPlayer )
 	//SendMOTDToClient( pl->edict() );
 
 	// loop through all active players and send their score info to the new client
-	for (unsigned int i = 1; i <= gpGlobals->maxClients; i++ )
+	for (int i = 1; i <= gpGlobals->maxClients; i++ )
 	{
 		CBasePlayer *pOtherPlayer = (CBasePlayer *)UTIL_PlayerByIndex( i );
 		if( !pOtherPlayer ) continue;
@@ -785,7 +785,7 @@ float CHalfLifeMultiplay::FlWeaponTryRespawn( CBasePlayerItem *pWeapon )
 {
 	if ( pWeapon && pWeapon->m_iId && (pWeapon->iFlags() & ITEM_FLAG_LIMITINWORLD) )
 	{
-		if ( (unsigned int)NUMBER_OF_ENTITIES() < (gpGlobals->maxEntities - ENTITY_INTOLERANCE) )
+		if (NUMBER_OF_ENTITIES() < (gpGlobals->maxEntities - ENTITY_INTOLERANCE) )
 			return 0;
 
 		// we're past the entity tolerance level,  so delay the respawn
@@ -1019,7 +1019,7 @@ typedef struct mapcycle_item_s
 	struct mapcycle_item_s *next;
 
 	char mapname[ 32 ];
-	unsigned int minplayers, maxplayers;
+	int minplayers, maxplayers;
 	char rulebuffer[ MAX_RULE_BUFFER ];
 } mapcycle_item_t;
 
@@ -1215,7 +1215,7 @@ int ReloadMapCycleFile( char *filename, mapcycle_t *cycle )
 
 				item->minplayers = 0;
 				item->maxplayers = 0;
-				unsigned int Minimum = 0;
+				int Minimum = 0;
 
 				memset( item->rulebuffer, 0, MAX_RULE_BUFFER );
 
@@ -1419,7 +1419,7 @@ void CHalfLifeMultiplay :: ChangeLevel( void )
 	int minplayers = 0, maxplayers = 0;
 	strncpy(szFirstMapInList, "edana", sizeof(szFirstMapInList));  // the absolute default level is edana
 
-	unsigned int curplayers;
+	int curplayers;
 	BOOL do_cycle = true;
 
 	// find the map to change to
@@ -1756,7 +1756,7 @@ BOOL CHalfLifeMultiplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd
 		if( pPlayer->m_pTeam && pPlayer->m_pTeam->GetPlayer( 0 ) == pPlayer )
 		{
 			CBasePlayer *pCheckPlayer = NULL;
-			for(unsigned int n = 1; n <= gpGlobals->maxClients; n++ )
+			for(int n = 1; n <= gpGlobals->maxClients; n++ )
 			{
 				pCheckPlayer = (CBasePlayer *)UTIL_PlayerByIndex( n );
 				if( pCheckPlayer && pCheckPlayer->m_pJoinTeam == pPlayer->m_pTeam ) 
@@ -1842,7 +1842,7 @@ BOOL CHalfLifeMultiplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd
 				ALERT(at_console, "as_reload_scripts: Script hot-reload completed successfully\n");
 				
 				// Send notification to all players
-				for(unsigned int i = 1; i <= gpGlobals->maxClients; i++ )
+				for(int i = 1; i <= gpGlobals->maxClients; i++ )
 				{
 					CBasePlayer* pOtherPlayer = (CBasePlayer*)UTIL_PlayerByIndex( i );
 					if( pOtherPlayer && pOtherPlayer != pPlayer )
@@ -2274,7 +2274,7 @@ void CHalfLifeMultiplay	:: UpdateVote( )
 	
 	//Count SPAWNED players (Connecting players don't count)
 	int	iTotalPlayers = 0;
-	for (unsigned int i = 1; i <= gpGlobals->maxClients; i++ )
+	for (int i = 1; i <= gpGlobals->maxClients; i++ )
 	{
 		CBasePlayer *pPlayer = (CBasePlayer *)UTIL_PlayerByIndex( i );
 		if( pPlayer && pPlayer->m_fGameHUDInitialized )
@@ -2287,7 +2287,7 @@ void CHalfLifeMultiplay	:: UpdateVote( )
 
 	//Count votes
 	int iYesVotes = 0;
-	for(unsigned int i = 0; i < gpGlobals->maxClients; i++ )
+	for(int i = 0; i < gpGlobals->maxClients; i++ )
 	{
 		if( FBitSet( m_CurrentVote.VoteTally,(1<<i) ) )
 			iYesVotes++;
diff --git a/src/game/server/gamerules/team.cpp b/src/game/server/gamerules/team.cpp
index f2f541c8..bb7578eb 100644
--- a/src/game/server/gamerules/team.cpp
+++ b/src/game/server/gamerules/team.cpp
@@ -84,7 +84,7 @@ void CTeam ::AddToTeam(CBasePlayer *pPlayer)
 	MemberList.add(Unit);
 
 	//Update everyone
-	for (unsigned int n = 1; n <= gpGlobals->maxClients; n++)
+	for (int n = 1; n <= gpGlobals->maxClients; n++)
 	{
 		CBasePlayer *pSendPlayer = (CBasePlayer *)UTIL_PlayerByIndex(n);
 		if (!pSendPlayer)
@@ -106,7 +106,7 @@ void CTeam ::RemoveFromTeam(CBasePlayer *pPlayer)
 		}
 
 	//Update everyone
-	for (unsigned int n = 1; n <= gpGlobals->maxClients; n++)
+	for (int n = 1; n <= gpGlobals->maxClients; n++)
 	{
 		CBasePlayer *pSendPlayer = (CBasePlayer *)UTIL_PlayerByIndex(n);
 		if (!pSendPlayer)
diff --git a/src/game/server/hl/animation.cpp b/src/game/server/hl/animation.cpp
index 4acfb05b..74666866 100644
--- a/src/game/server/hl/animation.cpp
+++ b/src/game/server/hl/animation.cpp
@@ -91,7 +91,7 @@ int LookupActivity(void *pmodel, entvars_t *pev, int activity)
 
 	int weighttotal = 0;
 	int seq = ACTIVITY_NOT_AVAILABLE;
-	for (unsigned int i = 0; i < pstudiohdr->numseq; i++)
+	for (int i = 0; i < pstudiohdr->numseq; i++)
 	{
 		if (pseqdesc[i].activity == activity)
 		{
@@ -118,7 +118,7 @@ int LookupActivityHeaviest(void *pmodel, entvars_t *pev, int activity)
 
 	int weight = 0;
 	int seq = ACTIVITY_NOT_AVAILABLE;
-	for (unsigned int i = 0; i < pstudiohdr->numseq; i++)
+	for (int i = 0; i < pstudiohdr->numseq; i++)
 	{
 		if (pseqdesc[i].activity == activity)
 		{
@@ -161,7 +161,7 @@ int LookupSequence(void* pmodel, const char* label)
 
 	pseqdesc = (mstudioseqdesc_t*)((byte*)pstudiohdr + pstudiohdr->seqindex);
 
-	for (unsigned int i = 0; i < pstudiohdr->numseq; i++)
+	for (int i = 0; i < pstudiohdr->numseq; i++)
 	{
 		if (_stricmp(pseqdesc[i].label, label) == 0)
 			return i;
@@ -201,7 +201,7 @@ int IsSoundEvent(int eventNumber)
 
 void SequencePrecache(void *pmodel, const char *pSequenceName)
 {
-	unsigned int index = LookupSequence(pmodel, pSequenceName);
+	int index = LookupSequence(pmodel, pSequenceName);
 	if (index >= 0)
 	{
 		studiohdr_t *pstudiohdr;
@@ -216,7 +216,7 @@ void SequencePrecache(void *pmodel, const char *pSequenceName)
 		pseqdesc = (mstudioseqdesc_t *)((byte *)pstudiohdr + pstudiohdr->seqindex) + index;
 		pevent = (mstudioevent_t *)((byte *)pstudiohdr + pseqdesc->eventindex);
 
-		for (unsigned int i = 0; i < pseqdesc->numevents; i++)
+		for (int i = 0; i < pseqdesc->numevents; i++)
 		{
 			// Don't send client-side events to the server AI
 			if (pevent[i].event >= EVENT_CLIENT)
@@ -286,10 +286,11 @@ int GetSequenceFlags(void *pmodel, entvars_t *pev)
 	return pseqdesc->flags;
 }
 
-int GetAnimationEvent(void* pmodel, entvars_t* pev, MonsterEvent_t* pMonsterEvent, float flStart, float flEnd, unsigned int index)
+int GetAnimationEvent(void* pmodel, entvars_t* pev, MonsterEvent_t* pMonsterEvent, float flStart, float flEnd, int index)
 {
 	studiohdr_t* pstudiohdr;
 
+
 	pstudiohdr = (studiohdr_t*)pmodel;
 	if (!pstudiohdr || pev->sequence < 0 || pev->sequence >= pstudiohdr->numseq || !pMonsterEvent)
 		return 0;
@@ -302,7 +303,7 @@ int GetAnimationEvent(void* pmodel, entvars_t* pev, MonsterEvent_t* pMonsterEven
 	pseqdesc = (mstudioseqdesc_t*)((byte*)pstudiohdr + pstudiohdr->seqindex) + (int)pev->sequence;
 	pevent = (mstudioevent_t*)((byte*)pstudiohdr + pseqdesc->eventindex);
 
-	if (pseqdesc->numevents == 0 || index > pseqdesc->numevents)
+	if (pseqdesc->numevents == 0 || static_cast<int>(index) > pseqdesc->numevents)
 		return 0;
 
 	if (pseqdesc->numframes > 1)
@@ -476,7 +477,7 @@ int FindTransition(void *pmodel, int iEndingAnim, int iGoalAnim, int *piDir)
 	if (iInternNode == 0)
 		return iGoalAnim;
 
-	unsigned int i;
+	int i;
 
 	// look for someone going
 	for (i = 0; i < pstudiohdr->numseq; i++)
diff --git a/src/game/server/hl/animation.h b/src/game/server/hl/animation.h
index cead84df..658f706e 100644
--- a/src/game/server/hl/animation.h
+++ b/src/game/server/hl/animation.h
@@ -45,7 +45,7 @@ int FindTransition(void *pmodel, int iEndingAnim, int iGoalAnim, int *piDir);
 void SetBodygroup(void *pmodel, entvars_t *pev, int iGroup, int iValue);
 int GetBodygroup(void *pmodel, entvars_t *pev, int iGroup);
 
-int GetAnimationEvent(void *pmodel, entvars_t *pev, MonsterEvent_t *pMonsterEvent, float flStart, float flEnd, unsigned int index);
+int GetAnimationEvent(void *pmodel, entvars_t *pev, MonsterEvent_t *pMonsterEvent, float flStart, float flEnd, int index);
 int ExtractBbox(void *pmodel, int sequence, float *mins, float *maxs);
 
 #endif //ANIMATION_H
diff --git a/src/game/server/hl/soundent.cpp b/src/game/server/hl/soundent.cpp
index fe9df4a5..70592469 100644
--- a/src/game/server/hl/soundent.cpp
+++ b/src/game/server/hl/soundent.cpp
@@ -240,7 +240,7 @@ int CSoundEnt :: InsertSound ( int iType, const Vector &vecOrigin, int iVolume,
 //=========================================================
 void CSoundEnt :: Initialize ( void )
 {
-  	unsigned int i;
+  	int i;
 	int iSound;
 
 	m_cLastActiveSounds;
diff --git a/src/game/server/hl/util.cpp b/src/game/server/hl/util.cpp
index 5906610d..b2d908be 100644
--- a/src/game/server/hl/util.cpp
+++ b/src/game/server/hl/util.cpp
@@ -407,7 +407,7 @@ void UTIL_MoveToOrigin(edict_t *pent, const Vector &vecGoal, float flDist, int i
 
 int UTIL_EntitiesInBox(CBaseEntity **pList, int listMax, const Vector &mins, const Vector &maxs, int flagMask, int startIndex)
 {
-	if ((unsigned int)startIndex >= gpGlobals->maxEntities) //End recursion if you have no more entities to search (shouldn't happen anyway) MiB Feb2008a
+	if (startIndex >= gpGlobals->maxEntities) //End recursion if you have no more entities to search (shouldn't happen anyway) MiB Feb2008a
 		return 0;
 
 	edict_t *pEdict = g_engfuncs.pfnPEntityOfEntIndex(startIndex);
@@ -423,7 +423,7 @@ int UTIL_EntitiesInBox(CBaseEntity **pList, int listMax, const Vector &mins, con
 		//return count;
 	}
 
-	for (unsigned int i = startIndex + 1; i < gpGlobals->maxEntities; i++, pEdict++) //MAR2008b - zapping neo-chatbug
+	for (int i = startIndex + 1; i < gpGlobals->maxEntities; i++, pEdict++) //MAR2008b - zapping neo-chatbug
 	{
 		if (pEdict->free || !pEdict->pvPrivateData) //MAR2008b - zapping neo-chatbug
 			continue;
@@ -455,7 +455,7 @@ int UTIL_EntitiesInBox(CBaseEntity **pList, int listMax, const Vector &mins, con
 
 int UTIL_MonstersInSphere(CBaseEntity **pList, int listMax, const Vector &center, float radius, int startIndex)
 {
-	if ((unsigned int)startIndex >= gpGlobals->maxEntities) //End recursion if you have no more entities to search (shouldn't happen anyway) MiB Feb2008a
+	if (startIndex >= gpGlobals->maxEntities) //End recursion if you have no more entities to search (shouldn't happen anyway) MiB Feb2008a
 		return 0;
 
 	edict_t *pEdict = g_engfuncs.pfnPEntityOfEntIndex(startIndex);
@@ -474,7 +474,7 @@ int UTIL_MonstersInSphere(CBaseEntity **pList, int listMax, const Vector &center
 		//return count;
 	}
 
-	for (unsigned int i = startIndex + 1; i < gpGlobals->maxEntities; i++, pEdict++) //MAR2008b - zapping neo-chatbug
+	for (int i = startIndex + 1; i < gpGlobals->maxEntities; i++, pEdict++) //MAR2008b - zapping neo-chatbug
 	{
 		if (pEdict->free || !pEdict->pvPrivateData) //MAR2008b - zapping neo-chatbug
 			continue;
@@ -588,7 +588,7 @@ CBaseEntity *UTIL_PlayerByIndex(int playerIndex)
 {
 	CBaseEntity *pPlayer = NULL;
 
-	if (playerIndex > 0 && (unsigned int)playerIndex <= gpGlobals->maxClients)
+	if (playerIndex > 0 && playerIndex <= gpGlobals->maxClients)
 	{
 		edict_t *pPlayerEdict = INDEXENT(playerIndex);
 		if (pPlayerEdict && !pPlayerEdict->free)
@@ -602,7 +602,7 @@ CBaseEntity *UTIL_PlayerByIndex(int playerIndex)
 
 CBasePlayer* UTIL_PlayerBySteamID(ID64 steamID64)
 {
-	for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
+	for (int i = 1; i <= gpGlobals->maxClients; i++)
 	{
 		CBaseEntity* pEntity = UTIL_PlayerByIndex(i);
 		CBasePlayer* pPlayer = (pEntity ? (CBasePlayer*)pEntity : NULL);
@@ -845,7 +845,7 @@ void Util_ScriptArray(CBaseEntity *pEntity, const char *array_operation, const c
 int UTIL_NumPlayers()
 {
 	int total_valid_players = 0;
-	for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
+	for (int i = 1; i <= gpGlobals->maxClients; i++)
 	{
 		CBaseEntity *pEntity = UTIL_PlayerByIndex(i);
 		CBasePlayer *pPlayer = pEntity ? (CBasePlayer *)pEntity : NULL;
@@ -869,7 +869,7 @@ int UTIL_NumActivePlayers()
 {
 	int total_valid_players = 0;
 	bool flagged_invalid = false;
-	for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
+	for (int i = 1; i <= gpGlobals->maxClients; i++)
 	{
 		CBaseEntity *pEntity = UTIL_PlayerByIndex(i);
 		CBasePlayer *pPlayer = pEntity ? (CBasePlayer *)pEntity : NULL;
@@ -905,7 +905,7 @@ float UTIL_TotalHP()
 	int total_valid_players = 0;
 	bool flagged_invalid = false;
 	float total_hp = 0;
-	for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
+	for (int i = 1; i <= gpGlobals->maxClients; i++)
 	{
 		CBaseEntity *pEntity = UTIL_PlayerByIndex(i);
 		CBasePlayer *pPlayer = pEntity ? (CBasePlayer *)pEntity : NULL;
@@ -942,7 +942,7 @@ float UTIL_AvgHP()
 	int total_valid_players = 0;
 	bool flagged_invalid = false;
 	float total_hp = 0;
-	for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
+	for (int i = 1; i <= gpGlobals->maxClients; i++)
 	{
 		CBaseEntity *pEntity = UTIL_PlayerByIndex(i);
 		CBasePlayer *pPlayer = pEntity ? (CBasePlayer *)pEntity : NULL;
@@ -1062,7 +1062,7 @@ static short FixedSigned16(float value, float scale)
 // UNDONE: Affect user controls?
 void UTIL_ScreenShake(const Vector &center, float amplitude, float frequency, float duration, float radius)
 {
-	unsigned int i;
+	int i;
 	float localAmplitude;
 	ScreenShake shake{};
 
@@ -1160,7 +1160,7 @@ void UTIL_ScreenFadeWrite(const ScreenFade &fade, CBaseEntity *pEntity)
 
 void UTIL_ScreenFadeAll(const Vector &color, float fadeTime, float fadeHold, int alpha, int flags)
 {
-	unsigned int i;
+	int i;
 	ScreenFade fade;
 
 	UTIL_ScreenFadeBuild(fade, color, fadeTime, fadeHold, alpha, flags);
@@ -1217,7 +1217,7 @@ void UTIL_HudMessage(CBaseEntity *pEntity, const hudtextparms_t &textparms, cons
 
 void UTIL_HudMessageAll(const hudtextparms_t &textparms, const char *pMessage)
 {
-	unsigned int i = 0;
+	int i = 0;
 	//UTIL_ClientPrintAll( HUD_PRINTNOTIFY, "Game_text reached UTIL_HudMessageAll","test");
 	for (i = 1; i <= gpGlobals->maxClients; i++)
 	{
@@ -1325,7 +1325,7 @@ void UTIL_ShowMessage(const char *pString, CBaseEntity *pEntity)
 
 void UTIL_ShowMessageAll(const char *pString)
 {
-	unsigned int i;
+	int i;
 
 	// loop through all players
 
diff --git a/src/game/server/msmapents.cpp b/src/game/server/msmapents.cpp
index 13e1e057..dcb3e194 100644
--- a/src/game/server/msmapents.cpp
+++ b/src/game/server/msmapents.cpp
@@ -1,2143 +1,2143 @@
-#include "msdllheaders.h"
-#include "player.h"
-#include "svglobals.h"
-#include "global.h"
-#include "mscharacter.h"
-#include "filesystem_shared.h"
-#include "mslogger.h"
-#include "ms/angelscript/CAngelScriptManager.h" // For AngelScript map transitions
-
+#include "msdllheaders.h"
+#include "player.h"
+#include "svglobals.h"
+#include "global.h"
+#include "mscharacter.h"
+#include "filesystem_shared.h"
+#include "mslogger.h"
+#include "ms/angelscript/CAngelScriptManager.h" // For AngelScript map transitions
+
 #ifndef EFFECTS_H
 #include "effects.h"
 #endif // !EFFECTS_H
-
-
-class CCycler : public CBaseMonster
-{
-public:
-	void GenericCyclerSpawn(char *szModel, Vector vecMin, Vector vecMax);
-	virtual int ObjectCaps(void) { return (CBaseEntity ::ObjectCaps() | FCAP_IMPULSE_USE); }
-	int TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType);
-	void Spawn(void);
-	void Think(void);
-	//void Pain( float flDamage );
-	void Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value);
-
-	// Don't treat as a live target
-	virtual BOOL IsAlive(void) { return false; }
-
-	virtual int Save(CSave &save);
-	virtual int Restore(CRestore &restore);
-	static TYPEDESCRIPTION m_SaveData[];
-
-	int m_animate;
-};
-
-TYPEDESCRIPTION CCycler::m_SaveData[] =
-{
-	DEFINE_FIELD(CCycler, m_animate, FIELD_INTEGER),
-};
-
-IMPLEMENT_SAVERESTORE(CCycler, CBaseMonster);
-
-//
-// we should get rid of all the other cyclers and replace them with this.
-//
-class CGenericCycler : public CCycler
-{
-public:
-	void Spawn(void) { GenericCyclerSpawn((char *)STRING(pev->model), Vector(-16, -16, 0), Vector(16, 16, 72)); }
-};
-LINK_ENTITY_TO_CLASS(cycler, CGenericCycler);
-
-// Cycler member functions
-
-void CCycler::GenericCyclerSpawn(char *szModel, Vector vecMin, Vector vecMax)
-{
-	if (!szModel || !*szModel)
-	{
-		ALERT(at_error, "Cycler (%.0f %.0f %0.f) Missing model name!\n", pev->origin.x, pev->origin.y, pev->origin.z);
-		REMOVE_ENTITY(ENT(pev));
-		return;
-	}
-
-	//hack to fix maps that wont load because they have old cyclers pointing to missing models
-	const auto fileContents = FileSystem_LoadFileIntoBuffer(szModel, FileContentFormat::Binary);
-
-	if (fileContents.empty())
-	{
-		ALERT(at_error, "Cycler (%.0f %.0f %0.f) Model: \'%s\' NOT FOUND!\n", pev->origin.x, pev->origin.y, pev->origin.z, szModel);
-		REMOVE_ENTITY(ENT(pev));
-		return;
-	}
-
-	pev->classname = MAKE_STRING("cycler");
-	PRECACHE_MODEL(szModel);
-	SET_MODEL(ENT(pev), szModel);
-
-	CCycler::Spawn();
-
-	UTIL_SetSize(pev, vecMin, vecMax);
-}
-
-void CCycler::Spawn()
-{
-	InitBoneControllers();
-	pev->solid = SOLID_SLIDEBOX;
-	pev->movetype = MOVETYPE_NONE;
-	pev->takedamage = DAMAGE_YES;
-	pev->effects = 0;
-	pev->health = 80000; // no cycler should die
-	pev->yaw_speed = 5;
-	pev->ideal_yaw = pev->angles.y;
-	ChangeYaw(360);
-
-	m_flFrameRate = 75;
-	m_flGroundSpeed = 0;
-
-	pev->nextthink += 1.0;
-
-	ResetSequenceInfo();
-
-	if (pev->sequence != 0 || pev->frame != 0)
-	{
-		m_animate = 0;
-		pev->framerate = 0;
-	}
-	else
-	{
-		m_animate = 1;
-	}
-}
-
-//
-// cycler think
-//
-void CCycler::Think(void)
-{
-	pev->nextthink = gpGlobals->time + 0.1;
-
-	if (m_animate)
-	{
-		StudioFrameAdvance();
-	}
-	if (m_fSequenceFinished && !m_fSequenceLoops)
-	{
-		// ResetSequenceInfo();
-		// hack to avoid reloading model every frame
-		pev->animtime = gpGlobals->time;
-		pev->framerate = 1.0;
-		m_fSequenceFinished = false;
-		m_flLastEventCheck = gpGlobals->time;
-		pev->frame = 0;
-		if (!m_animate)
-			pev->framerate = 0.0; // FIX: don't reset framerate
-	}
-}
-
-//
-// CyclerUse - starts a rotation trend
-//
-void CCycler::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value)
-{
-	m_animate = !m_animate;
-	if (m_animate)
-		pev->framerate = 1.0;
-	else
-		pev->framerate = 0.0;
-}
-
-//
-// CyclerPain , changes sequences when shot
-//
-//void CCycler :: Pain( float flDamage )
-int CCycler::TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType)
-{
-	if (m_animate)
-	{
-		pev->sequence++;
-
-		ResetSequenceInfo();
-
-		if (m_flFrameRate == 0.0)
-		{
-			pev->sequence = 0;
-			ResetSequenceInfo();
-		}
-		pev->frame = 0;
-	}
-	else
-	{
-		pev->framerate = 1.0;
-		StudioFrameAdvance(0.1);
-		pev->framerate = 0;
-		ALERT(at_console, "sequence: %d, frame %.0f\n", pev->sequence, pev->frame);
-	}
-
-	return 0;
-}
-
-class CCyclerSprite : public CBaseEntity
-{
-public:
-	void Spawn(void);
-	void Think(void);
-	void Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value);
-	virtual int ObjectCaps(void) { return (CBaseEntity ::ObjectCaps() | FCAP_DONT_SAVE | FCAP_IMPULSE_USE); }
-	virtual int TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType);
-	void Animate(float frames);
-
-	virtual int Save(CSave &save);
-	virtual int Restore(CRestore &restore);
-	static TYPEDESCRIPTION m_SaveData[];
-
-	inline int ShouldAnimate(void) { return m_animate && m_maxFrame > 1.0; }
-	int m_animate;
-	float m_lastTime;
-	float m_maxFrame;
-};
-
-LINK_ENTITY_TO_CLASS(cycler_sprite, CCyclerSprite);
-
-TYPEDESCRIPTION CCyclerSprite::m_SaveData[] =
-{
-	DEFINE_FIELD(CCyclerSprite, m_animate, FIELD_INTEGER),
-	DEFINE_FIELD(CCyclerSprite, m_lastTime, FIELD_TIME),
-	DEFINE_FIELD(CCyclerSprite, m_maxFrame, FIELD_FLOAT),
-};
-
-IMPLEMENT_SAVERESTORE(CCyclerSprite, CBaseEntity);
-
-void CCyclerSprite::Spawn(void)
-{
-	pev->solid = SOLID_SLIDEBOX;
-	pev->movetype = MOVETYPE_NONE;
-	pev->takedamage = DAMAGE_YES;
-	pev->effects = 0;
-
-	pev->frame = 0;
-	pev->nextthink = gpGlobals->time + 0.1;
-	m_animate = 1;
-	m_lastTime = gpGlobals->time;
-
-	PRECACHE_MODEL((char *)STRING(pev->model));
-	SET_MODEL(ENT(pev), STRING(pev->model));
-
-	m_maxFrame = (float)MODEL_FRAMES(pev->modelindex) - 1;
-}
-
-void CCyclerSprite::Think(void)
-{
-	if (ShouldAnimate())
-		Animate(pev->framerate * (gpGlobals->time - m_lastTime));
-
-	pev->nextthink = gpGlobals->time + 0.1;
-	m_lastTime = gpGlobals->time;
-}
-
-void CCyclerSprite::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value)
-{
-	m_animate = !m_animate;
-	ALERT(at_console, "Sprite: %s\n", STRING(pev->model));
-}
-
-int CCyclerSprite::TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType)
-{
-	if (m_maxFrame > 1.0)
-	{
-		Animate(1.0);
-	}
-	return 1;
-}
-
-void CCyclerSprite::Animate(float frames)
-{
-	pev->frame += frames;
-	if (m_maxFrame > 0)
-		pev->frame = fmod(pev->frame, m_maxFrame);
-}
-
-//Thothie OCT2007a - generate random events
-//Wait - multi_manager has a random property? :|
-/*class CRandEvent : public CPointEntity
-{
-public:
-	msstring thoth_event_prefix;
-	void Spawn( void )
-	{
-
-	}
-	void Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
-	{
-		SUB_UseTargets( this, triggerType, 0 );
-
-		if ( pev->spawnflags & SF_RELAY_FIREONCE )
-			UTIL_Remove( this );
-	}
-	void KeyValue( KeyValueData *pkvd )
-	{
-		if (FStrEq(pkvd->szKeyName, "prefix"))
-		{
-			thoth_event_prefix = pkvd->szValue;
-			pkvd->fHandled = true;
-		}
-		else if (FStrEq(pkvd->szKeyName, "nevents")) 
-		{
-			//Thothie - AUG2007a - adding option to only spawn monster if # players present
-			thoth_nevents = (atoi(pkvd->szValue));
-			pkvd->fHandled = true;
-		}
-	}
-}*/
-
-//
-// For Ewok.
-//
-class CStaticModel : public CBaseEntity
-{
-public:
-	void Spawn(void)
-	{
-		//Save these, since they change when the model is loaded
-		Vector vMins = pev->mins, vMaxs = pev->maxs;
-		int body = pev->body;	  //Thothie attempting to fix env_model body not settings
-		int skin = pev->skin;	  //" " skin
-		float scale = pev->scale; //FEB2010_23 - scale for env_model
-
-		//Set model
-		char *pszModel = (char *)STRING(pev->model);
-		if (!pszModel || !pszModel[0])
-		{
-			ALERT(at_console, "Error: env_model - no model specified");
-			return;
-		}
-		PRECACHE_MODEL(pszModel);
-		SET_MODEL(ENT(pev), pszModel);
-		//Set solidity
-		if (pev->dmg)
-		{
-			pev->solid = SOLID_SLIDEBOX;
-			UTIL_SetSize(pev, vMins, vMaxs);
-		}
-		pev->body = body; //Thothie (see above)
-		pev->skin = skin; //Thothie (see above)
-		pev->controller[0] = 255 / 2;
-		pev->controller[1] = 255 / 2;
-		pev->controller[2] = 255 / 2;
-		pev->controller[3] = 255 / 2;
-
-		// Strip Edicts with no targetname
-		/*if (FStringNull(this->pev->targetname))
-		{
-			this->pev->flags |= FL_CLIENTONLY;
-			SET_MODEL(ENT(this->pev), iStringNull);
-			UTIL_Remove(this);
-		}*/
-	}
-};
-LINK_ENTITY_TO_CLASS(env_model, CStaticModel);
-
-// MP3 Playback
-
-
-
-class CTargetMP3Audio : public CPointEntity
-{
-public:
-	void Spawn(void);
-
-	void Use(CBaseEntity *pActivator, CBaseEntity *pCaller,
-			 USE_TYPE useType, float value);
-
-	BOOL m_bPlaying;
-};
-
-LINK_ENTITY_TO_CLASS(trigger_mp3audio, CTargetMP3Audio);
-
-void CTargetMP3Audio ::Spawn(void)
-{
-	pev->solid = SOLID_NOT;
-	pev->movetype = MOVETYPE_NONE;
-
-	m_bPlaying = false; // start out not playing
-}
-
-void CTargetMP3Audio::Use(CBaseEntity *pActivator, CBaseEntity *pCaller,
-						  USE_TYPE useType, float value)
-{
-	char command[64];
-
-	if (!pActivator->IsPlayer()) // activator should be a player
-		return;
-
-	if (!m_bPlaying) // if we're not playing, start playing!
-		m_bPlaying = true;
-	else
-	{ // if we're already playing, stop the mp3
-		m_bPlaying = false;
-		CLIENT_COMMAND(pActivator->edict(), "mp3 stop\n");
-		return;
-	}
-
-	// issue the play/loop command
-	//Thothie AUG2007a - removing music/ dependancy, so you can play MP3's in valve/media/ folder
-	msstring th_test_string = STRING(pev->message);
-	if (th_test_string.contains("/"))
-		_snprintf(command, sizeof(command),  "mp3 %s %s\n",  FBitSet(pev->spawnflags,  SF_LOOP) ? "loop" : "play",  STRING(pev->message) );
-	else
-		_snprintf(command, sizeof(command),  "mp3 %s music/%s\n",  FBitSet(pev->spawnflags,  SF_LOOP) ? "loop" : "play",  STRING(pev->message) );
-
-	CLIENT_COMMAND(pActivator->edict(), command); //thothie - not sure how this works, might be useful to know
-
-	// remove if set
-	if (FBitSet(pev->spawnflags, SF_REMOVE_ON_FIRE))
-		UTIL_Remove(this);
-}
-
-//Thothie's half-assed game_text fix
-class CGameText : public CPointEntity
-{
-public:
-	inline void MessageSet(const char *pMessage) { pev->message = ALLOC_STRING(pMessage); }
-	inline const char *MessageGet(void) { return STRING(pev->message); }
-	msstring ms_npcname;
-	bool ms_sayasnpc;
-
-	void Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value)
-	{
-		//for( int i = 1; i <= gpGlobals->maxClients; i++ )
-		//{
-		//CBasePlayer *pOtherPlayer = (CBasePlayer *)UTIL_PlayerByIndex( i );
-		if (!ms_sayasnpc)
-		{
-			SendHUDMsgAll((ms_npcname.len() > 0) ? ms_npcname.c_str() : "   ", MessageGet());
-		}
-		else
-		{
-			static msstringlist Params;
-			Params.clearitems();
-			Params.add(ms_npcname.c_str());
-			Params.add(MessageGet());
-
-			CBaseEntity* pGameMasterEnt = UTIL_FindEntityByString(NULL, "netname", msstring("-") + "game_master");
-			IScripted* pGMScript = (pGameMasterEnt ? pGameMasterEnt->GetScripted() : NULL);
-			if (pGMScript)
-				pGMScript->CallScriptEvent("gm_ms_text", &Params);
-		}
-
-		//UTIL_SayTextAll( MessageGet(), pActivator );
-		//UTIL_HudMessageAll( thoth_textdef, MessageGet() );
-		//}
-	}
-
-	//NOV2014_20 Thothie - add ms_text option to "say" text as NPC
-	void KeyValue(KeyValueData *pkvd)
-	{
-		if (FStrEq(pkvd->szKeyName, "npcname"))
-		{
-			ms_npcname = pkvd->szValue;
-			pkvd->fHandled = true;
-		}
-		else if (FStrEq(pkvd->szKeyName, "sayasnpc"))
-		{
-			ms_sayasnpc = (atoi(pkvd->szValue) == 1) ? true : false;
-			pkvd->fHandled = true;
-		}
-	}
-};
-LINK_ENTITY_TO_CLASS(game_text, CGameText);
-LINK_ENTITY_TO_CLASS(ms_text, CGameText); //Thothie AUG2007a - To get around FGD issues
-
-//
-// Weather Changer
-//
-class CMSWeather : public CBaseEntity
-{
-public:
-	void Spawn(void)
-	{
-		//Thothie DEC2010_27 - weather is precached with player script
-		/*
-		msstringlist Parameters;
-		Parameters.add( m_WeatherName );
-		if( MSGlobals::GameScript )
-		{
-			MSGlobals::GameScript->SetScriptVar( "game.precacheweather", m_WeatherName );
-			MSGlobals::GameScript->CallScriptEvent( "game_precache_weather", &Parameters );
-		}
-		*/
-	}
-
-	void Use(CBaseEntity* pActivator, CBaseEntity* pCaller, USE_TYPE useType, float value)
-	{
-		msstringlist Parameters;
-		Parameters.add(m_WeatherName);
-		TokenizeString(m_WeatherOptions, Parameters);
-
-		//Thothie DEC2010_27 - lock weather via game master
-		CBaseEntity* pGameMasterEnt = UTIL_FindEntityByString(NULL, "netname", msstring("-") + "game_master");
-		IScripted* pGMScript = (pGameMasterEnt ? pGameMasterEnt->GetScripted() : NULL);
-		if (pGMScript)
-			pGMScript->CallScriptEvent("game_set_weather", &Parameters);
-
-		//Thothie DEC2010_27 - old system
-		/*
-		if( MSGlobals::GameScript )
-			MSGlobals::GameScript->CallScriptEvent( "game_change_weather", &Parameters );
-		*/
-	}
-
-	void KeyValue(KeyValueData *pkvd)
-	{
-		if (!strcmp(pkvd->szKeyName, "weather"))
-			m_WeatherName = pkvd->szValue;
-		else if (!strcmp(pkvd->szKeyName, "options"))
-			m_WeatherOptions = pkvd->szValue;
-		else
-			CBaseEntity::KeyValue(pkvd);
-	}
-
-	msstring m_WeatherName;
-	msstring m_WeatherOptions;
-};
-LINK_ENTITY_TO_CLASS(mstrig_weather, CMSWeather);
-
-// **************************************************
-//
-//		   msarea_* Classes.  Entity brushes
-//
-// **************************************************
-
-class CAreaInvisible : public CBaseEntity
-{
-public:
-	void Spawn()
-	{
-		pev->angles = g_vecZero;
-		pev->movetype = MOVETYPE_PUSH; // so it doesn't get pushed by anything
-		pev->solid = SOLID_NOT;
-		SET_MODEL(ENT(pev), STRING(pev->model));
-
-		// If it can't move/go away, it's really part of the world
-		//pev->flags |= FL_WORLDBRUSH;
-		m_Brush = true;
-
-		//pev->spawnflags |= SF_WALL_START_OFF;
-
-		SetBits(pev->effects, EF_NODRAW);
-		BaseClass::Spawn();
-	}
-};
-
-//[begin] Thothie NOV2014_07 msarea_music_dynamic for CBM system
-class CAreaMusicDyn : public CAreaInvisible
-{
-public:
-	std::string mt_idle;
-	std::string mt_combat;
-	std::string mt_global;	 //play for all players
-	std::string mt_playnow; //0= neither, 1= idle, 2= combat
-
-	void Spawn()
-	{
-		CAreaInvisible::Spawn();
-		pev->solid = SOLID_TRIGGER;
-		UTIL_SetOrigin(pev, pev->origin);
-		SetTouch(&CAreaMusicDyn::MusicTouch);
-	}
-
-	void KeyValue(KeyValueData *pkvd)
-	{
-		if (FStrEq(pkvd->szKeyName, "midle"))
-		{
-			mt_idle = pkvd->szValue;
-			pkvd->fHandled = true;
-		}
-		else if (FStrEq(pkvd->szKeyName, "mcombat"))
-		{
-			mt_combat = pkvd->szValue;
-			pkvd->fHandled = true;
-		}
-		else if (FStrEq(pkvd->szKeyName, "playall"))
-		{
-			mt_global = pkvd->szValue;
-			pkvd->fHandled = true;
-		}
-		else if (FStrEq(pkvd->szKeyName, "playnow"))
-		{
-			mt_playnow = pkvd->szValue;
-			pkvd->fHandled = true;
-		}
-		else
-			CBaseEntity::KeyValue(pkvd);
-	}
-
-	void MusicTouch(CBaseEntity *pOther)
-	{
-		
-		if (!pOther || !pOther->IsPlayer())
-			return;
-
-		int i, max;
-		if (mt_global == "1")
-		{
-			i = 1;
-			max = gpGlobals->maxClients;
-		}
-		else
-		{
-			i = pOther->entindex();
-			max = i;
-		}
-
-		do
-		{
-			if (mt_playnow == "1") //idle music
-			{
-				((CBasePlayer*)pOther)->SwapMusic(this->entindex(), MUSIC_AREA, mt_idle);
-			}
-			else if (mt_playnow == "2") //combat music
-			{
-				((CBasePlayer*)pOther)->SwapMusic(this->entindex(), MUSIC_COMBAT, mt_combat);
-			}
-
-			i++;
-		} while (i <= max);
-	}
-};
-LINK_ENTITY_TO_CLASS(msarea_music_dynamic, CAreaMusicDyn);
-//[end] Thothie NOV2014_07 msarea_music_dynamic for CBM system
-
-class CAreaMusic : public CAreaInvisible
-{
-public:
-	string_t m_sMaster;
-	std::string m_sSong;
-
-	void Spawn()
-	{
-		CAreaInvisible::Spawn();
-		pev->solid = SOLID_TRIGGER;
-		UTIL_SetOrigin(pev, pev->origin);
-		SetTouch(&CAreaMusic::MusicTouch);
-	}
-
-	void KeyValue(KeyValueData* pkvd)
-	{
-		std::string keyName = pkvd->szKeyName;
-		if (keyName == "song")
-		{
-			m_sSong = pkvd->szValue;
-			pkvd->fHandled = true;
-		}
-		else if (keyName.find(".mp3") != std::string::npos) //Legacy way of playing mp3s
-		{
-			m_sSong = pkvd->szKeyName;
-			pkvd->fHandled = true;
-		}
-		else
-			CBaseEntity::KeyValue(pkvd);
-	}
-
-	void Deactivate() {  }
-
-	void MusicTouch(CBaseEntity *pOther)
-	{
-		//No songs, can't play anything (code below would crash) - Solokiller 5/10/2017
-		if (m_sSong.size() == 0 || !pOther || !pOther->IsPlayer())
-			return;
-
-		MSGlobals::AllMusic.clear(); //Area trigger stops all music
-
-		if (m_sSong.find(".mp3") == std::string::npos || m_sSong == "stop.mp3") //if no .mp3 is found, assume they want to stop music. Also support legacy "stop.mp3"
-		{
-			((CBasePlayer*)pOther)->SwapMusic(this->entindex(), MUSIC_STOP, m_sSong);
-		}
-
-		if (m_sSong.find(".mp3") != std::string::npos || m_sSong.find(".ogg") != std::string::npos)
-		{
-			((CBasePlayer*)pOther)->SwapMusic(this->entindex(), MUSIC_AREA, m_sSong);
-		}
-
-		if (m_sSong != MSGlobals::AllMusic)
-		{
-			((CBasePlayer*)pOther)->SwapMusic(this->entindex(), MUSIC_AREA, m_sSong);
-		}
-	}
-
-	void Use(CBaseEntity* pActivator, CBaseEntity* pCaller, USE_TYPE useType, float value)
-	{
-		if (m_sSong.size() == 0) return;
-
-		MSGlobals::AllMusicMode = MUSIC_AREA; //Point trigger always plays to all
-		MSGlobals::AllMusic = m_sSong;
-
-		int i = 1, max = gpGlobals->maxClients;
-		do
-		{
-			CBaseEntity* targ = UTIL_PlayerByIndex(i);
-			if (targ && targ->IsPlayer())
-			{
-				((CBasePlayer*)targ)->SwapMusic(this->entindex(), MUSIC_AREA, m_sSong);
-			}
-			i++;
-		} while (i <= max);
-	}
-};
-LINK_ENTITY_TO_CLASS(msarea_music, CAreaMusic);
-LINK_ENTITY_TO_CLASS(mstrig_music, CAreaMusic);
-
-struct monster_data_t
-{
-	string_t classname,
-		target,
-		targetname,
-		killtarget,
-		perishtarget,
-		title,	   //Thothie AUG2007b allow monster name changes
-		addparams, //Thothie DEC2007a allow pass params to script
-		scriptfile;
-
-	float delaylow,
-		delayhigh,
-		delayvalue, //the current delay
-		deathtime,
-		spawnchance,
-		dmgmulti, //Thothie SEP2007a
-		hpmulti;  //Thothie SEP2007a
-
-	int lives,
-		livesleft,
-		hpreq_min,	//Thothie FEB2011_22 - allow min;max hpreq definition
-		hpreq_max,	//Thothie FEB2011_22 - allow min;max hpreq definition
-		nplayers;	//Thothie AUG2007a - req# players for monster to spawn
-		
-	unsigned int m_nRndMobs; //NOV2014_20 - Thothie msmonster_random
-
-	Vector origin, angles;
-	bool spawned,
-		spawnontrigger, //monster only spawns when individually triggered
-		triggered,
-		hpreq_useavg; //Thothie OCT2015_28 - allow use average when calculating HP req, if token 2-3 is "avg";
-	long lPrivData,
-		lTrigPrivData; //For monsters spawned by trigger
-
-	mslist<random_monster_t> random_monsterdata; //NOV2014_20 - Thothie msmonster_random
-};
-
-class CAreaMonsterSpawn : public CAreaInvisible
-{
-public:
-	monster_data_t mdSpawnMonster[32];
-	unsigned int iMonstersToSpawn;
-	int iPlayerReq;			//Thothie AUG2007a - adding optional player req
-	int iHPReq_min;			//Thothie AUG2007a - adding optional total HP on server req
-	int iHPReq_max;			//Thothie FEB2011_22 - adding min;max option for reqhp
-	float flNextSpawnTime; //Thothie - JUN2007 - trying to stagger monster spawns to reduce lag
-	enum spawnloc_e
-	{
-		SPAWNLOC_FIXED,
-		SPAWNLOC_RANDOM
-	} m_SpawnLoc;
-	bool m_fSpawnOnTrigger,
-		m_fActive,			   //Set to false when ALL monsters run out of lives.
-		hpreq_useavg; //Thothie OCT2015_28 - allow use average when calculating HP req, if token 2-3 is "avg";
-	bool bSpawnImmediately; //Thothie JUN2007b this bits tells it to spawn all monsters imediately, if spawn isnt triggered (see second occurance below)
-	string_t m_sTargetAllPerish;
-	int resetwhen;		//NOV2014_20 Thothie - attempting to allow changes as to when ms_monsterspawn can respawn mobs 0=when all dead, 1=when any mob dead, 2=whenever triggered
-	bool didfirstspawn; //NOV2014_20 Thothie - the above requires us to know whether we've done the initial spawn or not
-	msstring sAddParams; //Thothie OCT2015_28 - pass additional parameters via monsterspawner
-
-	void Spawn()
-	{
-		//bool didfirstspawn = false; //NOV2014_20 Thothie - adding resetwhen options
-		if (!m_fSpawnOnTrigger)
-		{
-			m_fActive = true;
-			SetThink(&CAreaMonsterSpawn::SpawnMonsters);
-			pev->nextthink = pev->ltime + 3.0;
-		}
-		else
-			m_fActive = false;
-		CAreaInvisible::Spawn();
-		SetUse(&CAreaMonsterSpawn::ResetUse);
-	}
-
-	//Triggering this resets it.  It restores monster lives and lets them (re)spawn
-	void ResetUse(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value)
-	{
-		if (m_fActive)
-		{
-			//NOV2014_20 Thothie - attempting to allow changes as to when ms_monsterspawn can respawn mobs 0=when all dead, 1=when any mob dead, 2=whenever triggered
-			if (!resetwhen)
-				return;
-		}
-
-		if (resetwhen == 1 && didfirstspawn) //>= just to deal with the stump below
-		{
-			//cycle through my m obs, see if any are out of lives, if so, reset their lives
-			for (unsigned int i = 0; i < iMonstersToSpawn; i++)
-			{
-				if (mdSpawnMonster[i].livesleft == 0 && !mdSpawnMonster[i].spawned)
-				{
-					mdSpawnMonster[i].livesleft = mdSpawnMonster[i].lives;
-					RespawnMonster(&mdSpawnMonster[i]);
-					mdSpawnMonster[i].delayvalue = 0;
-				}
-			}
-		}
-
-		if (resetwhen == 2 && didfirstspawn)
-		{
-			//trigger a new wave
-			for (unsigned int i = 0; i < iMonstersToSpawn; i++)
-			{
-				mdSpawnMonster[i].livesleft = mdSpawnMonster[i].lives;
-				mdSpawnMonster[i].spawned = false;
-				RespawnMonster(&mdSpawnMonster[i]);
-				mdSpawnMonster[i].delayvalue = 0;
-			}
-		}
-
-		if (resetwhen && !didfirstspawn)
-		{
-			didfirstspawn = true;
-			for (unsigned int i = 0; i < iMonstersToSpawn; i++)
-			{
-				mdSpawnMonster[i].livesleft = mdSpawnMonster[i].lives;
-				RespawnMonster(&mdSpawnMonster[i]);
-				//Monsters spawn immediately the first time
-				mdSpawnMonster[i].delayvalue = 0;
-			}
-		}
-
-		//standard op
-		if (!resetwhen)
-		{
-			didfirstspawn = true;
-			for (unsigned int i = 0; i < iMonstersToSpawn; i++)
-			{
-				mdSpawnMonster[i].livesleft = mdSpawnMonster[i].lives;
-				RespawnMonster(&mdSpawnMonster[i]);
-				//Monsters spawn immediately the first time
-				mdSpawnMonster[i].delayvalue = 0;
-			}
-		}
-
-		m_fActive = true;
-		SetThink(&CAreaMonsterSpawn::SpawnMonsters);
-		pev->nextthink = pev->ltime + 0.1;
-	}
-
-	void KeyValue(KeyValueData *pkvd)
-	{
-		if (FStrEq(pkvd->szKeyName, "spawnloc"))
-		{
-			m_SpawnLoc = (spawnloc_e)atoi(pkvd->szValue);
-			if (m_SpawnLoc < SPAWNLOC_FIXED || m_SpawnLoc > SPAWNLOC_RANDOM)
-				m_SpawnLoc = SPAWNLOC_FIXED;
-			pkvd->fHandled = true;
-		}
-		else if (FStrEq(pkvd->szKeyName, "spawnstart"))
-		{
-			//Thothie - JUN2007a
-			//various atttempts to force monster spawn to spawnstart 1 -  fail
-			//bool thoth_in_value = atoi(pkvd->szValue) ? true : false;
-			//m_fSpawnOnTrigger = true;
-			//msstring thoth_new_targetname = "game_playerspawned";
-			//if ( !thoth_in_value ) pev->targetname = ALLOC_STRING(thoth_new_targetname);
-			//
-			//Thothie JUN2007 FAIL - see m_fSpawnOnTrigger above
-			/*if ( !m_fSpawnOnTrigger )
-			{
-				pev->targetname = ALLOC_STRING("game_playerspawn");
-				m_TargetName = pev->targetname;
-				logfile << "Monsterspawn with spawnstart 0! \r\n";
-			}*/
-			//original:
-			m_fSpawnOnTrigger = (atoi(pkvd->szValue)) ? true : false;
-			//Thothie - store original spawnstart state
-			bSpawnImmediately = (atoi(pkvd->szValue)) ? true : false;
-			pkvd->fHandled = true;
-		}
-		//NOV2014_20 seeing if we can change how ms_monsterspawn handles mob respawning
-		//- the fact that ms_monster and ms_monsterspawn seem to kinda be the same entity is making this confusing though
-		else if (FStrEq(pkvd->szKeyName, "resetwhen"))
-		{
-			//0=all mobs depleated, 1=any mob depleated, 2=whenever called
-			resetwhen = atoi(pkvd->szValue);
-			pkvd->fHandled = true;
-		}
-		else if (FStrEq(pkvd->szKeyName, "fireallperish"))
-		{
-			m_sTargetAllPerish = pev->target = ALLOC_STRING(pkvd->szValue);
-			pkvd->fHandled = true;
-		}
-		else if (FStrEq(pkvd->szKeyName, "params"))
-		{
-			//Thothie OCT2015_28 - pass additional parameters via monsterspawner
-			sAddParams = pkvd->szValue;
-			pkvd->fHandled = true;
-		}
-		else if (FStrEq(pkvd->szKeyName, "nplayers"))
-		{
-			//Thothie AUG2007a - player req for monster spawns
-			iPlayerReq = (atoi(pkvd->szValue));
-			pkvd->fHandled = true;
-		}
-		else if (FStrEq(pkvd->szKeyName, "reqhp"))
-		{
-			//Thothie AUG2007a - total hp present req for monster spawns
-			msstringlist reqhp_stringlist;
-			TokenizeString((pkvd->szValue), reqhp_stringlist);
-			iHPReq_min = 0;
-			iHPReq_max = 0;
-			hpreq_useavg = false; //Thothie OCT2015_28 - allow use average when calculating HP req, if token
-
-			if (reqhp_stringlist.size() > 0)
-				iHPReq_min = atoi(reqhp_stringlist[0].c_str());
-			if (reqhp_stringlist.size() > 1 && !reqhp_stringlist[1].contains("avg"))
-			{
-				iHPReq_max = atoi(reqhp_stringlist[1].c_str());
-				if ( iHPReq_max < iHPReq_min )
-				{
-					//logfile << "MAP_ERROR: " << this->pev->classname << " - max reqhp set higher than min.";
-					iHPReq_max = 0;
-				}
-				//if ( iHPReq_min == 0 ) iHPReq_min = 1; //OCT2015_28 disabled in case all players flagged AFK
-			}
-			if (reqhp_stringlist.size() > 2 && reqhp_stringlist[1].contains("avg")) hpreq_useavg = true; //Thothie OCT2015_28 - allow use average when calculating HP req, if token 2-3 is "avg"
-			pkvd->fHandled = true;
-		}
-		else
-			CBaseEntity::KeyValue(pkvd);
-	}
-
-	//Thothie OCT2016_18 spawnlimiter
-	bool SpawnLimitReached()
-	{
-		msstring sTemp = STRING(pev->targetname);
-		if (sTemp.starts_with("crit")) return false;
-
-		CBaseEntity* pGameMasterEnt = UTIL_FindEntityByString(NULL, "netname", msstring("-") + "game_master");
-		IScripted* pGMScript = (pGameMasterEnt ? pGameMasterEnt->GetScripted() : NULL);
-		if (pGMScript)
-		{
-			if (atoi(pGMScript->GetFirstScriptVar("GM_DISABLE_SPAWNS")) == 1) return true;
-			int tlimit = atoi(pGMScript->GetFirstScriptVar("GM_SPAWN_LIMIT"));
-			if (tlimit == 0) return false;
-			int tcount = atoi(pGMScript->GetFirstScriptVar("GM_SPAWN_COUNT"));
-			if (tcount >= tlimit) return true;
-		}
-
-		return false;
-	}
-
-	void RespawnMonster(monster_data_t *pMonsterData)
-	{
-		if (pMonsterData->spawned)
-		{
-			return;
-		}
-
-		if ( SpawnLimitReached() ) return; //Thothie OCT2016_18 spawnlimiter
-
-		//NOV2014_20 - Thothie msmonster_random [begin]
-		if (pMonsterData->m_nRndMobs > 0)
-		{
-			unsigned int idx = RANDOM_LONG(0, float(pMonsterData->m_nRndMobs) - 1);
-			for (unsigned int i = 0; i < pMonsterData->m_nRndMobs; i++)
-			{
-				MS_DEBUG("DEBUG: respawn randommob list #%i / %i as %s", pMonsterData->m_nRndMobs, pMonsterData->random_monsterdata[i].m_ScriptName.c_str() ? pMonsterData->random_monsterdata[i].m_ScriptName.c_str() : "???");
-			}
-
-			MS_DEBUG("DEBUG: respawn chose randommob #%i %s", idx, pMonsterData->random_monsterdata[idx].m_ScriptName.c_str() ? pMonsterData->random_monsterdata[idx].m_ScriptName.c_str() : "???");
-			//I DIE HERE:
-
-			MS_DEBUG("DEBUG: specifically: %s", pMonsterData->random_monsterdata[idx].m_ScriptName.c_str());
-			pMonsterData->scriptfile = ALLOC_STRING(pMonsterData->random_monsterdata[idx].m_ScriptName);
-			pMonsterData->title = ALLOC_STRING(pMonsterData->random_monsterdata[idx].m_title);
-
-			//Thothie OCT2015_28 - pass additional parameters via monsterspawner
-			msstring parseparams;
-			parseparams = pMonsterData->random_monsterdata[idx].m_addparams;
-			if ( sAddParams.len() > 1 && sAddParams != "none" )
-			{
-				if ( parseparams == "none" || !parseparams.len() )
-				{
-					parseparams = sAddParams;
-				}
-				else
-				{
-					//Thothie SEP2017_05 option to abort monsterspawn add params on individual monsters
-					//- also make sure local monster parameters are executed last, thus get priority
-					if ( !parseparams.contains("no_local") )
-					{
-						msstring stemp = parseparams;
-						parseparams = "";
-						parseparams.append(sAddParams.c_str());
-						parseparams.append(";");
-						parseparams.append(stemp.c_str());
-					}
-				}
-			}
-
-			pMonsterData->addparams = ALLOC_STRING(parseparams);
-			pMonsterData->dmgmulti = pMonsterData->random_monsterdata[idx].m_DMGMulti;
-			pMonsterData->hpmulti = pMonsterData->random_monsterdata[idx].m_HPMulti;
-			//nix these from the struct, this ain't gonna work
-			//pMonsterData->lives = pMonsterData->random_monsterdata[idx].m_Lives;
-			//pMonsterData->livesleft = pMonsterData->random_monsterdata[idx].m_Lives;
-			pMonsterData->nplayers = pMonsterData->random_monsterdata[idx].m_ReqPlayers;
-			pMonsterData->hpreq_min = pMonsterData->random_monsterdata[idx].m_HPReq_min;
-			pMonsterData->hpreq_max = pMonsterData->random_monsterdata[idx].m_HPReq_max;
-			pMonsterData->hpreq_useavg = pMonsterData->random_monsterdata[idx].m_HPReq_useavg;
-		}
-		//NOV2014_20 - Thothie msmonster_random [end]
-
-		//If the monster has unlimited lives or has some lives left, respawn it
-		if (pMonsterData->lives == -1 || pMonsterData->livesleft > 0)
-		{
-			pMonsterData->deathtime = gpGlobals->time;
-			pMonsterData->delayvalue = RANDOM_FLOAT(pMonsterData->delaylow, pMonsterData->delayhigh);
-		}
-		else if (pMonsterData->lives > 0 && !pMonsterData->livesleft)
-			FireTargets(STRING(pMonsterData->perishtarget), this, this, USE_TOGGLE, 0);
-	}
-
-	//count players and hp were here, moved to utils.cpp
-
-	void Activate()
-	{
-		if (!m_pGoalEnt)
-			return;
-		//if ( iPlayerReq < thoth_CountPlayers() && iPlayerReq > 0 ) return; //Thothie AUG2007a - player req for monster spawns (FAIL - but the monster side one works fine)
-
-		CMSMonster *pMonster = (CMSMonster *)m_pGoalEnt;
-		msstring parseparams; //Thothie OCT2015_28 - pass additional parameters via monsterspawner
-
-		//NOV2014_20 - Thothie msmonster_random [begin]
-		if (pMonster->m_nRndMobs > 0)
-		{
-			unsigned int idx = RANDOM_LONG(0, float(pMonster->m_nRndMobs) - 1);
-			mdSpawnMonster[iMonstersToSpawn].m_nRndMobs = pMonster->m_nRndMobs;
-			for (unsigned int i = 0; i < pMonster->m_nRndMobs; i++)
-			{
-				// logfile << UTIL_VarArgs("DEBUG: spawn adding randommob #%i / %i as %s\n", i, pMonster->m_nRndMobs, pMonster->random_monsterdata[i].m_ScriptName ? pMonster->random_monsterdata[i].m_ScriptName.c_str() : "???");
-				mdSpawnMonster[iMonstersToSpawn].random_monsterdata.add(pMonster->random_monsterdata[i]); //read em in
-			}
-			MS_DEBUG("DEBUG: spawn chose randommob #%i %s", idx, pMonster->random_monsterdata[idx].m_ScriptName ? pMonster->random_monsterdata[idx].m_ScriptName.c_str() : "???");
-
-			//I DIE HERE:
-			MS_DEBUG("DEBUG: specifically %s", pMonster->random_monsterdata[idx].m_ScriptName.c_str());
-			mdSpawnMonster[iMonstersToSpawn].scriptfile = ALLOC_STRING(pMonster->random_monsterdata[idx].m_ScriptName);
-			mdSpawnMonster[iMonstersToSpawn].title = ALLOC_STRING(pMonster->random_monsterdata[idx].m_title);
-
-			//Thothie OCT2015_28 - pass additional parameters via monsterspawner
-			parseparams = pMonster->random_monsterdata[idx].m_addparams;
-			if ( sAddParams.len() > 1 && sAddParams != "none" )
-			{
-				if ( parseparams == "none" || !parseparams.len() )
-				{
-					parseparams = sAddParams;
-				}
-				else
-				{
-					parseparams.append(";");
-					parseparams.append(sAddParams.c_str());
-				}
-			}
-
-			mdSpawnMonster[iMonstersToSpawn].addparams = ALLOC_STRING(parseparams);
-			mdSpawnMonster[iMonstersToSpawn].dmgmulti = pMonster->random_monsterdata[idx].m_DMGMulti;
-			mdSpawnMonster[iMonstersToSpawn].hpmulti = pMonster->random_monsterdata[idx].m_HPMulti;
-			mdSpawnMonster[iMonstersToSpawn].nplayers = pMonster->random_monsterdata[idx].m_ReqPlayers;
-			mdSpawnMonster[iMonstersToSpawn].hpreq_min = pMonster->random_monsterdata[idx].m_HPReq_min;
-			mdSpawnMonster[iMonstersToSpawn].hpreq_max = pMonster->random_monsterdata[idx].m_HPReq_max;
-			mdSpawnMonster[iMonstersToSpawn].hpreq_useavg = pMonster->random_monsterdata[idx].m_HPReq_useavg; //Thothie OCT2015_28 - allow use average when calculating HP req, if token 2-3 is "avg";
-			mdSpawnMonster[iMonstersToSpawn].lives =
-			mdSpawnMonster[iMonstersToSpawn].livesleft = pMonster->m_Lives;
-		}
-		//NOV2014_20 - Thothie msmonster_random [end]
-		else
-		{
-			mdSpawnMonster[iMonstersToSpawn].scriptfile = ALLOC_STRING(pMonster->m_ScriptName);
-			mdSpawnMonster[iMonstersToSpawn].title = ALLOC_STRING(pMonster->m_title);
-
-			//Thothie OCT2015_28 - pass additional parameters via monsterspawner
-			parseparams = pMonster->m_addparams;
-			if ( sAddParams.len() > 1 && sAddParams != "none" )
-			{
-				if ( parseparams == "none" || !parseparams.len() )
-				{
-					parseparams = sAddParams;
-				}
-				else
-				{
-					parseparams.append(";");
-					parseparams.append(sAddParams.c_str());
-				}
-			}
-
-			mdSpawnMonster[iMonstersToSpawn].addparams = ALLOC_STRING(parseparams);
-			mdSpawnMonster[iMonstersToSpawn].dmgmulti = pMonster->m_DMGMulti;
-			mdSpawnMonster[iMonstersToSpawn].hpmulti = pMonster->m_HPMulti;
-			mdSpawnMonster[iMonstersToSpawn].lives =
-			mdSpawnMonster[iMonstersToSpawn].livesleft = pMonster->m_Lives;
-			mdSpawnMonster[iMonstersToSpawn].nplayers = pMonster->m_ReqPlayers;
-			mdSpawnMonster[iMonstersToSpawn].hpreq_min = pMonster->m_HPReq_min;
-			mdSpawnMonster[iMonstersToSpawn].hpreq_max = pMonster->m_HPReq_max;
-			mdSpawnMonster[iMonstersToSpawn].hpreq_useavg = pMonster->m_HPReq_useavg; //Thothie OCT2015_28 - allow use average when calculating HP req, if token 2-3 is "avg";
-		}
-
-		mdSpawnMonster[iMonstersToSpawn].origin = pMonster->pev->origin;
-		mdSpawnMonster[iMonstersToSpawn].angles = pMonster->pev->angles;
-		mdSpawnMonster[iMonstersToSpawn].classname = pMonster->pev->classname;
-		mdSpawnMonster[iMonstersToSpawn].target = pMonster->pev->target;
-		mdSpawnMonster[iMonstersToSpawn].targetname = pMonster->pev->targetname;
-		mdSpawnMonster[iMonstersToSpawn].killtarget = ALLOC_STRING(pMonster->m_iszKillTarget);
-		mdSpawnMonster[iMonstersToSpawn].perishtarget = ALLOC_STRING(pMonster->m_iszPerishTarget);
-		mdSpawnMonster[iMonstersToSpawn].delaylow = pMonster->m_SpawnDelayLow;
-		mdSpawnMonster[iMonstersToSpawn].delayhigh = pMonster->m_SpawnDelayHigh;
-		mdSpawnMonster[iMonstersToSpawn].deathtime = gpGlobals->time;
-
-		//Monsters now spawn immediately the FIRST time
-		//The respawn delay only affects respawns... not first spawns.
-		//mdSpawnMonster[iMonstersToSpawn].delayvalue = RANDOM_FLOAT(mdSpawnMonster[iMonstersToSpawn].delaylow,mdSpawnMonster[iMonstersToSpawn].delayhigh);
-		mdSpawnMonster[iMonstersToSpawn].delayvalue = 0;
-		mdSpawnMonster[iMonstersToSpawn].spawnchance = pMonster->m_SpawnChance;
-		mdSpawnMonster[iMonstersToSpawn].spawned = false;
-		mdSpawnMonster[iMonstersToSpawn].spawnontrigger = pMonster->m_fSpawnOnTrigger;
-		mdSpawnMonster[iMonstersToSpawn].triggered = false;
-		mdSpawnMonster[iMonstersToSpawn].lTrigPrivData = (long)pMonster;
-
-		iMonstersToSpawn++;
-
-		m_pGoalEnt = NULL;
-	}
-	void DeathNotice(entvars_t *pevChild)
-	{
-		CMSMonster *pMonster = (CMSMonster *)CBaseEntity::Instance(pevChild);
-		if (!pMonster)
-			return;
-
-		for (unsigned int i = 0; i < iMonstersToSpawn; i++)
-		{
-			if (mdSpawnMonster[i].lPrivData == (long)pMonster)
-			{
-				mdSpawnMonster[i].spawned = false;
-				RespawnMonster(&mdSpawnMonster[i]);
-				break;
-			}
-		}
-	}
-	void SpawnMonsters()
-	{
-		if ( SpawnLimitReached() ) return; //Thothie OCT2016_18 spawnlimiter
-		
-		unsigned int i = 0, iDeadMonsters = 0;
-		CMSMonster *pMonster;
-		for (i = 0; i < iMonstersToSpawn; i++)
-		{
-			if (mdSpawnMonster[i].spawned)
-				continue;
-
-			//If the monster is out of lives, don't respawn
-			if (mdSpawnMonster[i].lives > 0 && mdSpawnMonster[i].livesleft <= 0)
-			{
-				iDeadMonsters++; //Count the dead monsters
-				continue;
-			}
-
-			bool bNoSpawn = false;	//Lark DEC2017_10 - Changed scope to simplify Random Monster respawn
-			if (mdSpawnMonster[i].nplayers > 0)
-			{
-				if (UTIL_NumActivePlayers() < mdSpawnMonster[i].nplayers)
-				{
-					//Thothie AUG2007a - not enough players to spawn monster
-
-					//Lark DEC2017_10 - If Random spawn, fix in the hpreq block a few lines down
-					if ( mdSpawnMonster[i].m_nRndMobs > 0 )
-						bNoSpawn = true;
-					else
-					{
-						//count as dead and continue
-						iDeadMonsters++; //count as dead
-						continue;
-					}
-				}
-			}
-
-			if (mdSpawnMonster[i].hpreq_min > 0 || mdSpawnMonster[i].hpreq_max > 0 || bNoSpawn) //NOV2014_20 - Thothie - fixed for potential bug if all players flagged AFK
-			{
-				//Lark DEC2017_10 - Added thoth_nospawn check from nplayers above
-				float flCheckedTotalHealth;
-				if ( mdSpawnMonster[i].hpreq_useavg )
-				{
-					flCheckedTotalHealth = UTIL_AvgHP(); //Thothie OCT2015_28 - allow use average when calculating HP req, if token 2-3 is "avg";
-				}
-				else
-				{
-					flCheckedTotalHealth = UTIL_TotalHP();
-				}
-				
-				if ( flCheckedTotalHealth < mdSpawnMonster[i].hpreq_min ) bNoSpawn = true;
-				if ( flCheckedTotalHealth >= mdSpawnMonster[i].hpreq_max && mdSpawnMonster[i].hpreq_max > 0 ) bNoSpawn = true;
-				if ( bNoSpawn )
-				{
-					//Thothie AUG2007a - not enough hp on server to spawn monster
-
-					//Lark DEC2017_10 - If msmonster_random, pick another random mob from the list.
-					//If this fails X times (where X = size of list), skip this spawn.
-					if ( mdSpawnMonster[i].m_nRndMobs > 0 )
-					{
-						int retrySpawn = mdSpawnMonster[i].m_nRndMobs * 2;	// Double the odds of finding a monster that meets requirements
-						do
-						{
-							RespawnMonster( &mdSpawnMonster[i] );
-							
-							bNoSpawn = false;
-							if ( UTIL_NumActivePlayers() < mdSpawnMonster[i].nplayers ) bNoSpawn = true;
-							if ( flCheckedTotalHealth < mdSpawnMonster[i].hpreq_min ) bNoSpawn = true;
-							if ( flCheckedTotalHealth >= mdSpawnMonster[i].hpreq_max && mdSpawnMonster[i].hpreq_max > 0 ) bNoSpawn = true;
-							--retrySpawn;
-						}
-						while ( bNoSpawn && retrySpawn > 0 );
-
-						if ( bNoSpawn ) // Requirements still failed; skip this spawn until triggered again.
-						{
-							iDeadMonsters++; //count as dead
-							continue;
-						}
-					}
-					else
-					{
-						//count as dead and continue
-						mdSpawnMonster[i].spawnchance = -1; //don't respawn later just cuz you meet reqs later
-						iDeadMonsters++; //count as dead
-						continue;
-					}
-				}
-			}
-
-			//If the monster has spawn on trigger set and It's trying to spawn
-			//the first time, don't spawn it. (It must be triggered the first time)
-			if (mdSpawnMonster[i].spawnontrigger &&
-				!mdSpawnMonster[i].triggered &&
-				mdSpawnMonster[i].lives == mdSpawnMonster[i].livesleft)
-				continue;
-
-			if ((gpGlobals->time - mdSpawnMonster[i].deathtime) < mdSpawnMonster[i].delayvalue)
-				continue;
-
-			if (RANDOM_FLOAT(0, 99) > mdSpawnMonster[i].spawnchance)
-			{ //The percent chance it would spawn failed..
-				RespawnMonster(&mdSpawnMonster[i]);
-				continue;
-			}
-
-			//Thothie - JUN2007 - trying to stagger monster spawns to reduce lag
-			if (gpGlobals->time < flNextSpawnTime)
-			{
-				//only if spawnstart 1
-				//otherwise it fubars the already buggy fireallperish on sloppily built msarea_monsterspawns
-				if (bSpawnImmediately)
-					continue;
-			}
-			flNextSpawnTime = gpGlobals->time + 0.2;
-
-			//Spawn a monster
-			pMonster = (CMSMonster *)CREATE_ENT(STRING(mdSpawnMonster[i].classname));
-			if (!pMonster)
-				continue;
-
-			//Thothie AUG2007b
-			//send title property to monster (other properties in future)
-			pMonster->m_title = STRING(mdSpawnMonster[i].title);
-			pMonster->m_addparams = STRING(mdSpawnMonster[i].addparams);
-			pMonster->m_spawnedby = EntToString(this);
-			//[/thothie]
-
-			//Thothie SEP2007a
-			//- send hp/dmg multipliers
-			pMonster->m_DMGMulti = mdSpawnMonster[i].dmgmulti;
-			pMonster->m_HPMulti = mdSpawnMonster[i].hpmulti;
-
-			pMonster->pev->target = mdSpawnMonster[i].target;
-			pMonster->pev->targetname = mdSpawnMonster[i].targetname;
-			pMonster->m_iszKillTarget = STRING(mdSpawnMonster[i].killtarget);
-			pMonster->m_iszPerishTarget = STRING(mdSpawnMonster[i].perishtarget);
-			pMonster->m_ScriptName = STRING(mdSpawnMonster[i].scriptfile);
-			mdSpawnMonster[i].lPrivData = (long)pMonster;
-
-			pMonster->pev->owner = edict();
-			if (m_SpawnLoc == SPAWNLOC_RANDOM)
-			{
-				CBaseEntity *List[1];
-				int iTrys = 1;
-				do
-				{
-					pMonster->pev->origin.x = RANDOM_FLOAT(pev->absmin.x, pev->absmax.x);
-					pMonster->pev->origin.y = RANDOM_FLOAT(pev->absmin.y, pev->absmax.y);
-					pMonster->pev->origin.z = Center().z;
-					iTrys++;
-				} while (UTIL_MonstersInSphere(List, 1, pMonster->pev->origin, 90) && iTrys < 10);
-			}
-			else
-				pMonster->pev->origin = mdSpawnMonster[i].origin;
-
-			pMonster->pev->angles = mdSpawnMonster[i].angles;
-
-			mdSpawnMonster[i].spawned = true;
-			mdSpawnMonster[i].triggered = false;
-			if (mdSpawnMonster[i].lives > 0 && mdSpawnMonster[i].livesleft > 0)
-				mdSpawnMonster[i].livesleft--;
-
-			UTIL_SetOrigin(pMonster->pev, pMonster->pev->origin);
-			pMonster->Spawn();
-
-			//Log( "Start" );
-			//msstring LogStr;
-			//_snprintf( LogStr.c_str(), MSS_STRING_SIZE, "[Spawn monster] %s from %s at %s", pMonster->DisplayName(), STRING(pev->targetname), VecToString(pMonster->pev->origin) );
-			//ALERT( at_console, "%s\n", LogStr.c_str() );
-			//Log( "%s\n", LogStr.c_str() );
-			//Log( "End" );
-		}
-
-		if (iDeadMonsters && (iDeadMonsters == iMonstersToSpawn) && m_fActive)
-		{
-			//All monsters are out of lives
-			//Firetargets, become inactive, and stop thinking
-			FireTargets(STRING(m_sTargetAllPerish), this, this, USE_TOGGLE, 0);
-			m_fActive = false;
-		}
-		else
-			pev->nextthink = pev->ltime + 0.2; //0.5
-	}
-	void *MSQuery(int iRequest)
-	{
-		//Spawn the specified monster RIGHT NOW
-		CMSMonster *pMonster = (CMSMonster *)CBaseEntity::Instance((entvars_t *)iRequest);
-		if (!pMonster)
-			return NULL;
-
-		for (unsigned int i = 0; i < iMonstersToSpawn; i++)
-			if (mdSpawnMonster[i].lTrigPrivData == (long)pMonster)
-			{
-				mdSpawnMonster[i].triggered = true;
-				mdSpawnMonster[i].deathtime = mdSpawnMonster[i].delayvalue = 0;
-				break;
-			}
-		return NULL;
-	}
-};
-
-LINK_ENTITY_TO_CLASS(msarea_monsterspawn, CAreaMonsterSpawn);
-LINK_ENTITY_TO_CLASS(ms_monsterspawn, CAreaMonsterSpawn);
-
-//This will make a monster spawn area become inactive (monsters stop spawning)
-//Thothie note: this does not seem to function
-class CTrigStopMonsterSpawn : public CBaseEntity
-{
-	string_t sTarget;
-	bool fRemoveAllMonsters;
-
-	void Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value)
-	{
-		edict_t *peSpawnArea = NULL,
-				*peFirstArea = NULL;
-		bool fFoundOneArea = false;
-
-		while (peSpawnArea = FIND_ENTITY_BY_TARGETNAME(peSpawnArea, STRING(pev->target)))
-		{
-			if (peSpawnArea == peFirstArea)
-				break;
-			else if (!peFirstArea)
-				peFirstArea = peSpawnArea;
-			CBaseEntity *pSpawnArea = CBaseEntity::Instance(peSpawnArea);
-			if (pSpawnArea && (FStrEq(STRING(pSpawnArea->pev->classname), "msarea_monsterspawn") || FStrEq(STRING(pSpawnArea->pev->classname), "ms_monsterspawn")))
-			{
-				fFoundOneArea = true;
-				pSpawnArea->SetThink(NULL);
-				((CAreaMonsterSpawn *)pSpawnArea)->m_fActive = false;
-			}
-		}
-
-		if (!fFoundOneArea)
-			ALERT(at_console, "ERROR: mstrig_stopspawn can't find area named %s\n", STRING(pev->target));
-
-		CBaseEntity::Use(pActivator, pCaller, useType, value);
-	}
-};
-
-LINK_ENTITY_TO_CLASS(mstrig_stopspawn, CTrigStopMonsterSpawn);
-
-//[Begin] Thothie NOV2014_08 msarea_transition_local
-//- serves as an asthetic teleport/checkpoint between different areas of the same map
-class CAreaTransitionLocal : public CAreaInvisible
-{
-public:
-	typedef CAreaInvisible BaseClass;
-
-	//todos: add hp/#plr reqs, scriptevent
-	//- mtl_respawnat (might wanna string_t that)
-	//- script side messages
-
-	bool mtl_req_all_players; //rallplayers
-	msstring mtl_title;		  //title
-	//msstring mtl_desc; //desc //swapping for Press +Use to continue
-	string_t mtl_teledest;	  //teleport (if any)
-	msstring mtl_respawnat;	  //spawntotie (if any)
-	string_t mtl_target;	  //firetarget - fire target on activate (if any)
-	string_t mtl_touchtarget; //fires when touched (with each message)
-	int iTeleIdx;			  //teleport index tracker
-	string_t ms_master;
-
-	void Spawn()
-	{
-		BaseClass::Spawn();
-		pev->solid = SOLID_TRIGGER;
-		UTIL_SetOrigin(pev, pev->origin);
-		SetTouch(&CAreaTransitionLocal::TransTouch);
-		iTeleIdx = 0;
-	}
-
-	void KeyValue(KeyValueData *pkvd)
-	{
-		if (FStrEq(pkvd->szKeyName, "rallplayers"))
-		{
-			mtl_req_all_players = (strcmp(pkvd->szValue, "1") == 0);
-			pkvd->fHandled = true;
-		}
-		else if (FStrEq(pkvd->szKeyName, "title"))
-		{
-			mtl_title = pkvd->szValue;
-			pkvd->fHandled = true;
-		}
-		else if (FStrEq(pkvd->szKeyName, "master"))
-		{
-			ms_master = ALLOC_STRING(pkvd->szValue);
-			pkvd->fHandled = true;
-		}
-		else if (FStrEq(pkvd->szKeyName, "teleport"))
-		{
-			mtl_teledest = ALLOC_STRING(pkvd->szValue);
-			pkvd->fHandled = true;
-		}
-		else if (FStrEq(pkvd->szKeyName, "spawntotie"))
-		{
-			mtl_respawnat = pkvd->szValue;
-			pkvd->fHandled = true;
-		}
-		else if (FStrEq(pkvd->szKeyName, "firetarget"))
-		{
-			mtl_target = ALLOC_STRING(pkvd->szValue);
-			pkvd->fHandled = true;
-		}
-		else if (FStrEq(pkvd->szKeyName, "touchtarget"))
-		{
-			mtl_touchtarget = ALLOC_STRING(pkvd->szValue);
-			pkvd->fHandled = true;
-		}
-		else
-			CBaseEntity::KeyValue(pkvd);
-	}
-
-	void TransTouch(CBaseEntity *pOther)
-	{
-		if (!pOther || !pOther->IsPlayer())
-			return;
-
-		if (ms_master)
-		{
-			ALERT(at_console, "DEBUG: %s - checking for master %s\n", STRING(pev->classname), STRING(ms_master));
-			if (!UTIL_IsMasterTriggered(ms_master, pOther))
-			{
-				ALERT(at_console, "DEBUG: %s - master not unlocked.\n", STRING(pev->classname));
-				return;
-			}
-			else
-			{
-				ALERT(at_console, "DEBUG: %s - master unlocked, activating.\n", STRING(pev->classname));
-			}
-		}
-
-		CBaseEntity* pGameMasterEnt = UTIL_FindEntityByString(NULL, "netname", msstring("-") + "game_master");
-		IScripted* pGMScript = (pGameMasterEnt ? pGameMasterEnt->GetScripted() : NULL);
-		if (pGMScript && (strcmp(pGMScript->GetFirstScriptVar("GM_DISABLE_TRANSITIONS"), "1") == 0))
-			return;
-
-		CBasePlayer *pPlayer = (CBasePlayer *)pOther;
-		IScripted *iScripted = pOther->GetScripted();
-		if (iScripted)
-		{
-			msstring last_ltrans_touch = iScripted->GetFirstScriptVar("PLR_LOCAL_TRANS");
-			if (!last_ltrans_touch.starts_with(EntToString(this).c_str()))
-			{
-				//iScripted->SetScriptVar("PLR_LOCAL_TRANS",EntToString(this)); //script side now
-
-				//send event for plr message here
-				static msstringlist Params;
-				Params.clearitems();
-				Params.add(mtl_title.c_str());
-				Params.add(EntToString(this).c_str());
-				Params.add(mtl_req_all_players ? "0" : "1");
-				//Params.add( VecToString(pev->origin) ); //no good, sends vec0 (prob cuz no origin brush, dun wanna require it)
-				Params.add(VecToString(pev->absmin));
-				Params.add(VecToString(pev->absmax));
-				Params.add((mtl_respawnat.len() > 0) ? mtl_respawnat.c_str() : "none");
-				pPlayer->CallScriptEvent("game_touched_local_trans", &Params);
-				if (mtl_touchtarget)
-					FireTargets(STRING(mtl_touchtarget), pOther, this, USE_TOGGLE, 0);
-				return;
-			}
-			else
-			{
-				if ((FBitSet(pPlayer->pbs.ButtonsDown, IN_USE)))
-				{
-					bool valid_activate;
-					valid_activate = false;
-
-					if (mtl_req_all_players)
-					{
-						if (!FAllPlayersAreTouchingMe())
-						{
-							pPlayer->SendHUDMsg("", "All players must be present to activate this local transition.");
-							Print("DEBUG: LTrans not all players present\n");
-							return;
-						}
-						else
-						{
-							valid_activate = true;
-						}
-					}
-					else
-					{
-						valid_activate = true;
-					}
-
-					if (valid_activate)
-					{
-						if (mtl_teledest)
-						{
-							entvars_t *pevToucher = pOther->pev;
-							edict_t *pentTarget = NULL;
-							mslist<CBaseEntity *> TeleLocs;
-							CBaseEntity *pLoc = NULL;
-							msstring telefound;
-							while (pLoc = UTIL_FindEntityByClassname(pLoc, "info_teleport_destination"))
-							{
-								if (FNullEnt(pLoc))
-									continue;
-
-								if (msstring(STRING(mtl_teledest)) == msstring(STRING(pLoc->pev->targetname)))
-								{
-									TeleLocs.add(pLoc);
-								}
-							}
-
-							if (TeleLocs.size())
-							{
-								if (iTeleIdx > (int)(TeleLocs.size() - 1))
-									iTeleIdx = 0;
-								pentTarget = TeleLocs[iTeleIdx]->edict();
-								++iTeleIdx;
-								Vector tmp = VARS(pentTarget)->origin;
-								tmp.z -= pOther->pev->mins.z;
-								tmp.z++;
-								pevToucher->flags &= ~FL_ONGROUND;
-								UTIL_SetOrigin(pevToucher, tmp);
-								pevToucher->angles = pentTarget->v.angles;
-								pevToucher->fixangle = true;
-								pevToucher->velocity = pevToucher->basevelocity = g_vecZero;
-							}
-							else
-							{
-								ALERT(at_console, "Warning: Ltrans msarea_transition_local - no info_teleport_destination named %s found.\n", STRING(mtl_teledest));
-							}
-						}
-
-						if (mtl_target)
-						{
-							FireTargets(STRING(mtl_target), pOther, this, USE_TOGGLE, 0);
-						}
-
-						iScripted->SetScriptVar("PLR_LOCAL_TRANS", "none");
-					}
-				}
-			} //end toucher in use
-		}
-	}
-
-	bool FAllPlayersAreTouchingMe()
-	{
-		Print("DEBUG: Ltrans FAllPlayersAreTouchingMe\n");
-		for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
-		{
-			CBasePlayer *pOtherPlayer = (CBasePlayer *)UTIL_PlayerByIndex(i);
-			if (!pOtherPlayer)
-				continue;
-			if (!pOtherPlayer->IsActive())
-				continue;
-
-			CBaseEntity *pEntity = UTIL_PlayerByIndex(i);
-			IScripted *iScripted = pEntity ? pEntity->GetScripted() : NULL;
-
-			if (!iScripted)
-				continue;
-
-			msstring last_ltrans_touch = iScripted->GetFirstScriptVar("PLR_LOCAL_TRANS");
-			if (last_ltrans_touch.c_str() != EntToString(this).c_str())
-				return false;
-		}
-
-		return true;
-	}
-
-	//Doesn't work - be nice if it did, as I'm gonna have to hack something up
-	/*
-	void DeathNotice ( entvars_t *pev ) 
-	{
-		if( !CBaseEntity::Instance(pev)->IsPlayer( ) ) return;
-		CBaseEntity *pExiter = CBaseEntity::Instance(pev); //iffy
-		IScripted *iScripted = pExiter->GetScripted();
-		if ( iScripted )
-		{
-			msstring last_ltrans_touch =  iScripted->GetFirstScriptVar("PLR_LOCAL_TRANS");
-			if ( last_ltrans_touch == EntToString(this) )
-			{
-				iScripted->SetScriptVar("PLR_LOCAL_TRANS","none");
-				return;
-			}
-		}
-		else return;
-	}
-	*/
-};
-
-LINK_ENTITY_TO_CLASS(msarea_transition_local, CAreaTransitionLocal);
-//[End] Thothie NOV2014_08 msarea_transition_local
-
-//int CountPlayers( void );
-class CAreaTransition : public CAreaInvisible
-{
-public:
-	string_t sDestName, sDestMap, sDestTrans, sName, ms_master;
-
-	CAreaTransition() : CAreaInvisible()
-	{
-		sDestName = sDestMap = sDestTrans = 0;
-	}
-
-	int PlayerVotes;
-	bool bDidVote;
-
-	bool FAllPlayersAreTouchingMe()
-	{
-		for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
-		{
-			CBasePlayer *pOtherPlayer = (CBasePlayer *)UTIL_PlayerByIndex(i);
-			if (!pOtherPlayer)
-				continue;
-			if (!pOtherPlayer->IsActive())
-				continue;
-
-			if (pOtherPlayer->CurrentTransArea != this)
-				return false;
-		}
-
-		return true;
-	}
-
-	void Spawn()
-	{
-		CAreaInvisible::Spawn();
-		bDidVote = false;
-		//For some reason, the targetname gets unset after this Spawn()
-		//function.  No time to find out why, just save it here.
-		sName = pev->targetname;
-		if (!sName)
-		{
-			ALERT(at_console, "ERROR: msarea_transition with no Name!!\n");
-			UTIL_Remove(this);
-		}
-	}
-
-	BOOL OnControls(entvars_t *pev)
-	{
-		if (ms_master)
-		{
-			CBaseEntity *pMchecker = CBaseEntity::Instance(pev);
-			ALERT(at_console, "DEBUG: %s - checking for master %s\n", STRING(pev->classname), STRING(ms_master));
-			if (!UTIL_IsMasterTriggered(ms_master, pMchecker))
-			{
-				ALERT(at_console, "DEBUG: %s - master not unlocked.\n", "msarea_transition");
-				return false;
-			}
-			else
-			{
-				ALERT(at_console, "DEBUG: %s - master unlocked, activating.\n", "msarea_transition");
-			}
-		}
-
-		CBaseEntity* pGameMasterEnt = UTIL_FindEntityByString(NULL, "netname", msstring("-") + "game_master");
-		IScripted* pGMScript = (pGameMasterEnt ? pGameMasterEnt->GetScripted() : NULL);
-		if (pGMScript && (strcmp(pGMScript->GetFirstScriptVar("GM_DISABLE_TRANSITIONS"), "1") == 0))
-			return false;
-
-		if (!CBaseEntity::Instance(pev)->IsPlayer())
-			return false;
-
-		CBasePlayer *pPlayer = (CBasePlayer *)CBaseEntity::Instance(pev);
-
-		if (pPlayer->CurrentTransArea == this)
-			return false;
-		pPlayer->CurrentTransArea = this;
-		if (pPlayer->m_MapStatus == FIRST_MAP)
-			pPlayer->m_MapStatus = OLD_MAP;
-
-		bool fChangeLocalMap = FAllPlayersAreTouchingMe();
-		bool fAutoShowBrowser = !fChangeLocalMap;
-
-		if (fChangeLocalMap)
-		{
-			for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
-			{
-				CBasePlayer *pOtherPlayer = (CBasePlayer *)UTIL_PlayerByIndex(i);
-				if (!pOtherPlayer)
-					continue;
-
-				PlayerVotes = 0;
-			}
-		}
-
-
-		strncpy(pPlayer->m_OldTransition,  STRING(sName), sizeof(pPlayer->m_OldTransition) );
-		strncpy(pPlayer->m_NextMap,  STRING(sDestMap), sizeof(pPlayer->m_NextMap) );
-		strncpy(pPlayer->m_NextTransition,  STRING(sDestTrans), sizeof(pPlayer->m_NextTransition) );
-		pPlayer->m_SpawnTransition = pPlayer->m_OldTransition;
-
-		//Save character
-		pPlayer->SaveChar();
-
-		if (!MSGlobals::ServerSideChar)
-			pPlayer->m_TimeCharLastSent = 0; //Ensure char is sent down to the client immediately
-
-		//Thothie JUN2007 - tired of this not displaying, letting scripts handle it
-		//msstring Text = msstring("It appears that you wish to travel to ") + STRING(sDestName) + ".\nPress enter (accept), to continue.";
-		//pOtherPlayer->SendHUDMsg( "Travel", Text );
-		// Call AngelScript player function for transition entered
-		if (as_enabled.value > 0)
-		{
-			CAngelScriptManager* pASManager = CAngelScriptManager::Instance();
-			if (pASManager && pASManager->IsInitialized())
-			{
-				std::vector<std::string> params;
-				params.push_back(pPlayer->DisplayName());     // Player name
-				params.push_back(STRING(sDestName));          // Destination name
-				params.push_back(STRING(sDestMap));           // Destination map
-				params.push_back(STRING(sName));              // Local spawn point
-				params.push_back(STRING(sDestTrans));         // Destination spawn point
-				params.push_back(GETPLAYERAUTHID(pPlayer->edict())); // Steam ID
-				
-				// Call global AngelScript function
-				pASManager->CallGlobalFunctionWithParams("OnPlayerTransitionEntered", params);
-			}
-		}
-		else
-		{
-			msstringlist Parameters;
-			Parameters.add(STRING(sDestName));
-			Parameters.add(STRING(sDestMap));
-			Parameters.add(STRING(sName));
-			Parameters.add(STRING(sDestTrans));
-			pPlayer->CallScriptEvent("game_transition_entered", &Parameters);
-		}
-		
-		MESSAGE_BEGIN(MSG_ONE, g_netmsg[NETMSG_CLDLLFUNC], NULL, pPlayer->pev);
-		WRITE_BYTE(3);
-		WRITE_BYTE(0);
-		WRITE_BYTE((fAutoShowBrowser ? TRANS_AUTOSHOWBROWSER : 0) | TRANS_PLAYSOUND);
-		WRITE_STRING_LIMIT(STRING(sDestMap), 32);
-		WRITE_STRING_LIMIT(STRING(sName), 32);
-		WRITE_STRING_LIMIT(STRING(sDestTrans), 32);
-		MESSAGE_END();
-
-		return true;
-	}
-
-	// DeathNotice - Lets this transition area know that a client has left it;
-	void DeathNotice(entvars_t *pev)
-	{
-		if (!CBaseEntity::Instance(pev)->IsPlayer())
-			return;
-
-		if (ms_master)
-		{
-			CBaseEntity *pMchecker = CBaseEntity::Instance(pev);
-			ALERT(at_console, "DEBUG: %s - checking for master %s\n", STRING(pev->classname), "msarea_transition");
-			if (!UTIL_IsMasterTriggered(ms_master, pMchecker))
-			{
-				ALERT(at_console, "DEBUG: %s - master not unlocked.\n", "msarea_transition");
-				return;
-			}
-			else
-			{
-				ALERT(at_console, "DEBUG: %s - master unlocked, allowing exit notice.\n", "msarea_transition");
-			}
-		}
-
-		CBasePlayer *pPlayer = (CBasePlayer *)CBaseEntity::Instance(pev);
-		if (!pPlayer || pPlayer->CurrentTransArea != this)
-			return;
-
-		CBaseEntity* pGameMasterEnt = UTIL_FindEntityByString(NULL, "netname", msstring("-") + "game_master");
-		IScripted* pGMScript = (pGameMasterEnt ? pGameMasterEnt->GetScripted() : NULL);
-		if (pGMScript && (strcmp(pGMScript->GetFirstScriptVar("GM_DISABLE_TRANSITIONS"), "1") == 0))
-			return;
-
-		MESSAGE_BEGIN(MSG_ONE, g_netmsg[NETMSG_CLDLLFUNC], NULL, pPlayer->pev);
-		WRITE_BYTE(3);
-		WRITE_BYTE(1);
-		MESSAGE_END();
-
-		pPlayer->CurrentTransArea = NULL;
-
-		bDidVote = false;
-		
-		if (as_enabled.value > 0)
-		{
-			// Call AngelScript player function for transition exited
-			CAngelScriptManager* pASManager = CAngelScriptManager::Instance();
-			if (pASManager && pASManager->IsInitialized())
-			{
-				std::vector<std::string> params;
-				params.push_back(STRING(sDestName));
-				params.push_back(STRING(sDestMap));
-				params.push_back(STRING(sName));
-				params.push_back(GETPLAYERAUTHID(pPlayer->edict())); // Add player Steam ID
-				
-				// Call global AngelScript function
-				pASManager->CallGlobalFunctionWithParams("OnPlayerTransitionExited", params);
-			}
-		}
-		else
-		{
-			msstringlist Parameters;
-			Parameters.add(STRING(sDestName));
-			Parameters.add(STRING(sDestMap));
-			Parameters.add(STRING(sName));
-			pPlayer->CallScriptEvent("game_transition_exited", &Parameters);
-		}
-		
-	}
-
-	// MSQuery - Called by CHalfLifeMultiplay::ClientCommand to let me know who voted
-	//			 iRequest == index of player
-	//           (You can either vote yes or not vote, which means no)
-	void *MSQuery(int iRequest)
-	{
-		CBaseEntity* pGameMasterEnt = UTIL_FindEntityByString(NULL, "netname", msstring("-") + "game_master");
-		IScripted* pGMScript = (pGameMasterEnt ? pGameMasterEnt->GetScripted() : NULL);
-		if (pGMScript && (strcmp(pGMScript->GetFirstScriptVar("GM_DISABLE_TRANSITIONS"), "1") == 0))
-			return NULL;
-
-		if (!bDidVote)
-		{
-			if (as_enabled.value > 0)
-			{
-				// Updated to use AngelScript instead of MSScript for map transitions
-				CAngelScriptManager* pASManager = CAngelScriptManager::Instance();
-				if (pASManager && pASManager->IsInitialized())
-				{
-					std::vector<std::string> params;
-					params.push_back(STRING(sDestName));    // Map title
-					params.push_back(STRING(sDestMap));     // Destination BSP
-					params.push_back(STRING(sName));        // Local spawn point
-					params.push_back(STRING(sDestTrans));   // Destination spawn point
-					
-					// Call AngelScript GameMaster function
-					// This will be handled by MS::GameTransitionTriggered in GameMasterMapTransitions.as
-					pASManager->CallGlobalFunctionWithParams("GameTransitionTriggered", params);
-				}
-			}
-			else
-			{
-				msstringlist Parameters;
-				Parameters.add(STRING(sDestName));
-				Parameters.add(STRING(sDestMap));
-				Parameters.add(STRING(sName));
-				Parameters.add(STRING(sDestTrans));
-				pGMScript->CallScriptEvent("game_transition_triggered", &Parameters);
-			}
-			bDidVote = true;
-		}
-
-		if (!FAllPlayersAreTouchingMe())
-			return NULL;
-
-		byte PlayerBits = (1 << (iRequest - 1));
-
-		//Already voted
-		if (FBitSet(PlayerVotes, PlayerBits))
-			return NULL;
-
-		SetBits(PlayerVotes, PlayerBits);
-
-		//Compare the votes to what it should be
-		int AllVotes = 0;
-		for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
-		{
-			CBasePlayer *pOtherPlayer = (CBasePlayer *)UTIL_PlayerByIndex(i);
-			if (!pOtherPlayer || pOtherPlayer->m_CharacterState == CHARSTATE_UNLOADED || !pOtherPlayer->IsActive())
-				continue;
-			SetBits(AllVotes, (1 << (i - 1)));
-		}
-
-		if (UTIL_NumPlayers() > 1)
-		{
-			SendHUDMsgAll("Travel", msstring(CBaseEntity::Instance(INDEXENT(iRequest))->DisplayName()) + " wants to go to " + STRING(sDestName));
-		}
-
-		//Everyone voted, switch the map
-		if (PlayerVotes == AllVotes)
-		{
-			UTIL_ClientPrintAll(HUD_PRINTCENTER, UTIL_VarArgs("Traveling to %s\n", STRING(sDestName)));
-			for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
-			{
-				CBasePlayer *pOtherPlayer = (CBasePlayer *)UTIL_PlayerByIndex(i);
-				if (!pOtherPlayer)
-					continue;
-				if (!pOtherPlayer->IsActive())
-					continue;
-
-				msstring dest_map = STRING(sDestMap);
-				if (IS_MAP_VALID(dest_map.c_str()))
-					pOtherPlayer->EnableControl(false);
-				
-				if (as_enabled.value > 0)
-				{
-					// Call AngelScript player function for map change
-					CAngelScriptManager* pASManager = CAngelScriptManager::Instance();
-					if (pASManager && pASManager->IsInitialized())
-					{
-						std::vector<std::string> params;
-						params.push_back(STRING(sDestMap));
-						params.push_back(GETPLAYERAUTHID(pOtherPlayer->edict())); // Add player Steam ID
-						
-						// Call global AngelScript function
-						pASManager->CallGlobalFunctionWithParams("OnPlayerMapChange", params);
-					}
-				}
-				else
-				{
-					msstringlist Parameters;
-					Parameters.add(STRING(sDestMap));
-					pOtherPlayer->CallScriptEvent("game_map_change", &Parameters);
-				}
-
-				//Save character
-				pOtherPlayer->SaveChar();
-
-				if (!MSGlobals::ServerSideChar)
-					pOtherPlayer->m_TimeCharLastSent = 0;
-			}
-
-			//JAN2008a Give AMX a chance to change map first (has its own delay)
-			//char thoth_trans_string[64];
-			//strcpy(thoth_trans_string,"force_map_");
-			//strcat(thoth_trans_string,STRING(sDestMap));
-			//FireTargets( thoth_trans_string, this, this, USE_TOGGLE, 0 );
-
-			//JAN2008a - letting game_master script handle changelevel functions
-			//pev->nextthink = pev->ltime + 5.0; //Thothie JUN2007 - added to give more time for char save
-			//SetThink( ChangeLevel );
-		}
-
-		return NULL;
-	}
-
-	void ChangeLevel()
-	{
-		//Thothie (note only, no changes)
-		//- here we should send ClientCmd disconnect/reconnect sequence for all players
-		//- who are not loopback
-		//JAN2008a commenting out, letting game_master script handle changelevel functions
-		//CHANGE_LEVEL( (char *)STRING(sDestMap), NULL );
-	}
-
-	void KeyValue(KeyValueData *pkvd)
-	{
-		if (FStrEq(pkvd->szKeyName, "destname"))
-		{
-			sDestName = ALLOC_STRING(pkvd->szValue);
-			pkvd->fHandled = true;
-		}
-		else if (FStrEq(pkvd->szKeyName, "destmap"))
-		{
-			sDestMap = ALLOC_STRING(pkvd->szValue);
-			pkvd->fHandled = true;
-		}
-		else if (FStrEq(pkvd->szKeyName, "desttrans"))
-		{
-			sDestTrans = ALLOC_STRING(pkvd->szValue);
-			pkvd->fHandled = true;
-		}
-		else if (FStrEq(pkvd->szKeyName, "master"))
-		{
-			ms_master = ALLOC_STRING(pkvd->szValue);
-			pkvd->fHandled = true;
-		}
-		else
-			CBaseEntity::KeyValue(pkvd);
-	}
-};
-
-LINK_ENTITY_TO_CLASS(msarea_transition, CAreaTransition);
-
-//
-//  CAreaNoSave - An area the prevents the client from saving
-//
-
-class CAreaNoSave : public CAreaInvisible
-{
-public:
-	//Player touched me
-	BOOL OnControls(entvars_t *pev)
-	{
-		if (!CBaseEntity::Instance(pev)->IsPlayer())
-			return false;
-
-		CBasePlayer *pPlayer = (CBasePlayer *)CBaseEntity::Instance(pev);
-		if (pPlayer->CurrentNoSaveArea == this)
-			return false;
-		pPlayer->CurrentNoSaveArea = this;
-
-		//Let the client know they can no longer save
-		MESSAGE_BEGIN(MSG_ONE, g_netmsg[NETMSG_CLDLLFUNC], NULL, pPlayer->pev);
-		WRITE_BYTE(4);
-		WRITE_BYTE(0);
-		MESSAGE_END();
-
-		return true;
-	}
-	// DeathNotice - Let the client save again
-	void DeathNotice(entvars_t *pev)
-	{
-		if (!CBaseEntity::Instance(pev)->IsPlayer())
-			return;
-
-		CBasePlayer *pPlayer = (CBasePlayer *)CBaseEntity::Instance(pev);
-		if (!pPlayer || !pPlayer->CurrentNoSaveArea || pPlayer->CurrentNoSaveArea != this)
-			return;
-
-		MESSAGE_BEGIN(MSG_ONE, g_netmsg[NETMSG_CLDLLFUNC], NULL, pPlayer->pev);
-		WRITE_BYTE(4);
-		WRITE_BYTE(1);
-		MESSAGE_END();
-
-		pPlayer->CurrentNoSaveArea = NULL;
-	}
-};
-
-LINK_ENTITY_TO_CLASS(msarea_nosave, CAreaNoSave);
-
-//
-//  CAreaTown - An area the prevents the player from attacking
-//
-
-class CAreaTown : public CAreaInvisible
-{
-public:
-	bool m_fAllowPK;
-
-	//Player touched me
-	BOOL OnControls(entvars_t *pev)
-	{
-		if (!CBaseEntity::Instance(pev)->IsPlayer())
-			return false;
-
-		CBasePlayer *pPlayer = (CBasePlayer *)CBaseEntity::Instance(pev);
-		if (pPlayer->CurrentTownArea == this)
-			return false;
-
-		pPlayer->CurrentTownArea = this;
-
-		return true;
-	}
-	// DeathNotice - Player left the area
-	void DeathNotice(entvars_t *pev)
-	{
-		if (!CBaseEntity::Instance(pev)->IsPlayer())
-			return;
-
-		CBasePlayer *pPlayer = (CBasePlayer *)CBaseEntity::Instance(pev);
-		if (!pPlayer || !pPlayer->CurrentTownArea || pPlayer->CurrentTownArea != this)
-			return;
-
-		pPlayer->CurrentTownArea = NULL;
-	}
-
-	//Player tried to attack another player, is this allowed?
-	void *MSQuery(int iRequest)
-	{
-		if (m_fAllowPK)
-			return (void *)true;
-		return (void *)false;
-	}
-
-	void KeyValue(KeyValueData *pkvd)
-	{
-		if (FStrEq(pkvd->szKeyName, "pkill"))
-		{
-			m_fAllowPK = atoi(pkvd->szValue) ? true : false;
-			pkvd->fHandled = true;
-		}
-		else
-			CBaseEntity::KeyValue(pkvd);
-	}
-};
-
-LINK_ENTITY_TO_CLASS(msarea_town, CAreaTown);
-
-//
-//  CMonsterBrush - A Brush that's a monster
-//
-
-class CMonsterBrush : public CMSMonster
-{
-public:
-	void Spawn()
-	{
-		pev->angles = g_vecZero;
-		pev->movetype = MOVETYPE_PUSHSTEP;
-		pev->solid = SOLID_BSP;
-		SET_MODEL(ENT(pev), STRING(pev->model));
-		m_Brush = true;
-
-		CMSMonster::Spawn();
-	}
-	void Precache()
-	{
-		//CMSMonster::Precache( );
-	}
-
-	void Think()
-	{
-		pev->nextthink = BaseThinkTime() + 0.01;
-		CScriptedEnt::Think();
-	}
-	void Touch(CBaseEntity *pOther)
-	{
-		CScriptedEnt::Touch(pOther);
-	}
-	void Killed(entvars_t *pevAttacker, int iGib)
-	{
-		msstringlist Parameters;
-		Parameters.add(EntToString(CBaseEntity::Instance(pevAttacker)));
-		CallScriptEvent("game_death", &Parameters);
-	}
-};
-
-LINK_ENTITY_TO_CLASS(msarea_scripted, CMonsterBrush);
-//-------------------
+
+
+class CCycler : public CBaseMonster
+{
+public:
+	void GenericCyclerSpawn(char *szModel, Vector vecMin, Vector vecMax);
+	virtual int ObjectCaps(void) { return (CBaseEntity ::ObjectCaps() | FCAP_IMPULSE_USE); }
+	int TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType);
+	void Spawn(void);
+	void Think(void);
+	//void Pain( float flDamage );
+	void Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value);
+
+	// Don't treat as a live target
+	virtual BOOL IsAlive(void) { return false; }
+
+	virtual int Save(CSave &save);
+	virtual int Restore(CRestore &restore);
+	static TYPEDESCRIPTION m_SaveData[];
+
+	int m_animate;
+};
+
+TYPEDESCRIPTION CCycler::m_SaveData[] =
+{
+	DEFINE_FIELD(CCycler, m_animate, FIELD_INTEGER),
+};
+
+IMPLEMENT_SAVERESTORE(CCycler, CBaseMonster);
+
+//
+// we should get rid of all the other cyclers and replace them with this.
+//
+class CGenericCycler : public CCycler
+{
+public:
+	void Spawn(void) { GenericCyclerSpawn((char *)STRING(pev->model), Vector(-16, -16, 0), Vector(16, 16, 72)); }
+};
+LINK_ENTITY_TO_CLASS(cycler, CGenericCycler);
+
+// Cycler member functions
+
+void CCycler::GenericCyclerSpawn(char *szModel, Vector vecMin, Vector vecMax)
+{
+	if (!szModel || !*szModel)
+	{
+		ALERT(at_error, "Cycler (%.0f %.0f %0.f) Missing model name!\n", pev->origin.x, pev->origin.y, pev->origin.z);
+		REMOVE_ENTITY(ENT(pev));
+		return;
+	}
+
+	//hack to fix maps that wont load because they have old cyclers pointing to missing models
+	const auto fileContents = FileSystem_LoadFileIntoBuffer(szModel, FileContentFormat::Binary);
+
+	if (fileContents.empty())
+	{
+		ALERT(at_error, "Cycler (%.0f %.0f %0.f) Model: \'%s\' NOT FOUND!\n", pev->origin.x, pev->origin.y, pev->origin.z, szModel);
+		REMOVE_ENTITY(ENT(pev));
+		return;
+	}
+
+	pev->classname = MAKE_STRING("cycler");
+	PRECACHE_MODEL(szModel);
+	SET_MODEL(ENT(pev), szModel);
+
+	CCycler::Spawn();
+
+	UTIL_SetSize(pev, vecMin, vecMax);
+}
+
+void CCycler::Spawn()
+{
+	InitBoneControllers();
+	pev->solid = SOLID_SLIDEBOX;
+	pev->movetype = MOVETYPE_NONE;
+	pev->takedamage = DAMAGE_YES;
+	pev->effects = 0;
+	pev->health = 80000; // no cycler should die
+	pev->yaw_speed = 5;
+	pev->ideal_yaw = pev->angles.y;
+	ChangeYaw(360);
+
+	m_flFrameRate = 75;
+	m_flGroundSpeed = 0;
+
+	pev->nextthink += 1.0;
+
+	ResetSequenceInfo();
+
+	if (pev->sequence != 0 || pev->frame != 0)
+	{
+		m_animate = 0;
+		pev->framerate = 0;
+	}
+	else
+	{
+		m_animate = 1;
+	}
+}
+
+//
+// cycler think
+//
+void CCycler::Think(void)
+{
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	if (m_animate)
+	{
+		StudioFrameAdvance();
+	}
+	if (m_fSequenceFinished && !m_fSequenceLoops)
+	{
+		// ResetSequenceInfo();
+		// hack to avoid reloading model every frame
+		pev->animtime = gpGlobals->time;
+		pev->framerate = 1.0;
+		m_fSequenceFinished = false;
+		m_flLastEventCheck = gpGlobals->time;
+		pev->frame = 0;
+		if (!m_animate)
+			pev->framerate = 0.0; // FIX: don't reset framerate
+	}
+}
+
+//
+// CyclerUse - starts a rotation trend
+//
+void CCycler::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value)
+{
+	m_animate = !m_animate;
+	if (m_animate)
+		pev->framerate = 1.0;
+	else
+		pev->framerate = 0.0;
+}
+
+//
+// CyclerPain , changes sequences when shot
+//
+//void CCycler :: Pain( float flDamage )
+int CCycler::TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType)
+{
+	if (m_animate)
+	{
+		pev->sequence++;
+
+		ResetSequenceInfo();
+
+		if (m_flFrameRate == 0.0)
+		{
+			pev->sequence = 0;
+			ResetSequenceInfo();
+		}
+		pev->frame = 0;
+	}
+	else
+	{
+		pev->framerate = 1.0;
+		StudioFrameAdvance(0.1);
+		pev->framerate = 0;
+		ALERT(at_console, "sequence: %d, frame %.0f\n", pev->sequence, pev->frame);
+	}
+
+	return 0;
+}
+
+class CCyclerSprite : public CBaseEntity
+{
+public:
+	void Spawn(void);
+	void Think(void);
+	void Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value);
+	virtual int ObjectCaps(void) { return (CBaseEntity ::ObjectCaps() | FCAP_DONT_SAVE | FCAP_IMPULSE_USE); }
+	virtual int TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType);
+	void Animate(float frames);
+
+	virtual int Save(CSave &save);
+	virtual int Restore(CRestore &restore);
+	static TYPEDESCRIPTION m_SaveData[];
+
+	inline int ShouldAnimate(void) { return m_animate && m_maxFrame > 1.0; }
+	int m_animate;
+	float m_lastTime;
+	float m_maxFrame;
+};
+
+LINK_ENTITY_TO_CLASS(cycler_sprite, CCyclerSprite);
+
+TYPEDESCRIPTION CCyclerSprite::m_SaveData[] =
+{
+	DEFINE_FIELD(CCyclerSprite, m_animate, FIELD_INTEGER),
+	DEFINE_FIELD(CCyclerSprite, m_lastTime, FIELD_TIME),
+	DEFINE_FIELD(CCyclerSprite, m_maxFrame, FIELD_FLOAT),
+};
+
+IMPLEMENT_SAVERESTORE(CCyclerSprite, CBaseEntity);
+
+void CCyclerSprite::Spawn(void)
+{
+	pev->solid = SOLID_SLIDEBOX;
+	pev->movetype = MOVETYPE_NONE;
+	pev->takedamage = DAMAGE_YES;
+	pev->effects = 0;
+
+	pev->frame = 0;
+	pev->nextthink = gpGlobals->time + 0.1;
+	m_animate = 1;
+	m_lastTime = gpGlobals->time;
+
+	PRECACHE_MODEL((char *)STRING(pev->model));
+	SET_MODEL(ENT(pev), STRING(pev->model));
+
+	m_maxFrame = (float)MODEL_FRAMES(pev->modelindex) - 1;
+}
+
+void CCyclerSprite::Think(void)
+{
+	if (ShouldAnimate())
+		Animate(pev->framerate * (gpGlobals->time - m_lastTime));
+
+	pev->nextthink = gpGlobals->time + 0.1;
+	m_lastTime = gpGlobals->time;
+}
+
+void CCyclerSprite::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value)
+{
+	m_animate = !m_animate;
+	ALERT(at_console, "Sprite: %s\n", STRING(pev->model));
+}
+
+int CCyclerSprite::TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType)
+{
+	if (m_maxFrame > 1.0)
+	{
+		Animate(1.0);
+	}
+	return 1;
+}
+
+void CCyclerSprite::Animate(float frames)
+{
+	pev->frame += frames;
+	if (m_maxFrame > 0)
+		pev->frame = fmod(pev->frame, m_maxFrame);
+}
+
+//Thothie OCT2007a - generate random events
+//Wait - multi_manager has a random property? :|
+/*class CRandEvent : public CPointEntity
+{
+public:
+	msstring thoth_event_prefix;
+	void Spawn( void )
+	{
+
+	}
+	void Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+	{
+		SUB_UseTargets( this, triggerType, 0 );
+
+		if ( pev->spawnflags & SF_RELAY_FIREONCE )
+			UTIL_Remove( this );
+	}
+	void KeyValue( KeyValueData *pkvd )
+	{
+		if (FStrEq(pkvd->szKeyName, "prefix"))
+		{
+			thoth_event_prefix = pkvd->szValue;
+			pkvd->fHandled = true;
+		}
+		else if (FStrEq(pkvd->szKeyName, "nevents")) 
+		{
+			//Thothie - AUG2007a - adding option to only spawn monster if # players present
+			thoth_nevents = (atoi(pkvd->szValue));
+			pkvd->fHandled = true;
+		}
+	}
+}*/
+
+//
+// For Ewok.
+//
+class CStaticModel : public CBaseEntity
+{
+public:
+	void Spawn(void)
+	{
+		//Save these, since they change when the model is loaded
+		Vector vMins = pev->mins, vMaxs = pev->maxs;
+		int body = pev->body;	  //Thothie attempting to fix env_model body not settings
+		int skin = pev->skin;	  //" " skin
+		float scale = pev->scale; //FEB2010_23 - scale for env_model
+
+		//Set model
+		char *pszModel = (char *)STRING(pev->model);
+		if (!pszModel || !pszModel[0])
+		{
+			ALERT(at_console, "Error: env_model - no model specified");
+			return;
+		}
+		PRECACHE_MODEL(pszModel);
+		SET_MODEL(ENT(pev), pszModel);
+		//Set solidity
+		if (pev->dmg)
+		{
+			pev->solid = SOLID_SLIDEBOX;
+			UTIL_SetSize(pev, vMins, vMaxs);
+		}
+		pev->body = body; //Thothie (see above)
+		pev->skin = skin; //Thothie (see above)
+		pev->controller[0] = 255 / 2;
+		pev->controller[1] = 255 / 2;
+		pev->controller[2] = 255 / 2;
+		pev->controller[3] = 255 / 2;
+
+		// Strip Edicts with no targetname
+		/*if (FStringNull(this->pev->targetname))
+		{
+			this->pev->flags |= FL_CLIENTONLY;
+			SET_MODEL(ENT(this->pev), iStringNull);
+			UTIL_Remove(this);
+		}*/
+	}
+};
+LINK_ENTITY_TO_CLASS(env_model, CStaticModel);
+
+// MP3 Playback
+
+
+
+class CTargetMP3Audio : public CPointEntity
+{
+public:
+	void Spawn(void);
+
+	void Use(CBaseEntity *pActivator, CBaseEntity *pCaller,
+			 USE_TYPE useType, float value);
+
+	BOOL m_bPlaying;
+};
+
+LINK_ENTITY_TO_CLASS(trigger_mp3audio, CTargetMP3Audio);
+
+void CTargetMP3Audio ::Spawn(void)
+{
+	pev->solid = SOLID_NOT;
+	pev->movetype = MOVETYPE_NONE;
+
+	m_bPlaying = false; // start out not playing
+}
+
+void CTargetMP3Audio::Use(CBaseEntity *pActivator, CBaseEntity *pCaller,
+						  USE_TYPE useType, float value)
+{
+	char command[64];
+
+	if (!pActivator->IsPlayer()) // activator should be a player
+		return;
+
+	if (!m_bPlaying) // if we're not playing, start playing!
+		m_bPlaying = true;
+	else
+	{ // if we're already playing, stop the mp3
+		m_bPlaying = false;
+		CLIENT_COMMAND(pActivator->edict(), "mp3 stop\n");
+		return;
+	}
+
+	// issue the play/loop command
+	//Thothie AUG2007a - removing music/ dependancy, so you can play MP3's in valve/media/ folder
+	msstring th_test_string = STRING(pev->message);
+	if (th_test_string.contains("/"))
+		_snprintf(command, sizeof(command),  "mp3 %s %s\n",  FBitSet(pev->spawnflags,  SF_LOOP) ? "loop" : "play",  STRING(pev->message) );
+	else
+		_snprintf(command, sizeof(command),  "mp3 %s music/%s\n",  FBitSet(pev->spawnflags,  SF_LOOP) ? "loop" : "play",  STRING(pev->message) );
+
+	CLIENT_COMMAND(pActivator->edict(), command); //thothie - not sure how this works, might be useful to know
+
+	// remove if set
+	if (FBitSet(pev->spawnflags, SF_REMOVE_ON_FIRE))
+		UTIL_Remove(this);
+}
+
+//Thothie's half-assed game_text fix
+class CGameText : public CPointEntity
+{
+public:
+	inline void MessageSet(const char *pMessage) { pev->message = ALLOC_STRING(pMessage); }
+	inline const char *MessageGet(void) { return STRING(pev->message); }
+	msstring ms_npcname;
+	bool ms_sayasnpc;
+
+	void Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value)
+	{
+		//for( int i = 1; i <= gpGlobals->maxClients; i++ )
+		//{
+		//CBasePlayer *pOtherPlayer = (CBasePlayer *)UTIL_PlayerByIndex( i );
+		if (!ms_sayasnpc)
+		{
+			SendHUDMsgAll((ms_npcname.len() > 0) ? ms_npcname.c_str() : "   ", MessageGet());
+		}
+		else
+		{
+			static msstringlist Params;
+			Params.clearitems();
+			Params.add(ms_npcname.c_str());
+			Params.add(MessageGet());
+
+			CBaseEntity* pGameMasterEnt = UTIL_FindEntityByString(NULL, "netname", msstring("-") + "game_master");
+			IScripted* pGMScript = (pGameMasterEnt ? pGameMasterEnt->GetScripted() : NULL);
+			if (pGMScript)
+				pGMScript->CallScriptEvent("gm_ms_text", &Params);
+		}
+
+		//UTIL_SayTextAll( MessageGet(), pActivator );
+		//UTIL_HudMessageAll( thoth_textdef, MessageGet() );
+		//}
+	}
+
+	//NOV2014_20 Thothie - add ms_text option to "say" text as NPC
+	void KeyValue(KeyValueData *pkvd)
+	{
+		if (FStrEq(pkvd->szKeyName, "npcname"))
+		{
+			ms_npcname = pkvd->szValue;
+			pkvd->fHandled = true;
+		}
+		else if (FStrEq(pkvd->szKeyName, "sayasnpc"))
+		{
+			ms_sayasnpc = (atoi(pkvd->szValue) == 1) ? true : false;
+			pkvd->fHandled = true;
+		}
+	}
+};
+LINK_ENTITY_TO_CLASS(game_text, CGameText);
+LINK_ENTITY_TO_CLASS(ms_text, CGameText); //Thothie AUG2007a - To get around FGD issues
+
+//
+// Weather Changer
+//
+class CMSWeather : public CBaseEntity
+{
+public:
+	void Spawn(void)
+	{
+		//Thothie DEC2010_27 - weather is precached with player script
+		/*
+		msstringlist Parameters;
+		Parameters.add( m_WeatherName );
+		if( MSGlobals::GameScript )
+		{
+			MSGlobals::GameScript->SetScriptVar( "game.precacheweather", m_WeatherName );
+			MSGlobals::GameScript->CallScriptEvent( "game_precache_weather", &Parameters );
+		}
+		*/
+	}
+
+	void Use(CBaseEntity* pActivator, CBaseEntity* pCaller, USE_TYPE useType, float value)
+	{
+		msstringlist Parameters;
+		Parameters.add(m_WeatherName);
+		TokenizeString(m_WeatherOptions, Parameters);
+
+		//Thothie DEC2010_27 - lock weather via game master
+		CBaseEntity* pGameMasterEnt = UTIL_FindEntityByString(NULL, "netname", msstring("-") + "game_master");
+		IScripted* pGMScript = (pGameMasterEnt ? pGameMasterEnt->GetScripted() : NULL);
+		if (pGMScript)
+			pGMScript->CallScriptEvent("game_set_weather", &Parameters);
+
+		//Thothie DEC2010_27 - old system
+		/*
+		if( MSGlobals::GameScript )
+			MSGlobals::GameScript->CallScriptEvent( "game_change_weather", &Parameters );
+		*/
+	}
+
+	void KeyValue(KeyValueData *pkvd)
+	{
+		if (!strcmp(pkvd->szKeyName, "weather"))
+			m_WeatherName = pkvd->szValue;
+		else if (!strcmp(pkvd->szKeyName, "options"))
+			m_WeatherOptions = pkvd->szValue;
+		else
+			CBaseEntity::KeyValue(pkvd);
+	}
+
+	msstring m_WeatherName;
+	msstring m_WeatherOptions;
+};
+LINK_ENTITY_TO_CLASS(mstrig_weather, CMSWeather);
+
+// **************************************************
+//
+//		   msarea_* Classes.  Entity brushes
+//
+// **************************************************
+
+class CAreaInvisible : public CBaseEntity
+{
+public:
+	void Spawn()
+	{
+		pev->angles = g_vecZero;
+		pev->movetype = MOVETYPE_PUSH; // so it doesn't get pushed by anything
+		pev->solid = SOLID_NOT;
+		SET_MODEL(ENT(pev), STRING(pev->model));
+
+		// If it can't move/go away, it's really part of the world
+		//pev->flags |= FL_WORLDBRUSH;
+		m_Brush = true;
+
+		//pev->spawnflags |= SF_WALL_START_OFF;
+
+		SetBits(pev->effects, EF_NODRAW);
+		BaseClass::Spawn();
+	}
+};
+
+//[begin] Thothie NOV2014_07 msarea_music_dynamic for CBM system
+class CAreaMusicDyn : public CAreaInvisible
+{
+public:
+	std::string mt_idle;
+	std::string mt_combat;
+	std::string mt_global;	 //play for all players
+	std::string mt_playnow; //0= neither, 1= idle, 2= combat
+
+	void Spawn()
+	{
+		CAreaInvisible::Spawn();
+		pev->solid = SOLID_TRIGGER;
+		UTIL_SetOrigin(pev, pev->origin);
+		SetTouch(&CAreaMusicDyn::MusicTouch);
+	}
+
+	void KeyValue(KeyValueData *pkvd)
+	{
+		if (FStrEq(pkvd->szKeyName, "midle"))
+		{
+			mt_idle = pkvd->szValue;
+			pkvd->fHandled = true;
+		}
+		else if (FStrEq(pkvd->szKeyName, "mcombat"))
+		{
+			mt_combat = pkvd->szValue;
+			pkvd->fHandled = true;
+		}
+		else if (FStrEq(pkvd->szKeyName, "playall"))
+		{
+			mt_global = pkvd->szValue;
+			pkvd->fHandled = true;
+		}
+		else if (FStrEq(pkvd->szKeyName, "playnow"))
+		{
+			mt_playnow = pkvd->szValue;
+			pkvd->fHandled = true;
+		}
+		else
+			CBaseEntity::KeyValue(pkvd);
+	}
+
+	void MusicTouch(CBaseEntity *pOther)
+	{
+		
+		if (!pOther || !pOther->IsPlayer())
+			return;
+
+		int i, max;
+		if (mt_global == "1")
+		{
+			i = 1;
+			max = gpGlobals->maxClients;
+		}
+		else
+		{
+			i = pOther->entindex();
+			max = i;
+		}
+
+		do
+		{
+			if (mt_playnow == "1") //idle music
+			{
+				((CBasePlayer*)pOther)->SwapMusic(this->entindex(), MUSIC_AREA, mt_idle);
+			}
+			else if (mt_playnow == "2") //combat music
+			{
+				((CBasePlayer*)pOther)->SwapMusic(this->entindex(), MUSIC_COMBAT, mt_combat);
+			}
+
+			i++;
+		} while (i <= max);
+	}
+};
+LINK_ENTITY_TO_CLASS(msarea_music_dynamic, CAreaMusicDyn);
+//[end] Thothie NOV2014_07 msarea_music_dynamic for CBM system
+
+class CAreaMusic : public CAreaInvisible
+{
+public:
+	string_t m_sMaster;
+	std::string m_sSong;
+
+	void Spawn()
+	{
+		CAreaInvisible::Spawn();
+		pev->solid = SOLID_TRIGGER;
+		UTIL_SetOrigin(pev, pev->origin);
+		SetTouch(&CAreaMusic::MusicTouch);
+	}
+
+	void KeyValue(KeyValueData* pkvd)
+	{
+		std::string keyName = pkvd->szKeyName;
+		if (keyName == "song")
+		{
+			m_sSong = pkvd->szValue;
+			pkvd->fHandled = true;
+		}
+		else if (keyName.find(".mp3") != std::string::npos) //Legacy way of playing mp3s
+		{
+			m_sSong = pkvd->szKeyName;
+			pkvd->fHandled = true;
+		}
+		else
+			CBaseEntity::KeyValue(pkvd);
+	}
+
+	void Deactivate() {  }
+
+	void MusicTouch(CBaseEntity *pOther)
+	{
+		//No songs, can't play anything (code below would crash) - Solokiller 5/10/2017
+		if (m_sSong.size() == 0 || !pOther || !pOther->IsPlayer())
+			return;
+
+		MSGlobals::AllMusic.clear(); //Area trigger stops all music
+
+		if (m_sSong.find(".mp3") == std::string::npos || m_sSong == "stop.mp3") //if no .mp3 is found, assume they want to stop music. Also support legacy "stop.mp3"
+		{
+			((CBasePlayer*)pOther)->SwapMusic(this->entindex(), MUSIC_STOP, m_sSong);
+		}
+
+		if (m_sSong.find(".mp3") != std::string::npos || m_sSong.find(".ogg") != std::string::npos)
+		{
+			((CBasePlayer*)pOther)->SwapMusic(this->entindex(), MUSIC_AREA, m_sSong);
+		}
+
+		if (m_sSong != MSGlobals::AllMusic)
+		{
+			((CBasePlayer*)pOther)->SwapMusic(this->entindex(), MUSIC_AREA, m_sSong);
+		}
+	}
+
+	void Use(CBaseEntity* pActivator, CBaseEntity* pCaller, USE_TYPE useType, float value)
+	{
+		if (m_sSong.size() == 0) return;
+
+		MSGlobals::AllMusicMode = MUSIC_AREA; //Point trigger always plays to all
+		MSGlobals::AllMusic = m_sSong;
+
+		int i = 1, max = gpGlobals->maxClients;
+		do
+		{
+			CBaseEntity* targ = UTIL_PlayerByIndex(i);
+			if (targ && targ->IsPlayer())
+			{
+				((CBasePlayer*)targ)->SwapMusic(this->entindex(), MUSIC_AREA, m_sSong);
+			}
+			i++;
+		} while (i <= max);
+	}
+};
+LINK_ENTITY_TO_CLASS(msarea_music, CAreaMusic);
+LINK_ENTITY_TO_CLASS(mstrig_music, CAreaMusic);
+
+struct monster_data_t
+{
+	string_t classname,
+		target,
+		targetname,
+		killtarget,
+		perishtarget,
+		title,	   //Thothie AUG2007b allow monster name changes
+		addparams, //Thothie DEC2007a allow pass params to script
+		scriptfile;
+
+	float delaylow,
+		delayhigh,
+		delayvalue, //the current delay
+		deathtime,
+		spawnchance,
+		dmgmulti, //Thothie SEP2007a
+		hpmulti;  //Thothie SEP2007a
+
+	int lives,
+		livesleft,
+		hpreq_min,	//Thothie FEB2011_22 - allow min;max hpreq definition
+		hpreq_max,	//Thothie FEB2011_22 - allow min;max hpreq definition
+		nplayers;	//Thothie AUG2007a - req# players for monster to spawn
+		
+	unsigned int m_nRndMobs; //NOV2014_20 - Thothie msmonster_random
+
+	Vector origin, angles;
+	bool spawned,
+		spawnontrigger, //monster only spawns when individually triggered
+		triggered,
+		hpreq_useavg; //Thothie OCT2015_28 - allow use average when calculating HP req, if token 2-3 is "avg";
+	long lPrivData,
+		lTrigPrivData; //For monsters spawned by trigger
+
+	mslist<random_monster_t> random_monsterdata; //NOV2014_20 - Thothie msmonster_random
+};
+
+class CAreaMonsterSpawn : public CAreaInvisible
+{
+public:
+	monster_data_t mdSpawnMonster[32];
+	unsigned int iMonstersToSpawn;
+	int iPlayerReq;			//Thothie AUG2007a - adding optional player req
+	int iHPReq_min;			//Thothie AUG2007a - adding optional total HP on server req
+	int iHPReq_max;			//Thothie FEB2011_22 - adding min;max option for reqhp
+	float flNextSpawnTime; //Thothie - JUN2007 - trying to stagger monster spawns to reduce lag
+	enum spawnloc_e
+	{
+		SPAWNLOC_FIXED,
+		SPAWNLOC_RANDOM
+	} m_SpawnLoc;
+	bool m_fSpawnOnTrigger,
+		m_fActive,			   //Set to false when ALL monsters run out of lives.
+		hpreq_useavg; //Thothie OCT2015_28 - allow use average when calculating HP req, if token 2-3 is "avg";
+	bool bSpawnImmediately; //Thothie JUN2007b this bits tells it to spawn all monsters imediately, if spawn isnt triggered (see second occurance below)
+	string_t m_sTargetAllPerish;
+	int resetwhen;		//NOV2014_20 Thothie - attempting to allow changes as to when ms_monsterspawn can respawn mobs 0=when all dead, 1=when any mob dead, 2=whenever triggered
+	bool didfirstspawn; //NOV2014_20 Thothie - the above requires us to know whether we've done the initial spawn or not
+	msstring sAddParams; //Thothie OCT2015_28 - pass additional parameters via monsterspawner
+
+	void Spawn()
+	{
+		//bool didfirstspawn = false; //NOV2014_20 Thothie - adding resetwhen options
+		if (!m_fSpawnOnTrigger)
+		{
+			m_fActive = true;
+			SetThink(&CAreaMonsterSpawn::SpawnMonsters);
+			pev->nextthink = pev->ltime + 3.0;
+		}
+		else
+			m_fActive = false;
+		CAreaInvisible::Spawn();
+		SetUse(&CAreaMonsterSpawn::ResetUse);
+	}
+
+	//Triggering this resets it.  It restores monster lives and lets them (re)spawn
+	void ResetUse(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value)
+	{
+		if (m_fActive)
+		{
+			//NOV2014_20 Thothie - attempting to allow changes as to when ms_monsterspawn can respawn mobs 0=when all dead, 1=when any mob dead, 2=whenever triggered
+			if (!resetwhen)
+				return;
+		}
+
+		if (resetwhen == 1 && didfirstspawn) //>= just to deal with the stump below
+		{
+			//cycle through my m obs, see if any are out of lives, if so, reset their lives
+			for (unsigned int i = 0; i < iMonstersToSpawn; i++)
+			{
+				if (mdSpawnMonster[i].livesleft == 0 && !mdSpawnMonster[i].spawned)
+				{
+					mdSpawnMonster[i].livesleft = mdSpawnMonster[i].lives;
+					RespawnMonster(&mdSpawnMonster[i]);
+					mdSpawnMonster[i].delayvalue = 0;
+				}
+			}
+		}
+
+		if (resetwhen == 2 && didfirstspawn)
+		{
+			//trigger a new wave
+			for (unsigned int i = 0; i < iMonstersToSpawn; i++)
+			{
+				mdSpawnMonster[i].livesleft = mdSpawnMonster[i].lives;
+				mdSpawnMonster[i].spawned = false;
+				RespawnMonster(&mdSpawnMonster[i]);
+				mdSpawnMonster[i].delayvalue = 0;
+			}
+		}
+
+		if (resetwhen && !didfirstspawn)
+		{
+			didfirstspawn = true;
+			for (unsigned int i = 0; i < iMonstersToSpawn; i++)
+			{
+				mdSpawnMonster[i].livesleft = mdSpawnMonster[i].lives;
+				RespawnMonster(&mdSpawnMonster[i]);
+				//Monsters spawn immediately the first time
+				mdSpawnMonster[i].delayvalue = 0;
+			}
+		}
+
+		//standard op
+		if (!resetwhen)
+		{
+			didfirstspawn = true;
+			for (unsigned int i = 0; i < iMonstersToSpawn; i++)
+			{
+				mdSpawnMonster[i].livesleft = mdSpawnMonster[i].lives;
+				RespawnMonster(&mdSpawnMonster[i]);
+				//Monsters spawn immediately the first time
+				mdSpawnMonster[i].delayvalue = 0;
+			}
+		}
+
+		m_fActive = true;
+		SetThink(&CAreaMonsterSpawn::SpawnMonsters);
+		pev->nextthink = pev->ltime + 0.1;
+	}
+
+	void KeyValue(KeyValueData *pkvd)
+	{
+		if (FStrEq(pkvd->szKeyName, "spawnloc"))
+		{
+			m_SpawnLoc = (spawnloc_e)atoi(pkvd->szValue);
+			if (m_SpawnLoc < SPAWNLOC_FIXED || m_SpawnLoc > SPAWNLOC_RANDOM)
+				m_SpawnLoc = SPAWNLOC_FIXED;
+			pkvd->fHandled = true;
+		}
+		else if (FStrEq(pkvd->szKeyName, "spawnstart"))
+		{
+			//Thothie - JUN2007a
+			//various atttempts to force monster spawn to spawnstart 1 -  fail
+			//bool thoth_in_value = atoi(pkvd->szValue) ? true : false;
+			//m_fSpawnOnTrigger = true;
+			//msstring thoth_new_targetname = "game_playerspawned";
+			//if ( !thoth_in_value ) pev->targetname = ALLOC_STRING(thoth_new_targetname);
+			//
+			//Thothie JUN2007 FAIL - see m_fSpawnOnTrigger above
+			/*if ( !m_fSpawnOnTrigger )
+			{
+				pev->targetname = ALLOC_STRING("game_playerspawn");
+				m_TargetName = pev->targetname;
+				logfile << "Monsterspawn with spawnstart 0! \r\n";
+			}*/
+			//original:
+			m_fSpawnOnTrigger = (atoi(pkvd->szValue)) ? true : false;
+			//Thothie - store original spawnstart state
+			bSpawnImmediately = (atoi(pkvd->szValue)) ? true : false;
+			pkvd->fHandled = true;
+		}
+		//NOV2014_20 seeing if we can change how ms_monsterspawn handles mob respawning
+		//- the fact that ms_monster and ms_monsterspawn seem to kinda be the same entity is making this confusing though
+		else if (FStrEq(pkvd->szKeyName, "resetwhen"))
+		{
+			//0=all mobs depleated, 1=any mob depleated, 2=whenever called
+			resetwhen = atoi(pkvd->szValue);
+			pkvd->fHandled = true;
+		}
+		else if (FStrEq(pkvd->szKeyName, "fireallperish"))
+		{
+			m_sTargetAllPerish = pev->target = ALLOC_STRING(pkvd->szValue);
+			pkvd->fHandled = true;
+		}
+		else if (FStrEq(pkvd->szKeyName, "params"))
+		{
+			//Thothie OCT2015_28 - pass additional parameters via monsterspawner
+			sAddParams = pkvd->szValue;
+			pkvd->fHandled = true;
+		}
+		else if (FStrEq(pkvd->szKeyName, "nplayers"))
+		{
+			//Thothie AUG2007a - player req for monster spawns
+			iPlayerReq = (atoi(pkvd->szValue));
+			pkvd->fHandled = true;
+		}
+		else if (FStrEq(pkvd->szKeyName, "reqhp"))
+		{
+			//Thothie AUG2007a - total hp present req for monster spawns
+			msstringlist reqhp_stringlist;
+			TokenizeString((pkvd->szValue), reqhp_stringlist);
+			iHPReq_min = 0;
+			iHPReq_max = 0;
+			hpreq_useavg = false; //Thothie OCT2015_28 - allow use average when calculating HP req, if token
+
+			if (reqhp_stringlist.size() > 0)
+				iHPReq_min = atoi(reqhp_stringlist[0].c_str());
+			if (reqhp_stringlist.size() > 1 && !reqhp_stringlist[1].contains("avg"))
+			{
+				iHPReq_max = atoi(reqhp_stringlist[1].c_str());
+				if ( iHPReq_max < iHPReq_min )
+				{
+					//logfile << "MAP_ERROR: " << this->pev->classname << " - max reqhp set higher than min.";
+					iHPReq_max = 0;
+				}
+				//if ( iHPReq_min == 0 ) iHPReq_min = 1; //OCT2015_28 disabled in case all players flagged AFK
+			}
+			if (reqhp_stringlist.size() > 2 && reqhp_stringlist[1].contains("avg")) hpreq_useavg = true; //Thothie OCT2015_28 - allow use average when calculating HP req, if token 2-3 is "avg"
+			pkvd->fHandled = true;
+		}
+		else
+			CBaseEntity::KeyValue(pkvd);
+	}
+
+	//Thothie OCT2016_18 spawnlimiter
+	bool SpawnLimitReached()
+	{
+		msstring sTemp = STRING(pev->targetname);
+		if (sTemp.starts_with("crit")) return false;
+
+		CBaseEntity* pGameMasterEnt = UTIL_FindEntityByString(NULL, "netname", msstring("-") + "game_master");
+		IScripted* pGMScript = (pGameMasterEnt ? pGameMasterEnt->GetScripted() : NULL);
+		if (pGMScript)
+		{
+			if (atoi(pGMScript->GetFirstScriptVar("GM_DISABLE_SPAWNS")) == 1) return true;
+			int tlimit = atoi(pGMScript->GetFirstScriptVar("GM_SPAWN_LIMIT"));
+			if (tlimit == 0) return false;
+			int tcount = atoi(pGMScript->GetFirstScriptVar("GM_SPAWN_COUNT"));
+			if (tcount >= tlimit) return true;
+		}
+
+		return false;
+	}
+
+	void RespawnMonster(monster_data_t *pMonsterData)
+	{
+		if (pMonsterData->spawned)
+		{
+			return;
+		}
+
+		if ( SpawnLimitReached() ) return; //Thothie OCT2016_18 spawnlimiter
+
+		//NOV2014_20 - Thothie msmonster_random [begin]
+		if (pMonsterData->m_nRndMobs > 0)
+		{
+			unsigned int idx = RANDOM_LONG(0, float(pMonsterData->m_nRndMobs) - 1);
+			for (unsigned int i = 0; i < pMonsterData->m_nRndMobs; i++)
+			{
+				MS_DEBUG("DEBUG: respawn randommob list #%i / %i as %s", pMonsterData->m_nRndMobs, pMonsterData->random_monsterdata[i].m_ScriptName.c_str() ? pMonsterData->random_monsterdata[i].m_ScriptName.c_str() : "???");
+			}
+
+			MS_DEBUG("DEBUG: respawn chose randommob #%i %s", idx, pMonsterData->random_monsterdata[idx].m_ScriptName.c_str() ? pMonsterData->random_monsterdata[idx].m_ScriptName.c_str() : "???");
+			//I DIE HERE:
+
+			MS_DEBUG("DEBUG: specifically: %s", pMonsterData->random_monsterdata[idx].m_ScriptName.c_str());
+			pMonsterData->scriptfile = ALLOC_STRING(pMonsterData->random_monsterdata[idx].m_ScriptName);
+			pMonsterData->title = ALLOC_STRING(pMonsterData->random_monsterdata[idx].m_title);
+
+			//Thothie OCT2015_28 - pass additional parameters via monsterspawner
+			msstring parseparams;
+			parseparams = pMonsterData->random_monsterdata[idx].m_addparams;
+			if ( sAddParams.len() > 1 && sAddParams != "none" )
+			{
+				if ( parseparams == "none" || !parseparams.len() )
+				{
+					parseparams = sAddParams;
+				}
+				else
+				{
+					//Thothie SEP2017_05 option to abort monsterspawn add params on individual monsters
+					//- also make sure local monster parameters are executed last, thus get priority
+					if ( !parseparams.contains("no_local") )
+					{
+						msstring stemp = parseparams;
+						parseparams = "";
+						parseparams.append(sAddParams.c_str());
+						parseparams.append(";");
+						parseparams.append(stemp.c_str());
+					}
+				}
+			}
+
+			pMonsterData->addparams = ALLOC_STRING(parseparams);
+			pMonsterData->dmgmulti = pMonsterData->random_monsterdata[idx].m_DMGMulti;
+			pMonsterData->hpmulti = pMonsterData->random_monsterdata[idx].m_HPMulti;
+			//nix these from the struct, this ain't gonna work
+			//pMonsterData->lives = pMonsterData->random_monsterdata[idx].m_Lives;
+			//pMonsterData->livesleft = pMonsterData->random_monsterdata[idx].m_Lives;
+			pMonsterData->nplayers = pMonsterData->random_monsterdata[idx].m_ReqPlayers;
+			pMonsterData->hpreq_min = pMonsterData->random_monsterdata[idx].m_HPReq_min;
+			pMonsterData->hpreq_max = pMonsterData->random_monsterdata[idx].m_HPReq_max;
+			pMonsterData->hpreq_useavg = pMonsterData->random_monsterdata[idx].m_HPReq_useavg;
+		}
+		//NOV2014_20 - Thothie msmonster_random [end]
+
+		//If the monster has unlimited lives or has some lives left, respawn it
+		if (pMonsterData->lives == -1 || pMonsterData->livesleft > 0)
+		{
+			pMonsterData->deathtime = gpGlobals->time;
+			pMonsterData->delayvalue = RANDOM_FLOAT(pMonsterData->delaylow, pMonsterData->delayhigh);
+		}
+		else if (pMonsterData->lives > 0 && !pMonsterData->livesleft)
+			FireTargets(STRING(pMonsterData->perishtarget), this, this, USE_TOGGLE, 0);
+	}
+
+	//count players and hp were here, moved to utils.cpp
+
+	void Activate()
+	{
+		if (!m_pGoalEnt)
+			return;
+		//if ( iPlayerReq < thoth_CountPlayers() && iPlayerReq > 0 ) return; //Thothie AUG2007a - player req for monster spawns (FAIL - but the monster side one works fine)
+
+		CMSMonster *pMonster = (CMSMonster *)m_pGoalEnt;
+		msstring parseparams; //Thothie OCT2015_28 - pass additional parameters via monsterspawner
+
+		//NOV2014_20 - Thothie msmonster_random [begin]
+		if (pMonster->m_nRndMobs > 0)
+		{
+			unsigned int idx = RANDOM_LONG(0, float(pMonster->m_nRndMobs) - 1);
+			mdSpawnMonster[iMonstersToSpawn].m_nRndMobs = pMonster->m_nRndMobs;
+			for (unsigned int i = 0; i < pMonster->m_nRndMobs; i++)
+			{
+				// logfile << UTIL_VarArgs("DEBUG: spawn adding randommob #%i / %i as %s\n", i, pMonster->m_nRndMobs, pMonster->random_monsterdata[i].m_ScriptName ? pMonster->random_monsterdata[i].m_ScriptName.c_str() : "???");
+				mdSpawnMonster[iMonstersToSpawn].random_monsterdata.add(pMonster->random_monsterdata[i]); //read em in
+			}
+			MS_DEBUG("DEBUG: spawn chose randommob #%i %s", idx, pMonster->random_monsterdata[idx].m_ScriptName ? pMonster->random_monsterdata[idx].m_ScriptName.c_str() : "???");
+
+			//I DIE HERE:
+			MS_DEBUG("DEBUG: specifically %s", pMonster->random_monsterdata[idx].m_ScriptName.c_str());
+			mdSpawnMonster[iMonstersToSpawn].scriptfile = ALLOC_STRING(pMonster->random_monsterdata[idx].m_ScriptName);
+			mdSpawnMonster[iMonstersToSpawn].title = ALLOC_STRING(pMonster->random_monsterdata[idx].m_title);
+
+			//Thothie OCT2015_28 - pass additional parameters via monsterspawner
+			parseparams = pMonster->random_monsterdata[idx].m_addparams;
+			if ( sAddParams.len() > 1 && sAddParams != "none" )
+			{
+				if ( parseparams == "none" || !parseparams.len() )
+				{
+					parseparams = sAddParams;
+				}
+				else
+				{
+					parseparams.append(";");
+					parseparams.append(sAddParams.c_str());
+				}
+			}
+
+			mdSpawnMonster[iMonstersToSpawn].addparams = ALLOC_STRING(parseparams);
+			mdSpawnMonster[iMonstersToSpawn].dmgmulti = pMonster->random_monsterdata[idx].m_DMGMulti;
+			mdSpawnMonster[iMonstersToSpawn].hpmulti = pMonster->random_monsterdata[idx].m_HPMulti;
+			mdSpawnMonster[iMonstersToSpawn].nplayers = pMonster->random_monsterdata[idx].m_ReqPlayers;
+			mdSpawnMonster[iMonstersToSpawn].hpreq_min = pMonster->random_monsterdata[idx].m_HPReq_min;
+			mdSpawnMonster[iMonstersToSpawn].hpreq_max = pMonster->random_monsterdata[idx].m_HPReq_max;
+			mdSpawnMonster[iMonstersToSpawn].hpreq_useavg = pMonster->random_monsterdata[idx].m_HPReq_useavg; //Thothie OCT2015_28 - allow use average when calculating HP req, if token 2-3 is "avg";
+			mdSpawnMonster[iMonstersToSpawn].lives =
+			mdSpawnMonster[iMonstersToSpawn].livesleft = pMonster->m_Lives;
+		}
+		//NOV2014_20 - Thothie msmonster_random [end]
+		else
+		{
+			mdSpawnMonster[iMonstersToSpawn].scriptfile = ALLOC_STRING(pMonster->m_ScriptName);
+			mdSpawnMonster[iMonstersToSpawn].title = ALLOC_STRING(pMonster->m_title);
+
+			//Thothie OCT2015_28 - pass additional parameters via monsterspawner
+			parseparams = pMonster->m_addparams;
+			if ( sAddParams.len() > 1 && sAddParams != "none" )
+			{
+				if ( parseparams == "none" || !parseparams.len() )
+				{
+					parseparams = sAddParams;
+				}
+				else
+				{
+					parseparams.append(";");
+					parseparams.append(sAddParams.c_str());
+				}
+			}
+
+			mdSpawnMonster[iMonstersToSpawn].addparams = ALLOC_STRING(parseparams);
+			mdSpawnMonster[iMonstersToSpawn].dmgmulti = pMonster->m_DMGMulti;
+			mdSpawnMonster[iMonstersToSpawn].hpmulti = pMonster->m_HPMulti;
+			mdSpawnMonster[iMonstersToSpawn].lives =
+			mdSpawnMonster[iMonstersToSpawn].livesleft = pMonster->m_Lives;
+			mdSpawnMonster[iMonstersToSpawn].nplayers = pMonster->m_ReqPlayers;
+			mdSpawnMonster[iMonstersToSpawn].hpreq_min = pMonster->m_HPReq_min;
+			mdSpawnMonster[iMonstersToSpawn].hpreq_max = pMonster->m_HPReq_max;
+			mdSpawnMonster[iMonstersToSpawn].hpreq_useavg = pMonster->m_HPReq_useavg; //Thothie OCT2015_28 - allow use average when calculating HP req, if token 2-3 is "avg";
+		}
+
+		mdSpawnMonster[iMonstersToSpawn].origin = pMonster->pev->origin;
+		mdSpawnMonster[iMonstersToSpawn].angles = pMonster->pev->angles;
+		mdSpawnMonster[iMonstersToSpawn].classname = pMonster->pev->classname;
+		mdSpawnMonster[iMonstersToSpawn].target = pMonster->pev->target;
+		mdSpawnMonster[iMonstersToSpawn].targetname = pMonster->pev->targetname;
+		mdSpawnMonster[iMonstersToSpawn].killtarget = ALLOC_STRING(pMonster->m_iszKillTarget);
+		mdSpawnMonster[iMonstersToSpawn].perishtarget = ALLOC_STRING(pMonster->m_iszPerishTarget);
+		mdSpawnMonster[iMonstersToSpawn].delaylow = pMonster->m_SpawnDelayLow;
+		mdSpawnMonster[iMonstersToSpawn].delayhigh = pMonster->m_SpawnDelayHigh;
+		mdSpawnMonster[iMonstersToSpawn].deathtime = gpGlobals->time;
+
+		//Monsters now spawn immediately the FIRST time
+		//The respawn delay only affects respawns... not first spawns.
+		//mdSpawnMonster[iMonstersToSpawn].delayvalue = RANDOM_FLOAT(mdSpawnMonster[iMonstersToSpawn].delaylow,mdSpawnMonster[iMonstersToSpawn].delayhigh);
+		mdSpawnMonster[iMonstersToSpawn].delayvalue = 0;
+		mdSpawnMonster[iMonstersToSpawn].spawnchance = pMonster->m_SpawnChance;
+		mdSpawnMonster[iMonstersToSpawn].spawned = false;
+		mdSpawnMonster[iMonstersToSpawn].spawnontrigger = pMonster->m_fSpawnOnTrigger;
+		mdSpawnMonster[iMonstersToSpawn].triggered = false;
+		mdSpawnMonster[iMonstersToSpawn].lTrigPrivData = (long)pMonster;
+
+		iMonstersToSpawn++;
+
+		m_pGoalEnt = NULL;
+	}
+	void DeathNotice(entvars_t *pevChild)
+	{
+		CMSMonster *pMonster = (CMSMonster *)CBaseEntity::Instance(pevChild);
+		if (!pMonster)
+			return;
+
+		for (unsigned int i = 0; i < iMonstersToSpawn; i++)
+		{
+			if (mdSpawnMonster[i].lPrivData == (long)pMonster)
+			{
+				mdSpawnMonster[i].spawned = false;
+				RespawnMonster(&mdSpawnMonster[i]);
+				break;
+			}
+		}
+	}
+	void SpawnMonsters()
+	{
+		if ( SpawnLimitReached() ) return; //Thothie OCT2016_18 spawnlimiter
+		
+		unsigned int i = 0, iDeadMonsters = 0;
+		CMSMonster *pMonster;
+		for (i = 0; i < iMonstersToSpawn; i++)
+		{
+			if (mdSpawnMonster[i].spawned)
+				continue;
+
+			//If the monster is out of lives, don't respawn
+			if (mdSpawnMonster[i].lives > 0 && mdSpawnMonster[i].livesleft <= 0)
+			{
+				iDeadMonsters++; //Count the dead monsters
+				continue;
+			}
+
+			bool bNoSpawn = false;	//Lark DEC2017_10 - Changed scope to simplify Random Monster respawn
+			if (mdSpawnMonster[i].nplayers > 0)
+			{
+				if (UTIL_NumActivePlayers() < mdSpawnMonster[i].nplayers)
+				{
+					//Thothie AUG2007a - not enough players to spawn monster
+
+					//Lark DEC2017_10 - If Random spawn, fix in the hpreq block a few lines down
+					if ( mdSpawnMonster[i].m_nRndMobs > 0 )
+						bNoSpawn = true;
+					else
+					{
+						//count as dead and continue
+						iDeadMonsters++; //count as dead
+						continue;
+					}
+				}
+			}
+
+			if (mdSpawnMonster[i].hpreq_min > 0 || mdSpawnMonster[i].hpreq_max > 0 || bNoSpawn) //NOV2014_20 - Thothie - fixed for potential bug if all players flagged AFK
+			{
+				//Lark DEC2017_10 - Added thoth_nospawn check from nplayers above
+				float flCheckedTotalHealth;
+				if ( mdSpawnMonster[i].hpreq_useavg )
+				{
+					flCheckedTotalHealth = UTIL_AvgHP(); //Thothie OCT2015_28 - allow use average when calculating HP req, if token 2-3 is "avg";
+				}
+				else
+				{
+					flCheckedTotalHealth = UTIL_TotalHP();
+				}
+				
+				if ( flCheckedTotalHealth < mdSpawnMonster[i].hpreq_min ) bNoSpawn = true;
+				if ( flCheckedTotalHealth >= mdSpawnMonster[i].hpreq_max && mdSpawnMonster[i].hpreq_max > 0 ) bNoSpawn = true;
+				if ( bNoSpawn )
+				{
+					//Thothie AUG2007a - not enough hp on server to spawn monster
+
+					//Lark DEC2017_10 - If msmonster_random, pick another random mob from the list.
+					//If this fails X times (where X = size of list), skip this spawn.
+					if ( mdSpawnMonster[i].m_nRndMobs > 0 )
+					{
+						int retrySpawn = mdSpawnMonster[i].m_nRndMobs * 2;	// Double the odds of finding a monster that meets requirements
+						do
+						{
+							RespawnMonster( &mdSpawnMonster[i] );
+							
+							bNoSpawn = false;
+							if ( UTIL_NumActivePlayers() < mdSpawnMonster[i].nplayers ) bNoSpawn = true;
+							if ( flCheckedTotalHealth < mdSpawnMonster[i].hpreq_min ) bNoSpawn = true;
+							if ( flCheckedTotalHealth >= mdSpawnMonster[i].hpreq_max && mdSpawnMonster[i].hpreq_max > 0 ) bNoSpawn = true;
+							--retrySpawn;
+						}
+						while ( bNoSpawn && retrySpawn > 0 );
+
+						if ( bNoSpawn ) // Requirements still failed; skip this spawn until triggered again.
+						{
+							iDeadMonsters++; //count as dead
+							continue;
+						}
+					}
+					else
+					{
+						//count as dead and continue
+						mdSpawnMonster[i].spawnchance = -1; //don't respawn later just cuz you meet reqs later
+						iDeadMonsters++; //count as dead
+						continue;
+					}
+				}
+			}
+
+			//If the monster has spawn on trigger set and It's trying to spawn
+			//the first time, don't spawn it. (It must be triggered the first time)
+			if (mdSpawnMonster[i].spawnontrigger &&
+				!mdSpawnMonster[i].triggered &&
+				mdSpawnMonster[i].lives == mdSpawnMonster[i].livesleft)
+				continue;
+
+			if ((gpGlobals->time - mdSpawnMonster[i].deathtime) < mdSpawnMonster[i].delayvalue)
+				continue;
+
+			if (RANDOM_FLOAT(0, 99) > mdSpawnMonster[i].spawnchance)
+			{ //The percent chance it would spawn failed..
+				RespawnMonster(&mdSpawnMonster[i]);
+				continue;
+			}
+
+			//Thothie - JUN2007 - trying to stagger monster spawns to reduce lag
+			if (gpGlobals->time < flNextSpawnTime)
+			{
+				//only if spawnstart 1
+				//otherwise it fubars the already buggy fireallperish on sloppily built msarea_monsterspawns
+				if (bSpawnImmediately)
+					continue;
+			}
+			flNextSpawnTime = gpGlobals->time + 0.2;
+
+			//Spawn a monster
+			pMonster = (CMSMonster *)CREATE_ENT(STRING(mdSpawnMonster[i].classname));
+			if (!pMonster)
+				continue;
+
+			//Thothie AUG2007b
+			//send title property to monster (other properties in future)
+			pMonster->m_title = STRING(mdSpawnMonster[i].title);
+			pMonster->m_addparams = STRING(mdSpawnMonster[i].addparams);
+			pMonster->m_spawnedby = EntToString(this);
+			//[/thothie]
+
+			//Thothie SEP2007a
+			//- send hp/dmg multipliers
+			pMonster->m_DMGMulti = mdSpawnMonster[i].dmgmulti;
+			pMonster->m_HPMulti = mdSpawnMonster[i].hpmulti;
+
+			pMonster->pev->target = mdSpawnMonster[i].target;
+			pMonster->pev->targetname = mdSpawnMonster[i].targetname;
+			pMonster->m_iszKillTarget = STRING(mdSpawnMonster[i].killtarget);
+			pMonster->m_iszPerishTarget = STRING(mdSpawnMonster[i].perishtarget);
+			pMonster->m_ScriptName = STRING(mdSpawnMonster[i].scriptfile);
+			mdSpawnMonster[i].lPrivData = (long)pMonster;
+
+			pMonster->pev->owner = edict();
+			if (m_SpawnLoc == SPAWNLOC_RANDOM)
+			{
+				CBaseEntity *List[1];
+				int iTrys = 1;
+				do
+				{
+					pMonster->pev->origin.x = RANDOM_FLOAT(pev->absmin.x, pev->absmax.x);
+					pMonster->pev->origin.y = RANDOM_FLOAT(pev->absmin.y, pev->absmax.y);
+					pMonster->pev->origin.z = Center().z;
+					iTrys++;
+				} while (UTIL_MonstersInSphere(List, 1, pMonster->pev->origin, 90) && iTrys < 10);
+			}
+			else
+				pMonster->pev->origin = mdSpawnMonster[i].origin;
+
+			pMonster->pev->angles = mdSpawnMonster[i].angles;
+
+			mdSpawnMonster[i].spawned = true;
+			mdSpawnMonster[i].triggered = false;
+			if (mdSpawnMonster[i].lives > 0 && mdSpawnMonster[i].livesleft > 0)
+				mdSpawnMonster[i].livesleft--;
+
+			UTIL_SetOrigin(pMonster->pev, pMonster->pev->origin);
+			pMonster->Spawn();
+
+			//Log( "Start" );
+			//msstring LogStr;
+			//_snprintf( LogStr.c_str(), MSS_STRING_SIZE, "[Spawn monster] %s from %s at %s", pMonster->DisplayName(), STRING(pev->targetname), VecToString(pMonster->pev->origin) );
+			//ALERT( at_console, "%s\n", LogStr.c_str() );
+			//Log( "%s\n", LogStr.c_str() );
+			//Log( "End" );
+		}
+
+		if (iDeadMonsters && (iDeadMonsters == iMonstersToSpawn) && m_fActive)
+		{
+			//All monsters are out of lives
+			//Firetargets, become inactive, and stop thinking
+			FireTargets(STRING(m_sTargetAllPerish), this, this, USE_TOGGLE, 0);
+			m_fActive = false;
+		}
+		else
+			pev->nextthink = pev->ltime + 0.2; //0.5
+	}
+	void *MSQuery(int iRequest)
+	{
+		//Spawn the specified monster RIGHT NOW
+		CMSMonster *pMonster = (CMSMonster *)CBaseEntity::Instance((entvars_t *)iRequest);
+		if (!pMonster)
+			return NULL;
+
+		for (unsigned int i = 0; i < iMonstersToSpawn; i++)
+			if (mdSpawnMonster[i].lTrigPrivData == (long)pMonster)
+			{
+				mdSpawnMonster[i].triggered = true;
+				mdSpawnMonster[i].deathtime = mdSpawnMonster[i].delayvalue = 0;
+				break;
+			}
+		return NULL;
+	}
+};
+
+LINK_ENTITY_TO_CLASS(msarea_monsterspawn, CAreaMonsterSpawn);
+LINK_ENTITY_TO_CLASS(ms_monsterspawn, CAreaMonsterSpawn);
+
+//This will make a monster spawn area become inactive (monsters stop spawning)
+//Thothie note: this does not seem to function
+class CTrigStopMonsterSpawn : public CBaseEntity
+{
+	string_t sTarget;
+	bool fRemoveAllMonsters;
+
+	void Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value)
+	{
+		edict_t *peSpawnArea = NULL,
+				*peFirstArea = NULL;
+		bool fFoundOneArea = false;
+
+		while (peSpawnArea = FIND_ENTITY_BY_TARGETNAME(peSpawnArea, STRING(pev->target)))
+		{
+			if (peSpawnArea == peFirstArea)
+				break;
+			else if (!peFirstArea)
+				peFirstArea = peSpawnArea;
+			CBaseEntity *pSpawnArea = CBaseEntity::Instance(peSpawnArea);
+			if (pSpawnArea && (FStrEq(STRING(pSpawnArea->pev->classname), "msarea_monsterspawn") || FStrEq(STRING(pSpawnArea->pev->classname), "ms_monsterspawn")))
+			{
+				fFoundOneArea = true;
+				pSpawnArea->SetThink(NULL);
+				((CAreaMonsterSpawn *)pSpawnArea)->m_fActive = false;
+			}
+		}
+
+		if (!fFoundOneArea)
+			ALERT(at_console, "ERROR: mstrig_stopspawn can't find area named %s\n", STRING(pev->target));
+
+		CBaseEntity::Use(pActivator, pCaller, useType, value);
+	}
+};
+
+LINK_ENTITY_TO_CLASS(mstrig_stopspawn, CTrigStopMonsterSpawn);
+
+//[Begin] Thothie NOV2014_08 msarea_transition_local
+//- serves as an asthetic teleport/checkpoint between different areas of the same map
+class CAreaTransitionLocal : public CAreaInvisible
+{
+public:
+	typedef CAreaInvisible BaseClass;
+
+	//todos: add hp/#plr reqs, scriptevent
+	//- mtl_respawnat (might wanna string_t that)
+	//- script side messages
+
+	bool mtl_req_all_players; //rallplayers
+	msstring mtl_title;		  //title
+	//msstring mtl_desc; //desc //swapping for Press +Use to continue
+	string_t mtl_teledest;	  //teleport (if any)
+	msstring mtl_respawnat;	  //spawntotie (if any)
+	string_t mtl_target;	  //firetarget - fire target on activate (if any)
+	string_t mtl_touchtarget; //fires when touched (with each message)
+	int iTeleIdx;			  //teleport index tracker
+	string_t ms_master;
+
+	void Spawn()
+	{
+		BaseClass::Spawn();
+		pev->solid = SOLID_TRIGGER;
+		UTIL_SetOrigin(pev, pev->origin);
+		SetTouch(&CAreaTransitionLocal::TransTouch);
+		iTeleIdx = 0;
+	}
+
+	void KeyValue(KeyValueData *pkvd)
+	{
+		if (FStrEq(pkvd->szKeyName, "rallplayers"))
+		{
+			mtl_req_all_players = (strcmp(pkvd->szValue, "1") == 0);
+			pkvd->fHandled = true;
+		}
+		else if (FStrEq(pkvd->szKeyName, "title"))
+		{
+			mtl_title = pkvd->szValue;
+			pkvd->fHandled = true;
+		}
+		else if (FStrEq(pkvd->szKeyName, "master"))
+		{
+			ms_master = ALLOC_STRING(pkvd->szValue);
+			pkvd->fHandled = true;
+		}
+		else if (FStrEq(pkvd->szKeyName, "teleport"))
+		{
+			mtl_teledest = ALLOC_STRING(pkvd->szValue);
+			pkvd->fHandled = true;
+		}
+		else if (FStrEq(pkvd->szKeyName, "spawntotie"))
+		{
+			mtl_respawnat = pkvd->szValue;
+			pkvd->fHandled = true;
+		}
+		else if (FStrEq(pkvd->szKeyName, "firetarget"))
+		{
+			mtl_target = ALLOC_STRING(pkvd->szValue);
+			pkvd->fHandled = true;
+		}
+		else if (FStrEq(pkvd->szKeyName, "touchtarget"))
+		{
+			mtl_touchtarget = ALLOC_STRING(pkvd->szValue);
+			pkvd->fHandled = true;
+		}
+		else
+			CBaseEntity::KeyValue(pkvd);
+	}
+
+	void TransTouch(CBaseEntity *pOther)
+	{
+		if (!pOther || !pOther->IsPlayer())
+			return;
+
+		if (ms_master)
+		{
+			ALERT(at_console, "DEBUG: %s - checking for master %s\n", STRING(pev->classname), STRING(ms_master));
+			if (!UTIL_IsMasterTriggered(ms_master, pOther))
+			{
+				ALERT(at_console, "DEBUG: %s - master not unlocked.\n", STRING(pev->classname));
+				return;
+			}
+			else
+			{
+				ALERT(at_console, "DEBUG: %s - master unlocked, activating.\n", STRING(pev->classname));
+			}
+		}
+
+		CBaseEntity* pGameMasterEnt = UTIL_FindEntityByString(NULL, "netname", msstring("-") + "game_master");
+		IScripted* pGMScript = (pGameMasterEnt ? pGameMasterEnt->GetScripted() : NULL);
+		if (pGMScript && (strcmp(pGMScript->GetFirstScriptVar("GM_DISABLE_TRANSITIONS"), "1") == 0))
+			return;
+
+		CBasePlayer *pPlayer = (CBasePlayer *)pOther;
+		IScripted *iScripted = pOther->GetScripted();
+		if (iScripted)
+		{
+			msstring last_ltrans_touch = iScripted->GetFirstScriptVar("PLR_LOCAL_TRANS");
+			if (!last_ltrans_touch.starts_with(EntToString(this).c_str()))
+			{
+				//iScripted->SetScriptVar("PLR_LOCAL_TRANS",EntToString(this)); //script side now
+
+				//send event for plr message here
+				static msstringlist Params;
+				Params.clearitems();
+				Params.add(mtl_title.c_str());
+				Params.add(EntToString(this).c_str());
+				Params.add(mtl_req_all_players ? "0" : "1");
+				//Params.add( VecToString(pev->origin) ); //no good, sends vec0 (prob cuz no origin brush, dun wanna require it)
+				Params.add(VecToString(pev->absmin));
+				Params.add(VecToString(pev->absmax));
+				Params.add((mtl_respawnat.len() > 0) ? mtl_respawnat.c_str() : "none");
+				pPlayer->CallScriptEvent("game_touched_local_trans", &Params);
+				if (mtl_touchtarget)
+					FireTargets(STRING(mtl_touchtarget), pOther, this, USE_TOGGLE, 0);
+				return;
+			}
+			else
+			{
+				if ((FBitSet(pPlayer->pbs.ButtonsDown, IN_USE)))
+				{
+					bool valid_activate;
+					valid_activate = false;
+
+					if (mtl_req_all_players)
+					{
+						if (!FAllPlayersAreTouchingMe())
+						{
+							pPlayer->SendHUDMsg("", "All players must be present to activate this local transition.");
+							Print("DEBUG: LTrans not all players present\n");
+							return;
+						}
+						else
+						{
+							valid_activate = true;
+						}
+					}
+					else
+					{
+						valid_activate = true;
+					}
+
+					if (valid_activate)
+					{
+						if (mtl_teledest)
+						{
+							entvars_t *pevToucher = pOther->pev;
+							edict_t *pentTarget = NULL;
+							mslist<CBaseEntity *> TeleLocs;
+							CBaseEntity *pLoc = NULL;
+							msstring telefound;
+							while (pLoc = UTIL_FindEntityByClassname(pLoc, "info_teleport_destination"))
+							{
+								if (FNullEnt(pLoc))
+									continue;
+
+								if (msstring(STRING(mtl_teledest)) == msstring(STRING(pLoc->pev->targetname)))
+								{
+									TeleLocs.add(pLoc);
+								}
+							}
+
+							if (TeleLocs.size())
+							{
+								if (iTeleIdx > (int)(TeleLocs.size() - 1))
+									iTeleIdx = 0;
+								pentTarget = TeleLocs[iTeleIdx]->edict();
+								++iTeleIdx;
+								Vector tmp = VARS(pentTarget)->origin;
+								tmp.z -= pOther->pev->mins.z;
+								tmp.z++;
+								pevToucher->flags &= ~FL_ONGROUND;
+								UTIL_SetOrigin(pevToucher, tmp);
+								pevToucher->angles = pentTarget->v.angles;
+								pevToucher->fixangle = true;
+								pevToucher->velocity = pevToucher->basevelocity = g_vecZero;
+							}
+							else
+							{
+								ALERT(at_console, "Warning: Ltrans msarea_transition_local - no info_teleport_destination named %s found.\n", STRING(mtl_teledest));
+							}
+						}
+
+						if (mtl_target)
+						{
+							FireTargets(STRING(mtl_target), pOther, this, USE_TOGGLE, 0);
+						}
+
+						iScripted->SetScriptVar("PLR_LOCAL_TRANS", "none");
+					}
+				}
+			} //end toucher in use
+		}
+	}
+
+	bool FAllPlayersAreTouchingMe()
+	{
+		Print("DEBUG: Ltrans FAllPlayersAreTouchingMe\n");
+		for (int i = 1; i <= gpGlobals->maxClients; i++)
+		{
+			CBasePlayer *pOtherPlayer = (CBasePlayer *)UTIL_PlayerByIndex(i);
+			if (!pOtherPlayer)
+				continue;
+			if (!pOtherPlayer->IsActive())
+				continue;
+
+			CBaseEntity *pEntity = UTIL_PlayerByIndex(i);
+			IScripted *iScripted = pEntity ? pEntity->GetScripted() : NULL;
+
+			if (!iScripted)
+				continue;
+
+			msstring last_ltrans_touch = iScripted->GetFirstScriptVar("PLR_LOCAL_TRANS");
+			if (last_ltrans_touch.c_str() != EntToString(this).c_str())
+				return false;
+		}
+
+		return true;
+	}
+
+	//Doesn't work - be nice if it did, as I'm gonna have to hack something up
+	/*
+	void DeathNotice ( entvars_t *pev ) 
+	{
+		if( !CBaseEntity::Instance(pev)->IsPlayer( ) ) return;
+		CBaseEntity *pExiter = CBaseEntity::Instance(pev); //iffy
+		IScripted *iScripted = pExiter->GetScripted();
+		if ( iScripted )
+		{
+			msstring last_ltrans_touch =  iScripted->GetFirstScriptVar("PLR_LOCAL_TRANS");
+			if ( last_ltrans_touch == EntToString(this) )
+			{
+				iScripted->SetScriptVar("PLR_LOCAL_TRANS","none");
+				return;
+			}
+		}
+		else return;
+	}
+	*/
+};
+
+LINK_ENTITY_TO_CLASS(msarea_transition_local, CAreaTransitionLocal);
+//[End] Thothie NOV2014_08 msarea_transition_local
+
+//int CountPlayers( void );
+class CAreaTransition : public CAreaInvisible
+{
+public:
+	string_t sDestName, sDestMap, sDestTrans, sName, ms_master;
+
+	CAreaTransition() : CAreaInvisible()
+	{
+		sDestName = sDestMap = sDestTrans = 0;
+	}
+
+	int PlayerVotes;
+	bool bDidVote;
+
+	bool FAllPlayersAreTouchingMe()
+	{
+		for (int i = 1; i <= gpGlobals->maxClients; i++)
+		{
+			CBasePlayer *pOtherPlayer = (CBasePlayer *)UTIL_PlayerByIndex(i);
+			if (!pOtherPlayer)
+				continue;
+			if (!pOtherPlayer->IsActive())
+				continue;
+
+			if (pOtherPlayer->CurrentTransArea != this)
+				return false;
+		}
+
+		return true;
+	}
+
+	void Spawn()
+	{
+		CAreaInvisible::Spawn();
+		bDidVote = false;
+		//For some reason, the targetname gets unset after this Spawn()
+		//function.  No time to find out why, just save it here.
+		sName = pev->targetname;
+		if (!sName)
+		{
+			ALERT(at_console, "ERROR: msarea_transition with no Name!!\n");
+			UTIL_Remove(this);
+		}
+	}
+
+	BOOL OnControls(entvars_t *pev)
+	{
+		if (ms_master)
+		{
+			CBaseEntity *pMchecker = CBaseEntity::Instance(pev);
+			ALERT(at_console, "DEBUG: %s - checking for master %s\n", STRING(pev->classname), STRING(ms_master));
+			if (!UTIL_IsMasterTriggered(ms_master, pMchecker))
+			{
+				ALERT(at_console, "DEBUG: %s - master not unlocked.\n", "msarea_transition");
+				return false;
+			}
+			else
+			{
+				ALERT(at_console, "DEBUG: %s - master unlocked, activating.\n", "msarea_transition");
+			}
+		}
+
+		CBaseEntity* pGameMasterEnt = UTIL_FindEntityByString(NULL, "netname", msstring("-") + "game_master");
+		IScripted* pGMScript = (pGameMasterEnt ? pGameMasterEnt->GetScripted() : NULL);
+		if (pGMScript && (strcmp(pGMScript->GetFirstScriptVar("GM_DISABLE_TRANSITIONS"), "1") == 0))
+			return false;
+
+		if (!CBaseEntity::Instance(pev)->IsPlayer())
+			return false;
+
+		CBasePlayer *pPlayer = (CBasePlayer *)CBaseEntity::Instance(pev);
+
+		if (pPlayer->CurrentTransArea == this)
+			return false;
+		pPlayer->CurrentTransArea = this;
+		if (pPlayer->m_MapStatus == FIRST_MAP)
+			pPlayer->m_MapStatus = OLD_MAP;
+
+		bool fChangeLocalMap = FAllPlayersAreTouchingMe();
+		bool fAutoShowBrowser = !fChangeLocalMap;
+
+		if (fChangeLocalMap)
+		{
+			for (int i = 1; i <= gpGlobals->maxClients; i++)
+			{
+				CBasePlayer *pOtherPlayer = (CBasePlayer *)UTIL_PlayerByIndex(i);
+				if (!pOtherPlayer)
+					continue;
+
+				PlayerVotes = 0;
+			}
+		}
+
+
+		strncpy(pPlayer->m_OldTransition,  STRING(sName), sizeof(pPlayer->m_OldTransition) );
+		strncpy(pPlayer->m_NextMap,  STRING(sDestMap), sizeof(pPlayer->m_NextMap) );
+		strncpy(pPlayer->m_NextTransition,  STRING(sDestTrans), sizeof(pPlayer->m_NextTransition) );
+		pPlayer->m_SpawnTransition = pPlayer->m_OldTransition;
+
+		//Save character
+		pPlayer->SaveChar();
+
+		if (!MSGlobals::ServerSideChar)
+			pPlayer->m_TimeCharLastSent = 0; //Ensure char is sent down to the client immediately
+
+		//Thothie JUN2007 - tired of this not displaying, letting scripts handle it
+		//msstring Text = msstring("It appears that you wish to travel to ") + STRING(sDestName) + ".\nPress enter (accept), to continue.";
+		//pOtherPlayer->SendHUDMsg( "Travel", Text );
+		// Call AngelScript player function for transition entered
+		if (as_enabled.value > 0)
+		{
+			CAngelScriptManager* pASManager = CAngelScriptManager::Instance();
+			if (pASManager && pASManager->IsInitialized())
+			{
+				std::vector<std::string> params;
+				params.push_back(pPlayer->DisplayName());     // Player name
+				params.push_back(STRING(sDestName));          // Destination name
+				params.push_back(STRING(sDestMap));           // Destination map
+				params.push_back(STRING(sName));              // Local spawn point
+				params.push_back(STRING(sDestTrans));         // Destination spawn point
+				params.push_back(GETPLAYERAUTHID(pPlayer->edict())); // Steam ID
+				
+				// Call global AngelScript function
+				pASManager->CallGlobalFunctionWithParams("OnPlayerTransitionEntered", params);
+			}
+		}
+		else
+		{
+			msstringlist Parameters;
+			Parameters.add(STRING(sDestName));
+			Parameters.add(STRING(sDestMap));
+			Parameters.add(STRING(sName));
+			Parameters.add(STRING(sDestTrans));
+			pPlayer->CallScriptEvent("game_transition_entered", &Parameters);
+		}
+		
+		MESSAGE_BEGIN(MSG_ONE, g_netmsg[NETMSG_CLDLLFUNC], NULL, pPlayer->pev);
+		WRITE_BYTE(3);
+		WRITE_BYTE(0);
+		WRITE_BYTE((fAutoShowBrowser ? TRANS_AUTOSHOWBROWSER : 0) | TRANS_PLAYSOUND);
+		WRITE_STRING_LIMIT(STRING(sDestMap), 32);
+		WRITE_STRING_LIMIT(STRING(sName), 32);
+		WRITE_STRING_LIMIT(STRING(sDestTrans), 32);
+		MESSAGE_END();
+
+		return true;
+	}
+
+	// DeathNotice - Lets this transition area know that a client has left it;
+	void DeathNotice(entvars_t *pev)
+	{
+		if (!CBaseEntity::Instance(pev)->IsPlayer())
+			return;
+
+		if (ms_master)
+		{
+			CBaseEntity *pMchecker = CBaseEntity::Instance(pev);
+			ALERT(at_console, "DEBUG: %s - checking for master %s\n", STRING(pev->classname), "msarea_transition");
+			if (!UTIL_IsMasterTriggered(ms_master, pMchecker))
+			{
+				ALERT(at_console, "DEBUG: %s - master not unlocked.\n", "msarea_transition");
+				return;
+			}
+			else
+			{
+				ALERT(at_console, "DEBUG: %s - master unlocked, allowing exit notice.\n", "msarea_transition");
+			}
+		}
+
+		CBasePlayer *pPlayer = (CBasePlayer *)CBaseEntity::Instance(pev);
+		if (!pPlayer || pPlayer->CurrentTransArea != this)
+			return;
+
+		CBaseEntity* pGameMasterEnt = UTIL_FindEntityByString(NULL, "netname", msstring("-") + "game_master");
+		IScripted* pGMScript = (pGameMasterEnt ? pGameMasterEnt->GetScripted() : NULL);
+		if (pGMScript && (strcmp(pGMScript->GetFirstScriptVar("GM_DISABLE_TRANSITIONS"), "1") == 0))
+			return;
+
+		MESSAGE_BEGIN(MSG_ONE, g_netmsg[NETMSG_CLDLLFUNC], NULL, pPlayer->pev);
+		WRITE_BYTE(3);
+		WRITE_BYTE(1);
+		MESSAGE_END();
+
+		pPlayer->CurrentTransArea = NULL;
+
+		bDidVote = false;
+		
+		if (as_enabled.value > 0)
+		{
+			// Call AngelScript player function for transition exited
+			CAngelScriptManager* pASManager = CAngelScriptManager::Instance();
+			if (pASManager && pASManager->IsInitialized())
+			{
+				std::vector<std::string> params;
+				params.push_back(STRING(sDestName));
+				params.push_back(STRING(sDestMap));
+				params.push_back(STRING(sName));
+				params.push_back(GETPLAYERAUTHID(pPlayer->edict())); // Add player Steam ID
+				
+				// Call global AngelScript function
+				pASManager->CallGlobalFunctionWithParams("OnPlayerTransitionExited", params);
+			}
+		}
+		else
+		{
+			msstringlist Parameters;
+			Parameters.add(STRING(sDestName));
+			Parameters.add(STRING(sDestMap));
+			Parameters.add(STRING(sName));
+			pPlayer->CallScriptEvent("game_transition_exited", &Parameters);
+		}
+		
+	}
+
+	// MSQuery - Called by CHalfLifeMultiplay::ClientCommand to let me know who voted
+	//			 iRequest == index of player
+	//           (You can either vote yes or not vote, which means no)
+	void *MSQuery(int iRequest)
+	{
+		CBaseEntity* pGameMasterEnt = UTIL_FindEntityByString(NULL, "netname", msstring("-") + "game_master");
+		IScripted* pGMScript = (pGameMasterEnt ? pGameMasterEnt->GetScripted() : NULL);
+		if (pGMScript && (strcmp(pGMScript->GetFirstScriptVar("GM_DISABLE_TRANSITIONS"), "1") == 0))
+			return NULL;
+
+		if (!bDidVote)
+		{
+			if (as_enabled.value > 0)
+			{
+				// Updated to use AngelScript instead of MSScript for map transitions
+				CAngelScriptManager* pASManager = CAngelScriptManager::Instance();
+				if (pASManager && pASManager->IsInitialized())
+				{
+					std::vector<std::string> params;
+					params.push_back(STRING(sDestName));    // Map title
+					params.push_back(STRING(sDestMap));     // Destination BSP
+					params.push_back(STRING(sName));        // Local spawn point
+					params.push_back(STRING(sDestTrans));   // Destination spawn point
+					
+					// Call AngelScript GameMaster function
+					// This will be handled by MS::GameTransitionTriggered in GameMasterMapTransitions.as
+					pASManager->CallGlobalFunctionWithParams("GameTransitionTriggered", params);
+				}
+			}
+			else
+			{
+				msstringlist Parameters;
+				Parameters.add(STRING(sDestName));
+				Parameters.add(STRING(sDestMap));
+				Parameters.add(STRING(sName));
+				Parameters.add(STRING(sDestTrans));
+				pGMScript->CallScriptEvent("game_transition_triggered", &Parameters);
+			}
+			bDidVote = true;
+		}
+
+		if (!FAllPlayersAreTouchingMe())
+			return NULL;
+
+		byte PlayerBits = (1 << (iRequest - 1));
+
+		//Already voted
+		if (FBitSet(PlayerVotes, PlayerBits))
+			return NULL;
+
+		SetBits(PlayerVotes, PlayerBits);
+
+		//Compare the votes to what it should be
+		int AllVotes = 0;
+		for (int i = 1; i <= gpGlobals->maxClients; i++)
+		{
+			CBasePlayer *pOtherPlayer = (CBasePlayer *)UTIL_PlayerByIndex(i);
+			if (!pOtherPlayer || pOtherPlayer->m_CharacterState == CHARSTATE_UNLOADED || !pOtherPlayer->IsActive())
+				continue;
+			SetBits(AllVotes, (1 << (i - 1)));
+		}
+
+		if (UTIL_NumPlayers() > 1)
+		{
+			SendHUDMsgAll("Travel", msstring(CBaseEntity::Instance(INDEXENT(iRequest))->DisplayName()) + " wants to go to " + STRING(sDestName));
+		}
+
+		//Everyone voted, switch the map
+		if (PlayerVotes == AllVotes)
+		{
+			UTIL_ClientPrintAll(HUD_PRINTCENTER, UTIL_VarArgs("Traveling to %s\n", STRING(sDestName)));
+			for (int i = 1; i <= gpGlobals->maxClients; i++)
+			{
+				CBasePlayer *pOtherPlayer = (CBasePlayer *)UTIL_PlayerByIndex(i);
+				if (!pOtherPlayer)
+					continue;
+				if (!pOtherPlayer->IsActive())
+					continue;
+
+				msstring dest_map = STRING(sDestMap);
+				if (IS_MAP_VALID(dest_map.c_str()))
+					pOtherPlayer->EnableControl(false);
+				
+				if (as_enabled.value > 0)
+				{
+					// Call AngelScript player function for map change
+					CAngelScriptManager* pASManager = CAngelScriptManager::Instance();
+					if (pASManager && pASManager->IsInitialized())
+					{
+						std::vector<std::string> params;
+						params.push_back(STRING(sDestMap));
+						params.push_back(GETPLAYERAUTHID(pOtherPlayer->edict())); // Add player Steam ID
+						
+						// Call global AngelScript function
+						pASManager->CallGlobalFunctionWithParams("OnPlayerMapChange", params);
+					}
+				}
+				else
+				{
+					msstringlist Parameters;
+					Parameters.add(STRING(sDestMap));
+					pOtherPlayer->CallScriptEvent("game_map_change", &Parameters);
+				}
+
+				//Save character
+				pOtherPlayer->SaveChar();
+
+				if (!MSGlobals::ServerSideChar)
+					pOtherPlayer->m_TimeCharLastSent = 0;
+			}
+
+			//JAN2008a Give AMX a chance to change map first (has its own delay)
+			//char thoth_trans_string[64];
+			//strcpy(thoth_trans_string,"force_map_");
+			//strcat(thoth_trans_string,STRING(sDestMap));
+			//FireTargets( thoth_trans_string, this, this, USE_TOGGLE, 0 );
+
+			//JAN2008a - letting game_master script handle changelevel functions
+			//pev->nextthink = pev->ltime + 5.0; //Thothie JUN2007 - added to give more time for char save
+			//SetThink( ChangeLevel );
+		}
+
+		return NULL;
+	}
+
+	void ChangeLevel()
+	{
+		//Thothie (note only, no changes)
+		//- here we should send ClientCmd disconnect/reconnect sequence for all players
+		//- who are not loopback
+		//JAN2008a commenting out, letting game_master script handle changelevel functions
+		//CHANGE_LEVEL( (char *)STRING(sDestMap), NULL );
+	}
+
+	void KeyValue(KeyValueData *pkvd)
+	{
+		if (FStrEq(pkvd->szKeyName, "destname"))
+		{
+			sDestName = ALLOC_STRING(pkvd->szValue);
+			pkvd->fHandled = true;
+		}
+		else if (FStrEq(pkvd->szKeyName, "destmap"))
+		{
+			sDestMap = ALLOC_STRING(pkvd->szValue);
+			pkvd->fHandled = true;
+		}
+		else if (FStrEq(pkvd->szKeyName, "desttrans"))
+		{
+			sDestTrans = ALLOC_STRING(pkvd->szValue);
+			pkvd->fHandled = true;
+		}
+		else if (FStrEq(pkvd->szKeyName, "master"))
+		{
+			ms_master = ALLOC_STRING(pkvd->szValue);
+			pkvd->fHandled = true;
+		}
+		else
+			CBaseEntity::KeyValue(pkvd);
+	}
+};
+
+LINK_ENTITY_TO_CLASS(msarea_transition, CAreaTransition);
+
+//
+//  CAreaNoSave - An area the prevents the client from saving
+//
+
+class CAreaNoSave : public CAreaInvisible
+{
+public:
+	//Player touched me
+	BOOL OnControls(entvars_t *pev)
+	{
+		if (!CBaseEntity::Instance(pev)->IsPlayer())
+			return false;
+
+		CBasePlayer *pPlayer = (CBasePlayer *)CBaseEntity::Instance(pev);
+		if (pPlayer->CurrentNoSaveArea == this)
+			return false;
+		pPlayer->CurrentNoSaveArea = this;
+
+		//Let the client know they can no longer save
+		MESSAGE_BEGIN(MSG_ONE, g_netmsg[NETMSG_CLDLLFUNC], NULL, pPlayer->pev);
+		WRITE_BYTE(4);
+		WRITE_BYTE(0);
+		MESSAGE_END();
+
+		return true;
+	}
+	// DeathNotice - Let the client save again
+	void DeathNotice(entvars_t *pev)
+	{
+		if (!CBaseEntity::Instance(pev)->IsPlayer())
+			return;
+
+		CBasePlayer *pPlayer = (CBasePlayer *)CBaseEntity::Instance(pev);
+		if (!pPlayer || !pPlayer->CurrentNoSaveArea || pPlayer->CurrentNoSaveArea != this)
+			return;
+
+		MESSAGE_BEGIN(MSG_ONE, g_netmsg[NETMSG_CLDLLFUNC], NULL, pPlayer->pev);
+		WRITE_BYTE(4);
+		WRITE_BYTE(1);
+		MESSAGE_END();
+
+		pPlayer->CurrentNoSaveArea = NULL;
+	}
+};
+
+LINK_ENTITY_TO_CLASS(msarea_nosave, CAreaNoSave);
+
+//
+//  CAreaTown - An area the prevents the player from attacking
+//
+
+class CAreaTown : public CAreaInvisible
+{
+public:
+	bool m_fAllowPK;
+
+	//Player touched me
+	BOOL OnControls(entvars_t *pev)
+	{
+		if (!CBaseEntity::Instance(pev)->IsPlayer())
+			return false;
+
+		CBasePlayer *pPlayer = (CBasePlayer *)CBaseEntity::Instance(pev);
+		if (pPlayer->CurrentTownArea == this)
+			return false;
+
+		pPlayer->CurrentTownArea = this;
+
+		return true;
+	}
+	// DeathNotice - Player left the area
+	void DeathNotice(entvars_t *pev)
+	{
+		if (!CBaseEntity::Instance(pev)->IsPlayer())
+			return;
+
+		CBasePlayer *pPlayer = (CBasePlayer *)CBaseEntity::Instance(pev);
+		if (!pPlayer || !pPlayer->CurrentTownArea || pPlayer->CurrentTownArea != this)
+			return;
+
+		pPlayer->CurrentTownArea = NULL;
+	}
+
+	//Player tried to attack another player, is this allowed?
+	void *MSQuery(int iRequest)
+	{
+		if (m_fAllowPK)
+			return (void *)true;
+		return (void *)false;
+	}
+
+	void KeyValue(KeyValueData *pkvd)
+	{
+		if (FStrEq(pkvd->szKeyName, "pkill"))
+		{
+			m_fAllowPK = atoi(pkvd->szValue) ? true : false;
+			pkvd->fHandled = true;
+		}
+		else
+			CBaseEntity::KeyValue(pkvd);
+	}
+};
+
+LINK_ENTITY_TO_CLASS(msarea_town, CAreaTown);
+
+//
+//  CMonsterBrush - A Brush that's a monster
+//
+
+class CMonsterBrush : public CMSMonster
+{
+public:
+	void Spawn()
+	{
+		pev->angles = g_vecZero;
+		pev->movetype = MOVETYPE_PUSHSTEP;
+		pev->solid = SOLID_BSP;
+		SET_MODEL(ENT(pev), STRING(pev->model));
+		m_Brush = true;
+
+		CMSMonster::Spawn();
+	}
+	void Precache()
+	{
+		//CMSMonster::Precache( );
+	}
+
+	void Think()
+	{
+		pev->nextthink = BaseThinkTime() + 0.01;
+		CScriptedEnt::Think();
+	}
+	void Touch(CBaseEntity *pOther)
+	{
+		CScriptedEnt::Touch(pOther);
+	}
+	void Killed(entvars_t *pevAttacker, int iGib)
+	{
+		msstringlist Parameters;
+		Parameters.add(EntToString(CBaseEntity::Instance(pevAttacker)));
+		CallScriptEvent("game_death", &Parameters);
+	}
+};
+
+LINK_ENTITY_TO_CLASS(msarea_scripted, CMonsterBrush);
+//-------------------
diff --git a/src/game/server/player/player.cpp b/src/game/server/player/player.cpp
index 51a39885..737a8e9e 100644
--- a/src/game/server/player/player.cpp
+++ b/src/game/server/player/player.cpp
@@ -4887,7 +4887,7 @@ void CBasePlayer::UpdateMiscPositions(void)
 			if (memcmp(&Info, &m_ScoreInfoCache, sizeof(scoreinfo_t)))
 			{
 				pev->frags = m_MaxHP; //FEB2008a - Report HP to Scoreboard
-				for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
+				for (int i = 1; i <= gpGlobals->maxClients; i++)
 				{
 					CBasePlayer *pSendPlayer = (CBasePlayer *)UTIL_PlayerByIndex(i);
 					if (pSendPlayer)
diff --git a/src/game/server/player/playershared.cpp b/src/game/server/player/playershared.cpp
index b074d57f..e4cb9d34 100644
--- a/src/game/server/player/playershared.cpp
+++ b/src/game/server/player/playershared.cpp
@@ -1541,7 +1541,7 @@ charinfo_t::~charinfo_t()
 const char* GetOtherPlayerTransition(CBasePlayer* pPlayer)
 {
 #ifdef VALVE_DLL
-	for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
+	for (int i = 1; i <= gpGlobals->maxClients; i++)
 	{
 		CBasePlayer* pOtherPlayer = (CBasePlayer*)UTIL_PlayerByIndex(i);
 		if (!pOtherPlayer || pOtherPlayer == pPlayer)
diff --git a/src/game/server/shield.cpp b/src/game/server/shield.cpp
index a47fb241..3d21e9ea 100644
--- a/src/game/server/shield.cpp
+++ b/src/game/server/shield.cpp
@@ -21,7 +21,7 @@ void G_SolidifyEnts(bool fEnable, bool fSolidShields, bool fEnableCorpses, bool
 	//Make corpses solid here too...
 	CBaseEntity *pEnt = NULL;
 	edict_t *pEdict = g_engfuncs.pfnPEntityOfEntIndex(1);
-	for (unsigned int i = 1; i < gpGlobals->maxEntities; i++, pEdict++)
+	for (int i = 1; i < gpGlobals->maxEntities; i++, pEdict++)
 	{
 		if (pEdict->free) // Not in use
 			continue;
diff --git a/src/game/server/svglobals.cpp b/src/game/server/svglobals.cpp
index f4bd468f..fbf376d3 100644
--- a/src/game/server/svglobals.cpp
+++ b/src/game/server/svglobals.cpp
@@ -536,7 +536,7 @@ void MSGameEnd()
 	}
 	
 	//Save all characters now - Solokiller 5/10/2017
-	for(unsigned int i = 1; i <= gpGlobals->maxClients; ++i)
+	for(int i = 1; i <= gpGlobals->maxClients; ++i)
 	{
 		CBasePlayer *pPlayer = static_cast<CBasePlayer*>(UTIL_PlayerByIndex(i));
 
@@ -557,7 +557,7 @@ void MSGameEnd()
 	//Deallocate any 'extra' memory the mod allocated for any entity
 	edict_t *pEdict = g_engfuncs.pfnPEntityOfEntIndex(0);
 	if (pEdict)
-		for (unsigned int i = 0; i < gpGlobals->maxEntities; i++, pEdict++)
+		for (int i = 0; i < gpGlobals->maxEntities; i++, pEdict++)
 		{
 			if (pEdict->free)
 				continue;
@@ -622,7 +622,7 @@ void MSGameEnd()
 
 void SendHUDMsgAll(const char* Title, const char* Text)
 {
-	for (unsigned int p = 0; p < gpGlobals->maxClients; p++)
+	for (int p = 0; p < gpGlobals->maxClients; p++)
 		if (MSInstance(INDEXENT(p + 1)))
 			((CBasePlayer *)MSInstance(INDEXENT(p + 1)))->SendHUDMsg(Title, Text);
 }
diff --git a/src/game/server/triggers.cpp b/src/game/server/triggers.cpp
index f33451de..1a99fc1a 100644
--- a/src/game/server/triggers.cpp
+++ b/src/game/server/triggers.cpp
@@ -2812,7 +2812,7 @@ void CTriggerCamera::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE
 	//Camera takes control of all players?
 	if (FBitSet(pev->spawnflags, SF_CAMERA_PLAYER_ALL)) 
 	{
-		for (unsigned int i = 0; i < gpGlobals->maxClients; i++)
+		for (int i = 0; i < gpGlobals->maxClients; i++)
 		{
 			pActivator = UTIL_PlayerByIndex(i + 1); //get pointer to player's cbaseentity
 			if (!pActivator || !pActivator->IsPlayer())
diff --git a/src/game/shared/ms/angelscript/ASBuiltinFunctions.cpp b/src/game/shared/ms/angelscript/ASBuiltinFunctions.cpp
index 4345e40c..6a6a507b 100644
--- a/src/game/shared/ms/angelscript/ASBuiltinFunctions.cpp
+++ b/src/game/shared/ms/angelscript/ASBuiltinFunctions.cpp
@@ -53,7 +53,7 @@ static CBasePlayer* GetPlayerByIndexHelper(int index)
     return nullptr; // Client doesn't have access to other players
 #else
 
-    unsigned int idx = static_cast<unsigned int>(index);
+    int idx = index;
     // Server-side implementation
     if (idx < 1 || idx > gpGlobals->maxClients) {
         return nullptr;
@@ -474,7 +474,7 @@ namespace ASBuiltinFunctions
             return nullptr;
         #else
 
-        unsigned int idx = static_cast<unsigned int>(index);
+            int idx = index;
 
             // Server-side: Real player lookup
             if (idx < 1 || idx > gpGlobals->maxClients) {
@@ -502,7 +502,7 @@ namespace ASBuiltinFunctions
         #else
             // Server-side: Count connected players
             int playerCount = 0;
-            for (unsigned int i = 1; i <= gpGlobals->maxClients; i++) {
+            for (int i = 1; i <= gpGlobals->maxClients; i++) {
                 CBasePlayer* pPlayer = GetPlayerByIndexHelper(i);
                 if (pPlayer && pPlayer->edict() && !pPlayer->edict()->free) {
                     // Additional check: ensure player is fully connected
@@ -532,7 +532,7 @@ namespace ASBuiltinFunctions
         
         #ifdef VALVE_DLL
             // Server-side: Populate with real players
-            for (unsigned int i = 1; i <= gpGlobals->maxClients; i++) {
+            for (int i = 1; i <= gpGlobals->maxClients; i++) {
                 CBasePlayer* pPlayer = GetPlayerByIndexHelper(i);
                 if (pPlayer && pPlayer->edict() && !pPlayer->edict()->free) {
                     if (pPlayer->edict()->v.flags & FL_CLIENT) {
@@ -642,7 +642,7 @@ namespace ASBuiltinFunctions
                 return nullptr;
             }
             
-            for (unsigned int i = 1; i <= gpGlobals->maxClients; i++) {
+            for (int i = 1; i <= gpGlobals->maxClients; i++) {
                 CBasePlayer* pPlayer = GetPlayerByIndexHelper(i);
                 if (pPlayer && pPlayer->edict() && !pPlayer->edict()->free && (pPlayer->edict()->v.flags & FL_CLIENT)) {
                     // Get player's Steam ID through engine
@@ -746,7 +746,7 @@ namespace ASBuiltinFunctions
                           title.c_str(), message.c_str());
         #else
             // Send info message to all connected players
-            for (unsigned int i = 1; i <= gpGlobals->maxClients; i++) {
+            for (int i = 1; i <= gpGlobals->maxClients; i++) {
                 CBasePlayer* pPlayer = GetPlayerByIndexHelper(i);
                 if (pPlayer && pPlayer->edict() && !pPlayer->edict()->free && (pPlayer->edict()->v.flags & FL_CLIENT)) {
                     //ASEngineProvider::SendInfoMsg((void*)pPlayer, fullMessage);
@@ -1366,7 +1366,7 @@ namespace ASBuiltinFunctions
             g_AdvancedSystems.activeSequences.clear();
             
             // Initialize HP monitoring for all players
-            for (unsigned int i = 1; i <= gpGlobals->maxClients; i++) {
+            for (int i = 1; i <= gpGlobals->maxClients; i++) {
                 CBasePlayer* pPlayer = GetPlayerByIndexHelper(i);
                 if (pPlayer && pPlayer->edict() && !pPlayer->edict()->free && (pPlayer->edict()->v.flags & FL_CLIENT)) {
                     // Set up HP monitoring for this player
diff --git a/src/game/shared/ms/angelscript/ASEntityBindings.cpp b/src/game/shared/ms/angelscript/ASEntityBindings.cpp
index e769e5d0..94fe6e63 100644
--- a/src/game/shared/ms/angelscript/ASEntityBindings.cpp
+++ b/src/game/shared/ms/angelscript/ASEntityBindings.cpp
@@ -321,7 +321,7 @@ namespace ASEntityBindings
 #ifdef VALVE_DLL
         // Server-side: Populate with actual connected players using real engine functions
         
-        for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
+        for (int i = 1; i <= gpGlobals->maxClients; i++)
         {
             edict_t* pEdict = g_engfuncs.pfnPEntityOfEntIndex(i);
             if (!pEdict || pEdict->free)
@@ -360,7 +360,7 @@ namespace ASEntityBindings
     {
 #ifdef VALVE_DLL
         
-        unsigned int idx = index;
+        int idx = index;
 
         if (idx < 1 || idx > gpGlobals->maxClients)
         {
@@ -407,7 +407,7 @@ namespace ASEntityBindings
             return nullptr;
         }
         
-        for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
+        for (int i = 1; i <= gpGlobals->maxClients; i++)
         {
             CBasePlayer* pPlayer = AS_PlayerByIndex(i);
             if (pPlayer)
diff --git a/src/game/shared/ms/findentities.cpp b/src/game/shared/ms/findentities.cpp
index 3f74d7eb..d1518e3b 100644
--- a/src/game/shared/ms/findentities.cpp
+++ b/src/game/shared/ms/findentities.cpp
@@ -1,7 +1,7 @@
 #include "findentities.h"
 #ifdef VALVE_DLL
 #include "cbase.h"
-#define MAX_SEARCH_ENTITIES gpGlobals->maxEntities //dont think can be changed to constexpr
+#define MAX_SEARCH_ENTITIES static_cast<unsigned int>(gpGlobals->maxEntities) //dont think can be changed to constexpr
 #else
 #include "inc_huditem.h"
 #include "movement/pm_defs.h"
diff --git a/src/game/shared/ms/script.cpp b/src/game/shared/ms/script.cpp
index b95712c3..e4444ae7 100644
--- a/src/game/shared/ms/script.cpp
+++ b/src/game/shared/ms/script.cpp
@@ -6007,7 +6007,7 @@ void CScript::CallScriptEventAll(const char* EventName, msstringlist* Parameters
 	CBaseEntity* pEntity = NULL;
 	IScripted* pScripted = NULL;
 
-	for (unsigned int i = 1; i < gpGlobals->maxEntities; i++)
+	for (int i = 1; i < gpGlobals->maxEntities; i++)
 	{
 		pEdict = g_engfuncs.pfnPEntityOfEntIndex(i);
 
@@ -6041,7 +6041,7 @@ void CScript::CallScriptPlayers(const char* EventName, msstringlist* Parameters)
 
 	IScripted* pScripted = NULL;
 
-	for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
+	for (int i = 1; i <= gpGlobals->maxClients; i++)
 	{
 		CBaseEntity* pEntity = UTIL_PlayerByIndex(i);
 		CBasePlayer* pPlayer = (CBasePlayer*)pEntity;;
diff --git a/src/game/shared/ms/scriptcmds.cpp b/src/game/shared/ms/scriptcmds.cpp
index a08c4728..d75c3816 100644
--- a/src/game/shared/ms/scriptcmds.cpp
+++ b/src/game/shared/ms/scriptcmds.cpp
@@ -302,7 +302,7 @@ struct SDebugInfo
 	// Info for finding entities
 	int                                 mTargetType;
 	int                                 mTimesLooked;
-	unsigned int                        mStartIndex;
+	int									mStartIndex;
 	msstring                            msScriptName;
 	CBaseEntity *                       mpFoundEntity;
 
@@ -2552,7 +2552,7 @@ bool CScript::ScriptCmd_ClientCmd(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstrin
 		}
 		else
 		{
-			for( unsigned int i = 1; i <= gpGlobals->maxClients; i++ )
+			for(int i = 1; i <= gpGlobals->maxClients; i++ )
 			{
 				CBaseEntity *pEntity = UTIL_PlayerByIndex( i );
 				CBasePlayer *pPlayer = (CBasePlayer *)pEntity;;
@@ -3375,7 +3375,7 @@ bool CScript::ScriptCmd_GetPlayers(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstri
 	//- get all players, store in token string
 #ifdef VALVE_DLL
 	msstring msStorePlayers;
-	for(unsigned int i = 1; i <= gpGlobals->maxClients; i++ )
+	for(int i = 1; i <= gpGlobals->maxClients; i++ )
 	{
 		CBasePlayer *pOtherPlayer = (CBasePlayer *)UTIL_PlayerByIndex( i );
 		if ( !pOtherPlayer ) continue;
@@ -3402,7 +3402,7 @@ bool CScript::ScriptCmd_GetPlayersArray(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, m
 	msscriptarray *                     pArray = m.pScriptedEnt->GetScriptedArray( ArrName, true );
 	pArray->clearitems();
 
-	for(unsigned int i = 1; i <= gpGlobals->maxClients; i++ )
+	for(int i = 1; i <= gpGlobals->maxClients; i++ )
 	{
 		CBasePlayer *pOtherPlayer = (CBasePlayer *)UTIL_PlayerByIndex( i );
 		if ( !pOtherPlayer ) continue;
@@ -3424,7 +3424,7 @@ bool CScript::ScriptCmd_GetPlayersNB(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msst
 	//- saves a step in the bot mess, but for better security, use the script side verifications too (see base_treasurechest)
 #ifdef VALVE_DLL
 	msstring msStorePlayers;
-	for(unsigned int i = 1; i <= gpGlobals->maxClients; i++ )
+	for(int i = 1; i <= gpGlobals->maxClients; i++ )
 	{
 		CBasePlayer *pOtherPlayer = (CBasePlayer *)UTIL_PlayerByIndex( i );
 		if ( !pOtherPlayer )
@@ -3686,7 +3686,7 @@ bool CScript::ScriptCmd_HelpTip(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstringl
 		}
 		else
 		{
-			for( unsigned int i = 1; i <= gpGlobals->maxClients; i++ )
+			for(int i = 1; i <= gpGlobals->maxClients; i++ )
 			{
 				CBaseEntity *pEntity = UTIL_PlayerByIndex(i);
 				CBasePlayer *pPlayer = (CBasePlayer *)pEntity;;
@@ -3808,7 +3808,7 @@ bool CScript::ScriptCmd_HudIcon(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstringl
 			}
 			else
 			{
-				for(unsigned int i = 1; i <= gpGlobals->maxClients; i++ )
+				for(int i = 1; i <= gpGlobals->maxClients; i++ )
 				{
 					CBasePlayer *pPlayer = (CBasePlayer *)UTIL_PlayerByIndex( i );
 					if ( !pPlayer ) continue;
@@ -3878,7 +3878,7 @@ bool CScript::ScriptCmd_HudIcon(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstringl
 			}
 			else
 			{
-				for( unsigned int i = 1; i <= gpGlobals->maxClients; i++ )
+				for(int i = 1; i <= gpGlobals->maxClients; i++ )
 				{
 					CBasePlayer *pPlayer = (CBasePlayer *)UTIL_PlayerByIndex( i );
 					if ( !pPlayer ) continue;
@@ -4397,7 +4397,7 @@ bool CScript::ScriptCmd_MessageAll(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstri
 			msTemp += Params[i+1];
 		}
 
-		for(unsigned int i = 1; i <= gpGlobals->maxClients; i++)
+		for(int i = 1; i <= gpGlobals->maxClients; i++)
 		{
 			CBasePlayer *pPlayer = (CBasePlayer *)UTIL_PlayerByIndex( i );
 
@@ -5216,7 +5216,7 @@ bool CScript::ScriptCmd_Respawn(SCRIPT_EVENT &Event, scriptcmd_t &Cmd, msstringl
 
 		if( Params[0] == "all" )
 		{
-			for( unsigned int i = 1; i <= gpGlobals->maxClients; i++ )
+			for(int i = 1; i <= gpGlobals->maxClients; i++ )
 			{
 				CBaseEntity *pEntity = UTIL_PlayerByIndex( i );
 				if( pEntity ) PlayerList.add( (CBasePlayer *)pEntity );
diff --git a/src/game/shared/voice_gamemgr.cpp b/src/game/shared/voice_gamemgr.cpp
index f47e754c..4db9d1b1 100644
--- a/src/game/shared/voice_gamemgr.cpp
+++ b/src/game/shared/voice_gamemgr.cpp
@@ -38,7 +38,7 @@ cvar_t sv_alltalk = {"sv_alltalk", "0"};
 // Find a player with a case-insensitive name search.
 static CBasePlayer *FindPlayerByName(const char *pTestName)
 {
-	for (unsigned int i = 1; i <= gpGlobals->maxClients; i++)
+	for (int i = 1; i <= gpGlobals->maxClients; i++)
 	{
 		edict_t *pEdict = g_engfuncs.pfnPEntityOfEntIndex(i);
 		if (pEdict)

From d24e09861c712e523866e75afe0f67f1ebd09504 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 26 Mar 2026 15:58:22 -0400
Subject: [PATCH 288/291] over wrote files with unchanged versions from repo.

---
 src/public/engine/eiface.h | 1 +
 src/public/engine/studio.h | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/public/engine/eiface.h b/src/public/engine/eiface.h
index b84d34b1..248a15c2 100644
--- a/src/public/engine/eiface.h
+++ b/src/public/engine/eiface.h
@@ -41,6 +41,7 @@
 #define DLLEXPORT  __attribute__ ((visibility("default")))
 #endif
 */
+
 typedef enum
 	{
 	at_notice,
diff --git a/src/public/engine/studio.h b/src/public/engine/studio.h
index 8dc172d7..8cee1d4d 100644
--- a/src/public/engine/studio.h
+++ b/src/public/engine/studio.h
@@ -28,6 +28,7 @@ Studio models are position independent, so the cache manager can move them.
 ==============================================================================
 */
 
+
 #define MAXSTUDIOTRIANGLES	20000	// TODO: tune this
 #define MAXSTUDIOVERTS		2048	// TODO: tune this
 #define MAXSTUDIOSEQUENCES	2048	// total animation sequences
@@ -69,7 +70,7 @@ typedef struct
 	int					numhitboxes;			// complex bounding boxes
 	int					hitboxindex;			
 	
-	int				    numseq;				// animation sequences
+	int					numseq;				// animation sequences
 	int					seqindex;
 
 	int					numseqgroups;		// demand loaded sequences

From 40160a3e0d12d94135fc0cd17c184267c966480b Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 26 Mar 2026 16:09:43 -0400
Subject: [PATCH 289/291] Reverted changes to thirdparty files

---
 thirdparty/angelscript/as_thread.cpp | 4 ++--
 thirdparty/tartan/textureloader.cpp  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/thirdparty/angelscript/as_thread.cpp b/thirdparty/angelscript/as_thread.cpp
index 15fbb895..b68f9bb7 100644
--- a/thirdparty/angelscript/as_thread.cpp
+++ b/thirdparty/angelscript/as_thread.cpp
@@ -449,7 +449,7 @@ void asCThreadReadWriteLock::AcquireExclusive()
 	// If we try to lock all at once it is quite possible the writer will
 	// never succeed.
 	for( asUINT n = 0; n < maxReaders; n++ )
-		WaitForSingleObjectEx(readLocks, INFINITE, false);
+		WaitForSingleObjectEx(readLocks, INFINITE, FALSE);
 
 	// Allow another writer to lock. It will only be able to
 	// lock the readers when this writer releases them anyway.
@@ -473,7 +473,7 @@ void asCThreadReadWriteLock::AcquireShared()
 	pthread_rwlock_rdlock(&lock);
 #elif defined AS_WINDOWS_THREADS
 	// Lock a reader slot
-	WaitForSingleObjectEx(readLocks, INFINITE, false);
+	WaitForSingleObjectEx(readLocks, INFINITE, FALSE);
 #endif
 }
 
diff --git a/thirdparty/tartan/textureloader.cpp b/thirdparty/tartan/textureloader.cpp
index 36c94eae..b9f77917 100644
--- a/thirdparty/tartan/textureloader.cpp
+++ b/thirdparty/tartan/textureloader.cpp
@@ -109,7 +109,7 @@ namespace Tartan
 
 			DataPixels = new GLubyte[NewSize];
 			int OldOfs = 0, NewOfs = 0;
-			for (unsigned int i = 0; i < (signed)LoadTex.Height; i++)
+			for (int i = 0; i < (signed)LoadTex.Height; i++)
 			{
 				int RowSize = BytesPerPixel * LoadTex.Width;
 				memcpy(&DataPixels[NewOfs], &Texture.imageData[OldOfs], RowSize);

From 982f294a93bd0b99572e2dab05189d653a71b152 Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 26 Mar 2026 18:40:52 -0400
Subject: [PATCH 290/291] Removed all changes from src/common files. Missing
 M_PI def for a few files. Re-added nanmask int. Added hard define for missing
 enums, 'unable to open header file' and it's commented out of another common
 file.

---
 src/common/Platform.h                         |   15 +-
 src/common/Sequence.h                         |    1 +
 src/common/beamdef.h                          |   32 +-
 src/common/cl_entity.h                        |   20 +-
 src/common/com_model.h                        |   78 +-
 src/common/const.h                            | 1264 ++++++++---------
 src/common/cvardef.h                          |   31 +-
 src/common/director_cmds.h                    |   45 +-
 src/common/dlight.h                           |    2 +-
 src/common/dll_state.h                        |   28 +-
 src/common/engine_launcher_api.h              |   11 +-
 src/common/entity_state.h                     |   50 +-
 src/common/entity_types.h                     |   14 +-
 src/common/event_api.h                        |    2 +-
 src/common/event_args.h                       |   10 +-
 src/common/event_flags.h                      |   20 +-
 src/common/hltv.h                             |   78 +-
 src/common/in_buttons.h                       |   35 +-
 src/common/interface.cpp                      |    1 -
 src/common/interface.h                        |    3 +-
 src/common/mathlib.h                          |   70 +-
 src/common/net_api.h                          |   27 +-
 src/common/particledef.h                      |    4 +-
 src/common/pmtrace.h                          |    6 +-
 src/common/qfont.h                            |    2 +-
 src/common/r_efx.h                            |   56 +-
 src/common/r_studioint.h                      |    8 +-
 src/common/ref_params.h                       |    2 +-
 src/common/triangleapi.h                      |   19 +-
 src/common/usercmd.h                          |    4 +-
 src/game/client/hud.cpp                       |    7 +-
 src/game/client/render/studio_util.cpp        |    8 +-
 src/game/client/render/studio_util.h          |    2 +
 .../client/render/studiomodelrenderer.cpp     |    6 +-
 src/game/client/view.cpp                      |    4 +-
 src/game/server/hl/animating.cpp              |    5 +-
 src/game/server/hl/func_tank.cpp              |    8 +-
 src/game/server/monsters/npcscript.cpp        |    5 +-
 src/game/shared/movement/pm_math.cpp          |   31 +-
 src/game/shared/movement/pm_shared.cpp        |    7 +-
 src/game/shared/movement/pm_shared.h          |    2 +
 src/game/shared/weapons/giattack.cpp          |    7 +-
 42 files changed, 979 insertions(+), 1051 deletions(-)

diff --git a/src/common/Platform.h b/src/common/Platform.h
index 12b476e9..bcfb4a8d 100644
--- a/src/common/Platform.h
+++ b/src/common/Platform.h
@@ -3,7 +3,7 @@
 
 // Allow "DEBUG" in addition to default "_DEBUG"
 #ifdef _DEBUG
-constexpr int DEBUG = 1
+#define DEBUG 1
 #endif
 
 // Silence certain warnings
@@ -12,6 +12,7 @@ constexpr int DEBUG = 1
 #pragma warning(disable : 4201)	 // nameless struct/union
 #pragma warning(disable : 4514)	 // unreferenced inline function removed
 #pragma warning(disable : 4100)	 // unreferenced formal parameter
+#pragma warning(disable : 4018) // signed/unsigned mismatch, this this probably isn't a good idea...
 #pragma warning(disable : 26495) // Variable is uninitialized
 #pragma warning(disable : 26451) // Arithmetic overflow
 #pragma warning(disable : 26812) // The enum type is unscoped
@@ -40,15 +41,7 @@ using word = unsigned short;
 // #undef ARRAYSIZE
 // #endif
 // #define ARRAYSIZE(p) (sizeof(p) / sizeof(p[0]))
-
-template <typename T1, typename T2>
-inline auto V_min(const T1& a, const T2& b) {
-	return (a <= b) ? a : b;
-};
-
-template <typename T1, typename T2>
-inline auto V_max(const T1& a, const T2& b) {
-	return (a >= b) ? a : b;
-};
+#define V_min(a, b) (((a) < (b)) ? (a) : (b))
+#define V_max(a, b) (((a) > (b)) ? (a) : (b))
 
 #endif
\ No newline at end of file
diff --git a/src/common/Sequence.h b/src/common/Sequence.h
index 4b7bf978..708c5c69 100644
--- a/src/common/Sequence.h
+++ b/src/common/Sequence.h
@@ -73,6 +73,7 @@ enum sequenceCommandEnum_
 	SEQUENCE_COMMAND_MODIFIER,
 	SEQUENCE_COMMAND_POSTMODIFIER,
 	SEQUENCE_COMMAND_NOOP,
+
 	SEQUENCE_MODIFIER_EFFECT,
 	SEQUENCE_MODIFIER_POSITION,
 	SEQUENCE_MODIFIER_COLOR,
diff --git a/src/common/beamdef.h b/src/common/beamdef.h
index 84796e67..cc4d3047 100644
--- a/src/common/beamdef.h
+++ b/src/common/beamdef.h
@@ -18,20 +18,18 @@
 #pragma once
 #endif
 
-enum {
-	FBEAM_STARTENTITY  = 0x00000001,
-	FBEAM_ENDENTITY    = 0x00000002,
-	FBEAM_FADEIN       = 0x00000004,
-	FBEAM_FADEOUT      = 0x00000008,
-	FBEAM_SINENOISE    = 0x00000010,
-	FBEAM_SOLID        = 0x00000020,
-	FBEAM_SHADEIN      = 0x00000040,
-	FBEAM_SHADEOUT     = 0x00000080,
-	FBEAM_STARTVISIBLE = 0x10000000, // Has this client actually seen this beam's start entity yet?;
-	FBEAM_ENDVISIBLE   = 0x20000000,	  // Has this client actually seen this beam's end entity yet?;
-	FBEAM_ISACTIVE     = 0x40000000,
-	FBEAM_FOREVER      = 0x80000000
-};
+#define FBEAM_STARTENTITY 0x00000001
+#define FBEAM_ENDENTITY 0x00000002
+#define FBEAM_FADEIN 0x00000004
+#define FBEAM_FADEOUT 0x00000008
+#define FBEAM_SINENOISE 0x00000010
+#define FBEAM_SOLID 0x00000020
+#define FBEAM_SHADEIN 0x00000040
+#define FBEAM_SHADEOUT 0x00000080
+#define FBEAM_STARTVISIBLE 0x10000000 // Has this client actually seen this beam's start entity yet?
+#define FBEAM_ENDVISIBLE 0x20000000	  // Has this client actually seen this beam's end entity yet?
+#define FBEAM_ISACTIVE 0x40000000
+#define FBEAM_FOREVER 0x80000000
 
 typedef struct beam_s BEAM;
 struct beam_s
@@ -39,9 +37,9 @@ struct beam_s
 	BEAM *next;
 	int type;
 	int flags;
-	Vector  source;
-	Vector  target;
-	Vector  delta;
+	vec3_t source;
+	vec3_t target;
+	vec3_t delta;
 	float t; // 0 .. 1 over lifetime of beam
 	float freq;
 	float die;
diff --git a/src/common/cl_entity.h b/src/common/cl_entity.h
index 447c3272..dbf3981d 100644
--- a/src/common/cl_entity.h
+++ b/src/common/cl_entity.h
@@ -39,10 +39,10 @@ typedef struct
 	float prevanimtime;
 	float sequencetime;
 	byte prevseqblending[2];
-	Vector prevorigin;
-	Vector prevangles;
+	vec3_t prevorigin;
+	vec3_t prevangles;
 
-	unsigned int prevsequence;
+	int prevsequence;
 	float prevframe;
 
 	byte prevcontroller[4];
@@ -54,14 +54,14 @@ typedef struct
 	// Time stamp for this movement
 	float animtime;
 
-	Vector origin;
-	Vector angles;
+	vec3_t origin;
+	vec3_t angles;
 } position_history_t;
 
 typedef struct cl_entity_s cl_entity_t;
 
-constexpr int HISTORY_MAX = 64; // Must be power of 2
-constexpr int HISTORY_MASK = (HISTORY_MAX - 1);
+#define HISTORY_MAX 64 // Must be power of 2
+#define HISTORY_MASK (HISTORY_MAX - 1)
 
 #if !defined(ENTITY_STATEH)
 #include "entity_state.h"
@@ -93,11 +93,11 @@ struct cl_entity_s
 	float lastmove;
 
 	// Actual render position and angles
-	Vector origin;
-	Vector angles;
+	vec3_t origin;
+	vec3_t angles;
 
 	// Attachment points
-	Vector attachment[4];
+	vec3_t attachment[4];
 
 	// Other entity local information
 	int trivial_accept;
diff --git a/src/common/com_model.h b/src/common/com_model.h
index a0265fea..1694a5c9 100644
--- a/src/common/com_model.h
+++ b/src/common/com_model.h
@@ -24,37 +24,33 @@
 #pragma once
 #endif
 
+#define STUDIO_RENDER 1
+#define STUDIO_EVENTS 2
 
-constexpr unsigned int MAX_MAP_HULLS = 4;
-constexpr unsigned int MAX_LIGHTMAPS = 4;
-constexpr unsigned int MAX_CLIENTS = 32;
-constexpr unsigned int MAX_MODEL_NAME = 64;
-constexpr unsigned int MAX_EDICTS = 2048;
-constexpr unsigned int MIPLEVELS = 4;
-constexpr unsigned int NUM_AMBIENTS = 4; // automatic ambient sounds
+#define MAX_CLIENTS 32
+#define MAX_EDICTS 2048
 
+#define MAX_MODEL_NAME 64
+#define MAX_MAP_HULLS 4
+#define MIPLEVELS 4
+#define NUM_AMBIENTS 4 // automatic ambient sounds
+#define MAXLIGHTMAPS 4
+#define PLANE_ANYZ 5
 
-// flags in finalvert_t.flags
-
+#define ALIAS_Z_CLIP_PLANE 5
 
-enum studio_e {
-    STUDIO_RENDER = 1,
-    STUDIO_EVENTS = 2
-};
+// flags in finalvert_t.flags
+#define ALIAS_LEFT_CLIP 0x0001
+#define ALIAS_TOP_CLIP 0x0002
+#define ALIAS_RIGHT_CLIP 0x0004
+#define ALIAS_BOTTOM_CLIP 0x0008
+#define ALIAS_Z_CLIP 0x0010
+#define ALIAS_ONSEAM 0x0020
+#define ALIAS_XY_CLIP_MASK 0x000F
 
-enum alias_clip_e {
-    ALIAS_LEFT_CLIP = 0x0001,
-    ALIAS_TOP_CLIP = 0x0002,
-    ALIAS_RIGHT_CLIP = 0x0004,
-    ALIAS_BOTTOM_CLIP = 0x0008,
-    ALIAS_Z_CLIP = 0x0010,
-    ALIAS_Z_CLIP_PLANE = 5,
-    ALIAS_ONSEAM = 0x0020,
-    ALIAS_XY_CLIP_MASK = 0x000F
-};
+#define ZISCALE ((float)0x8000)
 
-constexpr float ZISCALE = (float)0x8000;
-constexpr int CACHE_SIZE = 32; // used to align key data structures
+#define CACHE_SIZE 32 // used to align key data structures
 
 typedef enum
 {
@@ -91,7 +87,7 @@ typedef struct
 //  'model.h' and 'gl_model.h'
 typedef struct mplane_s
 {
-    Vector normal; // surface normal
+    vec3_t normal; // surface normal
     float dist;    // closest appoach to origin
     byte type;     // for texture axis selection and fast side tests
     byte signbits; // signx + signy<<1 + signz<<1
@@ -100,7 +96,7 @@ typedef struct mplane_s
 
 typedef struct
 {
-    Vector position;
+    vec3_t position;
 } mvertex_t;
 
 // 06/23/2002 MAH
@@ -163,7 +159,7 @@ typedef struct
 #ifdef HARDWARE_MODE
 // 06/23/2002 MAH
 // This structure is only need for hardware rendering
-constexpr int VERTEXSIZE = 7;
+#define VERTEXSIZE 7
 
 typedef struct glpoly_s
 {
@@ -283,7 +279,7 @@ typedef struct mleaf_s
     struct efrag_s *efrags;
 
     msurface_t **firstmarksurface;
-    unsigned int nummarksurfaces;
+    int nummarksurfaces;
     int key; // BSP sequence number for leaf's contents
     byte ambient_sound_level[NUM_AMBIENTS];
 } mleaf_t;
@@ -318,7 +314,7 @@ struct msurface_s
     mtexinfo_t *texinfo;
 
     // lighting info
-    byte styles[MAX_LIGHTMAPS]; // index into d_lightstylevalue[] for animated lights
+    byte styles[MAXLIGHTMAPS]; // index into d_lightstylevalue[] for animated lights
                                // no one surface can be effected by more than 4
                                // animated lights.
     color24 *samples;          // actual light map data for this surface
@@ -360,8 +356,8 @@ typedef struct msurface_s
     int dlightbits;
 
     int lightmaptexturenum;
-    byte styles[MAX_LIGHTMAPS];
-    int cached_light[MAX_LIGHTMAPS]; // values currently used in lightmap
+    byte styles[MAXLIGHTMAPS];
+    int cached_light[MAXLIGHTMAPS]; // values currently used in lightmap
     qboolean cached_dlight;         // true if dynamic light in cache
 
     //  byte        *samples;                   // [numstyles*surfsize]
@@ -391,8 +387,8 @@ typedef struct hull_s
     mplane_t *planes;
     int firstclipnode;
     int lastclipnode;
-    Vector clip_mins;
-    Vector clip_maxs;
+    vec3_t clip_mins;
+    vec3_t clip_maxs;
 } hull_t;
 
 #if !defined(CACHE_USER) && !defined(QUAKEDEF_H)
@@ -417,13 +413,13 @@ typedef struct model_s
     //
     // volume occupied by the model
     //
-    Vector mins, maxs; // +0x054, +060
+    vec3_t mins, maxs; // +0x054, +060
     float radius;      // +0x06C
 
     //
     // brush model
     //
-    unsigned int firstmodelsurface, nummodelsurfaces; // +0x070, +0x074
+    int firstmodelsurface, nummodelsurfaces; // +0x070, +0x074
 
     int numsubmodels;    // +0x078
     dmodel_t *submodels; // +0x07C
@@ -482,7 +478,7 @@ typedef struct alight_s
 {
     int ambientlight; // clip at 128
     int shadelight;   // clip at 192 - ambientlight
-    Vector color;
+    vec3_t color;
     float *plightvec;
 } alight_t;
 
@@ -496,8 +492,8 @@ typedef struct auxvert_s
 //
 #include "custom.h"
 
-constexpr int  MAX_INFO_STRING = 256;
-constexpr int  MAX_SCOREBOARDNAME = 32;
+#define MAX_INFO_STRING 256
+#define MAX_SCOREBOARDNAME 32
 typedef struct player_info_s
 {
     // User id on server
@@ -524,10 +520,10 @@ typedef struct player_info_s
     int renderframe;
 
     // Gait frame estimation
-    unsigned int gaitsequence;
+    int gaitsequence;
     float gaitframe;
     float gaityaw;
-    Vector prevgaitorigin;
+    vec3_t prevgaitorigin;
 
     customization_t customdata;
 } player_info_t;
diff --git a/src/common/const.h b/src/common/const.h
index 620ab2ea..49672a7b 100644
--- a/src/common/const.h
+++ b/src/common/const.h
@@ -21,666 +21,623 @@
 
 #include "Platform.h"
 
-constexpr double PI = 3.14159265358979323846;
-
 // edict->flags
+#define FL_FLY (1 << 0)	 // Changes the SV_Movestep() behavior to not need to be on ground
+#define FL_SWIM (1 << 1) // Changes the SV_Movestep() behavior to not need to be on ground (but stay in water)
+#define FL_CONVEYOR (1 << 2)
+#define FL_CLIENT (1 << 3)
+#define FL_INWATER (1 << 4)
+#define FL_MONSTER (1 << 5)
+#define FL_GODMODE (1 << 6)
+#define FL_NOTARGET (1 << 7)
+#define FL_SKIPLOCALHOST (1 << 8)  // Don't send entity to local host, it's predicting this entity itself
+#define FL_ONGROUND (1 << 9)	   // At rest / on the ground
+#define FL_PARTIALGROUND (1 << 10) // not all corners are valid
+#define FL_WATERJUMP (1 << 11)	   // player jumping out of water
+#define FL_FROZEN (1 << 12)		   // Player is frozen for 3rd person camera
+#define FL_FAKECLIENT (1 << 13)	   // JAC: fake client, simulated server side; don't send network messages to them
+#define FL_DUCKING (1 << 14)	   // Player flag -- Player is fully crouched
+#define FL_FLOAT (1 << 15)		   // Apply floating force to this entity when in water
+#define FL_GRAPHED (1 << 16)	   // worldgraph has this ent listed as something that blocks a connection
+
+// UNDONE: Do we need these?
+#define FL_IMMUNE_WATER (1 << 17)
+//#define FL_IMMUNE_SLIME (1 << 18)
+#define FL_CLIENTONLY (1 << 18)		// Strip edicts
+#define FL_IMMUNE_LAVA (1 << 19)
+
+#define FL_PROXY (1 << 20)		  // This is a spectator proxy
+#define FL_ALWAYSTHINK (1 << 21)  // Brush model flag -- call think every frame regardless of nextthink - ltime (for constantly changing velocity/path)
+#define FL_BASEVELOCITY (1 << 22) // Base velocity has been applied this frame (used to convert base velocity into momentum)
+#define FL_MONSTERCLIP (1 << 23)  // Only collide in with monsters who have FL_MONSTERCLIP set
+#define FL_ONTRAIN (1 << 24)	  // Player is _controlling_ a train, so movement commands should be ignored on client during prediction.
+#define FL_WORLDBRUSH (1 << 25)	  // Not moveable/removeable brush entity (really part of the world, but represented as an entity for transparency or something)
+#define FL_SPECTATOR (1 << 26)	  // This client is a spectator, don't run touch functions, etc.
+#define FL_CUSTOMENTITY (1 << 29) // This is a custom entity
+#define FL_KILLME (1 << 30)		  // This entity is marked for death -- This allows the engine to kill ents at the appropriate time
+#define FL_DORMANT (1 << 31)	  // Entity is dormant, no updates to client
 
-enum {
-	FL_FLY = (1 << 0),	 // Changes the SV_Movestep() behavior to not need to be on ground
-	FL_SWIM = (1 << 1), // Changes the SV_Movestep() behavior to not need to be on ground (but stay in water)
-	FL_CONVEYOR = (1 << 2),
-	FL_CLIENT = (1 << 3),
-	FL_INWATER = (1 << 4),
-	FL_MONSTER = (1 << 5),
-	FL_GODMODE = (1 << 6),
-	FL_NOTARGET = (1 << 7),
-	FL_SKIPLOCALHOST = (1 << 8), // Don't send entity to local host, it's predicting this entity itself
-	FL_ONGROUND = (1 << 9),	   // At rest / on the ground
-	FL_PARTIALGROUND = (1 << 10),// not all corners are valid
-	FL_WATERJUMP = (1 << 11),   // player jumping out of water
-	FL_FROZEN = (1 << 12),	   // Player is frozen for 3rd person camera
-	FL_FAKECLIENT = (1 << 13),  // JAC: fake client, simulated server side; don't send network messages to them
-	FL_DUCKING = (1 << 14),	   // Player flag -- Player is fully crouched
-	FL_FLOAT = (1 << 15),	   // Apply floating force to this entity when in water
-	FL_GRAPHED = (1 << 16),	   // worldgraph has this ent listed as something that blocks a connection
-    // UNDONE: Do we need these?
-	FL_IMMUNE_WATER = (1 << 17),
-    //FL_IMMUNE_SLIME (1 << 18);
-	FL_CLIENTONLY = (1 << 18),		// Strip edicts
-	FL_IMMUNE_LAVA = (1 << 19),
-	FL_PROXY = (1 << 20),		  // This is a spectator proxy
-	FL_ALWAYSTHINK = (1 << 21), // Brush model flag -- call think every frame regardless of nextthink - ltime (for constantly changing velocity/path)
-	FL_BASEVELOCITY = (1 << 22),// Base velocity has been applied this frame (used to convert base velocity into momentum)
-	FL_MONSTERCLIP = (1 << 23), // Only collide in with monsters who have FL_MONSTERCLIP set
-	FL_ONTRAIN = (1 << 24),	  // Player is _controlling_ a train, so movement commands should be ignored on client during prediction.
-	FL_WORLDBRUSH = (1 << 25),	  // Not moveable/removeable brush entity (really part of the world, but represented as an entity for transparency or something)
-	FL_SPECTATOR = (1 << 26),	  // This client is a spectator, don't run touch functions, etc.
-	FL_CUSTOMENTITY = (1 << 29), // This is a custom entity
-	FL_KILLME = (1 << 30),		  // This entity is marked for death -- This allows the engine to kill ents at the appropriate time
-	FL_DORMANT = (1 << 31)	  // Entity is dormant, no updates to client
-};
 // Goes into globalvars_t.trace_flags
-
-constexpr int FTRACE_SIMPLEBOX = (1 << 0); // Traceline with a simple box
+#define FTRACE_SIMPLEBOX (1 << 0) // Traceline with a simple box
 
 // walkmove modes
-enum {
-	WALKMOVE_NORMAL = 0,	 // normal walkmove
-	WALKMOVE_WORLDONLY = 1, // doesn't hit ANY entities, no matter what the solid type
-	WALKMOVE_CHECKONLY = 2 // move, but don't touch triggers
-};
+#define WALKMOVE_NORMAL 0	 // normal walkmove
+#define WALKMOVE_WORLDONLY 1 // doesn't hit ANY entities, no matter what the solid type
+#define WALKMOVE_CHECKONLY 2 // move, but don't touch triggers
 
 // edict->movetype values
-enum {
-	MOVETYPE_NONE = 0,
-	MOVETYPE_ANGLENOCLIP = 1,
-	MOVETYPE_ANGLECLIP = 2,
-	MOVETYPE_WALK = 3,		  // Player only - moving on the ground
-	MOVETYPE_STEP = 4,		  // gravity, special edge handling -- monsters use this
-	MOVETYPE_FLY = 5,		  // No gravity, but still collides with stuff
-	MOVETYPE_TOSS = 6,		  // gravity/collisions
-	MOVETYPE_PUSH = 7,		  // no clip to world, push and crush
-	MOVETYPE_NOCLIP = 8,  // No gravity, no collisions, still do velocity/avelocity
-	MOVETYPE_FLYMISSILE = 9, // extra size to monsters
-	MOVETYPE_BOUNCE = 10,		  // Just like Toss, but reflect velocity when contacting surfaces
-	MOVETYPE_BOUNCEMISSILE = 11,// bounce w/o gravity
-	MOVETYPE_FOLLOW = 12,		  // track movement of aiment
-	MOVETYPE_PUSHSTEP = 13  // BSP model that needs physics/world collisions (uses nearest hull for world collision)
-};
+#define MOVETYPE_NONE 0 // never moves
+//#define	MOVETYPE_ANGLENOCLIP	1
+//#define	MOVETYPE_ANGLECLIP		2
+#define MOVETYPE_WALK 3			  // Player only - moving on the ground
+#define MOVETYPE_STEP 4			  // gravity, special edge handling -- monsters use this
+#define MOVETYPE_FLY 5			  // No gravity, but still collides with stuff
+#define MOVETYPE_TOSS 6			  // gravity/collisions
+#define MOVETYPE_PUSH 7			  // no clip to world, push and crush
+#define MOVETYPE_NOCLIP 8		  // No gravity, no collisions, still do velocity/avelocity
+#define MOVETYPE_FLYMISSILE 9	  // extra size to monsters
+#define MOVETYPE_BOUNCE 10		  // Just like Toss, but reflect velocity when contacting surfaces
+#define MOVETYPE_BOUNCEMISSILE 11 // bounce w/o gravity
+#define MOVETYPE_FOLLOW 12		  // track movement of aiment
+#define MOVETYPE_PUSHSTEP 13	  // BSP model that needs physics/world collisions (uses nearest hull for world collision)
+
 // edict->solid values
 // NOTE: Some movetypes will cause collisions independent of SOLID_NOT/SOLID_TRIGGER when the entity moves
 // SOLID only effects OTHER entities colliding with this one when they move - UGH!
+#define SOLID_NOT 0		 // no interaction with other objects
+#define SOLID_TRIGGER 1	 // touch on edge, but not blocking
+#define SOLID_BBOX 2	 // touch on edge, block
+#define SOLID_SLIDEBOX 3 // touch on edge, but not an onground
+#define SOLID_BSP 4		 // bsp clip, touch on edge, block
 
-enum {
-	SOLID_NOT = 0, // no interaction with other objects
-	SOLID_TRIGGER = 1,	 // touch on edge, but not blocking
-	SOLID_BBOX = 2,	 // touch on edge, block
-	SOLID_SLIDEBOX = 3,// touch on edge, but not an onground
-	SOLID_BSP = 4	 // bsp clip, touch on edge, block
-};
 // edict->deadflag values
-
-enum {
-	DEAD_NO = 0,	 // alive
-	DEAD_DYING = 1, // playing death animation or still falling off of a ledge waiting to hit ground
-	DEAD_DEAD = 2,	 // dead. lying still.
-	DEAD_RESPAWNABLE = 3,
-	DEAD_DISCARDBODY = 4
-};
-
-enum {
-	DAMAGE_NO = 0,
-	DAMAGE_YES = 1,
-	DAMAGE_AIM = 2
-};
-
-enum {
-	// entity effects
-	EF_BRIGHTFIELD = 1, // swirling cloud of particles
-	EF_MUZZLEFLASH = 2, // single frame ELIGHT on entity attachment 0
-	EF_BRIGHTLIGHT = 4,// DLIGHT centered at entity origin
-	EF_DIMLIGHT = 8,	 // player flashlight
-	EF_INVLIGHT = 16,	 // get lighting from ceiling
-	EF_NOINTERP = 32,	 // don't interpolate the next frame
-	EF_LIGHT = 64,	 // rocket flare glow sprite
-	EF_NODRAW = 128	 // don't draw entity
-};
+#define DEAD_NO 0	 // alive
+#define DEAD_DYING 1 // playing death animation or still falling off of a ledge waiting to hit ground
+#define DEAD_DEAD 2	 // dead. lying still.
+#define DEAD_RESPAWNABLE 3
+#define DEAD_DISCARDBODY 4
+
+#define DAMAGE_NO 0
+#define DAMAGE_YES 1
+#define DAMAGE_AIM 2
+
+// entity effects
+#define EF_BRIGHTFIELD 1 // swirling cloud of particles
+#define EF_MUZZLEFLASH 2 // single frame ELIGHT on entity attachment 0
+#define EF_BRIGHTLIGHT 4 // DLIGHT centered at entity origin
+#define EF_DIMLIGHT 8	 // player flashlight
+#define EF_INVLIGHT 16	 // get lighting from ceiling
+#define EF_NOINTERP 32	 // don't interpolate the next frame
+#define EF_LIGHT 64		 // rocket flare glow sprite
+#define EF_NODRAW 128	 // don't draw entity
 
 // entity flags
-enum {
-	EFLAG_SLERP = 1, // do studio interpolation of this entity
-	EFLAG_FLESH_SOUND = 2
-};
-
-//temp entity explode flags
-
-enum {
-	TE_EXPLFLAG_NONE = 0,  // all flags clear makes default Half-Life explosion
-	TE_EXPLFLAG_NOADDITIVE = 1,  // sprite will be drawn opaque (ensure that the sprite you send is a non-additive sprite)
-	TE_EXPLFLAG_NODLIGHTS = 2,	  // do not render dynamic lights
-	TE_EXPLFLAG_NOSOUND = 4,  // do not play client explosion sound
-	TE_EXPLFLAG_NOPARTICLES = 8 // do not draw particles
-};
-
-
-//temp entity fire flags
-enum {
-	TEFIRE_FLAG_ALLFLOAT = 1,	// all sprites will drift upwards as they animate
-	TEFIRE_FLAG_SOMEFLOAT = 2, // some of the sprites will drift upwards. (50% chance)
-	TEFIRE_FLAG_LOOP = 4,		// if set, sprite plays at 15 fps, otherwise plays at whatever rate stretches the animation over the sprite's duration.
-	TEFIRE_FLAG_ALPHA = 8,		// if set, sprite is rendered alpha blended at 50% else, opaque
-	TEFIRE_FLAG_PLANAR = 16,// if set, all fire sprites have same initial Z instead of randomly filling a cube.
-	TEFIRE_FLAG_ADDITIVE = 32 // if set, sprite is rendered non-opaque with additive
-};
-
-// Temp entity bounce sound types
-
-enum {
-	TE_BOUNCE_NULL = 0,
-	TE_BOUNCE_SHELL = 1,
-	TE_BOUNCE_SHOTSHELL = 2
-};
+#define EFLAG_SLERP 1 // do studio interpolation of this entity
+#define EFLAG_FLESH_SOUND 2
 
 //
 // temp entity events
 //
-
-enum {
-	TE_BEAMPOINTS = 0, // beam effect between two points
-	// coord coord coord (start position)
-	// coord coord coord (end position)
-	// short (sprite index)
-	// byte (starting frame)
-	// byte (frame rate in 0.1's)
-	// byte (life in 0.1's)
-	// byte (line width in 0.1's)
-	// byte (noise amplitude in 0.01's)
-	// byte,byte,byte (color)
-	// byte (brightness)
-	// byte (scroll speed in 0.1's)
-
-	TE_BEAMENTPOINT = 1, // beam effect between point and entity
-	// short (start entity)
-	// coord coord coord (end position)
-	// short (sprite index)
-	// byte (starting frame)
-	// byte (frame rate in 0.1's)
-	// byte (life in 0.1's)
-	// byte (line width in 0.1's)
-	// byte (noise amplitude in 0.01's)
-	// byte,byte,byte (color)
-	// byte (brightness)
-	// byte (scroll speed in 0.1's)
-
-	TE_GUNSHOT = 2, // particle effect plus ricochet sound
-	// coord coord coord (position)
-
-	TE_EXPLOSION = 3, // additive sprite, 2 dynamic lights, flickering particles, explosion sound, move vertically 8 pps
-	// coord coord coord (position)
-	// short (sprite index)
-	// byte (scale in 0.1's)
-	// byte (framerate)
-	// byte (flags)
-	//
-	// The Explosion effect has some flags to control performance/aesthetic features:
-
-	TE_TAREXPLOSION = 4, // Quake1 "tarbaby" explosion with sound
-	// coord coord coord (position)
-
-	TE_SMOKE = 5, // alphablend sprite, move vertically 30 pps
-	// coord coord coord (position)
-	// short (sprite index)
-	// byte (scale in 0.1's)
-	// byte (framerate)
-
-	TE_TRACER = 6, // tracer effect from point to point
-	// coord, coord, coord (start)
-	// coord, coord, coord (end)
-
-	TE_LIGHTNING = 7, // TE_BEAMPOINTS with simplified parameters
-	// coord, coord, coord (start)
-	// coord, coord, coord (end)
-	// byte (life in 0.1's)
-	// byte (width in 0.1's)
-	// byte (amplitude in 0.01's)
-	// short (sprite model index)
-
-	TE_BEAMENTS = 8,
-	// short (start entity)
-	// short (end entity)
-	// short (sprite index)
-	// byte (starting frame)
-	// byte (frame rate in 0.1's)
-	// byte (life in 0.1's)
-	// byte (line width in 0.1's)
-	// byte (noise amplitude in 0.01's)
-	// byte,byte,byte (color)
-	// byte (brightness)
-	// byte (scroll speed in 0.1's)
-
-	TE_SPARKS = 9, // 8 random tracers with gravity, ricochet sprite
-	// coord coord coord (position)
-
-	TE_LAVASPLASH = 10, // Quake1 lava splash
-	// coord coord coord (position)
-	
-	TE_TELEPORT = 11, // Quake1 teleport splash
-	// coord coord coord (position)
-	
-	TE_EXPLOSION2 = 12, // Quake1 colormaped (base palette) particle explosion with sound
-	// coord coord coord (position)
-	// byte (starting color)
-	// byte (num colors)
-	
-	TE_BSPDECAL = 13, // Decal from the .BSP file
-	// coord, coord, coord (x,y,z), decal position (center of texture in world)
-	// short (texture index of precached decal texture name)
-	// short (entity index)
-	// [optional - only included if previous short is non-zero (not the world)] short (index of model of above entity)
-	
-	TE_IMPLOSION = 14, // tracers moving toward a point
-	// coord, coord, coord (position)
-	// byte (radius)
-	// byte (count)
-	// byte (life in 0.1's)
-	
-	TE_SPRITETRAIL = 15, // line of moving glow sprites with gravity, fadeout, and collisions
-	// coord, coord, coord (start)
-	// coord, coord, coord (end)
-	// short (sprite index)
-	// byte (count)
-	// byte (life in 0.1's)
-	// byte (scale in 0.1's)
-	// byte (velocity along vector in 10's)
-	// byte (randomness of velocity in 10's)
-	
-	TE_BEAM = 16, // obsolete
-	
-	TE_SPRITE = 17, // additive sprite, plays 1 cycle
-	// coord, coord, coord (position)
-	// short (sprite index)
-	// byte (scale in 0.1's)
-	// byte (brightness)
-	
-	TE_BEAMSPRITE = 18, // A beam with a sprite at the end
-	// coord, coord, coord (start position)
-	// coord, coord, coord (end position)
-	// short (beam sprite index)
-	// short (end sprite index)
-	
-	TE_BEAMTORUS = 19, // screen aligned beam ring, expands to max radius over lifetime
-	// coord coord coord (center position)
-	// coord coord coord (axis and radius)
-	// short (sprite index)
-	// byte (starting frame)
-	// byte (frame rate in 0.1's)
-	// byte (life in 0.1's)
-	// byte (line width in 0.1's)
-	// byte (noise amplitude in 0.01's)
-	// byte,byte,byte (color)
-	// byte (brightness)
-	// byte (scroll speed in 0.1's)
-	
-	TE_BEAMDISK = 20, // disk that expands to max radius over lifetime
-	// coord coord coord (center position)
-	// coord coord coord (axis and radius)
-	// short (sprite index)
-	// byte (starting frame)
-	// byte (frame rate in 0.1's)
-	// byte (life in 0.1's)
-	// byte (line width in 0.1's)
-	// byte (noise amplitude in 0.01's)
-	// byte,byte,byte (color)
-	// byte (brightness)
-	// byte (scroll speed in 0.1's)
-	
-	TE_BEAMCYLINDER = 21, // cylinder that expands to max radius over lifetime
-	// coord coord coord (center position)
-	// coord coord coord (axis and radius)
-	// short (sprite index)
-	// byte (starting frame)
-	// byte (frame rate in 0.1's)
-	// byte (life in 0.1's)
-	// byte (line width in 0.1's)
-	// byte (noise amplitude in 0.01's)
-	// byte,byte,byte (color)
-	// byte (brightness)
-	// byte (scroll speed in 0.1's)
-	
-	TE_BEAMFOLLOW = 22, // create a line of decaying beam segments until entity stops moving
-	// short (entity:attachment to follow)
-	// short (sprite index)
-	// byte (life in 0.1's)
-	// byte (line width in 0.1's)
-	// byte,byte,byte (color)
-	// byte (brightness)
-	
-	TE_GLOWSPRITE = 23,
-	// coord, coord, coord (pos) short (model index) byte (scale / 10)
-	
-	TE_BEAMRING = 24, // connect a beam ring to two entities
-	// short (start entity)
-	// short (end entity)
-	// short (sprite index)
-	// byte (starting frame)
-	// byte (frame rate in 0.1's)
-	// byte (life in 0.1's)
-	// byte (line width in 0.1's)
-	// byte (noise amplitude in 0.01's)
-	// byte,byte,byte (color)
-	// byte (brightness)
-	// byte (scroll speed in 0.1's)
-	
-	TE_STREAK_SPLASH = 25, // oriented shower of tracers
-	// coord coord coord (start position)
-	// coord coord coord (direction vector)
-	// byte (color)
-	// short (count)
-	// short (base speed)
-	// short (ramdon velocity)
-	
-	TE_BEAMHOSE = 26, // obsolete
-	
-	TE_DLIGHT = 27, // dynamic light, effect world, minor entity effect
-	// coord, coord, coord (pos)
-	// byte (radius in 10's)
-	// byte byte byte (color)
-	// byte (brightness)
-	// byte (life in 10's)
-	// byte (decay rate in 10's)
-	
-	TE_ELIGHT = 28, // point entity light, no world effect
-	// short (entity:attachment to follow)
-	// coord coord coord (initial position)
-	// coord (radius)
-	// byte byte byte (color)
-	// byte (life in 0.1's)
-	// coord (decay rate)
-	
-	TE_TEXTMESSAGE = 29,
-	// short 1.2.13 x (-1 = center)
-	// short 1.2.13 y (-1 = center)
-	// byte Effect 0 = fade in/fade out
-	// 1 is flickery credits
-	// 2 is write out (training room)
-	
-	// 4 bytes r,g,b,a color1	(text color)
-	// 4 bytes r,g,b,a color2	(effect color)
-	// ushort 8.8 fadein time
-	// ushort 8.8  fadeout time
-	// ushort 8.8 hold time
-	// optional ushort 8.8 fxtime	(time the highlight lags behing the leading text in effect 2)
-	// string text message		(512 chars max sz string)
-	TE_LINE = 30,
-	// coord, coord, coord		startpos
-	// coord, coord, coord		endpos
-	// short life in 0.1 s
-	// 3 bytes r, g, b
-	
-	TE_BOX = 31,
-	// coord, coord, coord		boxmins
-	// coord, coord, coord		boxmaxs
-	// short life in 0.1 s
-	// 3 bytes r, g, b
-	
-	TE_KILLBEAM = 99, // kill all beams attached to entity
-	// short (entity)
-	
-	TE_LARGEFUNNEL = 100,
-	// coord coord coord (funnel position)
-	// short (sprite index)
-	// short (flags)
-	
-	TE_BLOODSTREAM = 101, // particle spray
-	// coord coord coord (start position)
-	// coord coord coord (spray vector)
-	// byte (color)
-	// byte (speed)
-	
-	TE_SHOWLINE = 102, // line of particles every 5 units, dies in 30 seconds
-	// coord coord coord (start position)
-	// coord coord coord (end position)
-	
-	TE_BLOOD = 103, // particle spray
-	// coord coord coord (start position)
-	// coord coord coord (spray vector)
-	// byte (color)
-	// byte (speed)
-	
-	TE_DECAL = 104, // Decal applied to a brush entity (not the world)
-	// coord, coord, coord (x,y,z), decal position (center of texture in world)
-	// byte (texture index of precached decal texture name)
-	// short (entity index)
-	
-	TE_FIZZ = 105, // create alpha sprites inside of entity, float upwards
-	// short (entity)
-	// short (sprite index)
-	// byte (density)
-	
-	TE_MODEL = 106, // create a moving model that bounces and makes a sound when it hits
-	// coord, coord, coord (position)
-	// coord, coord, coord (velocity)
-	// angle (initial yaw)
-	// short (model index)
-	// byte (bounce sound type)
-	// byte (life in 0.1's)
-	
-	TE_EXPLODEMODEL = 107, // spherical shower of models, picks from set
-	// coord, coord, coord (origin)
-	// coord (velocity)
-	// short (model index)
-	// short (count)
-	// byte (life in 0.1's)
-	
-	TE_BREAKMODEL = 108, // box of models or sprites
-	// coord, coord, coord (position)
-	// coord, coord, coord (size)
-	// coord, coord, coord (velocity)
-	// byte (random velocity in 10's)
-	// short (sprite or model index)
-	// byte (count)
-	// byte (life in 0.1 secs)
-	// byte (flags)
-	
-	TE_GUNSHOTDECAL = 109, // decal and ricochet sound
-	// coord, coord, coord (position)
-	// short (entity index???)
-	// byte (decal???)
-	
-	TE_SPRITE_SPRAY = 110, // spay of alpha sprites
-	// coord, coord, coord (position)
-	// coord, coord, coord (velocity)
-	// short (sprite index)
-	// byte (count)
-	// byte (speed)
-	// byte (noise)
-	
-	TE_ARMOR_RICOCHET = 111, // quick spark sprite, client ricochet sound.
-	// coord, coord, coord (position)
-	// byte (scale in 0.1's)
-	
-	TE_PLAYERDECAL = 112, // ???
-	// byte (playerindex)
-	// coord, coord, coord (position)
-	// short (entity???)
-	// byte (decal number???)
-	// [optional] short (model index???)
-	
-	TE_BUBBLES = 113, // create alpha sprites inside of box, float upwards
-	// coord, coord, coord (min start position)
-	// coord, coord, coord (max start position)
-	// coord (float height)
-	// short (model index)
-	// byte (count)
-	// coord (speed)
-	
-	TE_BUBBLETRAIL = 114, // create alpha sprites along a line, float upwards
-	// coord, coord, coord (min start position)
-	// coord, coord, coord (max start position)
-	// coord (float height)
-	// short (model index)
-	// byte (count)
-	// coord (speed)
-	
-	TE_BLOODSPRITE = 115, // spray of opaque sprite1's that fall, single sprite2 for 1..2 secs (this is a high-priority tent)
-	// coord, coord, coord (position)
-	// short (sprite1 index)
-	// short (sprite2 index)
-	// byte (color)
-	// byte (scale)
-	
-	TE_WORLDDECAL = 116, // Decal applied to the world brush
-	// coord, coord, coord (x,y,z), decal position (center of texture in world)
-	// byte (texture index of precached decal texture name)
-	
-	TE_WORLDDECALHIGH = 117, // Decal (with texture index > 256) applied to world brush
-	// coord, coord, coord (x,y,z), decal position (center of texture in world)
-	// byte (texture index of precached decal texture name - 256)
-	
-	TE_DECALHIGH = 118, // Same as TE_DECAL, but the texture index was greater than 256
-	// coord, coord, coord (x,y,z), decal position (center of texture in world)
-	// byte (texture index of precached decal texture name - 256)
-	// short (entity index)
-	
-	TE_PROJECTILE = 119, // Makes a projectile (like a nail) (this is a high-priority tent)
-	// coord, coord, coord (position)
-	// coord, coord, coord (velocity)
-	// short (modelindex)
-	// byte (life)
-	// byte (owner)  projectile won't collide with owner (if owner == 0, projectile will hit any client).
-	
-	TE_SPRAY = 120, // Throws a shower of sprites or models
-	// coord, coord, coord (position)
-	// coord, coord, coord (direction)
-	// short (modelindex)
-	// byte (count)
-	// byte (speed)
-	// byte (noise)
-	// byte (rendermode)
-	
-	TE_PLAYERSPRITES = 121, // sprites emit from a player's bounding box (ONLY use for players!)
-	// byte (playernum)
-	// short (sprite modelindex)
-	// byte (count)
-	// byte (variance) (0 = no variance in size) (10 = 10% variance in size)
-	
-	TE_PARTICLEBURST = 122, // very similar to lavasplash.
-	// coord (origin)
-	// short (radius)
-	// byte (particle color)
-	// byte (duration * 10) (will be randomized a bit)
-	
-	TE_FIREFIELD = 123, // makes a field of fire.
-	// coord (origin)
-	// short (radius) (fire is made in a square around origin. -radius, -radius to radius, radius)
-	// short (modelindex)
-	// byte (count)
-	// byte (flags)
-	// byte (duration (in seconds) * 10) (will be randomized a bit)
-	//
-	// to keep network traffic low, this message has associated flags that fit into a byte:
-	
-	TE_PLAYERATTACHMENT = 124, // attaches a TENT to a player (this is a high-priority tent)
-	// byte (entity index of player)
-	// coord (vertical offset) ( attachment origin.z = player origin.z + vertical offset )
-	// short (model index)
-	// short (life * 10 ),
-	
-	TE_KILLPLAYERATTACHMENTS = 125, // will expire all TENTS attached to a player.
-	// byte (entity index of player)
-	
-	TE_MULTIGUNSHOT = 126, // much more compact shotgun message
-	// This message is used to make a client approximate a 'spray' of gunfire.
-	// Any weapon that fires more than one bullet per frame and fires in a bit of a spread is
-	// a good candidate for MULTIGUNSHOT use. (shotguns)
-	//
-	// NOTE: This effect makes the client do traces for each bullet, these client traces ignore
-	//		 entities that have studio models.Traces are 4096 long.
-	//
-	// coord (origin)
-	// coord (origin)
-	// coord (origin)
-	// coord (direction)
-	// coord (direction)
-	// coord (direction)
-	// coord (x noise * 100)
-	// coord (y noise * 100)
-	// byte (count)
-	// byte (bullethole decal texture index)
-	
-	TE_USERTRACER = 127 // larger message than the standard tracer, but allows some customization.
-	// coord (origin)
-	// coord (origin)
-	// coord (origin)
-	// coord (velocity)
-	// coord (velocity)
-	// coord (velocity)
-	// byte ( life * 10 )
-	// byte ( color ) this is an index into an array of color vectors in the engine. (0 - )
-	// byte ( length * 10 )
-};
-
-enum {
-	MSG_BROADCAST = 0,		 // unreliable to all
-	MSG_ONE = 1,		 // reliable to one (msg_entity)
-	MSG_ALL = 2,		 // reliable to all
-	MSG_INIT = 3,			 // write to the init string
-	MSG_PVS = 4,	 // Ents in PVS of org
-	MSG_PAS = 5,	 // Ents in PAS of org
-	MSG_PVS_R = 6,		 // Reliable to PVS
-	MSG_PAS_R = 7,		 // Reliable to PAS
-	MSG_ONE_UNRELIABLE = 8, // Send to one client, but don't put in reliable stream, put in unreliable datagram ( could be dropped )
-	MSG_SPEC = 9	 // Sends to all spectator proxies
-};
+#define TE_BEAMPOINTS 0 // beam effect between two points
+// coord coord coord (start position)
+// coord coord coord (end position)
+// short (sprite index)
+// byte (starting frame)
+// byte (frame rate in 0.1's)
+// byte (life in 0.1's)
+// byte (line width in 0.1's)
+// byte (noise amplitude in 0.01's)
+// byte,byte,byte (color)
+// byte (brightness)
+// byte (scroll speed in 0.1's)
+
+#define TE_BEAMENTPOINT 1 // beam effect between point and entity
+// short (start entity)
+// coord coord coord (end position)
+// short (sprite index)
+// byte (starting frame)
+// byte (frame rate in 0.1's)
+// byte (life in 0.1's)
+// byte (line width in 0.1's)
+// byte (noise amplitude in 0.01's)
+// byte,byte,byte (color)
+// byte (brightness)
+// byte (scroll speed in 0.1's)
+
+#define TE_GUNSHOT 2 // particle effect plus ricochet sound
+// coord coord coord (position)
+
+#define TE_EXPLOSION 3 // additive sprite, 2 dynamic lights, flickering particles, explosion sound, move vertically 8 pps
+// coord coord coord (position)
+// short (sprite index)
+// byte (scale in 0.1's)
+// byte (framerate)
+// byte (flags)
+//
+// The Explosion effect has some flags to control performance/aesthetic features:
+#define TE_EXPLFLAG_NONE 0		  // all flags clear makes default Half-Life explosion
+#define TE_EXPLFLAG_NOADDITIVE 1  // sprite will be drawn opaque (ensure that the sprite you send is a non-additive sprite)
+#define TE_EXPLFLAG_NODLIGHTS 2	  // do not render dynamic lights
+#define TE_EXPLFLAG_NOSOUND 4	  // do not play client explosion sound
+#define TE_EXPLFLAG_NOPARTICLES 8 // do not draw particles
+
+#define TE_TAREXPLOSION 4 // Quake1 "tarbaby" explosion with sound
+// coord coord coord (position)
+
+#define TE_SMOKE 5 // alphablend sprite, move vertically 30 pps
+// coord coord coord (position)
+// short (sprite index)
+// byte (scale in 0.1's)
+// byte (framerate)
+
+#define TE_TRACER 6 // tracer effect from point to point
+// coord, coord, coord (start)
+// coord, coord, coord (end)
+
+#define TE_LIGHTNING 7 // TE_BEAMPOINTS with simplified parameters
+// coord, coord, coord (start)
+// coord, coord, coord (end)
+// byte (life in 0.1's)
+// byte (width in 0.1's)
+// byte (amplitude in 0.01's)
+// short (sprite model index)
+
+#define TE_BEAMENTS 8
+// short (start entity)
+// short (end entity)
+// short (sprite index)
+// byte (starting frame)
+// byte (frame rate in 0.1's)
+// byte (life in 0.1's)
+// byte (line width in 0.1's)
+// byte (noise amplitude in 0.01's)
+// byte,byte,byte (color)
+// byte (brightness)
+// byte (scroll speed in 0.1's)
+
+#define TE_SPARKS 9 // 8 random tracers with gravity, ricochet sprite
+// coord coord coord (position)
+
+#define TE_LAVASPLASH 10 // Quake1 lava splash
+// coord coord coord (position)
+
+#define TE_TELEPORT 11 // Quake1 teleport splash
+// coord coord coord (position)
+
+#define TE_EXPLOSION2 12 // Quake1 colormaped (base palette) particle explosion with sound
+// coord coord coord (position)
+// byte (starting color)
+// byte (num colors)
+
+#define TE_BSPDECAL 13 // Decal from the .BSP file
+// coord, coord, coord (x,y,z), decal position (center of texture in world)
+// short (texture index of precached decal texture name)
+// short (entity index)
+// [optional - only included if previous short is non-zero (not the world)] short (index of model of above entity)
+
+#define TE_IMPLOSION 14 // tracers moving toward a point
+// coord, coord, coord (position)
+// byte (radius)
+// byte (count)
+// byte (life in 0.1's)
+
+#define TE_SPRITETRAIL 15 // line of moving glow sprites with gravity, fadeout, and collisions
+// coord, coord, coord (start)
+// coord, coord, coord (end)
+// short (sprite index)
+// byte (count)
+// byte (life in 0.1's)
+// byte (scale in 0.1's)
+// byte (velocity along vector in 10's)
+// byte (randomness of velocity in 10's)
+
+#define TE_BEAM 16 // obsolete
+
+#define TE_SPRITE 17 // additive sprite, plays 1 cycle
+// coord, coord, coord (position)
+// short (sprite index)
+// byte (scale in 0.1's)
+// byte (brightness)
+
+#define TE_BEAMSPRITE 18 // A beam with a sprite at the end
+// coord, coord, coord (start position)
+// coord, coord, coord (end position)
+// short (beam sprite index)
+// short (end sprite index)
+
+#define TE_BEAMTORUS 19 // screen aligned beam ring, expands to max radius over lifetime
+// coord coord coord (center position)
+// coord coord coord (axis and radius)
+// short (sprite index)
+// byte (starting frame)
+// byte (frame rate in 0.1's)
+// byte (life in 0.1's)
+// byte (line width in 0.1's)
+// byte (noise amplitude in 0.01's)
+// byte,byte,byte (color)
+// byte (brightness)
+// byte (scroll speed in 0.1's)
+
+#define TE_BEAMDISK 20 // disk that expands to max radius over lifetime
+// coord coord coord (center position)
+// coord coord coord (axis and radius)
+// short (sprite index)
+// byte (starting frame)
+// byte (frame rate in 0.1's)
+// byte (life in 0.1's)
+// byte (line width in 0.1's)
+// byte (noise amplitude in 0.01's)
+// byte,byte,byte (color)
+// byte (brightness)
+// byte (scroll speed in 0.1's)
+
+#define TE_BEAMCYLINDER 21 // cylinder that expands to max radius over lifetime
+// coord coord coord (center position)
+// coord coord coord (axis and radius)
+// short (sprite index)
+// byte (starting frame)
+// byte (frame rate in 0.1's)
+// byte (life in 0.1's)
+// byte (line width in 0.1's)
+// byte (noise amplitude in 0.01's)
+// byte,byte,byte (color)
+// byte (brightness)
+// byte (scroll speed in 0.1's)
+
+#define TE_BEAMFOLLOW 22 // create a line of decaying beam segments until entity stops moving
+// short (entity:attachment to follow)
+// short (sprite index)
+// byte (life in 0.1's)
+// byte (line width in 0.1's)
+// byte,byte,byte (color)
+// byte (brightness)
+
+#define TE_GLOWSPRITE 23
+// coord, coord, coord (pos) short (model index) byte (scale / 10)
+
+#define TE_BEAMRING 24 // connect a beam ring to two entities
+// short (start entity)
+// short (end entity)
+// short (sprite index)
+// byte (starting frame)
+// byte (frame rate in 0.1's)
+// byte (life in 0.1's)
+// byte (line width in 0.1's)
+// byte (noise amplitude in 0.01's)
+// byte,byte,byte (color)
+// byte (brightness)
+// byte (scroll speed in 0.1's)
+
+#define TE_STREAK_SPLASH 25 // oriented shower of tracers
+// coord coord coord (start position)
+// coord coord coord (direction vector)
+// byte (color)
+// short (count)
+// short (base speed)
+// short (ramdon velocity)
+
+#define TE_BEAMHOSE 26 // obsolete
+
+#define TE_DLIGHT 27 // dynamic light, effect world, minor entity effect
+// coord, coord, coord (pos)
+// byte (radius in 10's)
+// byte byte byte (color)
+// byte (brightness)
+// byte (life in 10's)
+// byte (decay rate in 10's)
+
+#define TE_ELIGHT 28 // point entity light, no world effect
+// short (entity:attachment to follow)
+// coord coord coord (initial position)
+// coord (radius)
+// byte byte byte (color)
+// byte (life in 0.1's)
+// coord (decay rate)
+
+#define TE_TEXTMESSAGE 29
+// short 1.2.13 x (-1 = center)
+// short 1.2.13 y (-1 = center)
+// byte Effect 0 = fade in/fade out
+// 1 is flickery credits
+// 2 is write out (training room)
+
+// 4 bytes r,g,b,a color1	(text color)
+// 4 bytes r,g,b,a color2	(effect color)
+// ushort 8.8 fadein time
+// ushort 8.8  fadeout time
+// ushort 8.8 hold time
+// optional ushort 8.8 fxtime	(time the highlight lags behing the leading text in effect 2)
+// string text message		(512 chars max sz string)
+#define TE_LINE 30
+// coord, coord, coord		startpos
+// coord, coord, coord		endpos
+// short life in 0.1 s
+// 3 bytes r, g, b
+
+#define TE_BOX 31
+// coord, coord, coord		boxmins
+// coord, coord, coord		boxmaxs
+// short life in 0.1 s
+// 3 bytes r, g, b
+
+#define TE_KILLBEAM 99 // kill all beams attached to entity
+// short (entity)
+
+#define TE_LARGEFUNNEL 100
+// coord coord coord (funnel position)
+// short (sprite index)
+// short (flags)
+
+#define TE_BLOODSTREAM 101 // particle spray
+// coord coord coord (start position)
+// coord coord coord (spray vector)
+// byte (color)
+// byte (speed)
+
+#define TE_SHOWLINE 102 // line of particles every 5 units, dies in 30 seconds
+// coord coord coord (start position)
+// coord coord coord (end position)
+
+#define TE_BLOOD 103 // particle spray
+// coord coord coord (start position)
+// coord coord coord (spray vector)
+// byte (color)
+// byte (speed)
+
+#define TE_DECAL 104 // Decal applied to a brush entity (not the world)
+// coord, coord, coord (x,y,z), decal position (center of texture in world)
+// byte (texture index of precached decal texture name)
+// short (entity index)
+
+#define TE_FIZZ 105 // create alpha sprites inside of entity, float upwards
+// short (entity)
+// short (sprite index)
+// byte (density)
+
+#define TE_MODEL 106 // create a moving model that bounces and makes a sound when it hits
+// coord, coord, coord (position)
+// coord, coord, coord (velocity)
+// angle (initial yaw)
+// short (model index)
+// byte (bounce sound type)
+// byte (life in 0.1's)
+
+#define TE_EXPLODEMODEL 107 // spherical shower of models, picks from set
+// coord, coord, coord (origin)
+// coord (velocity)
+// short (model index)
+// short (count)
+// byte (life in 0.1's)
+
+#define TE_BREAKMODEL 108 // box of models or sprites
+// coord, coord, coord (position)
+// coord, coord, coord (size)
+// coord, coord, coord (velocity)
+// byte (random velocity in 10's)
+// short (sprite or model index)
+// byte (count)
+// byte (life in 0.1 secs)
+// byte (flags)
+
+#define TE_GUNSHOTDECAL 109 // decal and ricochet sound
+// coord, coord, coord (position)
+// short (entity index???)
+// byte (decal???)
+
+#define TE_SPRITE_SPRAY 110 // spay of alpha sprites
+// coord, coord, coord (position)
+// coord, coord, coord (velocity)
+// short (sprite index)
+// byte (count)
+// byte (speed)
+// byte (noise)
+
+#define TE_ARMOR_RICOCHET 111 // quick spark sprite, client ricochet sound.
+// coord, coord, coord (position)
+// byte (scale in 0.1's)
+
+#define TE_PLAYERDECAL 112 // ???
+// byte (playerindex)
+// coord, coord, coord (position)
+// short (entity???)
+// byte (decal number???)
+// [optional] short (model index???)
+
+#define TE_BUBBLES 113 // create alpha sprites inside of box, float upwards
+// coord, coord, coord (min start position)
+// coord, coord, coord (max start position)
+// coord (float height)
+// short (model index)
+// byte (count)
+// coord (speed)
+
+#define TE_BUBBLETRAIL 114 // create alpha sprites along a line, float upwards
+// coord, coord, coord (min start position)
+// coord, coord, coord (max start position)
+// coord (float height)
+// short (model index)
+// byte (count)
+// coord (speed)
+
+#define TE_BLOODSPRITE 115 // spray of opaque sprite1's that fall, single sprite2 for 1..2 secs (this is a high-priority tent)
+// coord, coord, coord (position)
+// short (sprite1 index)
+// short (sprite2 index)
+// byte (color)
+// byte (scale)
+
+#define TE_WORLDDECAL 116 // Decal applied to the world brush
+// coord, coord, coord (x,y,z), decal position (center of texture in world)
+// byte (texture index of precached decal texture name)
+
+#define TE_WORLDDECALHIGH 117 // Decal (with texture index > 256) applied to world brush
+// coord, coord, coord (x,y,z), decal position (center of texture in world)
+// byte (texture index of precached decal texture name - 256)
+
+#define TE_DECALHIGH 118 // Same as TE_DECAL, but the texture index was greater than 256
+// coord, coord, coord (x,y,z), decal position (center of texture in world)
+// byte (texture index of precached decal texture name - 256)
+// short (entity index)
+
+#define TE_PROJECTILE 119 // Makes a projectile (like a nail) (this is a high-priority tent)
+// coord, coord, coord (position)
+// coord, coord, coord (velocity)
+// short (modelindex)
+// byte (life)
+// byte (owner)  projectile won't collide with owner (if owner == 0, projectile will hit any client).
+
+#define TE_SPRAY 120 // Throws a shower of sprites or models
+// coord, coord, coord (position)
+// coord, coord, coord (direction)
+// short (modelindex)
+// byte (count)
+// byte (speed)
+// byte (noise)
+// byte (rendermode)
+
+#define TE_PLAYERSPRITES 121 // sprites emit from a player's bounding box (ONLY use for players!)
+// byte (playernum)
+// short (sprite modelindex)
+// byte (count)
+// byte (variance) (0 = no variance in size) (10 = 10% variance in size)
+
+#define TE_PARTICLEBURST 122 // very similar to lavasplash.
+// coord (origin)
+// short (radius)
+// byte (particle color)
+// byte (duration * 10) (will be randomized a bit)
+
+#define TE_FIREFIELD 123 // makes a field of fire.
+// coord (origin)
+// short (radius) (fire is made in a square around origin. -radius, -radius to radius, radius)
+// short (modelindex)
+// byte (count)
+// byte (flags)
+// byte (duration (in seconds) * 10) (will be randomized a bit)
+//
+// to keep network traffic low, this message has associated flags that fit into a byte:
+#define TEFIRE_FLAG_ALLFLOAT 1	// all sprites will drift upwards as they animate
+#define TEFIRE_FLAG_SOMEFLOAT 2 // some of the sprites will drift upwards. (50% chance)
+#define TEFIRE_FLAG_LOOP 4		// if set, sprite plays at 15 fps, otherwise plays at whatever rate stretches the animation over the sprite's duration.
+#define TEFIRE_FLAG_ALPHA 8		// if set, sprite is rendered alpha blended at 50% else, opaque
+#define TEFIRE_FLAG_PLANAR 16	// if set, all fire sprites have same initial Z instead of randomly filling a cube.
+#define TEFIRE_FLAG_ADDITIVE 32 // if set, sprite is rendered non-opaque with additive
+
+#define TE_PLAYERATTACHMENT 124 // attaches a TENT to a player (this is a high-priority tent)
+// byte (entity index of player)
+// coord (vertical offset) ( attachment origin.z = player origin.z + vertical offset )
+// short (model index)
+// short (life * 10 );
+
+#define TE_KILLPLAYERATTACHMENTS 125 // will expire all TENTS attached to a player.
+// byte (entity index of player)
+
+#define TE_MULTIGUNSHOT 126 // much more compact shotgun message
+// This message is used to make a client approximate a 'spray' of gunfire.
+// Any weapon that fires more than one bullet per frame and fires in a bit of a spread is
+// a good candidate for MULTIGUNSHOT use. (shotguns)
+//
+// NOTE: This effect makes the client do traces for each bullet, these client traces ignore
+//		 entities that have studio models.Traces are 4096 long.
+//
+// coord (origin)
+// coord (origin)
+// coord (origin)
+// coord (direction)
+// coord (direction)
+// coord (direction)
+// coord (x noise * 100)
+// coord (y noise * 100)
+// byte (count)
+// byte (bullethole decal texture index)
+
+#define TE_USERTRACER 127 // larger message than the standard tracer, but allows some customization.
+// coord (origin)
+// coord (origin)
+// coord (origin)
+// coord (velocity)
+// coord (velocity)
+// coord (velocity)
+// byte ( life * 10 )
+// byte ( color ) this is an index into an array of color vectors in the engine. (0 - )
+// byte ( length * 10 )
+
+#define MSG_BROADCAST 0		 // unreliable to all
+#define MSG_ONE 1			 // reliable to one (msg_entity)
+#define MSG_ALL 2			 // reliable to all
+#define MSG_INIT 3			 // write to the init string
+#define MSG_PVS 4			 // Ents in PVS of org
+#define MSG_PAS 5			 // Ents in PAS of org
+#define MSG_PVS_R 6			 // Reliable to PVS
+#define MSG_PAS_R 7			 // Reliable to PAS
+#define MSG_ONE_UNRELIABLE 8 // Send to one client, but don't put in reliable stream, put in unreliable datagram ( could be dropped )
+#define MSG_SPEC 9			 // Sends to all spectator proxies
 
 // contents of a spot in the world
-enum {
-	CONTENTS_EMPTY = -1,
-	CONTENTS_SOLID = -2,
-	CONTENTS_WATER = -3,
-	CONTENTS_SLIME = -4,
-	CONTENTS_LAVA = -5,
-	CONTENTS_SKY = -6,
-	//These additional contents constants are defined in bspfile.h
-	CONTENTS_ORIGIN	=	-7,		// removed at csg time
-	CONTENTS_CLIP =		-8,		// changed to contents_solid
-	CONTENTS_CURRENT_0 =	-9,
-	CONTENTS_CURRENT_90 =	-10,
-	CONTENTS_CURRENT_180 =	-11,
-	CONTENTS_CURRENT_270 =	-12,
-	CONTENTS_CURRENT_UP	=	-13,
-	CONTENTS_CURRENT_DOWN =	-14,
-	CONTENTS_TRANSLUCENT =	-15,
-	CONTENTS_LADDER = -16,
-	CONTENTS_FLYFIELD = -17,
-	CONTENTS_GRAVITY_FLYFIELD = -18,
-	CONTENTS_FOG = -19
-};
+#define CONTENTS_EMPTY -1
+#define CONTENTS_SOLID -2
+#define CONTENTS_WATER -3
+#define CONTENTS_SLIME -4
+#define CONTENTS_LAVA -5
+#define CONTENTS_SKY -6
+/* These additional contents constants are defined in bspfile.h
+#define	CONTENTS_ORIGIN		-7		// removed at csg time
+#define	CONTENTS_CLIP		-8		// changed to contents_solid
+#define	CONTENTS_CURRENT_0		-9
+#define	CONTENTS_CURRENT_90		-10
+#define	CONTENTS_CURRENT_180	-11
+#define	CONTENTS_CURRENT_270	-12
+#define	CONTENTS_CURRENT_UP		-13
+#define	CONTENTS_CURRENT_DOWN	-14
+
+define CONTENTS_TRANSLUCENT	-15
+*/
+#define CONTENTS_LADDER -16
+
+#define CONTENT_FLYFIELD -17
+#define CONTENT_GRAVITY_FLYFIELD -18
+#define CONTENT_FOG -19
+
+#define CONTENT_EMPTY -1
+#define CONTENT_SOLID -2
+#define CONTENT_WATER -3
+#define CONTENT_SLIME -4
+#define CONTENT_LAVA -5
+#define CONTENT_SKY -6
 
 // channels
-enum {
-	CHAN_AUTO = 0,
-	CHAN_WEAPON = 1,
-	CHAN_VOICE = 2,
-	CHAN_ITEM = 3,
-	CHAN_BODY = 4,
-	CHAN_STREAM = 5,			  // allocate stream channel from the static or dynamic area
-	CHAN_STATIC = 6,			  // allocate channel from the static area
-	CHAN_NETWORKVOICE_BASE = 7,  // voice data coming across the network
-	CHAN_NETWORKVOICE_END = 500 // network voice data reserves slots (CHAN_NETWORKVOICE_BASE through CHAN_NETWORKVOICE_END).
-};
+#define CHAN_AUTO 0
+#define CHAN_WEAPON 1
+#define CHAN_VOICE 2
+#define CHAN_ITEM 3
+#define CHAN_BODY 4
+#define CHAN_STREAM 5			  // allocate stream channel from the static or dynamic area
+#define CHAN_STATIC 6			  // allocate channel from the static area
+#define CHAN_NETWORKVOICE_BASE 7  // voice data coming across the network
+#define CHAN_NETWORKVOICE_END 500 // network voice data reserves slots (CHAN_NETWORKVOICE_BASE through CHAN_NETWORKVOICE_END).
 
 // attenuation values
-
-
-constexpr float ATTN_NONE = 0.0f;
-constexpr float ATTN_NORM = 0.8f;
-constexpr float ATTN_IDLE = 2.0f;
-constexpr float ATTN_STATIC = 1.25f;
+#define ATTN_NONE 0
+#define ATTN_NORM (float)0.8
+#define ATTN_IDLE (float)2
+#define ATTN_STATIC (float)1.25
 
 // pitch values
-enum {
-	PITCH_NORM = 100, // non-pitch shifted
-	PITCH_LOW = 95, // other values are possible - 0-255, where 255 is very high
-	PITCH_HIGH = 120
-};
-// volume values
+#define PITCH_NORM 100 // non-pitch shifted
+#define PITCH_LOW 95   // other values are possible - 0-255, where 255 is very high
+#define PITCH_HIGH 120
 
-enum {
-	VOL_NORM = 1
-};
+// volume values
+#define VOL_NORM 1.0
 
 // plats
-enum {
-	PLAT_LOW_TRIGGER = 1
-};
+#define PLAT_LOW_TRIGGER 1
 
 // Trains
-enum {
-	SF_TRAIN_WAIT_RETRIGGER = 1,
-	SF_TRAIN_START_ON = 4, // Train is initially moving
-	SF_TRAIN_PASSABLE = 8 // Train is not solid -- used to make water trains
-};
+#define SF_TRAIN_WAIT_RETRIGGER 1
+#define SF_TRAIN_START_ON 4 // Train is initially moving
+#define SF_TRAIN_PASSABLE 8 // Train is not solid -- used to make water trains
+
 // buttons
 #ifndef IN_BUTTONS_H
 #include "in_buttons.h"
@@ -688,29 +645,32 @@ enum {
 
 // Break Model Defines
 
-enum {
-	BREAK_TYPEMASK = 0x4F,
-	BREAK_GLASS = 0x01,
-	BREAK_METAL = 0x02,
-	BREAK_FLESH = 0x04,
-	BREAK_WOOD = 0x08,
-	BREAK_SMOKE = 0x10,
-	BREAK_TRANS = 0x20,
-	BREAK_CONCRETE = 0x40,
-	BREAK_2 = 0x80
-};
+#define BREAK_TYPEMASK 0x4F
+#define BREAK_GLASS 0x01
+#define BREAK_METAL 0x02
+#define BREAK_FLESH 0x04
+#define BREAK_WOOD 0x08
+
+#define BREAK_SMOKE 0x10
+#define BREAK_TRANS 0x20
+#define BREAK_CONCRETE 0x40
+#define BREAK_2 0x80
+
 // Colliding temp entity sounds
 
-enum {
-	BOUNCE_GLASS = BREAK_GLASS,
-	BOUNCE_METAL = BREAK_METAL,
-	BOUNCE_FLESH = BREAK_FLESH,
-	BOUNCE_WOOD = BREAK_WOOD,
-	BOUNCE_SHRAP = 0x10,
-	BOUNCE_SHELL = 0x20,
-	BOUNCE_CONCRETE = BREAK_CONCRETE,
-	BOUNCE_SHOTSHELL = 0x80
-};
+#define BOUNCE_GLASS BREAK_GLASS
+#define BOUNCE_METAL BREAK_METAL
+#define BOUNCE_FLESH BREAK_FLESH
+#define BOUNCE_WOOD BREAK_WOOD
+#define BOUNCE_SHRAP 0x10
+#define BOUNCE_SHELL 0x20
+#define BOUNCE_CONCRETE BREAK_CONCRETE
+#define BOUNCE_SHOTSHELL 0x80
+
+// Temp entity bounce sound types
+#define TE_BOUNCE_NULL 0
+#define TE_BOUNCE_SHELL 1
+#define TE_BOUNCE_SHOTSHELL 2
 
 // Rendering constants
 enum
@@ -800,7 +760,7 @@ typedef struct edict_s edict_t;
 
 typedef struct
 {
-	Vector normal;
+	vec3_t normal;
 	float dist;
 } plane_t;
 
@@ -810,7 +770,7 @@ typedef struct
 	qboolean startsolid; // if true, the initial point was in a solid area
 	qboolean inopen, inwater;
 	float fraction; // time completed, 1.0 = didn't hit anything
-	Vector endpos;	// final position
+	vec3_t endpos;	// final position
 	plane_t plane;	// surface normal at impact
 	edict_t *ent;	// entity the surface is on
 	int hitgroup;	// 0 == generic, non zero is specific body part
diff --git a/src/common/cvardef.h b/src/common/cvardef.h
index d742c1a2..979e7e42 100644
--- a/src/common/cvardef.h
+++ b/src/common/cvardef.h
@@ -15,22 +15,21 @@
 #ifndef CVARDEF_H
 #define CVARDEF_H
 
-enum {
-	FCVAR_ARCHIVE = (1 << 0),		 // set to cause it to be saved to vars.rc
-	FCVAR_USERINFO = (1 << 1),		 // changes the client's info string
-	FCVAR_SERVER = (1 << 2),	 // notifies players when changed
-	FCVAR_EXTDLL = (1 << 3), // defined by external DLL
-	FCVAR_CLIENTDLL = (1 << 4), // defined by the client dll
-	FCVAR_PROTECTED = (1 << 5), // It's a server cvar, but we don't send the data since it's a password, etc.  Sends 1 if it's not bland/zero, 0 otherwise as value
-	FCVAR_SPONLY = (1 << 6),	 // This cvar cannot be changed by clients connected to a multiplayer server.
-	FCVAR_PRINTABLEONLY = (1 << 7),// This cvar's string cannot contain unprintable characters ( e.g., used for player name etc ).
-	FCVAR_UNLOGGED = (1 << 8),	 // If this is a FCVAR_SERVER, don't log changes to the log file / console if we are creating a log
-	FCVAR_NOEXTRAWHITEPACE = (1 << 9), // strip trailing/leading white space from this cvar
-	FCVAR_PRIVILEGED = (1 << 10),	// only available in privileged mode
-	FCVAR_FILTERABLE = (1 << 11),	// filtered in unprivileged mode if cl_filterstuffcmd is 1
-	FCVAR_ISEXECUTED = (1 << 12),// This cvar's string contains a value that will be executed as a cfg file; don't allow commands to be appended to it
-	FCVAR_ISPATH = (1 << 13) // This cvar's string is a path or filename; don't allow absolute paths, escaping to another directory or backslashes
-};
+#define FCVAR_ARCHIVE (1 << 0)		 // set to cause it to be saved to vars.rc
+#define FCVAR_USERINFO (1 << 1)		 // changes the client's info string
+#define FCVAR_SERVER (1 << 2)		 // notifies players when changed
+#define FCVAR_EXTDLL (1 << 3)		 // defined by external DLL
+#define FCVAR_CLIENTDLL (1 << 4)	 // defined by the client dll
+#define FCVAR_PROTECTED (1 << 5)	 // It's a server cvar, but we don't send the data since it's a password, etc.  Sends 1 if it's not bland/zero, 0 otherwise as value
+#define FCVAR_SPONLY (1 << 6)		 // This cvar cannot be changed by clients connected to a multiplayer server.
+#define FCVAR_PRINTABLEONLY (1 << 7) // This cvar's string cannot contain unprintable characters ( e.g., used for player name etc ).
+#define FCVAR_UNLOGGED (1 << 8)		 // If this is a FCVAR_SERVER, don't log changes to the log file / console if we are creating a log
+#define FCVAR_NOEXTRAWHITEPACE (1<<9) // strip trailing/leading white space from this cvar
+#define FCVAR_PRIVILEGED (1 << 10)		// only available in privileged mode
+#define FCVAR_FILTERABLE (1 << 11)		// filtered in unprivileged mode if cl_filterstuffcmd is 1
+#define FCVAR_ISEXECUTED	(1 << 12)	// This cvar's string contains a value that will be executed as a cfg file; don't allow commands to be appended to it
+#define FCVAR_ISPATH		(1 << 13)	// This cvar's string is a path or filename; don't allow absolute paths, escaping to another directory or backslashes
+
 typedef struct cvar_s
 {
 	const char *name;
diff --git a/src/common/director_cmds.h b/src/common/director_cmds.h
index a1f08bf0..ddff7e08 100644
--- a/src/common/director_cmds.h
+++ b/src/common/director_cmds.h
@@ -8,31 +8,26 @@
 // director_cmds.h
 // sub commands for svc_director
 
-enum {
-	DRC_ACTIVE = 0, // tells client that he's an spectator and will get director command
-	DRC_STATUS = 1, // send status infos about proxy
-	DRC_CAMERA = 2, // set the actual director camera position
-	DRC_EVENT = 3   // informs the dircetor about ann important game event
-};
+#define DRC_ACTIVE 0 // tells client that he's an spectator and will get director command
+#define DRC_STATUS 1 // send status infos about proxy
+#define DRC_CAMERA 2 // set the actual director camera position
+#define DRC_EVENT 3  // informs the dircetor about ann important game event
+
+#define DRC_FLAG_PRIO_MASK 0x0F //	priorities between 0 and 15 (15 most important)
+#define DRC_FLAG_SIDE (1 << 4)
+#define DRC_FLAG_DRAMATIC (1 << 5)
 
-enum {
-	DRC_FLAG_PRIO_MASK = 0x0F, //	priorities between 0 and 15 (15 most important)
-	DRC_FLAG_SIDE = (1 << 4),
-	DRC_FLAG_DRAMATIC = (1 << 5)
-};
 // commands of the director API function CallDirectorProc(...)
 
-enum {
-	DRCAPI_NOP = 0,               // no operation
-	DRCAPI_ACTIVE = 1,            // de/acivates director mode in engine
-	DRCAPI_STATUS = 2,            // request proxy information
-	DRCAPI_SETCAM = 3,            // set camera n to given position and angle
-	DRCAPI_GETCAM = 4,            // request camera n position and angle
-	DRCAPI_DIRPLAY = 5,           // set director time and play with normal speed
-	DRCAPI_DIRFREEZE = 6,         // freeze directo at this time
-	DRCAPI_SETVIEWMODE = 7,       // overview or 4 cameras
-	DRCAPI_SETOVERVIEWPARAMS = 8, // sets parameter for overview mode
-	DRCAPI_SETFOCUS = 9,          // set the camera which has the input focus
-	DRCAPI_GETTARGETS = 10,       // queries engine for player list
-	DRCAPI_SETVIEWPOINTS = 11     // gives engine all waypoints
-};
\ No newline at end of file
+#define DRCAPI_NOP 0               // no operation
+#define DRCAPI_ACTIVE 1            // de/acivates director mode in engine
+#define DRCAPI_STATUS 2            // request proxy information
+#define DRCAPI_SETCAM 3            // set camera n to given position and angle
+#define DRCAPI_GETCAM 4            // request camera n position and angle
+#define DRCAPI_DIRPLAY 5           // set director time and play with normal speed
+#define DRCAPI_DIRFREEZE 6         // freeze directo at this time
+#define DRCAPI_SETVIEWMODE 7       // overview or 4 cameras
+#define DRCAPI_SETOVERVIEWPARAMS 8 // sets parameter for overview mode
+#define DRCAPI_SETFOCUS 9          // set the camera which has the input focus
+#define DRCAPI_GETTARGETS 10       // queries engine for player list
+#define DRCAPI_SETVIEWPOINTS 11    // gives engine all waypoints
diff --git a/src/common/dlight.h b/src/common/dlight.h
index fc68eef7..024ffadf 100644
--- a/src/common/dlight.h
+++ b/src/common/dlight.h
@@ -20,7 +20,7 @@
 
 typedef struct dlight_s
 {
-	Vector origin;
+	vec3_t origin;
 	float radius;
 	color24 color;
 	float die;		// stop lighting after this time
diff --git a/src/common/dll_state.h b/src/common/dll_state.h
index 341b6908..a23ae742 100644
--- a/src/common/dll_state.h
+++ b/src/common/dll_state.h
@@ -7,19 +7,17 @@
 
 //DLL State Flags
 
-enum {
-	DLL_INACTIVE = 0, // no dll
-	DLL_ACTIVE = 1,   // dll is running
-	DLL_PAUSED = 2,   // dll is paused
-	DLL_CLOSE = 3,    // closing down dll
-	DLL_TRANS = 4,    // Level Transition
-	// DLL Pause reasons
-	DLL_NORMAL = 0,  // User hit Esc or something.
-	DLL_QUIT = 4,    // Quit now
-	DLL_RESTART = 6 // Switch to launcher for linux, does a quit but returns 1
-};
-// DLL Substate info ( not relevant )
+#define DLL_INACTIVE 0 // no dll
+#define DLL_ACTIVE 1   // dll is running
+#define DLL_PAUSED 2   // dll is paused
+#define DLL_CLOSE 3    // closing down dll
+#define DLL_TRANS 4    // Level Transition
+
+// DLL Pause reasons
 
-enum {
-	ENG_NORMAL = (1 << 0);
-};
\ No newline at end of file
+#define DLL_NORMAL 0  // User hit Esc or something.
+#define DLL_QUIT 4    // Quit now
+#define DLL_RESTART 6 // Switch to launcher for linux, does a quit but returns 1
+
+// DLL Substate info ( not relevant )
+#define ENG_NORMAL (1 << 0)
diff --git a/src/common/engine_launcher_api.h b/src/common/engine_launcher_api.h
index fa568d00..503c7aad 100644
--- a/src/common/engine_launcher_api.h
+++ b/src/common/engine_launcher_api.h
@@ -14,14 +14,11 @@
 
 //typedef void ( *xcommand_t ) ( void );
 
-enum {
-	RENDERTYPE_UNDEFINED = 0,
-	RENDERTYPE_SOFTWARE = 1,
-	RENDERTYPE_HARDWARE = 2
-};
+#define RENDERTYPE_UNDEFINED 0
+#define RENDERTYPE_SOFTWARE 1
+#define RENDERTYPE_HARDWARE 2
 
-
-constexpr int ENGINE_LAUNCHER_API_VERSION = 1;
+#define ENGINE_LAUNCHER_API_VERSION 1
 
 typedef struct engine_api_s
 {
diff --git a/src/common/entity_state.h b/src/common/entity_state.h
index 625c22d7..e26c99a4 100644
--- a/src/common/entity_state.h
+++ b/src/common/entity_state.h
@@ -19,10 +19,8 @@
 #endif
 
 // For entityType below
-enum {
-	ENTITY_NORMAL = (1 << 0),
-	ENTITY_BEAM = (1 << 1)
-};
+#define ENTITY_NORMAL (1 << 0)
+#define ENTITY_BEAM (1 << 1)
 
 // Entity state is used for the baseline and for delta compression of a packet of
 //  entities that is sent to a client.
@@ -40,11 +38,11 @@ struct entity_state_s
 	int messagenum;
 
 	// Fields which can be transmitted and reconstructed over the network stream
-	Vector origin;
-	Vector angles;
+	vec3_t origin;
+	vec3_t angles;
 
 	int modelindex;
-	unsigned int sequence;
+	int sequence;
 	float frame;
 	int colormap;
 	short skin;
@@ -66,11 +64,11 @@ struct entity_state_s
 	int body;
 	byte controller[4];
 	byte blending[4];
-	Vector velocity;
+	vec3_t velocity;
 
 	// Send bbox down to client for use during prediction.
-	Vector mins;
-	Vector maxs;
+	vec3_t mins;
+	vec3_t maxs;
 
 	int aiment;
 	// If owned by a player, the index of that player ( for projectiles ).
@@ -87,9 +85,9 @@ struct entity_state_s
 	int health;
 	qboolean spectator;
 	int weaponmodel;
-	unsigned int gaitsequence;
+	int gaitsequence;
 	// If standing on conveyor, e.g.
-	Vector basevelocity;
+	vec3_t basevelocity;
 	// Use the crouched hull, or the regular player hull.
 	int usehull;
 	// Latched buttons last time state updated.
@@ -104,8 +102,8 @@ struct entity_state_s
 	int weaponanim;
 
 	// Parametric movement overrides
-	Vector startpos;
-	Vector endpos;
+	vec3_t startpos;
+	vec3_t endpos;
 	float impacttime; //MS - Used for model scale
 	float starttime;
 
@@ -118,25 +116,25 @@ struct entity_state_s
 	float fuser2;
 	float fuser3;
 	float fuser4;
-	Vector vuser1;
-	Vector vuser2;
-	Vector vuser3;
-	Vector vuser4; //MS - vuser4.x used to store idx of extra info (including all current bone positions)
+	vec3_t vuser1;
+	vec3_t vuser2;
+	vec3_t vuser3;
+	vec3_t vuser4; //MS - vuser4.x used to store idx of extra info (including all current bone positions)
 };
 
 #include "pm_info.h"
 
 typedef struct clientdata_s
 {
-	Vector origin;
-	Vector velocity;
+	vec3_t origin;
+	vec3_t velocity;
 
 	int viewmodel;
-	Vector punchangle;
+	vec3_t punchangle;
 	int flags;
 	int waterlevel;
 	int watertype;
-	Vector view_ofs;
+	vec3_t view_ofs;
 	float health;
 
 	int bInDuck;
@@ -177,10 +175,10 @@ typedef struct clientdata_s
 	float fuser2;
 	float fuser3;
 	float fuser4;
-	Vector vuser1;
-	Vector vuser2;
-	Vector vuser3;
-	Vector vuser4;
+	vec3_t vuser1;
+	vec3_t vuser2;
+	vec3_t vuser3;
+	vec3_t vuser4;
 } clientdata_t;
 
 #include "weaponinfo.h"
diff --git a/src/common/entity_types.h b/src/common/entity_types.h
index d472c3cc..473793f5 100644
--- a/src/common/entity_types.h
+++ b/src/common/entity_types.h
@@ -16,13 +16,11 @@
 #if !defined(ENTITY_TYPESH)
 #define ENTITY_TYPESH
 
-enum {
-	ET_NORMAL = 0,
-	ET_PLAYER = 1,
-	ET_TEMPENTITY = 2,
-	ET_BEAM = 3,
-	// BMODEL or SPRITE that was split across BSP nodes
-	ET_FRAGMENTED = 4
-};
+#define ET_NORMAL 0
+#define ET_PLAYER 1
+#define ET_TEMPENTITY 2
+#define ET_BEAM 3
+// BMODEL or SPRITE that was split across BSP nodes
+#define ET_FRAGMENTED 4
 
 #endif // !ENTITY_TYPESH
diff --git a/src/common/event_api.h b/src/common/event_api.h
index 1bc0595b..2564d9e7 100644
--- a/src/common/event_api.h
+++ b/src/common/event_api.h
@@ -18,7 +18,7 @@
 #pragma once
 #endif
 
-constexpr int EVENT_API_VERSION = 1;
+#define EVENT_API_VERSION 1
 
 typedef struct event_api_s
 {
diff --git a/src/common/event_args.h b/src/common/event_args.h
index 25d94bd6..01bfe051 100644
--- a/src/common/event_args.h
+++ b/src/common/event_args.h
@@ -18,13 +18,11 @@
 #pragma once
 #endif
 
-enum {
-	// Event was invoked with stated origin
-	FEVENT_ORIGIN = (1 << 0),
+// Event was invoked with stated origin
+#define FEVENT_ORIGIN (1 << 0)
 
-	// Event was invoked with stated angles
-	FEVENT_ANGLES = (1 << 1)
-};
+// Event was invoked with stated angles
+#define FEVENT_ANGLES (1 << 1)
 
 typedef struct event_args_s
 {
diff --git a/src/common/event_flags.h b/src/common/event_flags.h
index acf8fd93..ba4a768d 100644
--- a/src/common/event_flags.h
+++ b/src/common/event_flags.h
@@ -18,32 +18,30 @@
 #pragma once
 #endif
 
-
-enum {
-	// Skip local host for event send.
-	FEV_NOTHOST = (1 << 0),
+// Skip local host for event send.
+#define FEV_NOTHOST (1 << 0)
 
 // Send the event reliably.  You must specify the origin and angles and use
 // PLAYBACK_EVENT_FULL for this to work correctly on the server for anything
 // that depends on the event origin/angles.  I.e., the origin/angles are not
 // taken from the invoking edict for reliable events.
-	FEV_RELIABLE = (1 << 1),
+#define FEV_RELIABLE (1 << 1)
 
 // Don't restrict to PAS/PVS, send this event to _everybody_ on the server ( useful for stopping CHAN_STATIC
 //  sounds started by client event when client is not in PVS anymore ( hwguy in TFC e.g. ).
-	FEV_GLOBAL = (1 << 2),
+#define FEV_GLOBAL (1 << 2)
 
 // If this client already has one of these events in its queue, just update the event instead of sending it as a duplicate
 //
-	FEV_UPDATE = (1 << 3),
+#define FEV_UPDATE (1 << 3)
 
 // Only send to entity specified as the invoker
-	FEV_HOSTONLY = (1 << 4),
+#define FEV_HOSTONLY (1 << 4)
 
 // Only send if the event was created on the server.
-	FEV_SERVER = (1 << 5),
+#define FEV_SERVER (1 << 5)
 
 // Only issue event client side ( from shared code )
-	FEV_CLIENT = (1 << 6)
-};
+#define FEV_CLIENT (1 << 6)
+
 #endif
diff --git a/src/common/hltv.h b/src/common/hltv.h
index 6ca800e4..4b6deca1 100644
--- a/src/common/hltv.h
+++ b/src/common/hltv.h
@@ -10,52 +10,44 @@
 
 #ifndef HLTV_H
 #define HLTV_H
-enum {
-	TYPE_CLIENT = 0,   // client is a normal HL client (default)
-	TYPE_PROXY = 1,       // client is another proxy
-	TYPE_COMMENTATOR = 3, // client is a commentator
-	TYPE_DEMO = 4       // client is a demo file
-};
-// sub commands of svc_hltv:
-enum {
-	HLTV_ACTIVE = 0, // tells client that he's an spectator and will get director commands
-	HLTV_STATUS = 1, // send status infos about proxy
-	HLTV_LISTEN = 2  // tell client to listen to a multicast stream
-};
-// sub commands of svc_director:
 
-enum {
-	DRC_CMD_NONE = 0,       // NULL director command
-	DRC_CMD_START = 1,      // start director mode
-	DRC_CMD_EVENT = 2,      // informs about director command
-	DRC_CMD_MODE = 3,       // switches camera modes
-	DRC_CMD_CAMERA = 4,     // sets camera registers
-	DRC_CMD_TIMESCALE = 5,  // sets time scale
-	DRC_CMD_MESSAGE = 6,    // send HUD centerprint
-	DRC_CMD_SOUND = 7,      // plays a particular sound
-	DRC_CMD_STATUS = 8,     // status info about broadcast
-	DRC_CMD_BANNER = 9,     // banner file name for HLTV gui
-	DRC_CMD_FADE = 10,      // send screen fade command
-	DRC_CMD_SHAKE = 11,     // send screen shake command
-	DRC_CMD_STUFFTEXT = 12, // like the normal svc_stufftext but as director command
-	DRC_CMD_LAST = 12
-};
+#define TYPE_CLIENT 0      // client is a normal HL client (default)
+#define TYPE_PROXY 1       // client is another proxy
+#define TYPE_COMMENTATOR 3 // client is a commentator
+#define TYPE_DEMO 4        // client is a demo file
+// sub commands of svc_hltv:
+#define HLTV_ACTIVE 0 // tells client that he's an spectator and will get director commands
+#define HLTV_STATUS 1 // send status infos about proxy
+#define HLTV_LISTEN 2 // tell client to listen to a multicast stream
 
+// sub commands of svc_director:
+#define DRC_CMD_NONE 0       // NULL director command
+#define DRC_CMD_START 1      // start director mode
+#define DRC_CMD_EVENT 2      // informs about director command
+#define DRC_CMD_MODE 3       // switches camera modes
+#define DRC_CMD_CAMERA 4     // sets camera registers
+#define DRC_CMD_TIMESCALE 5  // sets time scale
+#define DRC_CMD_MESSAGE 6    // send HUD centerprint
+#define DRC_CMD_SOUND 7      // plays a particular sound
+#define DRC_CMD_STATUS 8     // status info about broadcast
+#define DRC_CMD_BANNER 9     // banner file name for HLTV gui
+#define DRC_CMD_FADE 10      // send screen fade command
+#define DRC_CMD_SHAKE 11     // send screen shake command
+#define DRC_CMD_STUFFTEXT 12 // like the normal svc_stufftext but as director command
+
+#define DRC_CMD_LAST 12
 
 // HLTV_EVENT event flags
-
-enum {
-	DRC_FLAG_PRIO_MASK = 0x0F,      // priorities between 0 and 15 (15 most important)
-	DRC_FLAG_SIDE = (1 << 4),       //
-	DRC_FLAG_DRAMATIC = (1 << 5),   // is a dramatic scene
-	DRC_FLAG_SLOWMOTION = (1 << 6), // would look good in SloMo
-	DRC_FLAG_FACEPLAYER = (1 << 7), // player is doning something (reload/defuse bomb etc)
-	DRC_FLAG_INTRO = (1 << 8),      // is a introduction scene
-	DRC_FLAG_FINAL = (1 << 9),      // is a final scene
-	DRC_FLAG_NO_RANDOM = (1 << 10)  // don't randomize event data
-};
-
-constexpr int MAX_DIRECTOR_CMD_PARAMETERS = 4;
-constexpr int MAX_DIRECTOR_CMD_STRING = 128;
+#define DRC_FLAG_PRIO_MASK 0x0F      // priorities between 0 and 15 (15 most important)
+#define DRC_FLAG_SIDE (1 << 4)       //
+#define DRC_FLAG_DRAMATIC (1 << 5)   // is a dramatic scene
+#define DRC_FLAG_SLOWMOTION (1 << 6) // would look good in SloMo
+#define DRC_FLAG_FACEPLAYER (1 << 7) // player is doning something (reload/defuse bomb etc)
+#define DRC_FLAG_INTRO (1 << 8)      // is a introduction scene
+#define DRC_FLAG_FINAL (1 << 9)      // is a final scene
+#define DRC_FLAG_NO_RANDOM (1 << 10) // don't randomize event data
+
+#define MAX_DIRECTOR_CMD_PARAMETERS 4
+#define MAX_DIRECTOR_CMD_STRING 128
 
 #endif // HLTV_H
diff --git a/src/common/in_buttons.h b/src/common/in_buttons.h
index dc20d5f5..79129201 100644
--- a/src/common/in_buttons.h
+++ b/src/common/in_buttons.h
@@ -18,22 +18,21 @@
 #pragma once
 #endif
 
-enum {
-	IN_ATTACK = (1 << 0),
-	IN_JUMP = (1 << 1),
-	IN_DUCK = (1 << 2),
-	IN_FORWARD = (1 << 3),
-	IN_BACK = (1 << 4),
-	IN_USE = (1 << 5),
-	IN_CANCEL = (1 << 6),
-	IN_LEFT = (1 << 7),
-	IN_RIGHT = (1 << 8),
-	IN_MOVELEFT = (1 << 9),
-	IN_MOVERIGHT = (1 << 10),
-	IN_ATTACK2 = (1 << 11),
-	IN_RUN = (1 << 12),
-	IN_RELOAD = (1 << 13),
-	IN_ALT1 = (1 << 14),
-	IN_SCORE = (1 << 15)	// Used by client.dll for when scoreboard is held down
-};
+#define IN_ATTACK (1 << 0)
+#define IN_JUMP (1 << 1)
+#define IN_DUCK (1 << 2)
+#define IN_FORWARD (1 << 3)
+#define IN_BACK (1 << 4)
+#define IN_USE (1 << 5)
+#define IN_CANCEL (1 << 6)
+#define IN_LEFT (1 << 7)
+#define IN_RIGHT (1 << 8)
+#define IN_MOVELEFT (1 << 9)
+#define IN_MOVERIGHT (1 << 10)
+#define IN_ATTACK2 (1 << 11)
+#define IN_RUN (1 << 12)
+#define IN_RELOAD (1 << 13)
+#define IN_ALT1 (1 << 14)
+#define IN_SCORE (1 << 15) // Used by client.dll for when scoreboard is held down
+
 #endif // IN_BUTTONS_H
diff --git a/src/common/interface.cpp b/src/common/interface.cpp
index 40c5900c..3a4e1ea8 100644
--- a/src/common/interface.cpp
+++ b/src/common/interface.cpp
@@ -61,7 +61,6 @@ EXPORT_FUNCTION IBaseInterface *CreateInterface(const char *pName, int *pReturnC
 #ifdef _WIN32
 HINTERFACEMODULE Sys_LoadModule(const char *pModuleName)
 {
-	//preprocessor protection
 	return (HINTERFACEMODULE)LoadLibrary(pModuleName);
 }
 
diff --git a/src/common/interface.h b/src/common/interface.h
index 16b467fa..bdbd57c8 100644
--- a/src/common/interface.h
+++ b/src/common/interface.h
@@ -32,7 +32,7 @@ class IBaseInterface
 	virtual ~IBaseInterface() {}
 };
 
-constexpr const char* CREATEINTERFACE_PROCNAME = "CreateInterface";
+#define CREATEINTERFACE_PROCNAME "CreateInterface"
 typedef IBaseInterface *(*CreateInterfaceFn)(const char *pName, int *pReturnCode);
 
 typedef IBaseInterface *(*InstantiateInterfaceFn)();
@@ -80,7 +80,6 @@ class InterfaceReg
 	EXPOSE_SINGLE_INTERFACE_GLOBALVAR(className, interfaceName, versionName, __g_##className##_singleton)
 
 #ifdef WIN32
-//this is recommended standard practice, keep this as macro.
 #define EXPORT_FUNCTION __declspec(dllexport)
 #else
 #define EXPORT_FUNCTION
diff --git a/src/common/mathlib.h b/src/common/mathlib.h
index dab9927e..583acdf1 100644
--- a/src/common/mathlib.h
+++ b/src/common/mathlib.h
@@ -32,45 +32,41 @@ typedef int fixed4_t;
 typedef int fixed8_t;
 typedef int fixed16_t;
 
+#ifndef M_PI
+#define M_PI 3.14159265358979323846 // matches value in gcc v2 math.h
+#endif
+
 struct mplane_s;
 
 extern Vector vec3_origin;
-constexpr int nanmask = 255 << 23;
-
-static inline bool IS_NAN(float flVelocity) {
-
-	int i = *(int*)&flVelocity;
-	return (i & nanmask) == 0x7F800000 && (i & 0x007FFFFF) != 0;
+extern int nanmask;
 
-};
-
-inline void VectorSubtract(const float* a, const float* b, float* c)
-{
-	c[0] = a[0] - b[0];
-	c[1] = a[1] - b[1];
-	c[2] = a[2] - b[2];
-};
-
-inline void VectorAdd(const float* a, const float* b, float* c)
-{
-	(c)[0] = (a)[0] + (b)[0];
-	(c)[1] = (a)[1] + (b)[1];
-	(c)[2] = (a)[2] + (b)[2];
-};
-
-inline void VectorCopy(const float* source, float* destination)
-{
-	(destination)[0] = (source)[0];
-	(destination)[1] = (source)[1];
-	(destination)[2] = (source)[2];
-};
+#define IS_NAN(x) (((*(int*)&x) & nanmask) == nanmask)
 
+#define VectorSubtract(a, b, c)   \
+	{                             \
+		(c)[0] = (a)[0] - (b)[0]; \
+		(c)[1] = (a)[1] - (b)[1]; \
+		(c)[2] = (a)[2] - (b)[2]; \
+	}
+#define VectorAdd(a, b, c)        \
+	{                             \
+		(c)[0] = (a)[0] + (b)[0]; \
+		(c)[1] = (a)[1] + (b)[1]; \
+		(c)[2] = (a)[2] + (b)[2]; \
+	}
+#define VectorCopy(a, b) \
+	{                    \
+		(b)[0] = (a)[0]; \
+		(b)[1] = (a)[1]; \
+		(b)[2] = (a)[2]; \
+	}
 inline void VectorClear(float* a)
 {
 	a[0] = 0.0;
 	a[1] = 0.0;
 	a[2] = 0.0;
-};
+}
 
 void VectorMA(const float* veca, float scale, const float* vecb, float* vecc);
 
@@ -91,6 +87,7 @@ int GreatestCommonDivisor(int i1, int i2);
 
 void AngleVectors(const Vector& angles, Vector* forward, Vector* right, Vector* up);
 void AngleVectorsTranspose(const Vector& angles, Vector* forward, Vector* right, Vector* up);
+#define AngleIVectors AngleVectorsTranspose
 
 void AngleMatrix(const float* angles, float (*matrix)[4]);
 void AngleIMatrix(const Vector& angles, float (*matrix)[4]);
@@ -155,11 +152,10 @@ extern DLONG dlong;
 #define restore_fpu_cw() /* */
 #endif
 
-//#define BOX_ON_PLANE_SIDE(emins, emaxs, p)                                                                 \
-//	(((p)->type < 3) ? (                                                                                   \
-//						   ((p)->dist <= (emins)[(p)->type]) ? 1                                           \
-//															 : (                                           \
-//																   ((p)->dist >= (emaxs)[(p)->type]) ? 2   \
-//																									 : 3)) \
-//					 : BoxOnPlaneSide((emins), (emaxs), (p)))
-//
\ No newline at end of file
+#define BOX_ON_PLANE_SIDE(emins, emaxs, p)                                                                 \
+	(((p)->type < 3) ? (                                                                                   \
+						   ((p)->dist <= (emins)[(p)->type]) ? 1                                           \
+															 : (                                           \
+																   ((p)->dist >= (emaxs)[(p)->type]) ? 2   \
+																									 : 3)) \
+					 : BoxOnPlaneSide((emins), (emaxs), (p)))
diff --git a/src/common/net_api.h b/src/common/net_api.h
index a2937c1b..e4af8269 100644
--- a/src/common/net_api.h
+++ b/src/common/net_api.h
@@ -15,29 +15,22 @@
 #include "netadr.h"
 #endif
 
-
-enum {
-	NETAPI_REQUEST_SERVERLIST = 0, // Doesn't need a remote address
-	NETAPI_REQUEST_PING = 1,
-	NETAPI_REQUEST_RULES = 2,
-	NETAPI_REQUEST_PLAYERS = 3,
-	NETAPI_REQUEST_DETAILS = 4
-};
+#define NETAPI_REQUEST_SERVERLIST (0) // Doesn't need a remote address
+#define NETAPI_REQUEST_PING (1)
+#define NETAPI_REQUEST_RULES (2)
+#define NETAPI_REQUEST_PLAYERS (3)
+#define NETAPI_REQUEST_DETAILS (4)
 
 // Set this flag for things like broadcast requests, etc. where the engine should not
 //  kill the request hook after receiving the first response
-enum {
-	FNETAPI_MULTIPLE_RESPONSE = (1 << 0)
-};
+#define FNETAPI_MULTIPLE_RESPONSE (1 << 0)
 
 typedef void (*net_api_response_func_t)(struct net_response_s *response);
 
-enum {
-	NET_SUCCESS = 0,
-	NET_ERROR_TIMEOUT = 1 << 0,
-	NET_ERROR_PROTO_UNSUPPORTED = 1 << 1,
-	NET_ERROR_UNDEFINED = 1 << 2
-};
+#define NET_SUCCESS (0)
+#define NET_ERROR_TIMEOUT (1 << 0)
+#define NET_ERROR_PROTO_UNSUPPORTED (1 << 1)
+#define NET_ERROR_UNDEFINED (1 << 2)
 
 typedef struct net_adrlist_s
 {
diff --git a/src/common/particledef.h b/src/common/particledef.h
index ce66bc91..aadb22b1 100644
--- a/src/common/particledef.h
+++ b/src/common/particledef.h
@@ -37,12 +37,12 @@ typedef enum
 typedef struct particle_s
 {
 	// driver-usable fields
-	Vector  org;
+	vec3_t org;
 	short color;
 	short packedColor;
 	// drivers never touch the following fields
 	struct particle_s *next;
-	Vector  vel;
+	vec3_t vel;
 	float ramp;
 	float die;
 	ptype_t type;
diff --git a/src/common/pmtrace.h b/src/common/pmtrace.h
index a08059c8..868eb110 100644
--- a/src/common/pmtrace.h
+++ b/src/common/pmtrace.h
@@ -20,7 +20,7 @@
 
 typedef struct
 {
-	Vector  normal;
+	vec3_t normal;
 	float dist;
 } pmplane_t;
 
@@ -32,10 +32,10 @@ struct pmtrace_s
 	qboolean startsolid;	  // if true, the initial point was in a solid area
 	qboolean inopen, inwater; // End point is in empty space or in water
 	float fraction;			  // time completed, 1.0 = didn't hit anything
-	Vector  endpos;			  // final position
+	vec3_t endpos;			  // final position
 	pmplane_t plane;		  // surface normal at impact
 	int ent;				  // entity at impact
-	Vector  deltavelocity;	  // Change in player's velocity caused by impact.
+	vec3_t deltavelocity;	  // Change in player's velocity caused by impact.
 							  // Only run on server.
 	int hitgroup;
 };
diff --git a/src/common/qfont.h b/src/common/qfont.h
index f6f7831d..665ed97d 100644
--- a/src/common/qfont.h
+++ b/src/common/qfont.h
@@ -20,7 +20,7 @@
 
 // Font stuff
 
-constexpr int NUM_GLYPHS = 256;
+#define NUM_GLYPHS 256
 
 typedef struct
 {
diff --git a/src/common/r_efx.h b/src/common/r_efx.h
index add595ee..d42c4ee9 100644
--- a/src/common/r_efx.h
+++ b/src/common/r_efx.h
@@ -59,38 +59,32 @@ color24 gTracerColors[] =
 */
 
 // Temporary entity array
-
-enum {
-	TENTPRIORITY_LOW = 0,
-	TENTPRIORITY_HIGH = 1
-};
+#define TENTPRIORITY_LOW 0
+#define TENTPRIORITY_HIGH 1
 
 // TEMPENTITY flags
-
-enum {
-	FTENT_NONE = 0x00000000,
-	FTENT_SINEWAVE = 0x00000001,
-	FTENT_GRAVITY = 0x00000002,
-	FTENT_ROTATE = 0x00000004,
-	FTENT_SLOWGRAVITY = 0x00000008,
-	FTENT_SMOKETRAIL = 0x00000010,
-	FTENT_COLLIDEWORLD = 0x00000020,
-	FTENT_FLICKER = 0x00000040,
-	FTENT_FADEOUT = 0x00000080,
-	FTENT_SPRANIMATE = 0x00000100,
-	FTENT_HITSOUND = 0x00000200,
-	FTENT_SPIRAL = 0x00000400,
-	FTENT_SPRCYCLE = 0x00000800,
-	FTENT_COLLIDEALL = 0x00001000,	// will collide with world and slideboxes
-	FTENT_PERSIST = 0x00002000,		// tent is not removed when unable to draw
-	FTENT_COLLIDEKILL = 0x00004000,	// tent is removed upon collision with anything
-	FTENT_PLYRATTACHMENT = 0x00008000, // tent is attached to a player (owner)
-	FTENT_SPRANIMATELOOP = 0x00010000, // animating sprite doesn't die when last frame is displayed
-	FTENT_SPARKSHOWER = 0x00020000,
-	FTENT_NOMODEL = 0x00040000,	  // Doesn't have a model, never try to draw ( it just triggers other things )
-	FTENT_CLIENTCUSTOM = 0x00080000, // Must specify callback.  Callback function is responsible for killing tempent and updating fields ( unless other flags specify how to do things )
-	FTENT_SKIPENT = 0x00100000  // AUG2013_25 Thothie - Skip collision checks for stored ent index
-};
+#define FTENT_NONE 0x00000000
+#define FTENT_SINEWAVE 0x00000001
+#define FTENT_GRAVITY 0x00000002
+#define FTENT_ROTATE 0x00000004
+#define FTENT_SLOWGRAVITY 0x00000008
+#define FTENT_SMOKETRAIL 0x00000010
+#define FTENT_COLLIDEWORLD 0x00000020
+#define FTENT_FLICKER 0x00000040
+#define FTENT_FADEOUT 0x00000080
+#define FTENT_SPRANIMATE 0x00000100
+#define FTENT_HITSOUND 0x00000200
+#define FTENT_SPIRAL 0x00000400
+#define FTENT_SPRCYCLE 0x00000800
+#define FTENT_COLLIDEALL 0x00001000		// will collide with world and slideboxes
+#define FTENT_PERSIST 0x00002000		// tent is not removed when unable to draw
+#define FTENT_COLLIDEKILL 0x00004000	// tent is removed upon collision with anything
+#define FTENT_PLYRATTACHMENT 0x00008000 // tent is attached to a player (owner)
+#define FTENT_SPRANIMATELOOP 0x00010000 // animating sprite doesn't die when last frame is displayed
+#define FTENT_SPARKSHOWER 0x00020000
+#define FTENT_NOMODEL 0x00040000	  // Doesn't have a model, never try to draw ( it just triggers other things )
+#define FTENT_CLIENTCUSTOM 0x00080000 // Must specify callback.  Callback function is responsible for killing tempent and updating fields ( unless other flags specify how to do things )
+#define FTENT_SKIPENT 0x00100000	  // AUG2013_25 Thothie - Skip collision checks for stored ent index
 
 typedef struct tempent_s TEMPENTITY;
 typedef struct tempent_s
@@ -112,7 +106,7 @@ typedef struct tempent_s
 					   // if COLLIDEALL, this is the index of the client to ignore
 					   // TENTS with FTENT_PLYRATTACHMENT MUST set the clientindex!
 
-	Vector  tentOffset; // if attached, client origin + tentOffset = tent origin.
+	vec3_t tentOffset; // if attached, client origin + tentOffset = tent origin.
 	cl_entity_t entity;
 
 	// baseline.origin		- velocity
diff --git a/src/common/r_studioint.h b/src/common/r_studioint.h
index 43de192d..3e9caa52 100644
--- a/src/common/r_studioint.h
+++ b/src/common/r_studioint.h
@@ -11,7 +11,7 @@
 #pragma once
 #endif
 
-constexpr int STUDIO_INTERFACE_VERSION = 1;
+#define STUDIO_INTERFACE_VERSION 1
 
 typedef struct engine_studio_api_s
 {
@@ -126,7 +126,7 @@ typedef struct r_studio_interface_s
 extern r_studio_interface_t *pStudioAPI;
 
 // server blending
-constexpr int SV_BLENDING_INTERFACE_VERSION = 1;
+#define SV_BLENDING_INTERFACE_VERSION 1
 
 typedef struct sv_blending_interface_s
 {
@@ -135,8 +135,8 @@ typedef struct sv_blending_interface_s
 	void (*SV_StudioSetupBones)(struct model_s *pModel,
 								float frame,
 								int sequence,
-								const Vector  angles,
-								const Vector  origin,
+								const vec3_t angles,
+								const vec3_t origin,
 								const byte *pcontroller,
 								const byte *pblending,
 								int iBone,
diff --git a/src/common/ref_params.h b/src/common/ref_params.h
index 084166b1..f8a8d361 100644
--- a/src/common/ref_params.h
+++ b/src/common/ref_params.h
@@ -60,7 +60,7 @@ typedef struct ref_params_s
 	int maxclients;
 	int viewentity;
 	int playernum;
-	unsigned int max_entities;
+	int max_entities;
 	int demoplayback;
 	int hardware;
 
diff --git a/src/common/triangleapi.h b/src/common/triangleapi.h
index c498fb09..5e85cb03 100644
--- a/src/common/triangleapi.h
+++ b/src/common/triangleapi.h
@@ -24,18 +24,15 @@ typedef enum
 	TRI_NONE = 1,
 } TRICULLSTYLE;
 
+#define TRI_API_VERSION 1
 
-constexpr int TRI_API_VERSION = 1;
-
-enum {
-	TRI_TRIANGLES = 0,
-	TRI_TRIANGLE_FAN = 1,
-	TRI_QUADS = 2,
-	TRI_POLYGON = 3,
-	TRI_LINES = 4,
-	TRI_TRIANGLE_STRIP = 5,
-	TRI_QUAD_STRIP = 6
-};
+#define TRI_TRIANGLES 0
+#define TRI_TRIANGLE_FAN 1
+#define TRI_QUADS 2
+#define TRI_POLYGON 3
+#define TRI_LINES 4
+#define TRI_TRIANGLE_STRIP 5
+#define TRI_QUAD_STRIP 6
 
 typedef struct triangleapi_s
 {
diff --git a/src/common/usercmd.h b/src/common/usercmd.h
index 80cec914..8de5525c 100644
--- a/src/common/usercmd.h
+++ b/src/common/usercmd.h
@@ -22,7 +22,7 @@ typedef struct usercmd_s
 {
 	short lerp_msec;   // Interpolation time on client
 	byte msec;		   // Duration in ms of command
-	Vector  viewangles; // Command view angles.
+	vec3_t viewangles; // Command view angles.
 
 	// intended velocities
 	float forwardmove;		// Forward velocity.
@@ -35,7 +35,7 @@ typedef struct usercmd_s
 
 	// Experimental player impact stuff.
 	int impact_index;
-	Vector  impact_position;
+	vec3_t impact_position;
 } usercmd_t;
 
 #endif // USERCMD_H
diff --git a/src/game/client/hud.cpp b/src/game/client/hud.cpp
index 4d734579..c084f356 100644
--- a/src/game/client/hud.cpp
+++ b/src/game/client/hud.cpp
@@ -48,6 +48,11 @@
 #include "fmod/soundengine.h"
 #include "mslogger.h"
 
+#ifndef M_PI
+#define M_PI 3.14159265358979323846 // matches value in gcc v2 math.h
+#endif
+
+
 //-----------------
 extern client_sprite_t *GetSpriteList(client_sprite_t *pList, const char *psz, int iRes, int iCount);
 extern cvar_t *sensitivity;
@@ -762,7 +767,7 @@ int CHud::MsgFunc_SetFOV(const char *pszName, int iSize, void *pbuf)
 		m_iFOV = newfov;
 	}
 
-	ClFOV = cosf((m_iFOV / 2.0) * (PI / 180));
+	ClFOV = cosf((m_iFOV / 2.0) * (M_PI / 180));
 
 	// the clients fov is actually set in the client data update section of the hud
 
diff --git a/src/game/client/render/studio_util.cpp b/src/game/client/render/studio_util.cpp
index a172878a..bfc476d1 100644
--- a/src/game/client/render/studio_util.cpp
+++ b/src/game/client/render/studio_util.cpp
@@ -11,6 +11,10 @@
 #include "const.h"
 #include "com_model.h"
 #include "studio_util.h"
+#ifndef M_PI
+#define M_PI 3.14159265358979323846 // matches value in gcc v2 math.h
+#endif
+
 
 // angles index are not the same as ROLL, PITCH, YAW
 
@@ -96,8 +100,8 @@ void QuaternionSlerp( vec4_t p, vec4_t q, float t, vec4_t qt )
 		qt[1] = q[0];
 		qt[2] = -q[3];
 		qt[3] = q[2];
-		sclp = sin( (1.0 - t) * (0.5 * PI));
-		sclq = sin( t * (0.5 * PI));
+		sclp = sin( (1.0 - t) * (0.5 * M_PI));
+		sclq = sin( t * (0.5 * M_PI));
 		for (i = 0; i < 3; i++)
 		{
 			qt[i] = sclp * p[i] + sclq * qt[i];
diff --git a/src/game/client/render/studio_util.h b/src/game/client/render/studio_util.h
index c3dc3ddb..9248f80d 100644
--- a/src/game/client/render/studio_util.h
+++ b/src/game/client/render/studio_util.h
@@ -19,6 +19,8 @@ enum {
 };
 //#endif
 
+#undef PLANE_ANYZ
+
 enum planes_e {
 	PLANE_X = 0,
 	PLANE_Y = 1,
diff --git a/src/game/client/render/studiomodelrenderer.cpp b/src/game/client/render/studiomodelrenderer.cpp
index 2323e3db..ccd40676 100644
--- a/src/game/client/render/studiomodelrenderer.cpp
+++ b/src/game/client/render/studiomodelrenderer.cpp
@@ -186,7 +186,7 @@ void CStudioModelRenderer::StudioCalcBoneAdj(float dadt, float* adj, const byte*
 		case STUDIO_XR:
 		case STUDIO_YR:
 		case STUDIO_ZR:
-			adj[j] = value * (PI / 180.0);
+			adj[j] = value * (M_PI / 180.0);
 			break;
 		case STUDIO_X:
 		case STUDIO_Y:
@@ -1704,7 +1704,7 @@ void CStudioModelRenderer::StudioEstimateGait(entity_state_t* pplayer)
 	}
 	else
 	{
-		m_pPlayerInfo->gaityaw = (atan2(est_velocity[1], est_velocity[0]) * 180 / PI);
+		m_pPlayerInfo->gaityaw = (atan2(est_velocity[1], est_velocity[0]) * 180 / M_PI);
 		if (m_pPlayerInfo->gaityaw > 180)
 			m_pPlayerInfo->gaityaw = 180;
 		if (m_pPlayerInfo->gaityaw < -180)
@@ -2593,7 +2593,7 @@ void CStudioModelRenderer::ModifyBone(mstudiobone_t* pbone, Vector& angle)
 	if (Bone == 2)
 		Value = Pitch * 0.3f; //0.2
 
-	angle.z += -Value * (PI / 180.0);
+	angle.z += -Value * (M_PI / 180.0);
 }
 
 void CStudioModelRenderer::RegisterExtraData(cl_entity_t& Ent)
diff --git a/src/game/client/view.cpp b/src/game/client/view.cpp
index 6e5566c6..1469277a 100644
--- a/src/game/client/view.cpp
+++ b/src/game/client/view.cpp
@@ -219,11 +219,11 @@ float V_CalcBob(struct ref_params_s *pparams)
 
 	if (cycle < cl_bobup->value)
 	{
-		cycle = PI * cycle / cl_bobup->value;
+		cycle = M_PI * cycle / cl_bobup->value;
 	}
 	else
 	{
-		cycle = PI + PI * (cycle - cl_bobup->value) / (1.0 - cl_bobup->value);
+		cycle = M_PI + M_PI * (cycle - cl_bobup->value) / (1.0 - cl_bobup->value);
 	}
 
 	// bob is proportional to simulated velocity in the xy plane
diff --git a/src/game/server/hl/animating.cpp b/src/game/server/hl/animating.cpp
index 05dfe444..5c829afc 100644
--- a/src/game/server/hl/animating.cpp
+++ b/src/game/server/hl/animating.cpp
@@ -21,6 +21,9 @@
 */
 
 #define VALVE_DLL 1
+#ifndef M_PI
+#define M_PI 3.14159265358979323846 // matches value in gcc v2 math.h
+#endif
 
 #include "msdllheaders.h"
 #include "animation.h"
@@ -263,7 +266,7 @@ void CBaseAnimating ::SetSequenceBox(void)
 	{
 		// expand box for rotation
 		// find min / max for rotations
-		float yaw = pev->angles.y * (PI / 180.0);
+		float yaw = pev->angles.y * (M_PI / 180.0);
 
 		Vector xvector, yvector;
 		xvector.x = cos(yaw);
diff --git a/src/game/server/hl/func_tank.cpp b/src/game/server/hl/func_tank.cpp
index 460896a9..fb058abc 100644
--- a/src/game/server/hl/func_tank.cpp
+++ b/src/game/server/hl/func_tank.cpp
@@ -20,6 +20,10 @@
 #include "explode.h"
 
 #include "player.h"
+#ifndef M_PI
+#define M_PI 3.14159265358979323846 // matches value in gcc v2 math.h
+#endif
+
 
 enum sf_tank_e {
 	SF_TANK_ACTIVE = 0x0001,
@@ -636,12 +640,12 @@ void CFuncTank::AdjustAnglesForBarrel(Vector &angles, float distance)
 		if (m_barrelPos.y)
 		{
 			r2 = m_barrelPos.y * m_barrelPos.y;
-			angles.y += (180.0 / PI) * atan2(m_barrelPos.y, sqrt(d2 - r2));
+			angles.y += (180.0 / M_PI) * atan2(m_barrelPos.y, sqrt(d2 - r2));
 		}
 		if (m_barrelPos.z)
 		{
 			r2 = m_barrelPos.z * m_barrelPos.z;
-			angles.x += (180.0 / PI) * atan2(-m_barrelPos.z, sqrt(d2 - r2));
+			angles.x += (180.0 / M_PI) * atan2(-m_barrelPos.z, sqrt(d2 - r2));
 		}
 	}
 }
diff --git a/src/game/server/monsters/npcscript.cpp b/src/game/server/monsters/npcscript.cpp
index 95086d4d..b530ef8a 100644
--- a/src/game/server/monsters/npcscript.cpp
+++ b/src/game/server/monsters/npcscript.cpp
@@ -7,6 +7,9 @@
 #include "stats/stats.h"
 #include "stats/races.h"
 #include "msitemdefs.h"
+#ifndef M_PI
+#define M_PI 3.14159265358979323846 // matches value in gcc v2 math.h
+#endif
 
 
 
@@ -272,7 +275,7 @@ bool CMSMonster::Script_ExecuteCmd(CScript *Script, SCRIPT_EVENT &Event, scriptc
 	else if (Cmd.Name() == "fov")
 	{
 		if (Params.size() >= 1)
-			m_flFieldOfView = cosf((atof(Params[0]) / 2.0) * (PI / 180));
+			m_flFieldOfView = cosf((atof(Params[0]) / 2.0) * (M_PI / 180));
 
 		else
 			ERROR_MISSING_PARMS;
diff --git a/src/game/shared/movement/pm_math.cpp b/src/game/shared/movement/pm_math.cpp
index 8b5a64ef..737d9fa6 100644
--- a/src/game/shared/movement/pm_math.cpp
+++ b/src/game/shared/movement/pm_math.cpp
@@ -27,6 +27,7 @@ enum {
 	ROLL = 2
 };
 
+int nanmask = 255 << 23;
 //#pragma warning(disable : 4244)
 
 float anglemod(float a)
@@ -40,13 +41,13 @@ void AngleVectors(const Vector& angles, Vector* forward, Vector* right, Vector*
 	float angle;
 	float sr, sp, sy, cr, cp, cy;
 
-	angle = angles[YAW] * (PI * 2 / 360);
+	angle = angles[YAW] * (M_PI * 2 / 360);
 	sy = sin(angle);
 	cy = cos(angle);
-	angle = angles[PITCH] * (PI * 2 / 360);
+	angle = angles[PITCH] * (M_PI * 2 / 360);
 	sp = sin(angle);
 	cp = cos(angle);
-	angle = angles[ROLL] * (PI * 2 / 360);
+	angle = angles[ROLL] * (M_PI * 2 / 360);
 	sr = sin(angle);
 	cr = cos(angle);
 
@@ -75,13 +76,13 @@ void AngleVectorsTranspose(const Vector& angles, Vector* forward, Vector* right,
 	float angle;
 	float sr, sp, sy, cr, cp, cy;
 
-	angle = angles[YAW] * (PI * 2 / 360);
+	angle = angles[YAW] * (M_PI * 2 / 360);
 	sy = sin(angle);
 	cy = cos(angle);
-	angle = angles[PITCH] * (PI * 2 / 360);
+	angle = angles[PITCH] * (M_PI * 2 / 360);
 	sp = sin(angle);
 	cp = cos(angle);
-	angle = angles[ROLL] * (PI * 2 / 360);
+	angle = angles[ROLL] * (M_PI * 2 / 360);
 	sr = sin(angle);
 	cr = cos(angle);
 
@@ -110,13 +111,13 @@ void AngleMatrix(const float* angles, float (*matrix)[4])
 	float angle;
 	float sr, sp, sy, cr, cp, cy;
 
-	angle = angles[YAW] * (PI * 2 / 360);
+	angle = angles[YAW] * (M_PI * 2 / 360);
 	sy = sin(angle);
 	cy = cos(angle);
-	angle = angles[PITCH] * (PI * 2 / 360);
+	angle = angles[PITCH] * (M_PI * 2 / 360);
 	sp = sin(angle);
 	cp = cos(angle);
-	angle = angles[ROLL] * (PI * 2 / 360);
+	angle = angles[ROLL] * (M_PI * 2 / 360);
 	sr = sin(angle);
 	cr = cos(angle);
 
@@ -140,13 +141,13 @@ void AngleIMatrix(const Vector& angles, float matrix[3][4])
 	float angle;
 	float sr, sp, sy, cr, cp, cy;
 
-	angle = angles[YAW] * (PI * 2 / 360);
+	angle = angles[YAW] * (M_PI * 2 / 360);
 	sy = sin(angle);
 	cy = cos(angle);
-	angle = angles[PITCH] * (PI * 2 / 360);
+	angle = angles[PITCH] * (M_PI * 2 / 360);
 	sp = sin(angle);
 	cp = cos(angle);
-	angle = angles[ROLL] * (PI * 2 / 360);
+	angle = angles[ROLL] * (M_PI * 2 / 360);
 	sr = sin(angle);
 	cr = cos(angle);
 
@@ -238,7 +239,7 @@ float AngleBetweenVectors(const Vector& v1, const Vector& v2)
 		return 0.0f;
 
 	angle = acos(DotProduct(v1, v2)) / (l1 * l2);
-	angle = (angle * 180.0f) / PI;
+	angle = (angle * 180.0f) / M_PI;
 
 	return angle;
 }
@@ -372,12 +373,12 @@ void VectorAngles(const float* forward, float* angles)
 	}
 	else
 	{
-		yaw = (atan2(forward[1], forward[0]) * 180 / PI);
+		yaw = (atan2(forward[1], forward[0]) * 180 / M_PI);
 		if (yaw < 0)
 			yaw += 360;
 
 		tmp = sqrt(forward[0] * forward[0] + forward[1] * forward[1]);
-		pitch = (atan2(forward[2], tmp) * 180 / PI);
+		pitch = (atan2(forward[2], tmp) * 180 / M_PI);
 		if (pitch < 0)
 			pitch += 360;
 	}
diff --git a/src/game/shared/movement/pm_shared.cpp b/src/game/shared/movement/pm_shared.cpp
index 27794fc9..65e4d140 100644
--- a/src/game/shared/movement/pm_shared.cpp
+++ b/src/game/shared/movement/pm_shared.cpp
@@ -33,11 +33,12 @@
 #include "player/player.h"
 #include "filesystem_shared.h"
 #include "mathlib.h"
-
 #include "com_model.h"
 
-
-
+//defined in bspfile.h
+#define	CONTENTS_CURRENT_0 -9
+#define	CONTENTS_CURRENT_DOWN -14
+#define CONTENTS_TRANSLUCENT - 15
 
 //-----------------------------
 
diff --git a/src/game/shared/movement/pm_shared.h b/src/game/shared/movement/pm_shared.h
index 42cbddc0..de47eac1 100644
--- a/src/game/shared/movement/pm_shared.h
+++ b/src/game/shared/movement/pm_shared.h
@@ -67,4 +67,6 @@ enum step_surface_e {
 };
 
 
+
+
 #endif
diff --git a/src/game/shared/weapons/giattack.cpp b/src/game/shared/weapons/giattack.cpp
index f4505a85..db7f63b8 100644
--- a/src/game/shared/weapons/giattack.cpp
+++ b/src/game/shared/weapons/giattack.cpp
@@ -24,6 +24,11 @@
 #include "soundent.h"
 #endif
 
+#ifndef M_PI
+#define M_PI 3.14159265358979323846 // matches value in gcc v2 math.h
+#endif
+
+
 #include "iscript.h"
 
 //extern iBeam;
@@ -1055,7 +1060,7 @@ void CGenericItem::ChargeThrowProj()
 		float LoweredSpreadDeg = CurrentAttack->flAccBest + ((CurrentAttack->flAccuracyDefault - CurrentAttack->flAccBest) * (1 - flTimeHeldAdjusted));
 
 		float Spread = V_max(LoweredSpreadDeg, 0);
-		float VeerAng = RANDOM_FLOAT(0.0f, PI);
+		float VeerAng = RANDOM_FLOAT(0.0f, M_PI);
 		vAngle.x += cosf(VeerAng) * Spread; //Veer off at the angle, multiplied by the spread
 		vAngle.y += sinf(VeerAng) * Spread;
 

From 817dea58bb138eb49ba65b8b327d7daa5a0627bd Mon Sep 17 00:00:00 2001
From: Rederick5 <73010056+Rederick5@users.noreply.github.com>
Date: Thu, 26 Mar 2026 18:43:21 -0400
Subject: [PATCH 291/291] undid commend hash removal.

---
 src/common/const.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/const.h b/src/common/const.h
index 49672a7b..c37c7ab2 100644
--- a/src/common/const.h
+++ b/src/common/const.h
@@ -590,7 +590,7 @@
 #define	CONTENTS_CURRENT_UP		-13
 #define	CONTENTS_CURRENT_DOWN	-14
 
-define CONTENTS_TRANSLUCENT	-15
+#define CONTENTS_TRANSLUCENT	-15
 */
 #define CONTENTS_LADDER -16