Removing unused include. Fixing nodemeta position on rollback action.

builtin/mainmenu/common.lua

@@ -22,8 +22,7 @@ menudata = {}
 --------------------------------------------------------------------------------
 -- Local cached values
 --------------------------------------------------------------------------------
-local min_supp_proto
+local min_supp_proto, max_supp_proto
-local max_supp_proto
 
 function common_update_cached_supp_proto()
 	min_supp_proto = core.get_min_supp_proto()
@@ -36,31 +35,24 @@ common_update_cached_supp_proto()
 
 --------------------------------------------------------------------------------
 local function render_client_count(n)
-	if n > 99 then
+	if     n > 99 then return '99+'
-		return '99+'
+	elseif n >= 0 then return tostring(n)
-	elseif n >= 0 then
+	else return '?' end
-		return tostring(n)
-	else
-		return '?'
-	end
 end
 
 local function configure_selected_world_params(idx)
-	local worldconfig = modmgr.get_worldconfig(
+	local worldconfig = modmgr.get_worldconfig(menudata.worldlist:get_list()[idx].path)
-		menudata.worldlist:get_list()[idx].path)
+	if worldconfig.creative_mode then
-
-	if worldconfig.creative_mode ~= nil then
 		core.setting_set("creative_mode", worldconfig.creative_mode)
 	end
-	if worldconfig.enable_damage ~= nil then
+	if worldconfig.enable_damage then
 		core.setting_set("enable_damage", worldconfig.enable_damage)
 	end
 end
 
 --------------------------------------------------------------------------------
 function image_column(tooltip, flagname)
-	return "image," ..
+	return "image,tooltip=" .. core.formspec_escape(tooltip) .. "," ..
-		"tooltip=" .. core.formspec_escape(tooltip) .. "," ..
 		"0=" .. core.formspec_escape(defaulttexturedir .. "blank.png") .. "," ..
 		"1=" .. core.formspec_escape(defaulttexturedir .. "server_flags_" .. flagname .. ".png")
 end
@@ -69,13 +61,13 @@ end
 function order_favorite_list(list)
 	local res = {}
 	--orders the favorite list after support
