From 59128be88541677ad2abc44a23598040733046c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nuno=20Gon=C3=A7alves=20=28Ulukyn=29?= Date: Thu, 16 Sep 2021 16:41:34 +0100 Subject: [PATCH] Revert changes on yubo (silan_refactoring branch) --- code/ryzom/client/src/init_main_loop.cpp | 9 +-------- code/ryzom/client/src/interface_v3/lua_ihm_ryzom.h | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/code/ryzom/client/src/init_main_loop.cpp b/code/ryzom/client/src/init_main_loop.cpp index 7373827d0..2b391114c 100644 --- a/code/ryzom/client/src/init_main_loop.cpp +++ b/code/ryzom/client/src/init_main_loop.cpp @@ -1578,13 +1578,6 @@ void setLoadingContinent (CContinent *continent) void initWelcomeWindow() { - CSessionBrowserImpl &sb = CSessionBrowserImpl::getInstance(); - if (sb.CurrentJoinMode!=CFarTP::LaunchEditor && NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:WELCOME")->getValueBool()) - { - std::vector v; - CWidgetManager::getInstance()->runProcedure ("welcome_opened", NULL, v); - } - /* CInterfaceManager *pIM = CInterfaceManager::getInstance(); CInterfaceGroup* welcomeWnd = dynamic_cast(CWidgetManager::getInstance()->getElementFromId("ui:interface:welcome_info")); if(welcomeWnd) @@ -1592,7 +1585,7 @@ void initWelcomeWindow() bool welcomeDbProp = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:WELCOME")->getValueBool(); CSessionBrowserImpl &sb = CSessionBrowserImpl::getInstance(); welcomeWnd->setActive((sb.CurrentJoinMode!=CFarTP::LaunchEditor) && welcomeDbProp); - }*/ + } } // *************************************************************************** diff --git a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.h b/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.h index cbd458e04..320d78544 100644 --- a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.h +++ b/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.h @@ -207,8 +207,8 @@ private: static bool isDynStringAvailable(sint32 dynStringId); static bool isFullyPatched(); static std::string getSheetType(const std::string &sheet); - static float getCharacterSheetScale(const std::string &sheet); static std::string getSheetShape(const std::string &sheet); + static float getCharacterSheetScale(const std::string &sheet); static std::string getSheetFamily(const std::string &sheet); static std::string getSheetName(uint32 sheetId); static sint32 getFameIndex(const std::string &factionName);