X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapobjects%2Ftrigger%2Fmulti.qc;h=407a75371c54cd90529d33a4741a43b4eae6fe3e;hp=7a8c0be84c31961d0719efbf8850391b4cad50e6;hb=0b9df86c9a55dd9ed9031b21e430fc3094fac709;hpb=8e7d21da2c1a5f8701f3abde89c8dc4fa7da5100

diff --git a/qcsrc/common/mapobjects/trigger/multi.qc b/qcsrc/common/mapobjects/trigger/multi.qc
index 7a8c0be84..407a75371 100644
--- a/qcsrc/common/mapobjects/trigger/multi.qc
+++ b/qcsrc/common/mapobjects/trigger/multi.qc
@@ -29,16 +29,7 @@ void multi_trigger(entity this)
 		return; // only players
 	}
 
-	// TODO: restructure this so that trigger_secret is more independent
-	if (this.classname == "trigger_secret")
-	{
-		if (!IS_PLAYER(this.enemy))
-			return;
-		found_secrets = found_secrets + 1;
-		WriteByte (MSG_ALL, SVC_FOUNDSECRET);
-	}
-
-	if (this.noise)
+	if (this.noise && this.noise != "")
 	{
 		_sound (this.enemy, CH_TRIGGER, this.noise, VOL_BASE, ATTEN_NORM);
 	}
@@ -167,7 +158,7 @@ spawnfunc(trigger_multiple)
 	else if (this.sounds == 3)
 		this.noise = "misc/trigger1.wav";
 
-	if(this.noise)
+	if(this.noise && this.noise != "")
 		precache_sound(this.noise);
 
 	if (!this.wait)