Fixed: Some warnings

code/ryzom/common/src/game_share/persistent_data_template.h

@@ -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
 

code/ryzom/server/src/entities_game_service/phrase_manager/combat_action.cpp

@@ -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