Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Added parsing of PatchServer variable

Browse source
This commit is contained in:
kervala 2010-08-03 14:01:15 +02:00
parent a41146116b
commit b9dd4ff968
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
code/ryzom/client/src/client_cfg.cpp
View file

@ -31,7 +31,6 @@
#include "debug_client.h" #include "debug_client.h"
#include "view.h" // For the cameraDistance funtion #include "view.h" // For the cameraDistance funtion
#include "user_entity.h" #include "user_entity.h"
#include "interface_v3/interface_element.h" //for convertColor function
#include "misc.h" #include "misc.h"
// 3D Interface. // 3D Interface.
@ -379,6 +378,7 @@ CClientConfig::CClientConfig()
#endif #endif
PatchUrl = ""; PatchUrl = "";
PatchVersion = ""; PatchVersion = "";
PatchServer = "";
RingReleaseNotePath = "http://atys.ryzom.com/releasenotes_ring/index.php"; RingReleaseNotePath = "http://atys.ryzom.com/releasenotes_ring/index.php";
ReleaseNotePath = "http://atys.ryzom.com/releasenotes/index.php"; ReleaseNotePath = "http://atys.ryzom.com/releasenotes/index.php";
@ -1021,6 +1021,7 @@ void CClientConfig::setValues()
READ_STRING_DEV(PatchVersion) READ_STRING_DEV(PatchVersion)
READ_STRING_DEV(RingReleaseNotePath) READ_STRING_DEV(RingReleaseNotePath)
READ_STRING_DEV(ReleaseNotePath) READ_STRING_DEV(ReleaseNotePath)
READ_STRING_FV(PatchServer)
/////////////// ///////////////
// ANIMATION // // ANIMATION //
@ -1409,7 +1410,7 @@ void CClientConfig::setValues()
SPrintfCommand pcom; SPrintfCommand pcom;
pcom.X = pc->asInt(i); pcom.X = pc->asInt(i);
pcom.Y = pc->asInt(i+1); 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.FontSize = pc->asInt(i+3);
pcom.Text = pc->asString(i+4); pcom.Text = pc->asString(i+4);

6
code/ryzom/client/src/client_cfg.h
View file

@ -28,10 +28,15 @@
#include "nel/misc/vector.h" #include "nel/misc/vector.h"
#include "nel/misc/rgba.h" #include "nel/misc/rgba.h"
#include "nel/misc/config_file.h" #include "nel/misc/config_file.h"
#include "nel/sound/sound_anim_manager.h"
// std. // std.
#include <string> #include <string>
// Game Share // Game Share
#include "game_share/gender.h" #include "game_share/gender.h"
#include "game_share/character_title.h"
/////////// ///////////
@ -270,6 +275,7 @@ struct CClientConfig
bool PatchWanted; bool PatchWanted;
std::string PatchUrl; std::string PatchUrl;
std::string PatchVersion; std::string PatchVersion;
std::string PatchServer;
std::string RingReleaseNotePath; std::string RingReleaseNotePath;
std::string ReleaseNotePath; std::string ReleaseNotePath;