markmental/yapb-noob-edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: change comparison order in weapon pickup code

Browse source
This commit is contained in:
dmitry 2022-02-22 10:21:21 +03:00
commit 5104508665
No known key found for this signature in database
GPG key ID: 8297CE728B7A7E37
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/botlib.cpp
View file

@ -632,19 +632,19 @@ void Bot::updatePickups () {
else if (m_isVIP || !rateGroundWeapon (ent)) {
allowPickup = false;
}
else if (strcmp (model, "medkit.mdl") == 0 && m_healthValue >= 100.0f) {
else if (m_healthValue >= 100.0f && strcmp (model, "medkit.mdl") == 0) {
allowPickup = false;
}
else if ((strcmp (model, "kevlar.mdl") == 0 || strcmp (model, "battery.mdl") == 0) && pev->armorvalue >= 100.0f) {
else if (pev->armorvalue >= 100.0f && (strcmp (model, "kevlar.mdl") == 0 || strcmp (model, "battery.mdl") == 0)) {
allowPickup = false;
}
else if (strcmp (model, "flashbang.mdl") == 0 && (pev->weapons & cr::bit (Weapon::Flashbang))) {
else if ((pev->weapons & cr::bit (Weapon::Flashbang)) && strcmp (model, "flashbang.mdl") == 0) {
allowPickup = false;
}
else if (strcmp (model, "hegrenade.mdl") == 0 && (pev->weapons & cr::bit (Weapon::Explosive))) {
else if ((pev->weapons & cr::bit (Weapon::Explosive)) && strcmp (model, "hegrenade.mdl") == 0) {
allowPickup = false;
}
else if (strcmp (model, "smokegrenade.mdl") == 0 && (pev->weapons & cr::bit (Weapon::Smoke))) {
else if ((pev->weapons & cr::bit (Weapon::Smoke)) && strcmp (model, "smokegrenade.mdl") == 0) {
allowPickup = false;
}
}