From ba6378e07cabc0fcd7eb5d8b3cec29cfe01f754d Mon Sep 17 00:00:00 2001 From: kaetemi Date: Sat, 16 Nov 2019 14:25:32 +0800 Subject: [PATCH] Remove useless feature --- code/ryzom/client/src/client_cfg.cpp | 8 ++++++-- code/ryzom/client/src/client_cfg.h | 4 +++- code/ryzom/client/src/interface_v3/interface_manager.cpp | 2 ++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/code/ryzom/client/src/client_cfg.cpp b/code/ryzom/client/src/client_cfg.cpp index 67b40de60..0dff22c5c 100644 --- a/code/ryzom/client/src/client_cfg.cpp +++ b/code/ryzom/client/src/client_cfg.cpp @@ -416,7 +416,9 @@ CClientConfig::CClientConfig() #endif PatchUrl.clear(); +#ifdef RYZOM_FORGE PatchletUrl.clear(); +#endif PatchVersion.clear(); WebIgMainDomain = "https://classic.ryzom.dev"; @@ -1079,9 +1081,11 @@ void CClientConfig::setValues() READ_STRING_DEV(ReleaseNotePath) #endif - ///////////////////////// - // NEW PATCHLET SYSTEM // +#ifdef RYZOM_FORGE + ///////////////////////////// + // GARBAGE PATCHLET SYSTEM // READ_STRING_FV(PatchletUrl) +#endif /////////// // WEBIG // diff --git a/code/ryzom/client/src/client_cfg.h b/code/ryzom/client/src/client_cfg.h index 7d2dbac37..a02008e49 100644 --- a/code/ryzom/client/src/client_cfg.h +++ b/code/ryzom/client/src/client_cfg.h @@ -304,8 +304,10 @@ struct CClientConfig // NEW PATCHING SYSTEM // bool PatchWanted; std::string PatchUrl; - std::string PatchletUrl; std::string PatchVersion; +#ifdef RYZOM_FORGE + std::string PatchletUrl; +#endif std::string RingReleaseNotePath; std::string ReleaseNotePath; diff --git a/code/ryzom/client/src/interface_v3/interface_manager.cpp b/code/ryzom/client/src/interface_v3/interface_manager.cpp index 5593a365f..09f06148d 100644 --- a/code/ryzom/client/src/interface_v3/interface_manager.cpp +++ b/code/ryzom/client/src/interface_v3/interface_manager.cpp @@ -784,6 +784,7 @@ void CInterfaceManager::initOutGame() } //NLMEMORY::CheckHeap (true); +#ifdef RYZOM_FORGE // Initialize the web browser { CGroupHTML *pGH = dynamic_cast( CWidgetManager::getInstance()->getElementFromId(GROUP_BROWSER)); @@ -794,6 +795,7 @@ void CInterfaceManager::initOutGame() pGH->browse(ClientCfg.PatchletUrl.c_str()); } } +#endif } // ------------------------------------------------------------------------------------------------