Updates to secrets

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index 12a73217170f1bcdf38aa66096cf60775e76195c..a28405213cb90c2b7104431588448c8254f94e42 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -64,6 +64,8 @@ vote.qh
 
 playerdemo.qh
 
+secret.qh
+
 scores_rules.qc
 
 miscfunctions.qc

diff --git a/qcsrc/server/secret.qc b/qcsrc/server/secret.qc
index e5486ac755a6b8cf39aa9d9043e2580485686ba6..96470623b45a05d1bdbc0105a829d3d9960ad294 100644 (file)
--- a/qcsrc/server/secret.qc
+++ b/qcsrc/server/secret.qc
@@ -1,16 +1,3 @@
-entity secret_counter;
-
-/*
-.count - total number of secrets to find
-.cnt - number of secrets found
-*/
-void secret_counter_create() {
-       secret_counter = spawn();
-       secret_counter.classname = "secret_counter";
-       secret_counter.count = 0;
-       secret_counter.cnt = 0;
-}
-
 /*
 A secret has been found!
 */
@@ -20,7 +7,7 @@ void trigger_secret_touch() {
                return;
        
        // update secrets found counter
-       secret_counter.cnt += 1;
+       secrets_found += 1;
        //print("Secret found: ", ftos(secret_counter.cnt), "/");
        //print(ftos(secret_counter.count), "\n");
        
@@ -45,12 +32,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 == "")

diff --git a/qcsrc/server/secret.qh b/qcsrc/server/secret.qh
new file mode 100644 (file)
index 0000000..2eadc42
--- /dev/null
+++ b/qcsrc/server/secret.qh
@@ -0,0 +1,10 @@
+/**
+ * Total number of secrets on the map.
+ */
+float secrets_total;
+
+/**
+ * Total numbe of secrets found on the map.
+ */
+float secrets_found;
+