From 9d46de88e03f0e2a1e350f6395b966fcadb0c920 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Wed, 18 Apr 2018 20:30:48 +0300 Subject: [PATCH] [Client] Send cell states correctly after inputting name Previously, initial cell states were sent in LocalPlayer::processCharGen() and were ignored by the server because the player was not yet regarded as loaded. The result was that existing players logging in could not see each other until they went through at least one cell change. (cherry picked from commit b4e8560698fbe9ef30e1c5e004bf7f928e85c6a8) # Conflicts: # apps/openmw/mwmp/LocalPlayer.cpp --- apps/openmw/mwmp/LocalPlayer.cpp | 2 -- apps/openmw/mwmp/Main.cpp | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/openmw/mwmp/LocalPlayer.cpp b/apps/openmw/mwmp/LocalPlayer.cpp index 46ea85915..b723e487e 100644 --- a/apps/openmw/mwmp/LocalPlayer.cpp +++ b/apps/openmw/mwmp/LocalPlayer.cpp @@ -184,8 +184,6 @@ bool LocalPlayer::charGenThread() getNetworking()->getPlayerPacket(ID_PLAYER_CHARGEN)->Send(); } - sendCellStates(); - // Set the last stage variable to 0 to indicate that CharGen is finished charGenStage.end = 0; } diff --git a/apps/openmw/mwmp/Main.cpp b/apps/openmw/mwmp/Main.cpp index 38f2854cf..214f550f1 100644 --- a/apps/openmw/mwmp/Main.cpp +++ b/apps/openmw/mwmp/Main.cpp @@ -227,6 +227,7 @@ void Main::updateWorld(float dt) const mNetworking->getPlayerPacket(ID_PLAYER_BASEINFO)->Send(); mNetworking->getPlayerPacket(ID_LOADED)->Send(); mLocalPlayer->updateStatsDynamic(true); + mLocalPlayer->sendCellStates(); get().getGUIController()->setChatVisible(true); } else