From e59f5dbf314dc93689f6a0fdadd6564851ab0b29 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Thu, 26 May 2011 14:16:13 +0200
Subject: [PATCH] Changed: Merge changes from next patch

---
 code/ryzom/common/src/game_share/action_nature.cpp | 1 +
 code/ryzom/common/src/game_share/action_nature.h   | 1 +
 code/ryzom/common/src/game_share/magic_fx.h        | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/code/ryzom/common/src/game_share/action_nature.cpp b/code/ryzom/common/src/game_share/action_nature.cpp
index 04d8fc132..456cfcbc1 100644
--- a/code/ryzom/common/src/game_share/action_nature.cpp
+++ b/code/ryzom/common/src/game_share/action_nature.cpp
@@ -38,6 +38,7 @@ namespace ACTNATURE
 		NL_STRING_CONVERSION_TABLE_ENTRY(DODGE)
 		NL_STRING_CONVERSION_TABLE_ENTRY(PARRY)
 		NL_STRING_CONVERSION_TABLE_ENTRY(SHIELD_USE)
+		NL_STRING_CONVERSION_TABLE_ENTRY(RECHARGE)
 	NL_END_STRING_CONVERSION_TABLE(TActionNature, ActionNatureConversion, UNKNOWN)
 
 
diff --git a/code/ryzom/common/src/game_share/action_nature.h b/code/ryzom/common/src/game_share/action_nature.h
index 36494b1ff..333656101 100644
--- a/code/ryzom/common/src/game_share/action_nature.h
+++ b/code/ryzom/common/src/game_share/action_nature.h
@@ -35,6 +35,7 @@ namespace ACTNATURE
 		DODGE,
 		PARRY,
 		SHIELD_USE,
+		RECHARGE,
 
 		NEUTRAL,	//only for multi effect on spell,progression consider it as OFFENSIVE_MAGIC
 
diff --git a/code/ryzom/common/src/game_share/magic_fx.h b/code/ryzom/common/src/game_share/magic_fx.h
index df1d927ad..1d1df3bc4 100644
--- a/code/ryzom/common/src/game_share/magic_fx.h
+++ b/code/ryzom/common/src/game_share/magic_fx.h
@@ -133,6 +133,9 @@ namespace MAGICFX
 		WaterWall = 11,
 		ThornWall = 12,
 		LightningWall = 13,
+		OtherFireWall = 14,
+		TeleportKami = 15, // No effect aura
+		TeleportKara = 16, // No effect aura
 	};
 }