X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapobjects%2Ftrigger%2Fkeylock.qc;h=626a588dcb880ff625f3a7d29f68994ee274f04a;hp=67db14421662c2d0c40483b328ee3dd30ee6babe;hb=4bd11aeeefd1c90b1dd3a55beaf13f5e48de083b;hpb=5aab6120acfc624751d20a695d1b911b3e919831

diff --git a/qcsrc/common/mapobjects/trigger/keylock.qc b/qcsrc/common/mapobjects/trigger/keylock.qc
index 67db144216..626a588dcb 100644
--- a/qcsrc/common/mapobjects/trigger/keylock.qc
+++ b/qcsrc/common/mapobjects/trigger/keylock.qc
@@ -30,7 +30,14 @@ void trigger_keylock_touch(entity this, entity toucher)
 
 	// check silver key
 	if(this.itemkeys)
-		key_used = item_keys_usekey(this, toucher);
+	{
+#ifdef SVQC
+		entity store = PS(toucher);
+#elif defined(CSQC)
+		entity store = toucher;
+#endif
+		key_used = item_keys_usekey(this, store);
+	}
 
 	if(this.itemkeys)
 	{
@@ -162,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();
@@ -182,6 +179,6 @@ NET_HANDLE(ENT_CLIENT_KEYLOCK, bool isnew)
 	return = true;
 
 	this.classname = "trigger_keylock";
-	this.entremove = keylock_remove;
+	this.entremove = trigger_remove_generic;
 }
 #endif