From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 12 Nov 2003 08:44:54 +0000 (+0000)
Subject: make quake completable again (killtarget problem with double remove call, now just... 
X-Git-Tag: xonotic-v0.1.0preview~6271
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=dfa063e310438792755e491716fab4e823f089b7

make quake completable again (killtarget problem with double remove call, now just a developer warning instead of an error)


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3638 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/pr_cmds.c b/pr_cmds.c
index 4f1c3b0c..1fa832fd 100644
--- a/pr_cmds.c
+++ b/pr_cmds.c
@@ -1127,8 +1127,9 @@ void PF_Remove (void)
 		Host_Error("remove: tried to remove world\n");
 	if (NUM_FOR_EDICT(ed) <= svs.maxclients)
 		Host_Error("remove: tried to remove a client\n");
-	if (ed->e->free)
-		Host_Error("remove: tried to remove an entity that was already removed\n");
+	// LordHavoc: not an error because id1 progs did this in some cases (killtarget removes entities, even if they are already removed in some cases...)
+	if (ed->e->free && developer.integer)
+		Con_Printf("remove: tried to remove an entity that was already removed\n");
 	ED_Free (ed);
 }