-	for i=1,#list,1 do
+	for i = 1, #list do
 		local fav = list[i]
 		if is_server_protocol_compat(fav.proto_min, fav.proto_max) then
 			res[#res + 1] = fav
 		end
 	end
-	for i=1,#list,1 do
+	for i = 1, #list do
 		local fav = list[i]
 		if not is_server_protocol_compat(fav.proto_min, fav.proto_max) then
 			res[#res + 1] = fav
@@ -85,60 +77,44 @@ function order_favorite_list(list)
 end
 
 --------------------------------------------------------------------------------
-function render_favorite(spec,render_details)
+function render_favorite(spec, is_favorite)
 	local text = ""
-
+	if spec.name then
-	if spec.name ~= nil then
 		text = text .. core.formspec_escape(spec.name:trim())
-
+	elseif spec.address then
---		if spec.description ~= nil and
---			core.formspec_escape(spec.description):trim() ~= "" then
---			text = text .. " (" .. core.formspec_escape(spec.description) .. ")"
---		end
-	else
-		if spec.address ~= nil then
 		text = text .. spec.address:trim()
-
+		if spec.port then
-			if spec.port ~= nil then
 			text = text .. ":" .. spec.port
 		end
 	end
-	end
-
-	if not render_details then
-		return text
-	end
 
 	local details = ""
 	local grey_out = not is_server_protocol_compat(spec.proto_min, spec.proto_max)
 
-	if spec.clients ~= nil and spec.clients_max ~= nil then
+	if is_favorite then
+		details = "1,"
+	else
+		details = "0,"
+	end
+
+	if spec.clients and spec.clients_max then
 		local clients_color = ''
 		local clients_percent = 100 * spec.clients / spec.clients_max
 
 		-- Choose a color depending on how many clients are connected
 		-- (relatively to clients_max)
-		if spec.clients == 0 then
+		if     grey_out		      then clients_color = '#aaaaaa'
-			clients_color = ''        -- 0 players: default/white
+		elseif spec.clients == 0      then clients_color = ''        -- 0 players: default/white
-		elseif spec.clients == spec.clients_max then
+		elseif clients_percent <= 60  then clients_color = '#a1e587' -- 0-60%: green
-			clients_color = '#dd5b5b' -- full server: red (darker)
+		elseif clients_percent <= 90  then clients_color = '#ffdc97' -- 60-90%: yellow
-		elseif clients_percent <= 60 then
+		elseif clients_percent == 100 then clients_color = '#dd5b5b' -- full server: red (darker)
-			clients_color = '#a1e587' -- 0-60%: green
+		else				   clients_color = '#ffba97' -- 90-100%: orange
-		elseif clients_percent <= 90 then
-			clients_color = '#ffdc97' -- 60-90%: yellow
-		else
-			clients_color = '#ffba97' -- 90-100%: orange
 		end
 
-		if grey_out then
+		details = details .. clients_color .. ',' ..
-			clients_color = '#aaaaaa'
+			render_client_count(spec.clients) .. ',/,' ..
-		end
-
-		details = details ..
-				clients_color .. ',' ..
-				render_client_count(spec.clients) .. ',' ..
-				'/,' ..
 			render_client_count(spec.clients_max) .. ','
+
 	elseif grey_out then
 		details = details .. '#aaaaaa,?,/,?,'
 	else
@@ -189,14 +165,10 @@ end
 --------------------------------------------------------------------------------
 function menu_render_worldlist()
 	local retval = ""
-
 	local current_worldlist = menudata.worldlist:get_list()
 
-	for i,v in ipairs(current_worldlist) do
+	for i, v in ipairs(current_worldlist) do
-		if retval ~= "" then
+		if retval ~= "" then retval = retval .. "," end
-			retval = retval ..","
-		end
-
 		retval = retval .. core.formspec_escape(v.name) ..
 				" \\[" .. core.formspec_escape(v.gameid) .. "\\]"
 	end
@@ -205,40 +177,24 @@ function menu_render_worldlist()
 end
 
 --------------------------------------------------------------------------------
-function menu_handle_key_up_down(fields,textlist,settingname)
+function menu_handle_key_up_down(fields, textlist, settingname)
-	if fields["key_up"] then
+	local oldidx, newidx = core.get_textlist_index(textlist)
-		local oldidx = core.get_textlist_index(textlist)
+	if fields.key_up or fields.key_down then
-
+		if fields.key_up and oldidx and oldidx > 1 then
-		if oldidx ~= nil and oldidx > 1 then
+			newidx = oldidx - 1
-			local newidx = oldidx -1
+		elseif fields.key_down and oldidx and
-			core.setting_set(settingname,
+				oldidx < menudata.worldlist:size() then
-				menudata.worldlist:get_raw_index(newidx))
+			newidx = oldidx + 1
-
-			configure_selected_world_params(newidx)
 		end
+		core.setting_set(settingname, menudata.worldlist:get_raw_index(newidx))
+		configure_selected_world_params(newidx)
 		return true
 	end
-
-	if fields["key_down"] then
-		local oldidx = core.get_textlist_index(textlist)
-
-		if oldidx ~= nil and oldidx < menudata.worldlist:size() then
-			local newidx = oldidx + 1
-			core.setting_set(settingname,
-				menudata.worldlist:get_raw_index(newidx))
-
-			configure_selected_world_params(newidx)
-		end
-
-		return true
-	end
-
 	return false
 end
 
 --------------------------------------------------------------------------------
 function asyncOnlineFavourites()
-
 	if not menudata.public_known then
 		menudata.public_known = {{
 			name = fgettext("Loading..."),
@@ -246,43 +202,37 @@ function asyncOnlineFavourites()
 		}}
 	end
 	menudata.favorites = menudata.public_known
+	menudata.favorites_is_public = true
 	core.handle_async(
 		function(param)
 			return core.get_favorites("online")
 		end,
 		nil,
 		function(result)
-			if core.setting_getbool("public_serverlist") then
 			local favs = order_favorite_list(result)
 			if favs[1] then
 				menudata.public_known = favs
 				menudata.favorites = menudata.public_known
+				menudata.favorites_is_public = true
 			end
 			core.event_handler("Refresh")
 		end
-		end
 	)
 end
 
 --------------------------------------------------------------------------------
-function text2textlist(xpos,ypos,width,height,tl_name,textlen,text,transparency)
+function text2textlist(xpos, ypos, width, height, tl_name, textlen, text, transparency)
-	local textlines = core.splittext(text,textlen)
+	local textlines = core.splittext(text, textlen)
+	local retval = "textlist[" .. xpos .. "," .. ypos .. ";" .. width ..
+			"," .. height .. ";" .. tl_name .. ";"
 
-	local retval = "textlist[" .. xpos .. "," .. ypos .. ";"
+	for i = 1, #textlines do
-								.. width .. "," .. height .. ";"
+		textlines[i] = textlines[i]:gsub("\r", "")
-								.. tl_name .. ";"
-
-	for i=1, #textlines, 1 do
-		textlines[i] = textlines[i]:gsub("\r","")
 		retval = retval .. core.formspec_escape(textlines[i]) .. ","
 	end
 
 	retval = retval .. ";0;"
-
+	if transparency then retval = retval .. "true" end
-	if transparency then
-		retval = retval .. "true"
-	end
-
 	retval = retval .. "]"
 
 	return retval
@@ -290,19 +240,21 @@ end
 
 --------------------------------------------------------------------------------
 function is_server_protocol_compat(server_proto_min, server_proto_max)
-	return not ((min_supp_proto > (server_proto_max or 24)) or (max_supp_proto < (server_proto_min or 13)))
+	return min_supp_proto <= (server_proto_max or 24) and max_supp_proto >= (server_proto_min or 13)
 end
 --------------------------------------------------------------------------------
 function is_server_protocol_compat_or_error(server_proto_min, server_proto_max)
 	if not is_server_protocol_compat(server_proto_min, server_proto_max) then
-		local server_prot_ver_info
+		local server_prot_ver_info, client_prot_ver_info
-		local client_prot_ver_info
+		local s_p_min = server_proto_min or 13
-		if server_proto_min ~= server_proto_max then
+		local s_p_max = server_proto_max or 24
+
+		if s_p_min ~= s_p_max then
 			server_prot_ver_info = fgettext_ne("Server supports protocol versions between $1 and $2. ",
-				server_proto_min or 13, server_proto_max or 24)
+				s_p_min, s_p_max)
 		else
 			server_prot_ver_info = fgettext_ne("Server enforces protocol version $1. ",
-				server_proto_min or 13)
+				s_p_min)
 		end
 		if min_supp_proto ~= max_supp_proto then
 			client_prot_ver_info= fgettext_ne("We support protocol versions between version $1 and $2.",
@@ -325,7 +277,7 @@ function menu_worldmt(selected, setting, value)
 		local filename = world.path .. DIR_DELIM .. "world.mt"
 		local world_conf = Settings(filename)
 
-		if value ~= nil then
+		if value then
 			if not world_conf:write() then
 				core.log("error", "Failed to write world config file")
 			end
@@ -343,10 +295,11 @@ function menu_worldmt_legacy(selected)
 	local modes_names = {"creative_mode", "enable_damage", "server_announce"}
 	for _, mode_name in pairs(modes_names) do
 		local mode_val = menu_worldmt(selected, mode_name)
-		if mode_val ~= nil then
+		if mode_val then
 			core.setting_set(mode_name, mode_val)
 		else
 			menu_worldmt(selected, mode_name, core.setting_get(mode_name))
 		end
 	end
 end
+

doc/lua_api.txt

@@ -1916,7 +1916,7 @@ Call these functions only at load time!
         multiple protection mods.
 * `minetest.register_on_item_eat(func(hp_change, replace_with_item, itemstack, user, pointed_thing))`
     * Called when an item is eaten, by `minetest.item_eat`
-    * Return `true` or `itemstack` to cancel the default item eat response (i.e.: hp increase)`
+    * Return `true` or `itemstack` to cancel the default item eat response (i.e.: hp increase)
 * `minetest.register_on_nodemeta_inventory_add_item(func(pos, list_name, slot, stack))`
     * Called when any node metadata inventory receive item.
     * 'pos' - {'x','y','z'} - absolute position of affected node with metadata.

src/inventory.cpp

@@ -694,8 +694,7 @@ ItemStack InventoryList::addItem(GameScripting *script_interface, u32 i, const I
 {
 	if(i >= m_items.size())
 		return new_item;
-	u16 count_before = 0;
+	u16 count_before = new_item.count;
-	count_before = new_item.count;
 	std::string item_name = new_item.name;
 	ItemStack leftover = m_items[i].addItem(new_item, m_itemdef);
 	if(leftover.count != count_before){

src/nodemetadata.h

@@ -37,7 +37,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 class Inventory;
 class IItemDefManager;
-class ScriptApiBase;
 
 class NodeMetadata: public InventoryChangeReceiver
 {

src/player.cpp

@@ -30,7 +30,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "filesys.h"
 #include "log.h"
 #include "porting.h"  // strlcpy
-#include "environment.h"  // For calling 'getScriptIface()', because ServerEnvironment forward declared in 'serverobject.h'.
 #include "script/scripting_game.h" // For calling API functions.
 
 

src/player.h

@@ -24,8 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "inventory.h"
 #include "constants.h" // BS
 #include "threading/mutex.h"
-//#include "script/scripting_game.h" // For GameScripting in callbacks
+	#include <list>
-#include <list>
 
 #define PLAYERNAME_SIZE 20
 
@@ -94,7 +93,6 @@ class PlayerSAO;
 struct HudElement;
 class Environment;
 class GameScripting;
-class Inventory;
 
 // IMPORTANT:
 // Do *not* perform an assignment or copy operation on a Player or

src/rollback_interface.cpp

@@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/string.h"
 #include "util/numeric.h"
 #include "map.h"
-#include "mapblock.h" //For getNodeBlockPos
 #include "gamedef.h"
 #include "nodedef.h"
 #include "nodemetadata.h"
@@ -156,9 +155,7 @@ bool RollbackAction::applyRevert(Map *map, InventoryManager *imgr, IGameDef *gam
 				} else {
 					NodeMetadata *meta = map->getNodeMetadata(p);
 					if (!meta) {
-						v3s16 blockpos = getNodeBlockPos(p);
+						meta = new NodeMetadata(gamedef->idef(),p);
-						v3s16 p_rel = p - blockpos*MAP_BLOCKSIZE;
-						meta = new NodeMetadata(gamedef->idef(),p_rel);
 						if (!map->setNodeMetadata(p, meta)) {
 							delete meta;
 							infostream << "RollbackAction::applyRevert(): "

src/script/cpp_api/s_player.cpp

@@ -22,7 +22,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "common/c_converter.h"
 #include "common/c_content.h"
 #include "util/string.h"
-#include "script/lua_api/l_inventory.h"// For InvRef.
 #include "script/lua_api/l_item.h" // For LuaItemStack.
 
 void ScriptApiPlayer::on_newplayer(ServerActiveObject *player)
@@ -248,8 +247,6 @@ void ScriptApiPlayer::on_player_inventory_add_item(
 	runCallbacks(4, RUN_CALLBACKS_MODE_LAST);
 }
 
-
-
 ScriptApiPlayer::~ScriptApiPlayer()
 {
 }

src/script/cpp_api/s_player.h

@@ -25,8 +25,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/string.h"
 #include "inventory.h" // For InventoryList and ItemStack
 
-class Player;
-
 struct ToolCapabilities;
 
 class ScriptApiPlayer

src/server.cpp

@@ -3244,7 +3244,7 @@ Inventory* Server::createDetachedInventory(const std::string &name)
 	} else {
 		infostream<<"Server creating detached inventory \""<<name<<"\""<<std::endl;
 	}
-	DetachedInventoryChangeReceiver * detached_inventory_change_reciever = new DetachedInventoryChangeReceiver(name);
+	DetachedInventoryChangeReceiver *detached_inventory_change_reciever = new DetachedInventoryChangeReceiver(name);
 	Inventory *inv = new Inventory(m_itemdef, detached_inventory_change_reciever);
 	sanity_check(inv);
 	m_detached_inventories[name] = inv;