X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Ftrigger%2Fsecret.qc;h=f94cd00ad9680e5b61b203c2c2b4e9eeaa10c3eb;hb=bf28c62f9ad2f130024109354c2503457195898d;hp=b93ab03d0a4ded5fcb90f76e2cef41c1963bb195;hpb=b8018d31cf40eadadfadfad602edd726d137866b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/triggers/trigger/secret.qc b/qcsrc/common/triggers/trigger/secret.qc
index b93ab03d0..f94cd00ad 100644
--- a/qcsrc/common/triggers/trigger/secret.qc
+++ b/qcsrc/common/triggers/trigger/secret.qc
@@ -1,23 +1,24 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-	#include "../../../server/_all.qh"
-    #include "../../util.qh"
-    #include "../../../server/defs.qh"
+    #include <common/util.qh>
+    #include <server/defs.qh>
     #include "secret.qh"
 #endif
 
 #ifdef SVQC
 
-void secrets_setstatus() {
-	self.stat_secrets_total = secrets_total;
-	self.stat_secrets_found = secrets_found;
+void secrets_setstatus()
+{SELFPARAM();
+	this.stat_secrets_total = secrets_total;
+	this.stat_secrets_found = secrets_found;
 }
 
 /**
  * A secret has been found (maybe :P)
  */
-void trigger_secret_touch() {
+void trigger_secret_touch()
+{SELFPARAM();
 	// only a player can trigger this
 	if (!IS_PLAYER(other))
 		return;
@@ -49,7 +50,8 @@ killtarget: remove all entities with this targetname when triggered
 You should create a common/trigger textured brush covering the entrance to a secret room/area.
 Trigger secret can only be trigger by a player's touch and can not be a target itself.
 */
-void spawnfunc_trigger_secret() {
+spawnfunc(trigger_secret)
+{
 	// FIXME: should it be disabled in most modes?
 
 	// update secrets count
@@ -75,7 +77,7 @@ void spawnfunc_trigger_secret() {
 
 	// convert this trigger to trigger_once
 	self.classname = "trigger_once";
-	spawnfunc_trigger_once();
+	spawnfunc_trigger_once(this);
 
 	// take over the touch() function, so we can mark secret as found
 	self.touch = trigger_secret_touch;