X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Ftrigger%2Fsecret.qc;h=d16d2773c193442fe04b83943e47b7c9ad8a5652;hb=a8cc9eb71b0d0e44e9a968a9cf5554f6226cc838;hp=1902b7e7d361efb5c5817801ba053178003b8cf5;hpb=52c8d9ce236f80561b3963a67da390ff19b82a81;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/triggers/trigger/secret.qc b/qcsrc/common/triggers/trigger/secret.qc
index 1902b7e7d..d16d2773c 100644
--- a/qcsrc/common/triggers/trigger/secret.qc
+++ b/qcsrc/common/triggers/trigger/secret.qc
@@ -1,7 +1,7 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-	#include "../../../dpdefs/progsdefs.qh"
+	#include "../../../server/_all.qh"
     #include "../../util.qh"
     #include "../../../server/defs.qh"
     #include "secret.qh"
@@ -9,7 +9,8 @@
 
 #ifdef SVQC
 
-void secrets_setstatus() {
+void secrets_setstatus()
+{SELFPARAM();
 	self.stat_secrets_total = secrets_total;
 	self.stat_secrets_found = secrets_found;
 }
@@ -17,7 +18,8 @@ void secrets_setstatus() {
 /**
  * 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 +51,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 +78,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;