Fix log lines option

Fix drag&dropping Prox Halfling Foot in the hotkeys


git-svn-id: http://svn.net-core.org/repos/t-engine4@4942 51575b47-30f0-44d4-a5cc-537603b46e54

game/engines/default/engine/HotkeysIconsDisplay.lua

@@ -271,7 +271,7 @@ function _M:onMouse(button, mx, my, click, on_over, on_click)
 		return
 	elseif button == "drag-end" then
 		local drag = game.mouse.dragged.payload
-		print(table.serialize(drag,nil,true))
+--		print(table.serialize(drag,nil,true))
 		if drag.kind == "talent" or drag.kind == "inventory" then
 			for i, zone in pairs(self.dragclics) do
 				if mx >= zone[1] and mx < zone[1] + zone[3] and my >= zone[2] and my < zone[2] + zone[4] then

game/modules/tome/data/damage_types.lua

@@ -444,8 +444,8 @@ newDamageType{
 			else
 				game.logSeen(target, "%s resists the mind attack!", target.name:capitalize())
 			end
-			return 0
 		end
+		return 0
 	end,
 	death_message = {"psyched", "mentally tortured", "mindraped"},
 }

game/modules/tome/data/talents/gifts/gifts.lua

@@ -129,7 +129,7 @@ function setupSummon(self, m, x, y, no_control)
 	m:attr("confusion_immune", self:attr("confusion_immune"))
 	m:attr("numbed", self:attr("numbed"))
 	if game.party:hasMember(self) then
-		local can_control = not no_controll and self:knowTalent(self.T_SUMMON_CONTROL)
+		local can_control = not no_control and self:knowTalent(self.T_SUMMON_CONTROL)
 
 		m.remove_from_party_on_death = true
 		game.party:addMember(m, {

game/modules/tome/dialogs/GameOptions.lua

@@ -197,7 +197,7 @@ function _M:generateList()
 				qty = util.bound(qty, 0, 20)
 				game:saveSettings("tome.log_fade", ("tome.log_fade = %d\n"):format(qty))
 				config.settings.tome.log_fade = qty
-				game.logdisplay:enableFading(config.settings.tome.log_fade)
+				game.uiset.logdisplay:enableFading(config.settings.tome.log_fade)
 				profile.chat:enableFading(config.settings.tome.log_fade)
 				self.c_list:drawItem(item)
 			end, 0))