Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Some warnings

Browse source
This commit is contained in:
kervala 2013-09-29 13:52:53 +02:00
parent 67e0b796ce
commit de42e4d7ff
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/ryzom/common/src/game_share/persistent_data_template.h
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

5
code/ryzom/server/src/entities_game_service/phrase_manager/combat_action.cpp
View file

@ -29,10 +29,7 @@ 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;