mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-29 22:15:32 +00:00
Code Issues Releases Wiki Activity

Fix frame listener errors for player markers

Browse source
This commit is contained in:
David Cernat 2016-10-30 16:39:59 +02:00
parent eebe1f156a
commit 3c4b74cd14
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwmp/DedicatedPlayer.cpp
View file

@ -468,7 +468,7 @@ void DedicatedPlayer::updateMarker()
GUIController *gui = Main::get().getGUIController();
if (gui->mPlayerMarkers.isExistent(marker))
if (gui->mPlayerMarkers.contains(marker))
{
gui->mPlayerMarkers.deleteMarker(marker);
marker = gui->CreateMarker(guid);

12
apps/openmw/mwmp/PlayerMarkerCollection.cpp
View file

@ -73,7 +73,15 @@ size_t PlayerMarkerCollection::size() const
return mMarkers.size();
}
bool PlayerMarkerCollection::isExistent(const ESM::CustomMarker &marker)
bool PlayerMarkerCollection::contains(const ESM::CustomMarker &marker)
{
return mMarkers.find(marker.mCell) != mMarkers.end();
std::pair<ContainerType::iterator, ContainerType::iterator> range = mMarkers.equal_range(marker.mCell);
for (ContainerType::iterator it = range.first; it != range.second; ++it)
{
if (it->second == marker)
return true;
}
return false;
}

2
apps/openmw/mwmp/PlayerMarkerCollection.hpp
View file

@ -39,7 +39,7 @@ namespace mwmp
typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
EventHandle_Void eventMarkersChanged;
bool isExistent(const ESM::CustomMarker &marker);
bool contains(const ESM::CustomMarker &marker);
private:
ContainerType mMarkers;
};