From: Rudolf Polzer <divverent@xonotic.org>
Date: Thu, 22 Sep 2011 04:39:49 +0000 (+0200)
Subject: tuba has a very small refire rate, so fix some false positives of the fire auditing
X-Git-Tag: xonotic-v0.6.0~40^2~120
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=06e9a678e3adcd81b1736ab4d52bf1d7b8abe89f;p=xonotic%2Fxonotic-data.pk3dir.git

tuba has a very small refire rate, so fix some false positives of the fire auditing
---

diff --git a/qcsrc/server/bot/scripting.qc b/qcsrc/server/bot/scripting.qc
index 005d9ed88..63151cac1 100644
--- a/qcsrc/server/bot/scripting.qc
+++ b/qcsrc/server/bot/scripting.qc
@@ -1095,6 +1095,7 @@ float bot_cmd_sound()
 	return CMD_STATUS_FINISHED;
 }
 
+.entity tuba_note;
 float bot_cmd_debug_assert_canfire()
 {
 	float f;
@@ -1116,6 +1117,14 @@ float bot_cmd_debug_assert_canfire()
 			print("Bot wants to fire, inhibited by ATTACK_FINISHED\n");
 		}
 	}
+	else if(self.tuba_note)
+	{
+		if(f)
+		{
+			self.colormod = '8 0 0';
+			print("Bot wants to fire, bot still has an active tuba note\n");
+		}
+	}
 	else
 	{
 		if(!f)