Fixed: Some warnings

This commit is contained in:
kervala 2013-09-29 13:52:53 +02:00
parent 32135d8cc7
commit a80a4d47b8
2 changed files with 4 additions and 5 deletions

View file

@ -325,9 +325,11 @@ static _TOKENS_CLASSNAME _TOKENS_OBJNAME;
#else #else
#ifdef NL_OS_WINDOWS
#pragma message( " ") #pragma message( " ")
#pragma message( "NON-OPTIMISED: Persistent data class " NL_MACRO_TO_STR(PERSISTENT_CLASS) " not using a token family") #pragma message( "NON-OPTIMISED: Persistent data class " NL_MACRO_TO_STR(PERSISTENT_CLASS) " not using a token family")
#pragma message( " ") #pragma message( " ")
#endif
#endif #endif

View file

@ -29,11 +29,8 @@ CCombatAction * CCombatAIActionFactory::buildAiAction(const CStaticAiAction *aiA
nlassert(phrase); nlassert(phrase);
#endif #endif
const AI_ACTION::TAiActionType actionType = aiAction->getType(); const AI_ACTION::TAiActionType actionType = aiAction->getType();
if (actionType != AI_ACTION::Melee && actionType != AI_ACTION::Range) if (actionType != AI_ACTION::Melee && actionType != AI_ACTION::Range) return NULL;
{
return false;
}
AI_ACTION::TAiEffectType effectType = aiAction->getData().Combat.EffectFamily; AI_ACTION::TAiEffectType effectType = aiAction->getData().Combat.EffectFamily;
//get appropriate factory //get appropriate factory