Some more cleanup to map objects, allow trigger_delay and trigger_counter to be deact...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mapobjects / trigger / keylock.qc

diff --git a/qcsrc/common/mapobjects/trigger/keylock.qc b/qcsrc/common/mapobjects/trigger/keylock.qc
index f7ecd7c1f1ab8c5c0e3afd1e202085c2e27fd460..626a588dcb880ff625f3a7d29f68994ee274f04a 100644 (file)
--- a/qcsrc/common/mapobjects/trigger/keylock.qc
+++ b/qcsrc/common/mapobjects/trigger/keylock.qc
@@ -169,16 +169,6 @@ spawnfunc(trigger_keylock)
        trigger_keylock_link(this);
 }
 #elif defined(CSQC)
        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();
 NET_HANDLE(ENT_CLIENT_KEYLOCK, bool isnew)
 {
        this.itemkeys = ReadInt24_t();


@@ -189,6 +179,6 @@ NET_HANDLE(ENT_CLIENT_KEYLOCK, bool isnew)
        return = true;
 
        this.classname = "trigger_keylock";
        return = true;
 
        this.classname = "trigger_keylock";

-       this.entremove = keylock_remove;
+       this.entremove = trigger_remove_generic;

 }
 #endif
 }
 #endif