From 0ce6b3c41131eab3906098c5c5d0e86b70a83ab5 Mon Sep 17 00:00:00 2001 From: Yann Date: Fri, 4 Mar 2016 20:16:16 +0100 Subject: [PATCH] Adding new talents in mdehaviours in common --- .../common/src/game_share/mode_and_behaviour.cpp | 7 +++++++ .../ryzom/common/src/game_share/mode_and_behaviour.h | 12 +++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/code/ryzom/common/src/game_share/mode_and_behaviour.cpp b/code/ryzom/common/src/game_share/mode_and_behaviour.cpp index f98cf8468..f6e4a100d 100644 --- a/code/ryzom/common/src/game_share/mode_and_behaviour.cpp +++ b/code/ryzom/common/src/game_share/mode_and_behaviour.cpp @@ -135,6 +135,13 @@ namespace MBEHAV // Combat creature NL_STRING_CONVERSION_TABLE_ENTRY (CREATURE_ATTACK_0) NL_STRING_CONVERSION_TABLE_ENTRY (CREATURE_ATTACK_1) + // New talents + NL_STRING_CONVERSION_TABLE_ENTRY (JUGGLE) + NL_STRING_CONVERSION_TABLE_ENTRY (DANSE) + NL_STRING_CONVERSION_TABLE_ENTRY (PAINT_INIT) + NL_STRING_CONVERSION_TABLE_ENTRY (PAINT_LOOP) + NL_STRING_CONVERSION_TABLE_ENTRY (PAINT_END) + NL_END_STRING_CONVERSION_TABLE(EBehaviour, BehaviourConversion, UNKNOWN_BEHAVIOUR) diff --git a/code/ryzom/common/src/game_share/mode_and_behaviour.h b/code/ryzom/common/src/game_share/mode_and_behaviour.h index b56a20354..ca25c468a 100644 --- a/code/ryzom/common/src/game_share/mode_and_behaviour.h +++ b/code/ryzom/common/src/game_share/mode_and_behaviour.h @@ -286,7 +286,17 @@ namespace MBEHAV EMOTE_BEGIN, // 46 EMOTE_END = EMOTE_BEGIN+150, - + //--------- JUGGLE ----------// + JUGGLE, + + //--------- DANSE ----------//, + DANSE, + + //--------- PAINT ----------// + PAINT_INIT, + PAINT_LOOP, + PAINT_END, + // IMPORTANT : IF YOU MODIFY THIS ENUM DO NOT FORGET TO CHANGE stringToBehaviour() TOO NUMBER_OF_BEHAVIOURS };