weapon change

This commit is contained in:
ineedbots 2021-06-02 10:39:45 -06:00
parent 9cf2770ef5
commit bb84f84abc

View File

@ -686,14 +686,14 @@ changeToWeapon(weap)
if (!self HasWeapon(weap)) if (!self HasWeapon(weap))
return false; return false;
if (self GetCurrentWeapon() == weap)
return true;
self SwitchToWeapon(weap); self SwitchToWeapon(weap);
if (isWeaponAltmode(weap)) if (isWeaponAltmode(weap))
self setSpawnWeapon(weap); self setSpawnWeapon(weap);
if (self GetCurrentWeapon() == weap)
return true;
self waittill_any_timeout(5, "weapon_change"); self waittill_any_timeout(5, "weapon_change");
return (self GetCurrentWeapon() == weap); return (self GetCurrentWeapon() == weap);
@ -1245,16 +1245,7 @@ bot_killstreak_think_loop()
} }
} }
if (!self ChangeToWeapon(weapon))
break;
wait 1;
break;
case "killstreak_dogs": case "killstreak_dogs":
if (IsDefined( level.dogs ))
return;
default: default:
if (!self ChangeToWeapon(weapon)) if (!self ChangeToWeapon(weapon))
break; break;
@ -2656,7 +2647,7 @@ bot_watch_think_mw2_loop()
if (randomInt(100) > 35) if (randomInt(100) > 35)
return; return;
self ChangeToWeapon(tube); self thread ChangeToWeapon(tube);
} }
/* /*