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

Changed: Added WITH_RYZOM_CUSTOM_PATCH_SERVER that allows to give priority to PatchUrl defined in client.cfg

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2015-12-21 17:33:32 +01:00
parent 93225c6495
commit fb98ffe809
5 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
code/CMakeModules/nel.cmake
View file

@ -320,7 +320,6 @@ MACRO(NL_SETUP_RYZOM_DEFAULT_OPTIONS)
OPTION(WITH_RYZOM_TOOLS "Build Ryzom Core Tools" ON ) OPTION(WITH_RYZOM_TOOLS "Build Ryzom Core Tools" ON )
OPTION(WITH_RYZOM_SERVER "Build Ryzom Core Services" ON ) OPTION(WITH_RYZOM_SERVER "Build Ryzom Core Services" ON )
OPTION(WITH_RYZOM_SOUND "Enable Ryzom Core Sound" ON ) OPTION(WITH_RYZOM_SOUND "Enable Ryzom Core Sound" ON )
OPTION(WITH_RYZOM_PATCH "Enable Ryzom in-game patch support" OFF)
### ###
# Optional support # Optional support
@ -329,6 +328,8 @@ MACRO(NL_SETUP_RYZOM_DEFAULT_OPTIONS)
OPTION(WITH_LUA52 "Build Ryzom Core using Lua 5.2" OFF) OPTION(WITH_LUA52 "Build Ryzom Core using Lua 5.2" OFF)
OPTION(WITH_LUA53 "Build Ryzom Core using Lua 5.3" OFF) OPTION(WITH_LUA53 "Build Ryzom Core using Lua 5.3" OFF)
OPTION(WITH_RYZOM_CLIENT_UAC "Ask to run as Administrator" OFF) OPTION(WITH_RYZOM_CLIENT_UAC "Ask to run as Administrator" OFF)
OPTION(WITH_RYZOM_PATCH "Enable Ryzom in-game patch support" OFF)
OPTION(WITH_RYZOM_CUSTOM_PATCH_SERVER "Only use patch server from CFG file" OFF)
ENDMACRO(NL_SETUP_RYZOM_DEFAULT_OPTIONS) ENDMACRO(NL_SETUP_RYZOM_DEFAULT_OPTIONS)
MACRO(NL_SETUP_SNOWBALLS_DEFAULT_OPTIONS) MACRO(NL_SETUP_SNOWBALLS_DEFAULT_OPTIONS)

1
code/ryzom/client/client_default.cfg
View file

@ -41,7 +41,6 @@ Gamma_max = 1.0;
Application = { "ryzom_open", "./client_ryzom_r.exe", "./" }; Application = { "ryzom_open", "./client_ryzom_r.exe", "./" };
BackgroundDownloader = 0; BackgroundDownloader = 0;
PatchWanted = 0;
SignUpURL = ""; SignUpURL = "";
StartupHost = "shard.ryzomcore.org:40916"; StartupHost = "shard.ryzomcore.org:40916";
StartupPage = "/login/r2_login.php"; StartupPage = "/login/r2_login.php";

4
code/ryzom/client/src/CMakeLists.txt
View file

@ -10,6 +10,10 @@ ADD_SUBDIRECTORY(seven_zip)
IF(WITH_RYZOM_PATCH) IF(WITH_RYZOM_PATCH)
ADD_DEFINITIONS(-DRZ_USE_PATCH) ADD_DEFINITIONS(-DRZ_USE_PATCH)
IF(WITH_RYZOM_CUSTOM_PATCH_SERVER)
ADD_DEFINITIONS(-DRZ_USE_CUSTOM_PATCH_SERVER)
ENDIF()
ENDIF() ENDIF()
FILE(GLOB CFG ../*.cfg) FILE(GLOB CFG ../*.cfg)

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

@ -1048,17 +1048,19 @@ void CClientConfig::setValues()
///////////////////////// /////////////////////////
// NEW PATCHING SYSTEM // // NEW PATCHING SYSTEM //
READ_BOOL_FV(PatchWanted) READ_BOOL_DEV(PatchWanted)
#ifdef RZ_USE_CUSTOM_PATCH_SERVER
READ_STRING_FV(PatchUrl) READ_STRING_FV(PatchUrl)
READ_STRING_FV(PatchVersion) READ_STRING_FV(PatchVersion)
READ_STRING_FV(RingReleaseNotePath) READ_STRING_FV(RingReleaseNotePath)
READ_STRING_FV(ReleaseNotePath) READ_STRING_FV(ReleaseNotePath)
READ_BOOL_DEV(PatchWanted) #else
READ_STRING_DEV(PatchUrl) READ_STRING_DEV(PatchUrl)
READ_STRING_DEV(PatchVersion) READ_STRING_DEV(PatchVersion)
READ_STRING_DEV(RingReleaseNotePath) READ_STRING_DEV(RingReleaseNotePath)
READ_STRING_DEV(ReleaseNotePath) READ_STRING_DEV(ReleaseNotePath)
#endif
///////////////////////// /////////////////////////
// NEW PATCHLET SYSTEM // // NEW PATCHLET SYSTEM //

7
code/ryzom/client/src/login.cpp
View file

@ -991,11 +991,18 @@ void removeSpace(string &s)
static void getPatchParameters(std::string &url, std::string &ver, std::vector<std::string> &patchURIs) static void getPatchParameters(std::string &url, std::string &ver, std::vector<std::string> &patchURIs)
{ {
if (ClientCfg.R2Mode) if (ClientCfg.R2Mode)
{
url = ClientCfg.PatchUrl;
ver = ClientCfg.PatchVersion;
// if PatchUrl is forced, don't use URLs returned by server
if (url.empty())
{ {
patchURIs = R2PatchURLs; patchURIs = R2PatchURLs;
url = R2BackupPatchURL; url = R2BackupPatchURL;
ver = R2ServerVersion; ver = R2ServerVersion;
} }
}
else else
{ {
nlassert(ShardSelected != -1); nlassert(ShardSelected != -1);