Merge branch 'master' into martin-t/dmgtext

[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 e6e35c295a9f8d723285699de7db0972e850ea9c..9377332e2fb138299e1f3af53b653d57e55163d6 100644 (file)
--- a/qcsrc/common/triggers/trigger/secret.qc
+++ b/qcsrc/common/triggers/trigger/secret.qc
@@ -10,8 +10,9 @@
 
 void secrets_setstatus(entity this)
 {
-       this.stat_secrets_total = secrets_total;
-       this.stat_secrets_found = secrets_found;
+       // TODO: use global stats!
+       STAT(SECRETS_TOTAL, this) = secrets_total;
+       STAT(SECRETS_FOUND, this) = secrets_found;
 }
 
 /**
@@ -34,7 +35,9 @@ void trigger_secret_touch(entity this, entity toucher)
 
        // handle normal trigger features
        multi_touch(this, toucher);
-       delete(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 +79,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