Some optimizations to client side items and spawn points

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / triggers / trigger / secret.qc

diff --git a/qcsrc/common/triggers/trigger/secret.qc b/qcsrc/common/triggers/trigger/secret.qc
index b54f99dcd411eead96c2cfcc723767ba3b087850..c3c2c7474e6983b071464d04cc59ea45bbb47c1f 100644 (file)
--- a/qcsrc/common/triggers/trigger/secret.qc
+++ b/qcsrc/common/triggers/trigger/secret.qc
@@ -1,9 +1,9 @@
+#include "secret.qh"
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
     #include <common/util.qh>
     #include <server/defs.qh>
-    #include "secret.qh"
 #endif
 
 #ifdef SVQC
@@ -34,7 +34,9 @@ void trigger_secret_touch(entity this, entity toucher)
 
        // handle normal trigger features
        multi_touch(this, toucher);
-       remove(this);
+       // we can't just delete(this) here, because this is a touch function
+       // called while C code is looping through area links...
+       //delete(this);
 }
 
 /*QUAKED trigger_secret (.5 .5 .5) ?
@@ -76,7 +78,7 @@ spawnfunc(trigger_secret)
        this.delay = 0;
 
        // convert this trigger to trigger_once
-       this.classname = "trigger_once";
+       //this.classname = "trigger_once";
        spawnfunc_trigger_once(this);
 
        // take over the touch() function, so we can mark secret as found