Cleanup: drop Server::hudGetHotbarSelectedImage()

Call directly accessible RemotePlayer::getHotbarSelectedImage() from server api
minetest · Mar 8, 2018 · c7656edaa57a951f2496d454a42cdf899459b572 · c7656ed
1 parent 4be46ae
commit c7656edaa57a951f2496d454a42cdf899459b572
Unified Split

Showing with 1 addition and 7 deletions.

+1 −1 src/script/lua_api/l_object.cpp

+0 −5 src/server.cpp

+0 −1 src/server.h
diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp
@@ -1519,7 +1519,7 @@ int ObjectRef::l_hud_get_hotbar_selected_image(lua_State *L)
 	if (player == NULL)
 		return 0;
 
-	const std::string &name = getServer(L)->hudGetHotbarSelectedImage(player);
+	const std::string &name = player->getHotbarSelectedImage();
 	lua_pushlstring(L, name.c_str(), name.size());
 	return 1;
 }

diff --git a/src/server.cpp b/src/server.cpp
@@ -3108,11 +3108,6 @@ void Server::hudSetHotbarSelectedImage(RemotePlayer *player, std::string 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)
 {
 	return m_con->GetPeerAddress(peer_id);

diff --git a/src/server.h b/src/server.h
@@ -292,7 +292,6 @@ class Server : public con::PeerHandler, public MapEventReceiver,
 	bool hudSetHotbarItemcount(RemotePlayer *player, s32 hotbar_itemcount);
 	void hudSetHotbarImage(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);