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

[General] Fix code style inconsistencies

Browse source
This commit is contained in:
David Cernat 2017-05-31 08:37:11 +03:00
parent 97bf0252a4
commit a353a21280
25 changed files with 65 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -252,7 +252,7 @@ void DedicatedPlayer::updateMarker()
if (gui->mPlayerMarkers.contains(marker)) if (gui->mPlayerMarkers.contains(marker))
{ {
gui->mPlayerMarkers.deleteMarker(marker); gui->mPlayerMarkers.deleteMarker(marker);
marker = gui->CreateMarker(guid); marker = gui->createMarker(guid);
gui->mPlayerMarkers.addMarker(marker); gui->mPlayerMarkers.addMarker(marker);
} }
else else

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

@ -264,7 +264,7 @@ private:
} }
}; };
ESM::CustomMarker mwmp::GUIController::CreateMarker(const RakNet::RakNetGUID &guid) ESM::CustomMarker mwmp::GUIController::createMarker(const RakNet::RakNetGUID &guid)
{ {
DedicatedPlayer *player = PlayerList::getPlayer(guid); DedicatedPlayer *player = PlayerList::getPlayer(guid);
ESM::CustomMarker mEditingMarker; ESM::CustomMarker mEditingMarker;

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

@ -58,7 +58,7 @@ namespace mwmp
void updatePlayersMarkers(MWGui::LocalMapBase *localMapBase); void updatePlayersMarkers(MWGui::LocalMapBase *localMapBase);
void updateGlobalMapMarkerTooltips(MWGui::MapWindow *pWindow); void updateGlobalMapMarkerTooltips(MWGui::MapWindow *pWindow);
ESM::CustomMarker CreateMarker(const RakNet::RakNetGUID &guid); ESM::CustomMarker createMarker(const RakNet::RakNetGUID &guid);
PlayerMarkerCollection mPlayerMarkers; PlayerMarkerCollection mPlayerMarkers;
private: private:
void setGlobalMapMarkerTooltip(MWGui::MapWindow *mapWindow ,MyGUI::Widget* markerWidget, int x, int y); void setGlobalMapMarkerTooltip(MWGui::MapWindow *mapWindow ,MyGUI::Widget* markerWidget, int x, int y);