From: Rudolf Polzer <divverent@xonotic.org>
Date: Sun, 16 Oct 2011 20:42:27 +0000 (+0200)
Subject: tuba: support bot_sound_monopoly
X-Git-Tag: xonotic-v0.6.0~40^2~32
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f2df8b72c66db28ccfc87bdfdbd3b823e1d401f6;p=xonotic%2Fxonotic-data.pk3dir.git

tuba: support bot_sound_monopoly
---

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 4a860f03e..27c04f8a4 100644
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -1292,7 +1292,9 @@ float sound_allowed(float dest, entity e)
     {
         if (e.classname == "body")
             e = e.enemy;
-        if (e.owner && e.owner != e)
+	else if (e.realowner && e.realowner != e)
+            e = e.realowner;
+	else if (e.owner && e.owner != e)
             e = e.owner;
         else
             break;
diff --git a/qcsrc/server/w_tuba.qc b/qcsrc/server/w_tuba.qc
index 1ed217851..c10d1f544 100644
--- a/qcsrc/server/w_tuba.qc
+++ b/qcsrc/server/w_tuba.qc
@@ -78,6 +78,10 @@ float W_Tuba_NoteSendEntity(entity to, float sf)
 {
 	float f;
 
+	msg_entity = to;
+	if(!sound_allowed(MSG_ONE, self.realowner))
+		return FALSE;
+
 	WriteByte(MSG_ENTITY, ENT_CLIENT_TUBANOTE);
 	WriteByte(MSG_ENTITY, sf);
 	if(sf & 1)