Jordach
/
Minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup: drop Server::hudGetHotbarItemcount() 

Call directly accessible RemotePlayer::getHotbarItemcount() from server api
master
Loic Blot 2018-03-08 22:03:45 +01:00 committed by Loïc Blot
parent f35236afea
commit 373f1bfb4a
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1462,9 +1462,7 @@ int ObjectRef::l_hud_get_hotbar_itemcount(lua_State *L)
if (player == NULL) if (player == NULL)
return 0; return 0;
s32 hotbar_itemcount = getServer(L)->hudGetHotbarItemcount(player); lua_pushnumber(L, player->getHotbarItemcount());
lua_pushnumber(L, hotbar_itemcount);
return 1; return 1;
} }

7
src/server.cpp
View File

@ -317,7 +317,7 @@ Server::~Server()
{ {
MutexAutoLock envlock(m_env_mutex); MutexAutoLock envlock(m_env_mutex);
infostream << "Server: Saving players" << std::endl; infostream << "Server: Saving players" << std::endl;
m_env->saveLoadedPlayers(); m_env->saveLoadedPlayers();
@ -3090,11 +3090,6 @@ bool Server::hudSetHotbarItemcount(RemotePlayer *player, s32 hotbar_itemcount)
return true; return true;
} }
s32 Server::hudGetHotbarItemcount(RemotePlayer *player) const
{
return player->getHotbarItemcount();
}
void Server::hudSetHotbarImage(RemotePlayer *player, std::string name) void Server::hudSetHotbarImage(RemotePlayer *player, std::string name)
{ {
if (!player) if (!player)

1
src/server.h
View File

@ -290,7 +290,6 @@ public:
bool hudChange(RemotePlayer *player, u32 id, HudElementStat stat, void *value); bool hudChange(RemotePlayer *player, u32 id, HudElementStat stat, void *value);
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);
s32 hudGetHotbarItemcount(RemotePlayer *player) const;
void hudSetHotbarImage(RemotePlayer *player, std::string name); void hudSetHotbarImage(RemotePlayer *player, std::string name);
std::string hudGetHotbarImage(RemotePlayer *player); std::string hudGetHotbarImage(RemotePlayer *player);
void hudSetHotbarSelectedImage(RemotePlayer *player, std::string name); void hudSetHotbarSelectedImage(RemotePlayer *player, std::string name);