X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Ftarget%2Fmusic.qc;h=7abcd67403391fb821bbdfd45ff02de704dc5664;hb=fc15d72b041c9a748b605ba28735380fbe5b5b01;hp=32237200ee9bd93abda850564cb8bf9054800535;hpb=490a31934aa67cc7de5299a4d3f625d5271f8583;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/triggers/target/music.qc b/qcsrc/common/triggers/target/music.qc
index 32237200e..7abcd6740 100644
--- a/qcsrc/common/triggers/target/music.qc
+++ b/qcsrc/common/triggers/target/music.qc
@@ -39,9 +39,9 @@ void target_music_kill()
 	FOREACH_ENTITY_CLASS("target_music", true, {
 		it.volume = 0;
         if (it.targetname == "")
-            WITHSELF(it, target_music_sendto(it, MSG_ALL, 1));
+            target_music_sendto(it, MSG_ALL, 1);
         else
-            WITHSELF(it, target_music_sendto(it, MSG_ALL, 0));
+            target_music_sendto(it, MSG_ALL, 0);
 	});
 }
 void target_music_use(entity this, entity actor, entity trigger)
@@ -71,13 +71,13 @@ spawnfunc(target_music)
 }
 void TargetMusic_RestoreGame()
 {
-	for(entity e = world; (e = find(e, classname, "target_music")); )
+	FOREACH_ENTITY_CLASS("target_music", true,
 	{
-		if(e.targetname == "")
-			target_music_sendto(e, MSG_INIT, 1);
+		if(it.targetname == "")
+			target_music_sendto(it, MSG_INIT, 1);
 		else
-			target_music_sendto(e, MSG_INIT, 0);
-	}
+			target_music_sendto(it, MSG_INIT, 0);
+	});
 }
 // values:
 //   volume
@@ -188,7 +188,7 @@ void TargetMusic_Advance()
 			it.lastvol = vol;
 		}
 	});
-	music_trigger = world;
+	music_trigger = NULL;
 	bgmtime = (best) ? getsoundtime(best, CH_BGM_SINGLE) : gettime(GETTIME_CDTRACK);
 }
 
@@ -254,18 +254,18 @@ void Net_TargetMusic()
 
 void Ent_TriggerMusic_Think(entity this)
 {
-	if(WarpZoneLib_BoxTouchesBrush(view_origin, view_origin, self, world))
+	if(WarpZoneLib_BoxTouchesBrush(view_origin, view_origin, this, NULL))
 	{
-		music_trigger = self;
+		music_trigger = this;
 	}
-	self.nextthink = time;
+	this.nextthink = time;
 }
 
-void Ent_TriggerMusic_Remove()
-{SELFPARAM();
-	if(self.noise)
-		strunzone(self.noise);
-	self.noise = string_null;
+void Ent_TriggerMusic_Remove(entity this)
+{
+	if(this.noise)
+		strunzone(this.noise);
+	this.noise = string_null;
 }
 
 NET_HANDLE(ENT_CLIENT_TRIGGER_MUSIC, bool isnew)