isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-05-02 10:33:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix player count not updating when exiting Isle overlay areas

Browse Source 
When transitioning from a restricted area (elevator, observatory, etc.)
back to the Isle world, the player count stayed at 0 because nothing
triggered a recount — the Isle world was already enabled so
OnWorldEnabled didn't fire. Track restricted-area status changes in
BroadcastLocalState and call NotifyPlayerCountChanged on transitions.
Also sync the flag in OnWorldEnabled/OnWorldDisabled to prevent
spurious recounts across world transitions.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Christian Semmler 2026-03-15 13:54:48 -07:00
parent 629d77c40f
commit 09ed6edb3e
No known key found for this signature in database
GPG Key ID: 086DAA1360BEEE5C
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
extensions/include/extensions/multiplayer/networkmanager.h
View File

@ -147,6 +147,7 @@ class NetworkManager : public MxCore {
bool m_disableAllNPCs; bool m_disableAllNPCs;
bool m_showNameBubbles; bool m_showNameBubbles;
bool m_lastCameraEnabled; bool m_lastCameraEnabled;
bool m_wasInRestrictedArea;
static const uint32_t BROADCAST_INTERVAL_MS = 66; // ~15Hz static const uint32_t BROADCAST_INTERVAL_MS = 66; // ~15Hz
static const uint32_t TIMEOUT_MS = 5000; // 5 second timeout static const uint32_t TIMEOUT_MS = 5000; // 5 second timeout

13
extensions/src/multiplayer/networkmanager.cpp
View File

@ -49,7 +49,7 @@ NetworkManager::NetworkManager()
m_sequence(0), m_lastBroadcastTime(0), m_lastValidActorId(0), m_localAllowRemoteCustomize(true), m_sequence(0), m_lastBroadcastTime(0), m_lastValidActorId(0), m_localAllowRemoteCustomize(true),
m_inIsleWorld(false), m_registered(false), m_pendingToggleThirdPerson(false), m_pendingToggleNameBubbles(false), m_inIsleWorld(false), m_registered(false), m_pendingToggleThirdPerson(false), m_pendingToggleNameBubbles(false),
m_pendingWalkAnim(-1), m_pendingIdleAnim(-1), m_pendingEmote(-1), m_pendingToggleAllowCustomize(false), m_pendingWalkAnim(-1), m_pendingIdleAnim(-1), m_pendingEmote(-1), m_pendingToggleAllowCustomize(false),
m_disableAllNPCs(false), m_showNameBubbles(true), m_lastCameraEnabled(false) m_disableAllNPCs(false), m_showNameBubbles(true), m_lastCameraEnabled(false), m_wasInRestrictedArea(false)
{ {
} }
@ -201,6 +201,7 @@ void NetworkManager::OnWorldEnabled(LegoWorld* p_world)
if (p_world->GetWorldId() == LegoOmni::e_act1) { if (p_world->GetWorldId() == LegoOmni::e_act1) {
m_inIsleWorld = true; m_inIsleWorld = true;
m_wasInRestrictedArea = IsRestrictedArea(GameState()->m_currentArea);
m_worldSync.SetInIsleWorld(true); m_worldSync.SetInIsleWorld(true);
for (auto& [peerId, player] : m_remotePlayers) { for (auto& [peerId, player] : m_remotePlayers) {
@ -236,6 +237,7 @@ void NetworkManager::OnWorldDisabled(LegoWorld* p_world)
if (p_world->GetWorldId() == LegoOmni::e_act1) { if (p_world->GetWorldId() == LegoOmni::e_act1) {
m_inIsleWorld = false; m_inIsleWorld = false;
m_wasInRestrictedArea = false;
m_worldSync.SetInIsleWorld(false); m_worldSync.SetInIsleWorld(false);
// Destroy local name bubble (ROI is about to be destroyed) // Destroy local name bubble (ROI is about to be destroyed)
@ -407,11 +409,16 @@ void NetworkManager::BroadcastLocalState()
ThirdPersonCamera::Controller* cam = GetCamera(); ThirdPersonCamera::Controller* cam = GetCamera();
bool inRestrictedArea = IsRestrictedArea(GameState()->m_currentArea);
if (m_inIsleWorld && m_wasInRestrictedArea != inRestrictedArea) {
m_wasInRestrictedArea = inRestrictedArea;
NotifyPlayerCountChanged();
}
PlayerStateMsg msg{}; PlayerStateMsg msg{};
msg.header = {MSG_STATE, m_localPeerId, m_sequence++, TARGET_BROADCAST}; msg.header = {MSG_STATE, m_localPeerId, m_sequence++, TARGET_BROADCAST};
msg.actorId = actorId; msg.actorId = actorId;
msg.worldId = msg.worldId = inRestrictedArea ? WORLD_NOT_VISIBLE : (int8_t) currentWorld->GetWorldId();
IsRestrictedArea(GameState()->m_currentArea) ? WORLD_NOT_VISIBLE : (int8_t) currentWorld->GetWorldId();
msg.vehicleType = DetectVehicleType(userActor); msg.vehicleType = DetectVehicleType(userActor);
SDL_memcpy(msg.position, pos, sizeof(msg.position)); SDL_memcpy(msg.position, pos, sizeof(msg.position));
SDL_memcpy(msg.direction, dir, sizeof(msg.direction)); SDL_memcpy(msg.direction, dir, sizeof(msg.direction));