Cleanup: drop Server::hudGetHotbarItemcount()

nerzhul · nerzhul · commit 373f1bfb4ab5 · 2018-03-08T23:00:17.000+01:00
Call directly accessible RemotePlayer::getHotbarItemcount() from server api
diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp
@@ -1462,9 +1462,7 @@ int ObjectRef::l_hud_get_hotbar_itemcount(lua_State *L)
 	if (player == NULL)
 		return 0;
 
-	s32 hotbar_itemcount = getServer(L)->hudGetHotbarItemcount(player);
-
-	lua_pushnumber(L, hotbar_itemcount);
+	lua_pushnumber(L, player->getHotbarItemcount());
 	return 1;
 }
 
diff --git a/src/server.cpp b/src/server.cpp
@@ -317,7 +317,7 @@ Server::~Server()
 
 	{
 		MutexAutoLock envlock(m_env_mutex);
-		
+
 		infostream << "Server: Saving players" << std::endl;
 		m_env->saveLoadedPlayers();
 
@@ -3090,11 +3090,6 @@ bool Server::hudSetHotbarItemcount(RemotePlayer *player, s32 hotbar_itemcount)
 	return true;
 }
 
-s32 Server::hudGetHotbarItemcount(RemotePlayer *player) const
-{
-	return player->getHotbarItemcount();
-}
-
 void Server::hudSetHotbarImage(RemotePlayer *player, std::string name)
 {
 	if (!player)
diff --git a/src/server.h b/src/server.h
@@ -290,7 +290,6 @@ class Server : public con::PeerHandler, public MapEventReceiver,
 	bool hudChange(RemotePlayer *player, u32 id, HudElementStat stat, void *value);
 	bool hudSetFlags(RemotePlayer *player, u32 flags, u32 mask);
 	bool hudSetHotbarItemcount(RemotePlayer *player, s32 hotbar_itemcount);
-	s32 hudGetHotbarItemcount(RemotePlayer *player) const;
 	void hudSetHotbarImage(RemotePlayer *player, std::string name);
 	std::string hudGetHotbarImage(RemotePlayer *player);
 	void hudSetHotbarSelectedImage(RemotePlayer *player, std::string name);

Original file line number	Diff line number	Diff line change
`@@ -1462,9 +1462,7 @@ int ObjectRef::l_hud_get_hotbar_itemcount(lua_State *L)`
`1462`	`1462`	`if (player == NULL)`
`1463`	`1463`	`return 0;`
`1464`	`1464`
`1465`		`- s32 hotbar_itemcount = getServer(L)->hudGetHotbarItemcount(player);`
`1466`		`-`
`1467`		`- lua_pushnumber(L, hotbar_itemcount);`
	`1465`	`+ lua_pushnumber(L, player->getHotbarItemcount());`
`1468`	`1466`	`return 1;`
`1469`	`1467`	`}`
`1470`	`1468`
Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ Server::~Server()`
`317`	`317`
`318`	`318`	`{`
`319`	`319`	`MutexAutoLock envlock(m_env_mutex);`
`320`		`-`
	`320`	`+`
`321`	`321`	`infostream << "Server: Saving players" << std::endl;`
`322`	`322`	`m_env->saveLoadedPlayers();`
`323`	`323`
`@@ -3090,11 +3090,6 @@ bool Server::hudSetHotbarItemcount(RemotePlayer *player, s32 hotbar_itemcount)`
`3090`	`3090`	`return true;`
`3091`	`3091`	`}`
`3092`	`3092`
`3093`		`-s32 Server::hudGetHotbarItemcount(RemotePlayer *player) const`
`3094`		`-{`
`3095`		`- return player->getHotbarItemcount();`
`3096`		`-}`
`3097`		`-`
`3098`	`3093`	`void Server::hudSetHotbarImage(RemotePlayer *player, std::string name)`
`3099`	`3094`	`{`
`3100`	`3095`	`if (!player)`