Cleanup: drop Server::hudGetHotbarSelectedImage()

nerzhul · nerzhul · commit c7656edaa57a · 2018-03-08T23:00:17.000+01:00
Call directly accessible RemotePlayer::getHotbarSelectedImage() from server api
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);
 

Original file line number	Diff line number	Diff line change
`@@ -1519,7 +1519,7 @@ int ObjectRef::l_hud_get_hotbar_selected_image(lua_State *L)`
`1519`	`1519`	`if (player == NULL)`
`1520`	`1520`	`return 0;`
`1521`	`1521`
`1522`		`- const std::string &name = getServer(L)->hudGetHotbarSelectedImage(player);`
	`1522`	`+ const std::string &name = player->getHotbarSelectedImage();`
`1523`	`1523`	`lua_pushlstring(L, name.c_str(), name.size());`
`1524`	`1524`	`return 1;`
`1525`	`1525`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3108,11 +3108,6 @@ void Server::hudSetHotbarSelectedImage(RemotePlayer *player, std::string name)`
`3108`	`3108`	`SendHUDSetParam(player->getPeerId(), HUD_PARAM_HOTBAR_SELECTED_IMAGE, name);`
`3109`	`3109`	`}`
`3110`	`3110`
`3111`		`-const std::string& Server::hudGetHotbarSelectedImage(RemotePlayer *player) const`
`3112`		`-{`
`3113`		`- return player->getHotbarSelectedImage();`
`3114`		`-}`
`3115`		`-`
`3116`	`3111`	`Address Server::getPeerAddress(session_t peer_id)`
`3117`	`3112`	`{`
`3118`	`3113`	`return m_con->GetPeerAddress(peer_id);`