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

diff --git a/qcsrc/common/triggers/target/music.qc b/qcsrc/common/triggers/target/music.qc
index 52f1fca0e..7abcd6740 100644
--- a/qcsrc/common/triggers/target/music.qc
+++ b/qcsrc/common/triggers/target/music.qc
@@ -20,66 +20,64 @@ REGISTER_NET_LINKED(ENT_CLIENT_TRIGGER_MUSIC)
 //   fade_rate
 // when triggered, the music is overridden for activator until lifetime (or forever, if lifetime is 0)
 // when targetname is not set, THIS ONE is default
-void target_music_sendto(float to, float is)
-{SELFPARAM();
+void target_music_sendto(entity this, int to, bool is)
+{
 	WriteHeader(to, TE_CSQC_TARGET_MUSIC);
-	WriteShort(to, etof(self));
-	WriteByte(to, self.volume * 255.0 * is);
-	WriteByte(to, self.fade_time * 16.0);
-	WriteByte(to, self.fade_rate * 16.0);
-	WriteByte(to, self.lifetime);
-	WriteString(to, self.noise);
+	WriteShort(to, etof(this));
+	WriteByte(to, this.volume * 255.0 * is);
+	WriteByte(to, this.fade_time * 16.0);
+	WriteByte(to, this.fade_rate * 16.0);
+	WriteByte(to, this.lifetime);
+	WriteString(to, this.noise);
 }
 void target_music_reset(entity this)
 {
-	if (this.targetname == "") target_music_sendto(MSG_ALL, 1);
+	if (this.targetname == "") target_music_sendto(this, MSG_ALL, 1);
 }
 void target_music_kill()
 {
-	for(self = world; (self = find(self, classname, "target_music")); )
-	{
-		self.volume = 0;
-		if(self.targetname == "")
-			target_music_sendto(MSG_ALL, 1);
-		else
-			target_music_sendto(MSG_ALL, 0);
-	}
+	FOREACH_ENTITY_CLASS("target_music", true, {
+		it.volume = 0;
+        if (it.targetname == "")
+            target_music_sendto(it, MSG_ALL, 1);
+        else
+            target_music_sendto(it, MSG_ALL, 0);
+	});
 }
-void target_music_use()
+void target_music_use(entity this, entity actor, entity trigger)
 {
-	if(!activator)
+	if(!actor)
 		return;
-	if(IS_REAL_CLIENT(activator))
+	if(IS_REAL_CLIENT(actor))
 	{
-		msg_entity = activator;
-		target_music_sendto(MSG_ONE, 1);
+		msg_entity = actor;
+		target_music_sendto(this, MSG_ONE, 1);
 	}
-	FOREACH_CLIENT(IS_SPEC(it) && it.enemy == activator, {
+	FOREACH_CLIENT(IS_SPEC(it) && it.enemy == actor, {
 		msg_entity = it;
-		target_music_sendto(MSG_ONE, 1);
+		target_music_sendto(this, MSG_ONE, 1);
 	});
 }
 spawnfunc(target_music)
 {
-	self.use = target_music_use;
-	self.reset = target_music_reset;
-	if(!self.volume)
-		self.volume = 1;
-	if(self.targetname == "")
-		target_music_sendto(MSG_INIT, 1);
+	this.use = target_music_use;
+	this.reset = target_music_reset;
+	if(!this.volume)
+		this.volume = 1;
+	if(this.targetname == "")
+		target_music_sendto(this, MSG_INIT, 1);
 	else
-		target_music_sendto(MSG_INIT, 0);
+		target_music_sendto(this, MSG_INIT, 0);
 }
 void TargetMusic_RestoreGame()
-{SELFPARAM();
-	for(entity e = world; (e = find(e, classname, "target_music")); )
+{
+	FOREACH_ENTITY_CLASS("target_music", true,
 	{
-		setself(e);
-		if(self.targetname == "")
-			target_music_sendto(MSG_INIT, 1);
+		if(it.targetname == "")
+			target_music_sendto(it, MSG_INIT, 1);
 		else
-			target_music_sendto(MSG_INIT, 0);
-	}
+			target_music_sendto(it, MSG_INIT, 0);
+	});
 }
 // values:
 //   volume
@@ -93,38 +91,38 @@ bool trigger_music_SendEntity(entity this, entity to, float sf)
 {
 	WriteHeader(MSG_ENTITY, ENT_CLIENT_TRIGGER_MUSIC);
 	sf &= ~0x80;
-	if(self.cnt)
+	if(this.cnt)
 		sf |= 0x80;
 	WriteByte(MSG_ENTITY, sf);
 	if(sf & 4)
 	{
-		WriteCoord(MSG_ENTITY, self.origin.x);
-		WriteCoord(MSG_ENTITY, self.origin.y);
-		WriteCoord(MSG_ENTITY, self.origin.z);
+		WriteCoord(MSG_ENTITY, this.origin.x);
+		WriteCoord(MSG_ENTITY, this.origin.y);
+		WriteCoord(MSG_ENTITY, this.origin.z);
 	}
 	if(sf & 1)
 	{
-		if(self.model != "null")
+		if(this.model != "null")
 		{
-			WriteShort(MSG_ENTITY, self.modelindex);
-			WriteCoord(MSG_ENTITY, self.mins.x);
-			WriteCoord(MSG_ENTITY, self.mins.y);
-			WriteCoord(MSG_ENTITY, self.mins.z);
-			WriteCoord(MSG_ENTITY, self.maxs.x);
-			WriteCoord(MSG_ENTITY, self.maxs.y);
-			WriteCoord(MSG_ENTITY, self.maxs.z);
+			WriteShort(MSG_ENTITY, this.modelindex);
+			WriteCoord(MSG_ENTITY, this.mins.x);
+			WriteCoord(MSG_ENTITY, this.mins.y);
+			WriteCoord(MSG_ENTITY, this.mins.z);
+			WriteCoord(MSG_ENTITY, this.maxs.x);
+			WriteCoord(MSG_ENTITY, this.maxs.y);
+			WriteCoord(MSG_ENTITY, this.maxs.z);
 		}
 		else
 		{
 			WriteShort(MSG_ENTITY, 0);
-			WriteCoord(MSG_ENTITY, self.maxs.x);
-			WriteCoord(MSG_ENTITY, self.maxs.y);
-			WriteCoord(MSG_ENTITY, self.maxs.z);
+			WriteCoord(MSG_ENTITY, this.maxs.x);
+			WriteCoord(MSG_ENTITY, this.maxs.y);
+			WriteCoord(MSG_ENTITY, this.maxs.z);
 		}
-		WriteByte(MSG_ENTITY, self.volume * 255.0);
-		WriteByte(MSG_ENTITY, self.fade_time * 16.0);
-		WriteByte(MSG_ENTITY, self.fade_rate * 16.0);
-		WriteString(MSG_ENTITY, self.noise);
+		WriteByte(MSG_ENTITY, this.volume * 255.0);
+		WriteByte(MSG_ENTITY, this.fade_time * 16.0);
+		WriteByte(MSG_ENTITY, this.fade_rate * 16.0);
+		WriteString(MSG_ENTITY, this.noise);
 	}
 	return 1;
 }
@@ -133,10 +131,10 @@ void trigger_music_reset(entity this)
 	this.cnt = !(this.spawnflags & 1);
 	this.SendFlags |= 0x80;
 }
-void trigger_music_use()
-{SELFPARAM();
-	self.cnt = !self.cnt;
-	self.SendFlags |= 0x80;
+void trigger_music_use(entity this, entity actor, entity trigger)
+{
+	this.cnt = !this.cnt;
+	this.SendFlags |= 0x80;
 }
 spawnfunc(trigger_music)
 {
@@ -190,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,20 +252,20 @@ void Net_TargetMusic()
 	}
 }
 
-void Ent_TriggerMusic_Think()
-{SELFPARAM();
-	if(WarpZoneLib_BoxTouchesBrush(view_origin, view_origin, self, world))
+void Ent_TriggerMusic_Think(entity this)
+{
+	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)
@@ -275,55 +273,55 @@ NET_HANDLE(ENT_CLIENT_TRIGGER_MUSIC, bool isnew)
 	int f = ReadByte();
 	if(f & 4)
 	{
-		self.origin_x = ReadCoord();
-		self.origin_y = ReadCoord();
-		self.origin_z = ReadCoord();
+		this.origin_x = ReadCoord();
+		this.origin_y = ReadCoord();
+		this.origin_z = ReadCoord();
 	}
 	if(f & 1)
 	{
-		self.modelindex = ReadShort();
-		if(self.modelindex)
+		this.modelindex = ReadShort();
+		if(this.modelindex)
 		{
-			self.mins_x = ReadCoord();
-			self.mins_y = ReadCoord();
-			self.mins_z = ReadCoord();
-			self.maxs_x = ReadCoord();
-			self.maxs_y = ReadCoord();
-			self.maxs_z = ReadCoord();
+			this.mins_x = ReadCoord();
+			this.mins_y = ReadCoord();
+			this.mins_z = ReadCoord();
+			this.maxs_x = ReadCoord();
+			this.maxs_y = ReadCoord();
+			this.maxs_z = ReadCoord();
 		}
 		else
 		{
-			self.mins    = '0 0 0';
-			self.maxs_x = ReadCoord();
-			self.maxs_y = ReadCoord();
-			self.maxs_z = ReadCoord();
+			this.mins    = '0 0 0';
+			this.maxs_x = ReadCoord();
+			this.maxs_y = ReadCoord();
+			this.maxs_z = ReadCoord();
 		}
 
-		self.volume = ReadByte() / 255.0;
-		self.fade_time = ReadByte() / 16.0;
-		self.fade_rate = ReadByte() / 16.0;
-		string s = self.noise;
-		if(self.noise)
-			strunzone(self.noise);
-		self.noise = strzone(ReadString());
-		if(self.noise != s)
+		this.volume = ReadByte() / 255.0;
+		this.fade_time = ReadByte() / 16.0;
+		this.fade_rate = ReadByte() / 16.0;
+		string s = this.noise;
+		if(this.noise)
+			strunzone(this.noise);
+		this.noise = strzone(ReadString());
+		if(this.noise != s)
 		{
-			precache_sound(self.noise);
-			_sound(self, CH_BGM_SINGLE, self.noise, 0, ATTEN_NONE);
-			if(getsoundtime(self, CH_BGM_SINGLE) < 0)
+			precache_sound(this.noise);
+			_sound(this, CH_BGM_SINGLE, this.noise, 0, ATTEN_NONE);
+			if(getsoundtime(this, CH_BGM_SINGLE) < 0)
 			{
-				LOG_TRACEF("Cannot initialize sound %s\n", self.noise);
-				strunzone(self.noise);
-				self.noise = string_null;
+				LOG_TRACEF("Cannot initialize sound %s\n", this.noise);
+				strunzone(this.noise);
+				this.noise = string_null;
 			}
 		}
 	}
 
-	setorigin(self, self.origin);
-	setsize(self, self.mins, self.maxs);
-	self.cnt = 1;
-	self.think = Ent_TriggerMusic_Think;
-	self.nextthink = time;
+	setorigin(this, this.origin);
+	setsize(this, this.mins, this.maxs);
+	this.cnt = 1;
+	setthink(this, Ent_TriggerMusic_Think);
+	this.nextthink = time;
 	return true;
 }