Merge remote-tracking branch 'origin/master' into samual/individual_switchdelay

[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 1642133e11ea2c0d52104c795b6db4b6b6355172..21e1b728f6b0d553c9588fb93a104e7809f9356f 100644 (file)
--- a/qcsrc/server/bot/scripting.qc
+++ b/qcsrc/server/bot/scripting.qc
@@ -286,7 +286,7 @@ entity find_bot_by_name(string name)
        bot = findchainflags(flags, FL_CLIENT);
        while (bot)
        {
-               if(clienttype(bot) == CLIENTTYPE_BOT)
+               if(IS_BOT_CLIENT(bot))
                if(bot.netname==name)
                        return bot;
 
@@ -308,7 +308,7 @@ entity find_bot_by_number(float number)
        bot = findchainflags(flags, FL_CLIENT);
        while (bot)
        {
-               if(clienttype(bot) == CLIENTTYPE_BOT)
+               if(IS_BOT_CLIENT(bot))
                {
                        if(++c==number)
                                return bot;
@@ -1111,7 +1111,7 @@ float bot_cmd_sound()
        if(n >= 3)
                vol = stof(argv(1));
        if(n >= 4)
-               atten = stof(argv(1));
+               atten = stof(argv(2));
 
        precache_sound(f);
        sound(self, chan, sample, vol, atten);