Merge branch 'ark'

feature/prepare-cross-merge
Nuno 4 years ago committed by kaetemi
parent 4108367413
commit 005f1c755c
No known key found for this signature in database
GPG Key ID: 9873C4D40BB479BC

@ -294,9 +294,14 @@ void CMissionBaseBehaviour::addCompassTarget( uint32 targetId, bool isBot, bool
}
}
nlassert(_Mission->getCompass(freeIdx) == NULL);
if (freeIdx < 8)
{
if (_Mission->getCompass(freeIdx) == NULL)
{
EGSPD::CMissionCompassPD * compass = _Mission->addToCompass(freeIdx);
nlassert(compass != NULL);
if (compass)
{
if (c != NULL)
{
compass->setBotId(c->getAlias());
@ -329,9 +334,8 @@ void CMissionBaseBehaviour::addCompassTarget( uint32 targetId, bool isBot, bool
targetId = CAIAliasTranslator::Invalid;
}
else
{
nlstop;
}
}
}
}

Loading…
Cancel
Save