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

Cleanup: drop Server::hudGetHotbarImage()

Browse Source 
Call directly accessible RemotePlayer::getHotbarImage() from server api & make it const ref
This commit is contained in:
Loic Blot 2018-03-08 22:05:47 +01:00 committed by Loïc Blot
parent 373f1bfb4a
commit 4be46aeeb1
4 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/remoteplayer.h
View File

@ -71,7 +71,7 @@ public:
void setHotbarImage(const std::string &name) { hud_hotbar_image = name; } 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) void setHotbarSelectedImage(const std::string &name)
{ {

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

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

7
src/server.cpp
View File

@ -3099,13 +3099,6 @@ void Server::hudSetHotbarImage(RemotePlayer *player, std::string name)
SendHUDSetParam(player->getPeerId(), HUD_PARAM_HOTBAR_IMAGE, 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) void Server::hudSetHotbarSelectedImage(RemotePlayer *player, std::string name)
{ {
if (!player) if (!player)

1
src/server.h
View File

@ -291,7 +291,6 @@ public:
bool hudSetFlags(RemotePlayer *player, u32 flags, u32 mask); bool hudSetFlags(RemotePlayer *player, u32 flags, u32 mask);
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);
std::string hudGetHotbarImage(RemotePlayer *player);
void hudSetHotbarSelectedImage(RemotePlayer *player, std::string name); void hudSetHotbarSelectedImage(RemotePlayer *player, std::string name);
const std::string &hudGetHotbarSelectedImage(RemotePlayer *player) const; const std::string &hudGetHotbarSelectedImage(RemotePlayer *player) const;