fix: bots re-pickup same weapon multiple times (fiex #523)
fix: ammo pickup isn't working due to mistake between numbers and indexes
This commit is contained in:
parent
c662f4a08f
commit
816e020978
1 changed files with 2 additions and 2 deletions
|
|
@ -443,7 +443,7 @@ void Bot::updatePickups () {
|
||||||
&& (getAmmo (primary.id) > 0.3 * primaryProp.ammo1Max)
|
&& (getAmmo (primary.id) > 0.3 * primaryProp.ammo1Max)
|
||||||
&& !m_isUsingGrenade && !hasShield ()) {
|
&& !m_isUsingGrenade && !hasShield ()) {
|
||||||
|
|
||||||
auto weaponType = conf.getWeaponType (primaryWeaponCarried);
|
auto weaponType = conf.getWeaponType (primary.id);
|
||||||
|
|
||||||
const bool isSniperRifle = weaponType == WeaponType::Sniper;
|
const bool isSniperRifle = weaponType == WeaponType::Sniper;
|
||||||
const bool isSubmachine = weaponType == WeaponType::SMG;
|
const bool isSubmachine = weaponType == WeaponType::SMG;
|
||||||
|
|
@ -512,7 +512,7 @@ void Bot::updatePickups () {
|
||||||
if (allowPickup) {
|
if (allowPickup) {
|
||||||
|
|
||||||
// found weapon on ground?
|
// found weapon on ground?
|
||||||
if (pickupType == Pickup::Weapon) {
|
if (pickupType == Pickup::Weapon || pickupType == Pickup::AmmoAndKits) {
|
||||||
if (m_isVIP) {
|
if (m_isVIP) {
|
||||||
allowPickup = false;
|
allowPickup = false;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue