- added an extra NULL check to new max unit check
This commit is contained in:
parent
d80127f697
commit
67c1c52caa
|
@ -173,16 +173,16 @@ bool Faction::reqsOk(const RequirableType *rt) const{
|
||||||
}
|
}
|
||||||
|
|
||||||
//required upgrades
|
//required upgrades
|
||||||
for(int i=0; i<rt->getUpgradeReqCount(); ++i){
|
for(int i=0; i<rt->getUpgradeReqCount(); ++i) {
|
||||||
if(!upgradeManager.isUpgraded(rt->getUpgradeReq(i))){
|
if(upgradeManager.isUpgraded(rt->getUpgradeReq(i)) == false) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(dynamic_cast<const UnitType *>(rt) != NULL ){
|
if(dynamic_cast<const UnitType *>(rt) != NULL ) {
|
||||||
const UnitType *producedUnitType=(UnitType *) rt;
|
const UnitType *producedUnitType=(UnitType *) rt;
|
||||||
if(producedUnitType->getMaxUnitCount()>0){
|
if(producedUnitType != NULL && producedUnitType->getMaxUnitCount() > 0) {
|
||||||
if(producedUnitType->getMaxUnitCount()<=getCountForMaxUnitCount(producedUnitType)){
|
if(producedUnitType->getMaxUnitCount() <= getCountForMaxUnitCount(producedUnitType)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user