Merge pull request #12 from b1az3/al-merge-2

SOCDv2

Author: dusty-qw

src/bot_movement.c

@@ -498,6 +498,8 @@ void BotSetCommand(gedict_t *self)
 	}
 	else
 	{
+		float move_scale;
+
 		if (jumping && ((int)self->s.v.flags & FL_ONGROUND))
 		{
 			BestJumpingDirection(self);
@@ -507,24 +509,30 @@ void BotSetCommand(gedict_t *self)
 			ApplyPhysics(self);
 		}
 
+		move_scale = sv_maxspeed * 1.25f;
+		if (move_scale > 400.0f)
+		{
+			move_scale = 400.0f;
+		}
+
 		if (self->s.v.waterlevel <= 1)
 		{
 			vec3_t hor;
 
 			VectorCopy(self->fb.dir_move_, hor);
 			hor[2] = 0;
 			VectorNormalize(hor);
-			VectorScale(hor, 800, hor);
+			VectorScale(hor, move_scale, hor);
 
 			direction[0] = DotProduct(g_globalvars.v_forward, hor);
 			direction[1] = DotProduct(g_globalvars.v_right, hor);
 			direction[2] = 0;
 		}
 		else
 		{
-			direction[0] = DotProduct (g_globalvars.v_forward, self->fb.dir_move_) * 800;
-			direction[1] = DotProduct (g_globalvars.v_right, self->fb.dir_move_) * 800;
-			direction[2] = DotProduct (g_globalvars.v_up, self->fb.dir_move_) * 800;
+			direction[0] = DotProduct (g_globalvars.v_forward, self->fb.dir_move_) * move_scale;
+			direction[1] = DotProduct (g_globalvars.v_right, self->fb.dir_move_) * move_scale;
+			direction[2] = DotProduct (g_globalvars.v_up, self->fb.dir_move_) * move_scale;
 		}
 
 #ifdef DEBUG_MOVEMENT

src/client.c

@@ -1838,7 +1838,7 @@ void ClientConnect(void)
 		SendIntermissionToClient();
 	}
 
-// SOCD
+	// SOCD
 	self->socdValidationCount = 0;
 	self->socdDetectionCount = 0;
 	self->fStrafeChangeCount = 0;
@@ -3867,11 +3867,11 @@ void PlayerPreThink(void)
 
 				self->socdDetectionCount += 1;
 				if ((!match_in_progress) && (!self->isBot) && k_allow_socd_warning && (self->ct == ctPlayer) && (self->socdDetectionCount >= 2))
-                               {
-                                       G_bprint(PRINT_HIGH,
-                                               "[%s] Warning! %s: Movement assistance detected. Please disable iDrive or keyboard strafe assistance features.\n",
-                               SOCD_DETECTION_VERSION, self->netname);
-                               }
+				{
+					G_bprint(PRINT_HIGH,
+						"[%s] Warning! %s: Movement assistance detected. Please disable iDrive or keyboard strafe assistance features.\n",
+						SOCD_DETECTION_VERSION, self->netname);
+				}
 			}
 
 			self->socdValidationCount += 1;

src/commands.c

@@ -8436,8 +8436,8 @@ void fcheck(void)
 			if ((p->ct == ctPlayer) && (!p->isBot))
 			{
 				G_bprint(2, "[%s] %s: %s:%.1f%% (%d/%d) %s:%d/%d%s\n", SOCD_DETECTION_VERSION, p->netname, redtext("Perfect strafes"),
-					p->matchStrafeChangeCount > 0 ? 100.0 * p->matchPerfectStrafeCount / p->matchStrafeChangeCount : 0.0,
-					p->matchPerfectStrafeCount, p->matchStrafeChangeCount, redtext("SOCD detections"),
+					p->totalStrafeChangeCount > 0 ? 100.0 * p->totalPerfectStrafeCount / p->totalStrafeChangeCount : 0.0,
+					p->totalPerfectStrafeCount, p->totalStrafeChangeCount, redtext("SOCD detections"),
 					p->socdDetectionCount, p->socdValidationCount,
 					socd_movement_assisted(p) ? ". SOCD movement assistance detected!" : "");
 			}

src/g_utils.c

@@ -2844,8 +2844,8 @@ char* make_dots(char *dots, size_t dots_len, int cmd_max_len, char *cmd)
 	int len = cmd_max_len - strlen(cmd);
 	len = bound(0, len, dots_len - 1);
 	memset((void*) dots, (int)'.', len);
-	dots[len] = 0;
-	return dots;
+    dots[len] = 0;
+    return dots;
 }
 
 qbool socd_movement_assisted(gedict_t *p)
@@ -2854,17 +2854,17 @@ qbool socd_movement_assisted(gedict_t *p)
 	{
 		return false;
 	}
-
+	
 	if ((float)p->totalPerfectStrafeCount / p->totalStrafeChangeCount > 0.58f)
 	{
 		return true;
 	}
-
+	
 	if (p->socdValidationCount > 0 &&
 	((float)p->socdDetectionCount / p->socdValidationCount) >= 0.10f)
 	{
 		return true;
 	}
-
+	
 	return false;
 }

src/match.c

@@ -1161,6 +1161,7 @@ void HideSpawnPoints(void);
 void StartMatch(void)
 {
 	char date[64];
+	gedict_t *p;
 
 	// reset bloodfest vars.
 	bloodfest_reset();
@@ -1202,6 +1203,20 @@ void StartMatch(void)
 
 	SM_PrepareClients(); // put clients in server and reset some params
 
+	for (p = world; (p = find_client(p));)
+	{
+		p->socdDetectionCount = 0;
+		p->socdValidationCount = 0;
+		p->fStrafeChangeCount = 0;
+		p->fFramePerfectStrafeChangeCount = 0;
+		p->fLastSideMoveSpeed = 0;
+		p->matchStrafeChangeCount = 0;
+		p->matchPerfectStrafeCount = 0;
+		p->totalStrafeChangeCount = 0;
+		p->totalPerfectStrafeCount = 0;
+		p->nullStrafeCount = 0;
+	}
+	
 	if (!QVMstrftime(date, sizeof(date), "%Y-%m-%d %H:%M:%S %Z", 0))
 	{
 		date[0] = 0;

src/stats.c

@@ -766,11 +766,11 @@ void OnePlayerStats(gedict_t *p, int tp)
 	// movement
 	if (!p->isBot)
 	{
-			G_bprint(2, "[%s] %s: %s:%.1f%% (%d/%d) %s:%d/%d%s\n", SOCD_DETECTION_VERSION, redtext("Movement"), redtext("Perfect strafes"),
+			G_bprint(2, "%s: %s:%.1f%% (%d/%d) %s:%d/%d%s [%s]\n", redtext("Movement"), redtext("Perfect strafes"),
 				p->matchStrafeChangeCount > 0 ? 100.0 * p->matchPerfectStrafeCount / p->matchStrafeChangeCount : 0.0,
 				p->matchPerfectStrafeCount, p->matchStrafeChangeCount, redtext("SOCD detections"),
 				p->socdDetectionCount, p->socdValidationCount,
-				socd_movement_assisted(p) ? ". SOCD movement assistance detected!" : "");
+				socd_movement_assisted(p) ? ". SOCD movement assistance detected!" : "", SOCD_DETECTION_VERSION);
 	}