Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix a potential crash when building rule is checked without builder

Browse source
This commit is contained in:
Tim Felgentreff 2015-09-09 10:33:10 +02:00
parent 78094054bd
commit e052eb38b5
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/unit/build.cpp
View file

@ -114,6 +114,7 @@ bool CBuildRestrictionDistance::Check(const CUnit *builder, const CUnitType &typ
Vec2i pos1(0, 0);
Vec2i pos2(0, 0);
int distance = 0;
CPlayer* player = builder != NULL ? builder->Player : ThisPlayer;
if (this->DistanceType == LessThanEqual
|| this->DistanceType == GreaterThan
@ -140,9 +141,9 @@ bool CBuildRestrictionDistance::Check(const CUnit *builder, const CUnitType &typ
(this->RestrictType == table[i]->Type || (!this->RestrictType && this->RestrictTypeOwner.size() > 0)) &&
// RestrictTypeOwner is not set or unit belongs to a suitable player
(this->RestrictTypeOwner.size() == 0 ||
(!this->RestrictTypeOwner.compare("self") && builder->Player == table[i]->Player) ||
(!this->RestrictTypeOwner.compare("allied") && (builder->Player == table[i]->Player || builder->Player->IsAllied(*table[i]->Player))) ||
(!this->RestrictTypeOwner.compare("enemy") && builder->Player->IsEnemy(*table[i]->Player)))) {
(!this->RestrictTypeOwner.compare("self") && player == table[i]->Player) ||
(!this->RestrictTypeOwner.compare("allied") && (player == table[i]->Player || player->IsAllied(*table[i]->Player))) ||
(!this->RestrictTypeOwner.compare("enemy") && player->IsEnemy(*table[i]->Player)))) {
switch (this->DistanceType) {
case GreaterThan :
@ -182,7 +183,8 @@ bool CBuildRestrictionHasUnit::Check(const CUnit *builder, const CUnitType &type
{
Vec2i pos1(0, 0);
Vec2i pos2(0, 0);
int count = builder->Player->GetUnitTotalCount(*this->RestrictType);
CPlayer* player = builder != NULL ? builder->Player : ThisPlayer;
int count = player->GetUnitTotalCount(*this->RestrictType);
switch (this->CountType)
{
case LessThan: return count < this->Count;