From 252392c433c54e07dfcffe1c7bd46f80472eeace Mon Sep 17 00:00:00 2001
From: zaCade <zaCade@hotmail.com>
Date: Tue, 28 Aug 2018 13:22:54 +0200
Subject: [PATCH] Revert "General: Allow auto infection on 'late' spawners."

This reverts commit a45be1639911b33085bf040bf99cd0517e57a4bf.
---
 src/zr/cvars.inc  |  2 --
 src/zr/infect.inc | 35 +++++++----------------------------
 2 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/src/zr/cvars.inc b/src/zr/cvars.inc
index 51a34fa..17da431 100644
--- a/src/zr/cvars.inc
+++ b/src/zr/cvars.inc
@@ -107,7 +107,6 @@ enum CvarsList
     Handle:CVAR_INFECT_WEAPONS_DROP,
     Handle:CVAR_INFECT_KNIFE_COOLDOWN,
     Handle:CVAR_INFECT_MAX_DISTANCE,
-    Handle:CVAR_INFECT_LATE_SPAWN,
     Handle:CVAR_INFECT_MZOMBIE_MODE,
     Handle:CVAR_INFECT_MZOMBIE_RATIO,
     Handle:CVAR_INFECT_MZOMBIE_MIN,
@@ -336,7 +335,6 @@ CvarsCreate()
     g_hCvarsList[CVAR_INFECT_WEAPONS_DROP]              =    CreateConVar("zr_infect_weapons_drop",         "1",                                "Force player to drop all weapons on infect, disabling this will strip weapons instead.");
     g_hCvarsList[CVAR_INFECT_KNIFE_COOLDOWN]            =    CreateConVar("zr_infect_knife_cooldown",       "1.0",                              "Time in seconds during which knife can not be used after becoming a zombie.");
     g_hCvarsList[CVAR_INFECT_MAX_DISTANCE]              =    CreateConVar("zr_infect_max_distance",         "80.0",                             "The maximum allowed distance between a client and an attacker for a successful infection. [0.0 = Disabled]");
-    g_hCvarsList[CVAR_INFECT_LATE_SPAWN]                =    CreateConVar("zr_infect_late_spawn",           "0",                                "Should people spawning after mother infection also be infected, or should nothing happen. [0.0 = Disabled]");
 
     // Effects
     g_hCvarsList[CVAR_INFECT_EXPLOSION]                 =    CreateConVar("zr_infect_explosion",            "1",                                "Disabling this will disable the fireball, smoke cloud, and sparks in a more efficient way.");
diff --git a/src/zr/infect.inc b/src/zr/infect.inc
index f4a6f81..970a9c0 100644
--- a/src/zr/infect.inc
+++ b/src/zr/infect.inc
@@ -275,35 +275,14 @@ InfectOnClientTeam(client, team)
  */
 InfectOnClientSpawn(client)
 {
-    // If the zombie has spawned.
-    if (InfectHasZombieSpawned())
+    // Disable zombie flag on client.
+    g_bZombie[client] = false;
+
+    // Check if client is spawning on the terrorist team.
+    if (ZRIsClientOnTeam(client, CS_TEAM_T) && InfectHasZombieSpawned())
     {
-        // Check if late spawn protection is enabled.
-        new bool:latespawn = GetConVarBool(g_hCvarsList[CVAR_INFECT_LATE_SPAWN]);
-        if (latespawn)
-        {
-            // Enable zombie flag on client.
-            g_bZombie[client] = true;
-
-            // Swap the client to terrorists.
-            if (ZRIsClientOnTeam(client, CS_TEAM_CT))
-            {
-                CS_SwitchTeam(client, CS_TEAM_T);
-                CS_RespawnPlayer(client);
-            }
-        }
-        else
-        {
-            // Disable zombie flag on client.
-            g_bZombie[client] = false;
-
-            // Swap the client to counter-terrorists.
-            if (ZRIsClientOnTeam(client, CS_TEAM_T))
-            {
-                CS_SwitchTeam(client, CS_TEAM_CT);
-                CS_RespawnPlayer(client);
-            }
-        }
+        CS_SwitchTeam(client, CS_TEAM_CT);
+        CS_RespawnPlayer(client);
     }
 
     InfectUnglitchKevlar(client);