Merge remote-tracking branch 'origin/mirceakitsune/sandbox'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / secret.qc

diff --git a/qcsrc/server/secret.qc b/qcsrc/server/secret.qc
index 07957e5491d951eed120a88840ead12d30f8f2b3..2694cb3d6f536ac506b49b4b05f0b07ee9a75389 100644 (file)
--- a/qcsrc/server/secret.qc
+++ b/qcsrc/server/secret.qc
@@ -1,30 +1,26 @@
-entity secret_counter;
 
-/*
-.count - total number of secrets to find
-.cnt - number of secrets found
-*/
-void secret_counter_create() {
-       print("^1secret_counter_create()\n");
-       secret_counter = spawn();
-       secret_counter.classname = "secret_counter";
-       secret_counter.count = 0;
-       secret_counter.cnt = 0;
+
+void secrets_setstatus() {
+       self.stat_secrets_total = secrets_total;
+       self.stat_secrets_found = secrets_found;
 }
 
-/*
-A secret has been found!
-*/
+/**
+ * A secret has been found (maybe :P)
+ */
 void trigger_secret_touch() {
        // only a player can trigger this
        if (other.classname != "player")
                return;
        
        // update secrets found counter
-       secret_counter.cnt += 1;
-       print("Secret found: ", ftos(secret_counter.cnt), "/");
-       print(ftos(secret_counter.count), " - ");
-       print("self=", self.classname, ", other=", other.classname, "\n");
+       secrets_found += 1;
+       //print("Secret found: ", ftos(secret_counter.cnt), "/");
+       //print(ftos(secret_counter.count), "\n");
+
+       // centerprint message (multi_touch() doesn't always call centerprint())
+       centerprint(other, self.message);
+       self.message = "";
        
        // handle normal trigger features
        multi_touch();
@@ -47,12 +43,8 @@ Trigger secret can only be trigger by a player's touch and can not be a target i
 void spawnfunc_trigger_secret() {
        // FIXME: should it be disabled in most modes?
        
-       // create secret counter
-       if not(secret_counter)
-               secret_counter_create();
-       
        // update secrets count
-       secret_counter.count += 1;
+       secrets_total += 1;
        
        // add default message
        if (self.message == "")