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

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-04-02 19:34:20 +02:00
commit 435573b305
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
code/ryzom/client/src/far_tp.cpp
View file

@ -602,7 +602,7 @@ void CLoginStateMachine::run()
break; break;
case st_disconnect: case st_disconnect:
// Far TP part 2: disconnect from the FS and unload shard-specific data (called from farTPmainLoop()) // Far TP part 2: disconnect from the FS and unload shard-specific data (called from farTPmainLoop())
// FarTP.disconnectFromPreviousShard(); FarTP.disconnectFromPreviousShard();
SM_BEGIN_EVENT_TABLE SM_BEGIN_EVENT_TABLE
SM_EVENT(ev_connect, st_reconnect_fs); SM_EVENT(ev_connect, st_reconnect_fs);
@ -1439,9 +1439,6 @@ void CFarTP::farTPmainLoop()
{ {
ConnectionReadySent = false; ConnectionReadySent = false;
LoginSM.pushEvent(CLoginStateMachine::ev_far_tp_main_loop_entered); LoginSM.pushEvent(CLoginStateMachine::ev_far_tp_main_loop_entered);
disconnectFromPreviousShard();
uint nbRecoSelectCharReceived = 0; uint nbRecoSelectCharReceived = 0;
bool welcomeWindow = true; bool welcomeWindow = true;