X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapobjects%2Ftrigger%2Fkeylock.qc;h=3b66bb7e546925bd2e820b887f7044614d5064ce;hb=0ade80044244ecfd180e7a3dfc0113dcf3a26572;hp=f7ecd7c1f1ab8c5c0e3afd1e202085c2e27fd460;hpb=b9998b31fc75c66b601e66241350b10ca694809f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/mapobjects/trigger/keylock.qc b/qcsrc/common/mapobjects/trigger/keylock.qc
index f7ecd7c1f..3b66bb7e5 100644
--- a/qcsrc/common/mapobjects/trigger/keylock.qc
+++ b/qcsrc/common/mapobjects/trigger/keylock.qc
@@ -125,7 +125,7 @@ noise2: sound to play when a key is missing (default: misc/talk.wav)
 wait: prevent triggering again for this amount of time (default: 5) - applies to target2, target3, target4.
 ---------NOTES----------
 If spawned without any key specified in itemkeys, this trigger will display an error and remove itself.
-message2 and noise2 will be resent to the player every 2 seconds while he is in the trigger zone.
+message2 and noise2 will be resent to the player every 2 seconds while they are in the trigger zone.
 */
 spawnfunc(trigger_keylock)
 {
@@ -169,16 +169,6 @@ spawnfunc(trigger_keylock)
 	trigger_keylock_link(this);
 }
 #elif defined(CSQC)
-void keylock_remove(entity this)
-{
-	strfree(this.target);
-	strfree(this.target2);
-	strfree(this.target3);
-	strfree(this.target4);
-	strfree(this.killtarget);
-	strfree(this.targetname);
-}
-
 NET_HANDLE(ENT_CLIENT_KEYLOCK, bool isnew)
 {
 	this.itemkeys = ReadInt24_t();
@@ -188,7 +178,6 @@ NET_HANDLE(ENT_CLIENT_KEYLOCK, bool isnew)
 
 	return = true;
 
-	this.classname = "trigger_keylock";
-	this.entremove = keylock_remove;
+	this.entremove = trigger_remove_generic;
 }
 #endif