SAFESTRAFE: no more idrive advantage

Author: dusty-qw

include/progs.h

@@ -995,6 +995,10 @@ typedef struct gedict_s
 	int   nullStrafeCount;
 // SOCD
 
+// Safe strafe enforcement
+	qbool safestrafePending;				// true if player is in forced stop frame
+	float pendingStrafeDirection;			// direction player wants to move after stop
+
 	float shownick_time;					// used to force centerprint is off at desired time
 	clientType_t ct;						// client type for client edicts
 // { timing

src/admin.c

@@ -909,6 +909,16 @@ void ToggleFallBunny(void)
 	cvar_toggle_msg(self, "k_fallbunny", redtext("fallbunny"));
 }
 
+void ToggleSafeStrafe(void)
+{
+	if (match_in_progress)
+	{
+		return;
+	}
+
+	cvar_toggle_msg(self, "k_safestrafe", redtext("safestrafe"));
+}
+
 void sv_lock(void)
 {
 	int lock_time = 15;

src/client.c

@@ -1850,6 +1850,10 @@ void ClientConnect(void)
 	self->totalPerfectStrafeCount = 0;
 	self->nullStrafeCount = 0;
 
+	// Safe strafe
+	self->safestrafePending = false;
+	self->pendingStrafeDirection = 0;
+
 // ILLEGALFPS[
 
 	// Zibbo's frametime checking code
@@ -3864,6 +3868,37 @@ void PlayerPreThink(void)
 		}
 	}
 
+	// Safe strafe enforcement
+	if (cvar("k_safestrafe"))
+	{
+		float fSideMoveSpeed = self->movement[1];
+		
+		// If we're in a pending stop frame, force stop
+		if (self->safestrafePending)
+		{
+			self->movement[1] = 0;  // Force stop
+			self->fLastSideMoveSpeed = 0;  // Update for SOCD detection
+			self->safestrafePending = false;
+			
+			// Next frame will use the pending direction
+			// (it will be applied naturally from client input)
+		}
+		else if (fSideMoveSpeed != 0 && self->fLastSideMoveSpeed != 0)
+		{
+			// Check if attempting a perfect strafe (instant direction change)
+			int currentDir = (fSideMoveSpeed > 0) - (fSideMoveSpeed < 0);
+			int lastDir = (self->fLastSideMoveSpeed > 0) - (self->fLastSideMoveSpeed < 0);
+			
+			if (currentDir != lastDir && self->nullStrafeCount < 4)
+			{
+				// Perfect strafe detected - force a stop frame
+				self->safestrafePending = true;
+				self->pendingStrafeDirection = fSideMoveSpeed;
+				self->movement[1] = 0;  // Force stop this frame
+			}
+		}
+	}
+
 // ILLEGALFPS[
 
 	self->fAverageFrameTime += g_globalvars.frametime;

src/commands.c

@@ -133,6 +133,7 @@ void ToggleSpawnPoints(void);
 void ToggleBerzerk(void);
 void ToggleSpecTalk(void);
 void ToggleSpeed(void);
+void ToggleSafeStrafe(void);
 void VotePickup(void);
 void UserMode(float umode);
 void Wp_Reset(void);
@@ -370,6 +371,7 @@ const char CD_NODESC[] = "no desc";
 #define CD_TIMEDOWN			"-5 mins match time"
 #define CD_TIMEUP			"+5 mins match time"
 #define CD_FALLBUNNY		"toggle fallbunny"
+#define CD_SAFESTRAFE		"toggle safestrafe"
 #define CD_FRAGSDOWN		"-10 fraglimit"
 #define CD_FRAGSUP			"+10 fraglimit"
 #define CD_KILLQUAD			"kill the quad mode"
@@ -735,6 +737,7 @@ cmd_t cmds[] =
 	{ "timedown", 					DEF(TimeDown), 					5.0f, 		CF_PLAYER | CF_SPC_ADMIN, 												CD_TIMEDOWN },
 	{ "timeup", 					DEF(TimeUp), 					5.0f, 		CF_PLAYER | CF_SPC_ADMIN, 												CD_TIMEUP },
 	{ "fallbunny", 					ToggleFallBunny, 				0, 			CF_PLAYER | CF_SPC_ADMIN, 												CD_FALLBUNNY },
+	{ "safestrafe", 				ToggleSafeStrafe, 				0, 			CF_PLAYER | CF_SPC_ADMIN, 												CD_SAFESTRAFE },
 	{ "fragsdown", 					FragsDown, 						0, 			CF_PLAYER | CF_SPC_ADMIN, 												CD_FRAGSDOWN },
 	{ "fragsup", 					FragsUp, 						0, 			CF_PLAYER | CF_SPC_ADMIN, 												CD_FRAGSUP },
 	{ "killquad", 					killquad, 						0, 			CF_PLAYER | CF_SPC_ADMIN, 												CD_KILLQUAD },

src/world.c

@@ -1009,6 +1009,7 @@ void FirstFrame(void)
 	RegisterCvar("k_teamoverlay"); // q3 like team overlay
 
 	RegisterCvar("k_allow_socd_warning"); // socd
+	RegisterCvarEx("k_safestrafe", "1"); // prevent perfect strafes
 
 // { SP
 	RegisterCvarEx("k_monster_spawn_time", "20");