From: Freddy <schro.sb@gmail.com>
Date: Sat, 17 Mar 2018 15:14:26 +0000 (+0100)
Subject: trigger_music can now be controlled with relays
X-Git-Tag: xonotic-v0.8.5~2176^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0f79f04df1cc0e9796c38e8cb69a89351bdf6a3b;p=xonotic%2Fxonotic-data.pk3dir.git

trigger_music can now be controlled with relays
---

diff --git a/qcsrc/common/triggers/target/music.qc b/qcsrc/common/triggers/target/music.qc
index b6d8c69cb..24951b42b 100644
--- a/qcsrc/common/triggers/target/music.qc
+++ b/qcsrc/common/triggers/target/music.qc
@@ -99,13 +99,10 @@ void TargetMusic_RestoreGame()
 //   fade_time
 // spawnflags:
 //   START_DISABLED
-// when triggered, it is disabled/enabled for everyone
+// can be disabled/enabled for everyone with relays
 bool trigger_music_SendEntity(entity this, entity to, int sendflags)
 {
 	WriteHeader(MSG_ENTITY, ENT_CLIENT_TRIGGER_MUSIC);
-	sendflags &= ~0x80;
-	if(this.cnt)
-		sendflags |= 0x80;
 	WriteByte(MSG_ENTITY, sendflags);
 	if(sendflags & SF_MUSIC_ORIGIN)
 	{
@@ -129,18 +126,24 @@ bool trigger_music_SendEntity(entity this, entity to, int sendflags)
 		WriteByte(MSG_ENTITY, this.fade_rate * 16.0);
 		WriteString(MSG_ENTITY, this.noise);
 	}
+	if(sendflags & SF_TRIGGER_UPDATE)
+	{
+		WriteByte(MSG_ENTITY, this.active);
+	}
 	return true;
 }
 void trigger_music_reset(entity this)
 {
-	this.cnt = !(this.spawnflags & START_DISABLED);
-	this.SendFlags |= 0x80;
-}
-void trigger_music_use(entity this, entity actor, entity trigger)
-{
-	this.cnt = !this.cnt;
-	this.SendFlags |= 0x80;
+	if(this.spawnflags & START_DISABLED)
+	{
+		this.setactive(this, ACTIVE_NOT);
+	}
+	else
+	{
+		this.setactive(this, ACTIVE_ACTIVE);
+	}
 }
+
 spawnfunc(trigger_music)
 {
 	if(this.model != "")
@@ -156,10 +159,11 @@ spawnfunc(trigger_music)
 		setorigin(this, this.origin + this.mins);
 		setsize(this, '0 0 0', this.maxs - this.mins);
 	}
-	trigger_music_reset(this);
 
-	this.use = trigger_music_use;
+	this.setactive = generic_netlinked_setactive;
+	this.use = generic_netlinked_legacy_use; // backwards compatibility
 	this.reset = trigger_music_reset;
+	this.reset(this);
 
 	Net_LinkEntity(this, false, 0, trigger_music_SendEntity);
 }
@@ -271,6 +275,10 @@ void Net_TargetMusic()
 
 void Ent_TriggerMusic_Think(entity this)
 {
+	if(this.active == ACTIVE_NOT)
+	{
+		return;
+	}
 	vector org = (csqcplayer) ? csqcplayer.origin : view_origin;
 	if(WarpZoneLib_BoxTouchesBrush(org + STAT(PL_MIN), org + STAT(PL_MAX), this, NULL))
 	{
@@ -325,10 +333,13 @@ NET_HANDLE(ENT_CLIENT_TRIGGER_MUSIC, bool isnew)
 			}
 		}
 	}
+	if(sendflags & SF_TRIGGER_UPDATE)
+	{
+		this.active = ReadByte();
+	}
 
 	setorigin(this, this.origin);
 	setsize(this, this.mins, this.maxs);
-	this.cnt = 1;
 	this.draw = Ent_TriggerMusic_Think;
 	if(isnew)
 	{