1175-oglthread.patch
b/code/ryzom/client/src/far_tp.cpp Wed Jan 12 19:20:06 2011 +0100 | ||
---|---|---|
582 | 582 |
// Server Hop part 3.2: bypass character selection ui & select the same character. |
583 | 583 |
// Far TP part 3.2: bypass character selection ui & select the same character. |
584 | 584 |
// This is called from farTPmainloop(), when CONNECTION:USER_CHARS is received. |
585 |
Driver->releaseContext(); |
|
585 | 586 |
if( !FarTP.isReselectingChar() ) |
586 | 587 |
{ |
587 | 588 |
FarTP.selectCharAndEnter(); |
... | ... | |
642 | 644 |
break; |
643 | 645 |
} |
644 | 646 |
} |
647 |
Driver->releaseContext(); |
|
645 | 648 |
} |
646 | 649 |
|
647 | 650 |
|
... | ... | |
1053 | 1057 |
|
1054 | 1058 |
if (isIngame()) |
1055 | 1059 |
{ |
1060 |
Driver->enableContext(); |
|
1056 | 1061 |
// Display background (TODO: not Kami) |
1057 | 1062 |
beginLoading (StartBackground); |
1058 | 1063 |
UseEscapeDuringLoading = false; |
... | ... | |
1391 | 1398 |
void CFarTP::farTPmainLoop() |
1392 | 1399 |
{ |
1393 | 1400 |
ConnectionReadySent = false; |
1401 |
Driver->releaseContext(); |
|
1394 | 1402 |
LoginSM.pushEvent(CLoginStateMachine::ev_far_tp_main_loop_entered); |
1395 | 1403 |
uint nbRecoSelectCharReceived = 0; |
1396 | 1404 |
|
... | ... | |
1430 | 1439 |
if ( nbRecoSelectCharReceived <= 1 ) |
1431 | 1440 |
{ |
1432 | 1441 |
ClientCfg.SelectCharacter = -1; // turn off character autoselection |
1442 |
Driver->enableContext(); |
|
1433 | 1443 |
if ( ! FarTP.reselectCharacter() ) // it should not return here in farTPmainLoop() in the same state otherwise this would be called twice |
1434 | 1444 |
return; |
1435 | 1445 |
} |
... | ... | |
1441 | 1452 |
{ |
1442 | 1453 |
// Don't call sendReady() within the cotask but within the main loop, as it contains |
1443 | 1454 |
// event/network loops that could trigger a global exit(). |
1455 |
Driver->enableContext(); |
|
1444 | 1456 |
sendReady(); |
1445 | 1457 |
welcomeWindow = !isReselectingChar(); |
1446 | 1458 |
} |