oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-08-11 17:51:04 +00:00
Code Wiki Activity

Small cleanup of hud add/remove code

Browse source
This commit is contained in:
sapier 2014-05-25 14:34:32 +02:00
parent 5bd2aea663
commit d76b8c6e7c
6 changed files with 100 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/server.cpp
View file

@ -4560,24 +4560,25 @@ bool Server::showFormspec(const char *playername, const std::string &formspec, c
u32 Server::hudAdd(Player *player, HudElement *form) {
if (!player)
return -1;
u32 id = player->getFreeHudID();
if (id < player->hud.size())
player->hud[id] = form;
else
player->hud.push_back(form);
u32 id = player->addHud(form);
SendHUDAdd(player->peer_id, id, form);
return id;
}
bool Server::hudRemove(Player *player, u32 id) {
if (!player || id >= player->hud.size() || !player->hud[id])
if (!player)
return false;
delete player->hud[id];
player->hud[id] = NULL;
HudElement* todel = player->removeHud(id);
if (!todel)
return false;
delete todel;
SendHUDRemove(player->peer_id, id);
return true;
}
@ -5047,7 +5048,7 @@ PlayerSAO* Server::emergePlayer(const char *name, u16 peer_id)
isSingleplayer());
/* Clean up old HUD elements from previous sessions */
player->hud.clear();
player->clearHud();
/* Add object to environment */
m_env->addActiveObject(playersao);