Refactor PrintQueue function to optimize player requeue logic and imp…

…rove readability
altair-sossai · Oct 21, 2024 · 40f5175 · 40f5175
1 parent 47692bb
commit 40f5175
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/addons/sourcemod/plugins/optional/l4d2_queue.smx b/addons/sourcemod/plugins/optional/l4d2_queue.smx
diff --git a/addons/sourcemod/scripting/l4d2_queue.sp b/addons/sourcemod/scripting/l4d2_queue.sp
@@ -91,6 +91,9 @@ void Enqueue(int client)
 
 void RequeuePlayers()
 {
+	if (IsNewGame())
+		return;
+
 	Player player;
 
 	bool survivorsAreWinning = SurvivorsAreWinning();
@@ -105,17 +108,27 @@ void RequeuePlayers()
 			continue;
 
 		int team = GetClientTeam(client);
-		if (team != L4D2_TEAM_SURVIVOR && team != L4D2_TEAM_INFECTED)
+
+		if (team == L4D2_TEAM_SURVIVOR)
+		{
+			player.priority = survivorsAreWinning ? 0.0 : GetEngineTime();
+			h_Queue.SetArray(i, player);
+			continue;
+		}
+
+		if (team == L4D2_TEAM_INFECTED)
+		{
+			player.priority = infectedAreWinning ? 0.0 : GetEngineTime();
+			h_Queue.SetArray(i, player);
 			continue;
+		}
 
-		if (survivorsAreWinning && team == L4D2_TEAM_SURVIVOR)
-			player.priority = 0.0;
-		else if (infectedAreWinning && team == L4D2_TEAM_INFECTED)
-			player.priority = 0.0;
-		else
+		if (player.priority == 0.0)
+		{
 			player.priority = GetEngineTime();
-
-		h_Queue.SetArray(i, player);
+			h_Queue.SetArray(i, player);
+			continue;
+		}
 	}
 
 	SortQueue();
@@ -224,7 +237,7 @@ void PrintQueue(int target)
 			else
 				CPrintToChat(target, output);
 
-			output[0] = '\0';
+			output = "";
 		}
 	}