mirror of
https://github.com/minetest/minetest.git
synced 2024-08-20 21:44:19 +02:00
Cleanup: drop Server::hudGetHotbarImage()
Call directly accessible RemotePlayer::getHotbarImage() from server api & make it const ref
This commit is contained in:
parent
373f1bfb4a
commit
4be46aeeb1
@ -71,7 +71,7 @@ public:
|
||||
|
||||
void setHotbarImage(const std::string &name) { hud_hotbar_image = name; }
|
||||
|
||||
std::string getHotbarImage() const { return hud_hotbar_image; }
|
||||
const std::string &getHotbarImage() const { return hud_hotbar_image; }
|
||||
|
||||
void setHotbarSelectedImage(const std::string &name)
|
||||
{
|
||||
|
@ -1490,7 +1490,7 @@ int ObjectRef::l_hud_get_hotbar_image(lua_State *L)
|
||||
if (player == NULL)
|
||||
return 0;
|
||||
|
||||
std::string name = getServer(L)->hudGetHotbarImage(player);
|
||||
const std::string &name = player->getHotbarImage();
|
||||
lua_pushlstring(L, name.c_str(), name.size());
|
||||
return 1;
|
||||
}
|
||||
|
@ -3099,13 +3099,6 @@ void Server::hudSetHotbarImage(RemotePlayer *player, std::string name)
|
||||
SendHUDSetParam(player->getPeerId(), HUD_PARAM_HOTBAR_IMAGE, name);
|
||||
}
|
||||
|
||||
std::string Server::hudGetHotbarImage(RemotePlayer *player)
|
||||
{
|
||||
if (!player)
|
||||
return "";
|
||||
return player->getHotbarImage();
|
||||
}
|
||||
|
||||
void Server::hudSetHotbarSelectedImage(RemotePlayer *player, std::string name)
|
||||
{
|
||||
if (!player)
|
||||
|
@ -291,7 +291,6 @@ public:
|
||||
bool hudSetFlags(RemotePlayer *player, u32 flags, u32 mask);
|
||||
bool hudSetHotbarItemcount(RemotePlayer *player, s32 hotbar_itemcount);
|
||||
void hudSetHotbarImage(RemotePlayer *player, std::string name);
|
||||
std::string hudGetHotbarImage(RemotePlayer *player);
|
||||
void hudSetHotbarSelectedImage(RemotePlayer *player, std::string name);
|
||||
const std::string &hudGetHotbarSelectedImage(RemotePlayer *player) const;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user