Commit 3c9a9cbe authored by Milan's avatar Milan
Browse files

Merge https://github.com/entuland/rhotator into HEAD

parents f3ce62a3 383106db

init.lua

+1 −1
Original line number Diff line number Diff line
@@ -559,7 +559,7 @@ rhotator.check_on_rotate_handler = function(pos, node, nodedef, player, click, n 
		return false

	elseif nodedef.on_rotate then

		-- Copy pos and node because callback can modify it

		local pass_node = {name = node.name, param1 = node.param1, param2 = node.param2}

		local pass_node = table.copy(node)

		local pass_pos = vector.new(pos)

		local result = nodedef.on_rotate(pass_pos, pass_node, player, click, new_param2)

		if result == true then

notify.lua

+11 −7
Original line number Diff line number Diff line
@@ -20,7 +20,9 @@ local function hud_remove(player, playername) 
	if os.time() < hud_timeout_seconds + hud.time then

		return

	end

	if player and player.hud_remove then

		player:hud_remove(hud.id)

	end

	huds[playername] = nil

end
@@ -36,12 +38,14 @@ local function hud_create(player, message, params) 
	def.text = message or def.text

	def.hud_elem_type = def.hud_elem_type or "text"

	def.name = mod_name .. "_feedback"

	if player and player.hud_add then

		local id = player:hud_add(def)

		huds[playername] = {

			id = id,

			time = os.time(),

		}

	end

end



notify.warn = function(player, message)

	notify(player, message, {color = warning_color })
@@ -67,7 +71,7 @@ notify.__call = function(self, player, message, params) 
	end

	message = "[" .. mod_name .. "] " .. message

	local hud = huds[playername]

	if hud then

	if hud and player.hud_remove then

		player:hud_remove(hud.id)

	end

	hud_create(player, message, params)