aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-24 15:56:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed: Some warnings

Browse source
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
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
#ifdef NL_OS_WINDOWS
#pragma message( " ")
#pragma message( "NON-OPTIMISED: Persistent data class " NL_MACRO_TO_STR(PERSISTENT_CLASS) " not using a token family")
#pragma message( " ")
#endif
#endif

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

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