diff --git a/apps/openmw-mp/Player.cpp b/apps/openmw-mp/Player.cpp index 15e7204bb..f41810e7b 100644 --- a/apps/openmw-mp/Player.cpp +++ b/apps/openmw-mp/Player.cpp @@ -10,8 +10,8 @@ TSlots Players::slots; void Players::DeletePlayer(RakNet::RakNetGUID id) { - LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Deleting player with guid %s", - id.ToString()); + LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Deleting player with guid %lu", + id.g); if (players[id] != 0) { @@ -27,8 +27,8 @@ void Players::DeletePlayer(RakNet::RakNetGUID id) void Players::NewPlayer(RakNet::RakNetGUID id) { - LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Creating new player with guid %s", - id.ToString()); + LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Creating new player with guid %lu", + id.g); players[id] = new Player(id); players[id]->GetCell()->blank(); diff --git a/apps/openmw/mwmp/DedicatedPlayer.cpp b/apps/openmw/mwmp/DedicatedPlayer.cpp index 65db7fa8d..693ce0e29 100644 --- a/apps/openmw/mwmp/DedicatedPlayer.cpp +++ b/apps/openmw/mwmp/DedicatedPlayer.cpp @@ -102,16 +102,16 @@ void Players::CreatePlayer(RakNet::RakNetGUID id) esm_store->insert(npc); dedicPlayer->updateCell(); + + ESM::CustomMarker mEditingMarker = Main::get().getGUIController()->CreateMarker(id); + dedicPlayer->marker = mEditingMarker; + dedicPlayer->setMarkerState(true); } dedicPlayer->guid = id; dedicPlayer->state = 2; world->enable(players[id]->ptr); - - ESM::CustomMarker mEditingMarker = Main::get().getGUIController()->CreateMarker(id); - dedicPlayer->marker = mEditingMarker; - dedicPlayer->setMarkerState(true); } @@ -284,8 +284,8 @@ void DedicatedPlayer::UpdatePtr(MWWorld::Ptr newPtr) DedicatedPlayer *Players::NewPlayer(RakNet::RakNetGUID guid) { - LOG_APPEND(Log::LOG_INFO, "- Creating new DedicatedPlayer with guid %i", - guid.ToUint32); + LOG_APPEND(Log::LOG_INFO, "- Creating new DedicatedPlayer with guid %lu", + guid.g); players[guid] = new DedicatedPlayer(guid); players[guid]->state = 0;