From 581825829a1c3dd45d2979e2d3acb9ef88c981d0 Mon Sep 17 00:00:00 2001
From: Richard Helgeby <devnull@localhost>
Date: Sun, 1 Jul 2012 21:12:43 +0200
Subject: [PATCH] Replaced RemoveEdict with kill entity input command.

---
 src/zr/infect.inc                       | 2 +-
 src/zr/roundstart.inc                   | 2 +-
 src/zr/visualeffects/ragdoll.inc        | 4 ++--
 src/zr/visualeffects/visualambience.inc | 2 +-
 src/zr/visualeffects/visualeffects.inc  | 2 +-
 src/zr/weapons/weapons.inc              | 8 ++++----
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/zr/infect.inc b/src/zr/infect.inc
index a9649cb..80e2d69 100644
--- a/src/zr/infect.inc
+++ b/src/zr/infect.inc
@@ -786,7 +786,7 @@ InfectZombieToHuman(client, bool:respawn = false, bool:protect = false)
     if (knife != -1)
     {
         RemovePlayerItem(client, knife);
-        RemoveEdict(knife);
+        AcceptEntityInput(knife, "Kill");
         GivePlayerItem(client, "weapon_knife");
     }
     
diff --git a/src/zr/roundstart.inc b/src/zr/roundstart.inc
index 033df31..b856b54 100644
--- a/src/zr/roundstart.inc
+++ b/src/zr/roundstart.inc
@@ -85,7 +85,7 @@ stock RoundStartKillObjectives()
         if(StrContains(ROUNDSTART_OBJECTIVE_ENTITIES, classname) > -1)
         {
             // Entity is an objective, kill it.
-            RemoveEdict(x);
+            AcceptEntityInput(x, "Kill");
         }
     }
 }
diff --git a/src/zr/visualeffects/ragdoll.inc b/src/zr/visualeffects/ragdoll.inc
index e3cc261..c5231f3 100644
--- a/src/zr/visualeffects/ragdoll.inc
+++ b/src/zr/visualeffects/ragdoll.inc
@@ -105,7 +105,7 @@ RagdollRemove(ragdoll)
     if (dissolve == VEFFECTS_RAGDOLL_DISSOLVE_EFFECTLESS)
     {
         // Remove entity from world.
-        RemoveEdict(ragdoll);
+        AcceptEntityInput(ragdoll, "Kill");
         return;
     }
     
@@ -135,7 +135,7 @@ RagdollRemove(ragdoll)
     AcceptEntityInput(dissolver, "Dissolve");
     
     // Remove the dissolver.
-    RemoveEdict(dissolver); 
+    AcceptEntityInput(dissolver, "Kill");
 }
 
 /**
diff --git a/src/zr/visualeffects/visualambience.inc b/src/zr/visualeffects/visualambience.inc
index f28460b..8fe6603 100644
--- a/src/zr/visualeffects/visualambience.inc
+++ b/src/zr/visualeffects/visualambience.inc
@@ -317,7 +317,7 @@ VAmbienceApplyFog(bool:override = false)
         if (fogindex != -1)
         {
             // Delete fog.
-            RemoveEdict(fogindex);
+            AcceptEntityInput(fogindex, "Kill");
         }
     }
     
diff --git a/src/zr/visualeffects/visualeffects.inc b/src/zr/visualeffects/visualeffects.inc
index a03f3aa..3a8db6b 100644
--- a/src/zr/visualeffects/visualeffects.inc
+++ b/src/zr/visualeffects/visualeffects.inc
@@ -126,7 +126,7 @@ VEffectsCreateExplosion(const Float:origin[3], flags)
     AcceptEntityInput(explosion, "Explode");
     
     // Remove entity from world.
-    RemoveEdict(explosion);
+    AcceptEntityInput(explosion, "Kill");
 }
 
 /**
diff --git a/src/zr/weapons/weapons.inc b/src/zr/weapons/weapons.inc
index 7428f76..87fde19 100644
--- a/src/zr/weapons/weapons.inc
+++ b/src/zr/weapons/weapons.inc
@@ -824,7 +824,7 @@ stock WeaponsRemoveClientGrenades(client, bool:weaponsdrop)
         else
         {
             RemovePlayerItem(client, grenade);
-            RemoveEdict(grenade);
+            AcceptEntityInput(grenade, "Kill");
         }
         
         // Find next grenade.
@@ -854,7 +854,7 @@ stock WeaponsRefreshClientWeapon(client, WeaponsSlot:slot)
     
     // Refresh weapon.
     RemovePlayerItem(client, weaponindex);
-    RemoveEdict(weaponindex);
+    AcceptEntityInput(weaponindex, "Kill");
     GivePlayerItem(client, entityname);
 }
 
@@ -885,7 +885,7 @@ stock WeaponsRemoveAllClientWeapons(client, bool:weaponsdrop)
         {
             // Strip knife.
             RemovePlayerItem(client, weapons[x]);
-            RemoveEdict(weapons[x]);
+            AcceptEntityInput(weapons[x], "Kill");
             continue;
         }
         
@@ -898,7 +898,7 @@ stock WeaponsRemoveAllClientWeapons(client, bool:weaponsdrop)
         {
             // Strip weapon.
             RemovePlayerItem(client, weapons[x]);
-            RemoveEdict(weapons[x]);
+            AcceptEntityInput(weapons[x], "Kill");
         }
     }