krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Make markers get removed when their players quit, rename marker methods

Browse source
This commit is contained in:
David Cernat 2016-10-24 15:10:32 +03:00
parent aed884949c
commit 04eb051df6
4 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -111,7 +111,7 @@ void Players::CreatePlayer(RakNet::RakNetGUID id)
ESM::CustomMarker mEditingMarker = Main::get().getGUIController()->CreateMarker(id);
dedicPlayer->marker = mEditingMarker;
dedicPlayer->markerEnabled = true;
dedicPlayer->setMarkerState(true);
}
@ -126,6 +126,10 @@ void Players::DisconnectPlayer(RakNet::RakNetGUID id)
if (players[id]->state > 1)
{
players[id]->state = 1;
// Remove player's marker
players[id]->setMarkerState(false);
MWBase::World *world = MWBase::Environment::get().getWorld();
world->disable(players[id]->getPtr());
@ -469,7 +473,7 @@ void DedicatedPlayer::updateMarker()
if (!markerEnabled)
return;
GUIController *gui = Main::get().getGUIController();
if (gui->mPlayerMarkers.isExists(marker))
if (gui->mPlayerMarkers.isExistent(marker))
{
gui->mPlayerMarkers.deleteMarker(marker);
marker = gui->CreateMarker(guid);
@ -487,9 +491,9 @@ void DedicatedPlayer::removeMarker()
Main::get().getGUIController()->mPlayerMarkers.deleteMarker(marker);
}
void DedicatedPlayer::enableMarker(bool enable)
void DedicatedPlayer::setMarkerState(bool state)
{
if (enable)
if (state)
updateMarker();
else
removeMarker();

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

@ -49,7 +49,7 @@ namespace mwmp
void updateMarker();
void removeMarker();
void enableMarker(bool enable);
void setMarkerState(bool state);
private:
DedicatedPlayer(RakNet::RakNetGUID guid);
virtual ~DedicatedPlayer();

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

@ -73,7 +73,7 @@ size_t PlayerMarkerCollection::size() const
return mMarkers.size();
}
bool PlayerMarkerCollection::isExists(const ESM::CustomMarker &marker)
bool PlayerMarkerCollection::isExistent(const ESM::CustomMarker &marker)
{
return mMarkers.find(marker.mCell) != mMarkers.end();
}

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

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