Merge branch 'small_fixes' into 'master'

Small fixes

A couple of small bugs fixed; and one huge fail.

game/engines/default/engine/ui/Textzone.lua

@@ -171,7 +171,7 @@ function _M:display(x, y, nb_keyframes, screen_x, screen_y, offset_x, offset_y,
 			item._tex:toScreenPrecise(x + current_x, y + current_y, item.w, item.h - (clip_y_start + clip_y_end), 0, item.w / item._tex_w, clip_y_start * one_by_tex_h, (item.h - clip_y_end) * one_by_tex_h )
 			if self.text_shadow and shader then shader:use(false) end
 			-- add only visible part of item
-			current_y = current_y + item.h - clip_y_start
+			current_y = current_y + self.font_h - clip_y_start
 		end
 		-- add full size of item
 		total_h = total_h + self.font_h

game/engines/default/engine/ui/TextzoneList.lua

@@ -249,7 +249,7 @@ function _M:display(x, y, nb_keyframes, ox, oy, offset_x, offset_y, local_x, loc
 				item._tex:toScreenPrecise(x + current_x, y + current_y, item.w, item_h - (clip_y_start + clip_y_end), 0, item.w / item._tex_w, clip_y_start * one_by_tex_h, (item_h - clip_y_end) * one_by_tex_h )
 			end
 			-- add only visible part of item
-			current_y = current_y + item_h - clip_y_start
+			current_y = current_y + item_skip - clip_y_start
 		end
 		-- add line skip of item
 		total_h = total_h + item_skip

game/modules/tome/data/general/objects/gauntlets.lua

@@ -31,7 +31,7 @@ newEntity{
 	encumber = 1.5,
 	rarity = 9,
 	metallic = true,
-	combat = {accuracy_effect = "mace"},
+	wielder={combat = {accuracy_effect = "mace"},},
 	desc = [[Metal gloves protecting the hands up to the middle of the lower arm.]],
 	randart_able = "/data/general/objects/random-artifacts/gloves.lua",
 	egos = "/data/general/objects/egos/gloves.lua", egos_chance = { prefix=resolvers.mbonus(40, 5), suffix=resolvers.mbonus(40, 5) },

game/modules/tome/data/general/objects/gloves.lua

@@ -29,7 +29,7 @@ newEntity{
 	moddable_tile = resolvers.moddable_tile("gloves"),
 	encumber = 1,
 	rarity = 9,
-	combat = {accuracy_effect = "axe"},
+	wielder={combat = {accuracy_effect = "axe"},},
 	desc = [[Light gloves which do not seriously hinder finger movements, while still protecting the hands somewhat.]],
 	randart_able = "/data/general/objects/random-artifacts/gloves.lua",
 	egos = "/data/general/objects/egos/gloves.lua", egos_chance = { prefix=resolvers.mbonus(40, 5), suffix=resolvers.mbonus(40, 5) },