From: Freddy <schro.sb@gmail.com>
Date: Sat, 10 Mar 2018 15:17:48 +0000 (+0100)
Subject: Fix sound for func_vectormamamam
X-Git-Tag: xonotic-v0.8.5~2176^2~28
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ec14124b800aedd634f6068ae46708c3f0108c99;p=xonotic%2Fxonotic-data.pk3dir.git

Fix sound for func_vectormamamam
---

diff --git a/qcsrc/common/triggers/func/vectormamamam.qc b/qcsrc/common/triggers/func/vectormamamam.qc
index 8812930b2..61da52acb 100644
--- a/qcsrc/common/triggers/func/vectormamamam.qc
+++ b/qcsrc/common/triggers/func/vectormamamam.qc
@@ -98,12 +98,45 @@ void func_vectormamamam_findtarget(entity this)
 	setthink(controller, func_vectormamamam_controller_think);
 }
 
+void func_vectormamamam_setactive(entity this, int astate)
+{
+	if (astate == ACTIVE_TOGGLE)
+	{
+		if(this.active == ACTIVE_ACTIVE)
+			this.active = ACTIVE_NOT;
+		else
+			this.active = ACTIVE_ACTIVE;
+	}
+	else
+		this.active = astate;
+
+	if(this.active  == ACTIVE_NOT)
+	{
+		stopsound(this, CH_TRIGGER_SINGLE);
+	}
+	else
+	{
+		if(this.noise && this.noise != "")
+		{
+			_sound(this, CH_TRIGGER_SINGLE, this.noise, VOL_BASE, ATTEN_IDLE);
+		}
+	}
+}
+
+void func_vectormamamam_init_for_player(entity this, entity player)
+{
+	if (this.noise && this.noise != "" && this.active == ACTIVE_ACTIVE && IS_REAL_CLIENT(player))
+	{
+		msg_entity = player;
+		soundto(MSG_ONE, this, CH_TRIGGER_SINGLE, this.noise, VOL_BASE, ATTEN_IDLE);
+	}
+}
+
 spawnfunc(func_vectormamamam)
 {
 	if (this.noise != "")
 	{
 		precache_sound(this.noise);
-		soundto(MSG_INIT, this, CH_TRIGGER_SINGLE, this.noise, VOL_BASE, ATTEN_IDLE);
 	}
 
 	if(!this.targetfactor)
@@ -149,7 +182,12 @@ spawnfunc(func_vectormamamam)
 	// Savage: Reduce bandwith, critical on e.g. nexdm02
 	this.effects |= EF_LOWPRECISION;
 
-	this.active = ACTIVE_ACTIVE;
+	this.setactive = func_vectormamamam_setactive;
+	this.setactive(this, ACTIVE_ACTIVE);
+
+	// maybe send sound to new players
+	IL_PUSH(g_initforplayer, this);
+	this.init_for_player = func_vectormamamam_init_for_player;
 
 	InitializeEntity(this, func_vectormamamam_findtarget, INITPRIO_FINDTARGET);
 }