From 4f688d5616268f0d077b7e925933f54920120da4 Mon Sep 17 00:00:00 2001 From: red-001 Date: Fri, 26 Jan 2018 15:05:47 +0000 Subject: Fix issues with earlier CSM HUD commit (#6940) The CSM HUD PR caused some strange behavior including aborts due to parts of it using some slightly hacky code, the event refactor changing how events are processed and a minor oversight. --- src/network/clientpackethandler.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/network') diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp index db3655875..aa4d8c244 100644 --- a/src/network/clientpackethandler.cpp +++ b/src/network/clientpackethandler.cpp @@ -1062,12 +1062,10 @@ void Client::handleCommand_HudAdd(NetworkPacket* pkt) try { *pkt >> size; } catch(SerializationError &e) {}; - u32 client_id = getEnv().getLocalPlayer()->getFreeHudID(); - m_hud_server_to_client[server_id] = client_id; ClientEvent *event = new ClientEvent(); event->type = CE_HUDADD; - event->hudadd.id = client_id; + event->hudadd.server_id = server_id; event->hudadd.type = type; event->hudadd.pos = new v2f(pos); event->hudadd.name = new std::string(name); @@ -1089,7 +1087,7 @@ void Client::handleCommand_HudRemove(NetworkPacket* pkt) *pkt >> server_id; - std::unordered_map::const_iterator i = m_hud_server_to_client.find(server_id); + auto i = m_hud_server_to_client.find(server_id); if (i != m_hud_server_to_client.end()) { int client_id = i->second; m_hud_server_to_client.erase(i); -- cgit v1.2.3