From a7b931353c356bb09b597bd0bf5857a5fc37e43d Mon Sep 17 00:00:00 2001 From: Nimetu Date: Tue, 8 Jan 2019 11:39:02 +0200 Subject: [PATCH] Changed: Fixes for client local/debug mode --HG-- branch : develop --- .../ryzom/client/src/interface_v3/action_handler_game.cpp | 4 ++-- code/ryzom/client/src/interface_v3/group_html_webig.cpp | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/code/ryzom/client/src/interface_v3/action_handler_game.cpp b/code/ryzom/client/src/interface_v3/action_handler_game.cpp index 836a4df28..c5faa16d9 100644 --- a/code/ryzom/client/src/interface_v3/action_handler_game.cpp +++ b/code/ryzom/client/src/interface_v3/action_handler_game.cpp @@ -4238,7 +4238,7 @@ public: string fileName = getParam(sParams, "music"); // don't play if db is in init stage - if (IngameDbMngr.initInProgress()) return; + if (!ClientCfg.Local && IngameDbMngr.initInProgress()) return; if(SoundMngr) SoundMngr->playEventMusic(fileName, xFade, loop); @@ -4260,7 +4260,7 @@ public: string fileName= getParam(sParams, "music"); // don't play if db is in init stage - if (IngameDbMngr.initInProgress()) return; + if (!ClientCfg.Local && IngameDbMngr.initInProgress()) return; if(SoundMngr) SoundMngr->stopEventMusic(fileName, xFade); diff --git a/code/ryzom/client/src/interface_v3/group_html_webig.cpp b/code/ryzom/client/src/interface_v3/group_html_webig.cpp index fe2fa5229..66cfecdad 100644 --- a/code/ryzom/client/src/interface_v3/group_html_webig.cpp +++ b/code/ryzom/client/src/interface_v3/group_html_webig.cpp @@ -54,7 +54,7 @@ REGISTER_ACTION_HANDLER( CHandlerBrowseHome, "browse_home"); static string getWebAuthKey() { - if(!UserEntity) return ""; + if(!UserEntity || !NetMngr.getLoginCookie().isValid()) return ""; // authkey = uint32 cid = NetMngr.getLoginCookie().getUserId() * 16 + PlayerSelectedSlot; @@ -83,7 +83,7 @@ void addWebIGParams (string &url, bool trustedDomain) { url += string("&cid=") + toString(cid) + string("&authkey=") + getWebAuthKey(); - + if (url.find('$') != string::npos) { strFindReplace(url, "$gender$", GSGENDER::toString(UserEntity->getGender())); @@ -304,6 +304,8 @@ CGroupHTMLAuth::~CGroupHTMLAuth() void CGroupHTMLAuth::addHTTPGetParams (string &url, bool trustedDomain) { + if(!UserEntity || !NetMngr.getLoginCookie().isValid()) return; + addWebIGParams(url, trustedDomain); } @@ -311,7 +313,7 @@ void CGroupHTMLAuth::addHTTPGetParams (string &url, bool trustedDomain) void CGroupHTMLAuth::addHTTPPostParams (SFormFields &formfields, bool trustedDomain) { - if(!UserEntity) return; + if(!UserEntity || !NetMngr.getLoginCookie().isValid()) return; uint32 cid = NetMngr.getLoginCookie().getUserId() * 16 + PlayerSelectedSlot; formfields.add("shardid", toString(CharacterHomeSessionId));