Weapons: add a second .weaponentity

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / bot / scripting.qc

diff --git a/qcsrc/server/bot/scripting.qc b/qcsrc/server/bot/scripting.qc
index 76cda90d90f48dd98b796f31965f46ad4c017bdc..9dfc26de75291ee2db9a82effd7c796603d5fb67 100644 (file)
--- a/qcsrc/server/bot/scripting.qc
+++ b/qcsrc/server/bot/scripting.qc
@@ -1059,10 +1059,10 @@ float bot_cmd_sound()
 .entity tuba_note;
 float bot_cmd_debug_assert_canfire()
 {SELFPARAM();
-       float f;
-       f = bot_cmd.bot_cmd_parm_float;
+       float f = bot_cmd.bot_cmd_parm_float;
 
-       if(self.weaponentity.state != WS_READY)
+       int slot = 0;
+       if(self.weaponentity[slot].state != WS_READY)
        {
                if(f)
                {
@@ -1070,12 +1070,12 @@ float bot_cmd_debug_assert_canfire()
                        LOG_INFO("Bot ", self.netname, " using ", self.weaponname, " wants to fire, inhibited by weaponentity state\n");
                }
        }
-       else if(ATTACK_FINISHED(self) > time)
+       else if(ATTACK_FINISHED(self, slot) > time)
        {
                if(f)
                {
                        self.colormod = '8 0 8';
-                       LOG_INFO("Bot ", self.netname, " using ", self.weaponname, " wants to fire, inhibited by ATTACK_FINISHED (", ftos(ATTACK_FINISHED(self) - time), " seconds left)\n");
+                       LOG_INFO("Bot ", self.netname, " using ", self.weaponname, " wants to fire, inhibited by ATTACK_FINISHED (", ftos(ATTACK_FINISHED(self, slot) - time), " seconds left)\n");
                }
        }
        else if(self.tuba_note)
@@ -1091,7 +1091,7 @@ float bot_cmd_debug_assert_canfire()
                if(!f)
                {
                        self.colormod = '8 8 0';
-                       LOG_INFO("Bot ", self.netname, " using ", self.weaponname, " thinks it has fired, but apparently did not; ATTACK_FINISHED says ", ftos(ATTACK_FINISHED(self) - time), " seconds left\n");
+                       LOG_INFO("Bot ", self.netname, " using ", self.weaponname, " thinks it has fired, but apparently did not; ATTACK_FINISHED says ", ftos(ATTACK_FINISHED(self, slot) - time), " seconds left\n");
                }
        }