Merge branch 'storyline/s2e0' into atys

5 years ago · 5f762edac4
parent aaa24fd0f4 55172c93b5
commit 5f762edac4
2 changed files with 3 additions and 2 deletions
--- a/code/ryzom/common/src/game_share/brick_families.cpp
+++ b/code/ryzom/common/src/game_share/brick_families.cpp
@ -549,7 +549,6 @@ namespace BRICK_FAMILIES
 		NL_STRING_CONVERSION_TABLE_ENTRY(BSGMBP)
 		NL_STRING_CONVERSION_TABLE_ENTRY(BSGMBR)
 		NL_STRING_CONVERSION_TABLE_ENTRY(BSGMBS)
-		NL_STRING_CONVERSION_TABLE_ENTRY(BSGMC)
 		NL_STRING_CONVERSION_TABLE_ENTRY(BSMMA)
 		NL_STRING_CONVERSION_TABLE_ENTRY(BSMMB)
 		NL_STRING_CONVERSION_TABLE_ENTRY(BSMMC)
@ -558,6 +557,7 @@ namespace BRICK_FAMILIES
 		NL_STRING_CONVERSION_TABLE_ENTRY(BSCMB)
 		NL_STRING_CONVERSION_TABLE_ENTRY(BSCMC)
 		NL_STRING_CONVERSION_TABLE_ENTRY(BSCMD)
+		NL_STRING_CONVERSION_TABLE_ENTRY(BSGMC)

 		NL_STRING_CONVERSION_TABLE_ENTRY(BSXCA)

--- a/code/ryzom/common/src/game_share/brick_families.h
+++ b/code/ryzom/common/src/game_share/brick_families.h
@ -660,7 +660,6 @@ namespace BRICK_FAMILIES
 					BSGMBP,
 					BSGMBR,
 					BSGMBS,
-				BSGMC, // jewels s2e0

 				BeginMagicPowerParameter,
 				BSMMA = BeginMagicPowerParameter, // sap aura
@ -676,6 +675,8 @@ namespace BRICK_FAMILIES
 				BSCMD, // heal Focus
 			EndPowerParameter = BSCMD,

+			BSGMC, // jewels s2e0
+
 			BeginMagicPowerCredit,
 				BSXCA = BeginMagicPowerCredit, // recast time
 			EndMagicPowerCredit = BSXCA,