Net: handle in-game GC_PHASE like the Windows client

PHASE_SELECT returns the connection to LoginSession (cached roster,
SelectReady, later LOGIN_SUCCESS refreshes), PHASE_CLOSE goes to the
login phase, LOADING clears the player, GAME refreshes the status and
DEAD no longer leaves the game phase.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
shenlei
2026-10-13 13:24:12 +09:00
co-authored by Claude Opus 5.5
parent 189da4c269
commit 40cac5cf52
9 changed files with 113 additions and 24 deletions
+11 -1
View File
@@ -1409,7 +1409,8 @@ void pump_python_net() {
else if(event.type == LoginClient::EventType::SelectReady) {
callback(handler, client.session()->empire() ? "SetSelectCharacterPhase" : "SetSelectEmpirePhase");
if(event.generation == client.generation()) callback(phases[2], "Refresh");
} else if(event.type == LoginClient::EventType::DirectEnterReady) callback(handler, "SetLoadingPhase");
} else if(event.type == LoginClient::EventType::SelectRefresh) callback(phases[2], "Refresh");
else if(event.type == LoginClient::EventType::DirectEnterReady) callback(handler, "SetLoadingPhase");
else if(event.type == LoginClient::EventType::Loading) {
PythonNetworkStream::Instance().SetPhase(PHASE_LOADING);
// SetSelectPhase under DirectEnter: ENABLE_NEW_LOADING picks SetNewLoadingPhase for a warp.
@@ -1427,6 +1428,15 @@ void pump_python_net() {
auto& stream=PythonNetworkStream::Instance();
stream.PushRecvData(client.take_game_input(stream.RecvBufferSpace()));
stream.ProcessRecvData();
std::vector<uint8_t> selectLeftover;
if(stream.TakeSelectRequest(selectLeftover) && client.status()==LoginClient::Status::Loading) {
// RecvPhasePacket(PHASE_SELECT): SetSelectPhase. __LeaveGamePhase clears actors and items; the
// transport resumes select-phase parsing and raises SelectReady (SetSelectCharacterPhase).
stream.ResetConnection();stream.SetPhase(PHASE_SELECT);
try { client.return_to_select(selectLeftover); }
catch(const std::exception& e) { SDL_Log("Select phase failed: %s",e.what());client.cancel();callback(handler,"SetLoginPhase"); }
return;
}
uint32_t warpAddress=0;uint16_t warpPort=0;
if(stream.TakeWarpRequest(warpAddress,warpPort) && client.status()==LoginClient::Status::Loading) {
// RecvWarpPacket: __DirectEnterMode_Set(selected slot, true) + Connect. Leaving the game phase