From 72fbb94bdf03b5e8a96bfc050d3be2dc9a3410c1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Przemys=C5=82aw=20Grzywacz?= <nexather@gmail.com>
Date: Wed, 19 Oct 2011 21:39:56 +0200
Subject: [PATCH] Updates to secrets

---
 qcsrc/server/progs.src |  2 ++
 qcsrc/server/secret.qc | 21 ++-------------------
 qcsrc/server/secret.qh | 10 ++++++++++
 3 files changed, 14 insertions(+), 19 deletions(-)
 create mode 100644 qcsrc/server/secret.qh

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index 12a732171..a28405213 100644
--- 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 e5486ac75..96470623b 100644
--- 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
index 000000000..2eadc42f4
--- /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;
+
-- 
2.39.2