X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fsecret.qc;h=06f7e075ddcc241a0323b6d5a7a31efbf5f8d5ec;hb=a31aee64fd727b9e6f58dbf8084f837b40dd69a3;hp=2694cb3d6f536ac506b49b4b05f0b07ee9a75389;hpb=d2f81f24cd5a7bc8949a07a5e75b3dc2cb98e5b6;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/secret.qc b/qcsrc/server/secret.qc
index 2694cb3d6..06f7e075d 100644
--- a/qcsrc/server/secret.qc
+++ b/qcsrc/server/secret.qc
@@ -10,9 +10,9 @@ void secrets_setstatus() {
  */
 void trigger_secret_touch() {
 	// only a player can trigger this
-	if (other.classname != "player")
+	if (!IS_PLAYER(other))
 		return;
-	
+
 	// update secrets found counter
 	secrets_found += 1;
 	//print("Secret found: ", ftos(secret_counter.cnt), "/");
@@ -21,7 +21,7 @@ void trigger_secret_touch() {
 	// centerprint message (multi_touch() doesn't always call centerprint())
 	centerprint(other, self.message);
 	self.message = "";
-	
+
 	// handle normal trigger features
 	multi_touch();
 	remove(self);
@@ -42,35 +42,35 @@ 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?
-	
+
 	// update secrets count
 	secrets_total += 1;
-	
+
 	// add default message
 	if (self.message == "")
 		self.message = "You found a secret!";
-	
+
 	// set default sound
 	if (self.noise == "")
-	if not(self.sounds)
+	if (!self.sounds)
 		self.sounds = 1; // misc/secret.wav
-	
+
 	// this entity can't be a target itself!!!!
 	self.targetname = "";
-	
+
 	// you can't just shoot a room to find it, can you?
 	self.health = 0;
-	
+
 	// a secret can not be delayed
 	self.delay = 0;
-	
+
 	// convert this trigger to trigger_once
 	self.classname = "trigger_once";
 	spawnfunc_trigger_once();
-	
+
 	// take over the touch() function, so we can mark secret as found
 	self.touch = trigger_secret_touch;
 	// ignore triggering;
-	self.use = SUB_Null;
+	self.use = func_null;
 }