Minor refactoring

This commit is contained in:
Wuzzy 2015-02-12 05:49:30 +01:00
parent 197fc56145
commit 1fb539e7d8

View File

@ -114,15 +114,17 @@ function hb.register_hudbar(identifier, text_color, label, textures, default_sta
state.text = text state.text = text
state.barlength = hb.value_to_barlength(start_value, start_max) state.barlength = hb.value_to_barlength(start_value, start_max)
local main_error_text =
"[hudbars] Bad initial values of HUD bar identifier “"..tostring(identifier).."” for player "..name..". "
if start_max < start_value then if start_max < start_value then
minetest.log("error", "[hudbars] Bad initial values of HUD bar identifier “"..tostring(identifier).."” for player "..name..": start_max ("..start_max..") is smaller than start_value ("..start_value..")!") minetest.log("error", main_error_text.."start_max ("..start_max..") is smaller than start_value ("..start_value..")!")
end end
if start_max < 0 then if start_max < 0 then
minetest.log("error", "[hudbars] Bad initial values of HUD bar identifier “"..tostring(identifier).."” for player "..name..": start_max ("..start_max..") is smaller than 0!") minetest.log("error", main_error_text.."start_max ("..start_max..") is smaller than 0!")
end end
if start_value < 0 then if start_value < 0 then
minetest.log("error", "[hudbars] Bad initial values of HUD bar identifier “"..tostring(identifier).."” for player "..name..": start_value ("..start_value..") is smaller than 0!") minetest.log("error", main_error_text.."start_value ("..start_value..") is smaller than 0!")
end end
hb.hudtables[identifier].hudids[name] = ids hb.hudtables[identifier].hudids[name] = ids
@ -170,14 +172,16 @@ function hb.change_hudbar(player, identifier, new_value, new_max_value)
new_max_value = hudtable.hudstate[name].max new_max_value = hudtable.hudstate[name].max
end end
local main_error_text =
"[hudbars] Bad call to hb.change_hudbar, identifier: “"..tostring(identifier).."”, player name: “"..name.."”. "
if new_max_value < new_value then if new_max_value < new_value then
minetest.log("error", "[hudbars] Bad call to hb.change_hudbar, identifier: “"..tostring(identifier).."”, player name: “"..name.."”. new_max_value ("..new_max_value..") is smaller than new_value ("..new_value..")!") minetest.log("error", main_error_text.."new_max_value ("..new_max_value..") is smaller than new_value ("..new_value..")!")
end end
if new_max_value < 0 then if new_max_value < 0 then
minetest.log("error", "[hudbars] Bad call to hb.change_hudbar, identifier: “"..tostring(identifier).."”, player name: “"..name.."”. new_max_value ("..new_max_value..") is smaller than 0!") minetest.log("error", main_error_text.."new_max_value ("..new_max_value..") is smaller than 0!")
end end
if new_value < 0 then if new_value < 0 then
minetest.log("error", "[hudbars] Bad call to hb.change_hudbar, identifier: “"..tostring(identifier).."”, player name: “"..name.."”. new_value ("..new_value..") is smaller than 0!") minetest.log("error", main_error_text.."new_value ("..new_value..") is smaller than 0!")
end end
if hudtable.hudstate[name].hidden == false then if hudtable.hudstate[name].hidden == false then