mirror of
https://github.com/vcmi/vcmi.git
synced 2025-11-23 22:37:55 +02:00
Call cheap to compute conditions before costly conditions
This commit is contained in:
@@ -46,7 +46,7 @@ int32_t CAmmo::available() const
|
||||
|
||||
bool CAmmo::canUse(int32_t amount) const
|
||||
{
|
||||
return !isLimited() || (available() - amount >= 0);
|
||||
return (available() - amount >= 0) || !isLimited();
|
||||
}
|
||||
|
||||
bool CAmmo::isLimited() const
|
||||
@@ -99,7 +99,7 @@ CShots & CShots::operator=(const CShots & other)
|
||||
|
||||
bool CShots::isLimited() const
|
||||
{
|
||||
return !env->unitHasAmmoCart(owner) || !shooter.getHasBonus();
|
||||
return !shooter.getHasBonus() || !env->unitHasAmmoCart(owner);
|
||||
}
|
||||
|
||||
void CShots::setEnv(const IUnitEnvironment * env_)
|
||||
|
||||
Reference in New Issue
Block a user