BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Cleanup: drop Server::hudGetHotbarSelectedImage()

Browse Source 
Call directly accessible RemotePlayer::getHotbarSelectedImage() from server api
This commit is contained in:
Loic Blot 2018-03-08 22:06:48 +01:00 committed by Loïc Blot
parent 4be46aeeb1
commit c7656edaa5
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/script/lua_api/l_object.cpp
View File

@ -1519,7 +1519,7 @@ int ObjectRef::l_hud_get_hotbar_selected_image(lua_State *L)
if (player == NULL) if (player == NULL)
return 0; return 0;
const std::string &name = getServer(L)->hudGetHotbarSelectedImage(player); const std::string &name = player->getHotbarSelectedImage();
lua_pushlstring(L, name.c_str(), name.size()); lua_pushlstring(L, name.c_str(), name.size());
return 1; return 1;
} }

5
src/server.cpp
View File

@ -3108,11 +3108,6 @@ void Server::hudSetHotbarSelectedImage(RemotePlayer *player, std::string name)
SendHUDSetParam(player->getPeerId(), HUD_PARAM_HOTBAR_SELECTED_IMAGE, name); SendHUDSetParam(player->getPeerId(), HUD_PARAM_HOTBAR_SELECTED_IMAGE, name);
} }
const std::string& Server::hudGetHotbarSelectedImage(RemotePlayer *player) const
{
return player->getHotbarSelectedImage();
}
Address Server::getPeerAddress(session_t peer_id) Address Server::getPeerAddress(session_t peer_id)
{ {
return m_con->GetPeerAddress(peer_id); return m_con->GetPeerAddress(peer_id);

1
src/server.h
View File

@ -292,7 +292,6 @@ public:
bool hudSetHotbarItemcount(RemotePlayer *player, s32 hotbar_itemcount); bool hudSetHotbarItemcount(RemotePlayer *player, s32 hotbar_itemcount);
void hudSetHotbarImage(RemotePlayer *player, std::string name); void hudSetHotbarImage(RemotePlayer *player, std::string name);
void hudSetHotbarSelectedImage(RemotePlayer *player, std::string name); void hudSetHotbarSelectedImage(RemotePlayer *player, std::string name);
const std::string &hudGetHotbarSelectedImage(RemotePlayer *player) const;
Address getPeerAddress(session_t peer_id); Address getPeerAddress(session_t peer_id);