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

Changed: Fixes for client local/debug mode

Browse source 
--HG--
branch : develop
This commit is contained in:
Nimetu 2019-01-08 11:39:02 +02:00
parent 8b69d673be
commit a7b931353c
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/ryzom/client/src/interface_v3/action_handler_game.cpp
View file

@ -4238,7 +4238,7 @@ public:
string fileName = getParam(sParams, "music"); string fileName = getParam(sParams, "music");
// don't play if db is in init stage // don't play if db is in init stage
if (IngameDbMngr.initInProgress()) return; if (!ClientCfg.Local && IngameDbMngr.initInProgress()) return;
if(SoundMngr) if(SoundMngr)
SoundMngr->playEventMusic(fileName, xFade, loop); SoundMngr->playEventMusic(fileName, xFade, loop);
@ -4260,7 +4260,7 @@ public:
string fileName= getParam(sParams, "music"); string fileName= getParam(sParams, "music");
// don't play if db is in init stage // don't play if db is in init stage
if (IngameDbMngr.initInProgress()) return; if (!ClientCfg.Local && IngameDbMngr.initInProgress()) return;
if(SoundMngr) if(SoundMngr)
SoundMngr->stopEventMusic(fileName, xFade); SoundMngr->stopEventMusic(fileName, xFade);

8
code/ryzom/client/src/interface_v3/group_html_webig.cpp
View file

@ -54,7 +54,7 @@ REGISTER_ACTION_HANDLER( CHandlerBrowseHome, "browse_home");
static string getWebAuthKey() static string getWebAuthKey()
{ {
if(!UserEntity) return ""; if(!UserEntity || !NetMngr.getLoginCookie().isValid()) return "";
// authkey = <sharid><name><cid><cookie> // authkey = <sharid><name><cid><cookie>
uint32 cid = NetMngr.getLoginCookie().getUserId() * 16 + PlayerSelectedSlot; uint32 cid = NetMngr.getLoginCookie().getUserId() * 16 + PlayerSelectedSlot;
@ -83,7 +83,7 @@ void addWebIGParams (string &url, bool trustedDomain)
{ {
url += string("&cid=") + toString(cid) + url += string("&cid=") + toString(cid) +
string("&authkey=") + getWebAuthKey(); string("&authkey=") + getWebAuthKey();
if (url.find('$') != string::npos) if (url.find('$') != string::npos)
{ {
strFindReplace(url, "$gender$", GSGENDER::toString(UserEntity->getGender())); strFindReplace(url, "$gender$", GSGENDER::toString(UserEntity->getGender()));
@ -304,6 +304,8 @@ CGroupHTMLAuth::~CGroupHTMLAuth()
void CGroupHTMLAuth::addHTTPGetParams (string &url, bool trustedDomain) void CGroupHTMLAuth::addHTTPGetParams (string &url, bool trustedDomain)
{ {
if(!UserEntity || !NetMngr.getLoginCookie().isValid()) return;
addWebIGParams(url, trustedDomain); addWebIGParams(url, trustedDomain);
} }
@ -311,7 +313,7 @@ void CGroupHTMLAuth::addHTTPGetParams (string &url, bool trustedDomain)
void CGroupHTMLAuth::addHTTPPostParams (SFormFields &formfields, 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; uint32 cid = NetMngr.getLoginCookie().getUserId() * 16 + PlayerSelectedSlot;
formfields.add("shardid", toString(CharacterHomeSessionId)); formfields.add("shardid", toString(CharacterHomeSessionId));