From c54af2b02bdd8931b4cdc66f68d6b85acbf48ba7 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Mon, 24 Oct 2016 16:26:51 +0300 Subject: [PATCH] Make DedicatedPlayer's setMarkerState method actually enable markers --- apps/openmw/mwmp/DedicatedPlayer.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apps/openmw/mwmp/DedicatedPlayer.cpp b/apps/openmw/mwmp/DedicatedPlayer.cpp index 20599eee0..65db7fa8d 100644 --- a/apps/openmw/mwmp/DedicatedPlayer.cpp +++ b/apps/openmw/mwmp/DedicatedPlayer.cpp @@ -472,7 +472,9 @@ void DedicatedPlayer::updateMarker() { if (!markerEnabled) return; + GUIController *gui = Main::get().getGUIController(); + if (gui->mPlayerMarkers.isExistent(marker)) { gui->mPlayerMarkers.deleteMarker(marker); @@ -487,6 +489,7 @@ void DedicatedPlayer::removeMarker() { if (!markerEnabled) return; + markerEnabled = false; Main::get().getGUIController()->mPlayerMarkers.deleteMarker(marker); } @@ -494,7 +497,10 @@ void DedicatedPlayer::removeMarker() void DedicatedPlayer::setMarkerState(bool state) { if (state) + { + markerEnabled = true; updateMarker(); + } else removeMarker(); }