From aa6df6f3b922490fe1080e1ac8efdc72a9ea5b76 Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Tue, 3 Aug 2010 14:01:15 +0200
Subject: [PATCH] Changed: Added parsing of PatchServer variable

---
 code/ryzom/client/src/client_cfg.cpp | 5 +++--
 code/ryzom/client/src/client_cfg.h   | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/code/ryzom/client/src/client_cfg.cpp b/code/ryzom/client/src/client_cfg.cpp
index 7f7b6ed83..2641b96a0 100644
--- a/code/ryzom/client/src/client_cfg.cpp
+++ b/code/ryzom/client/src/client_cfg.cpp
@@ -31,7 +31,6 @@
 #include "debug_client.h"
 #include "view.h"	// For the cameraDistance funtion
 #include "user_entity.h"
-#include "interface_v3/interface_element.h" //for convertColor function
 #include "misc.h"
 
 // 3D Interface.
@@ -379,6 +378,7 @@ CClientConfig::CClientConfig()
 #endif
 	PatchUrl = "";
 	PatchVersion = "";
+	PatchServer = "";
 	RingReleaseNotePath = "http://atys.ryzom.com/releasenotes_ring/index.php";
 	ReleaseNotePath = "http://atys.ryzom.com/releasenotes/index.php";
 
@@ -1021,6 +1021,7 @@ void CClientConfig::setValues()
 	READ_STRING_DEV(PatchVersion)
 	READ_STRING_DEV(RingReleaseNotePath)
 	READ_STRING_DEV(ReleaseNotePath)
+	READ_STRING_FV(PatchServer)
 
 	///////////////
 	// ANIMATION //
@@ -1409,7 +1410,7 @@ void CClientConfig::setValues()
 					SPrintfCommand pcom;
 					pcom.X = pc->asInt(i);
 					pcom.Y = pc->asInt(i+1);
-					pcom.Color = CInterfaceElement::convertColor( pc->asString(i+2).c_str() );
+					pcom.Color = stringToRGBA( pc->asString(i+2).c_str() );
 					pcom.FontSize = pc->asInt(i+3);
 					pcom.Text = pc->asString(i+4);
 
diff --git a/code/ryzom/client/src/client_cfg.h b/code/ryzom/client/src/client_cfg.h
index c83e651a1..d9d8f5b5e 100644
--- a/code/ryzom/client/src/client_cfg.h
+++ b/code/ryzom/client/src/client_cfg.h
@@ -28,10 +28,15 @@
 #include "nel/misc/vector.h"
 #include "nel/misc/rgba.h"
 #include "nel/misc/config_file.h"
+
+#include "nel/sound/sound_anim_manager.h"
+
 // std.
 #include <string>
+
 // Game Share
 #include "game_share/gender.h"
+#include "game_share/character_title.h"
 
 
 ///////////
@@ -270,6 +275,7 @@ struct CClientConfig
 	bool			PatchWanted;
 	std::string		PatchUrl;
 	std::string		PatchVersion;
+	std::string		PatchServer;
 
 	std::string		RingReleaseNotePath;
 	std::string		ReleaseNotePath;