Sandworm Lair finally got its own unique music

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

game/engines/default/engine/Map.lua

@@ -439,7 +439,7 @@ end
 -- @param pos what kind of entity to set(Map.TERRAIN, Map.OBJECT, Map.ACTOR)
 -- @param e the entity to set, if null it will return the current one
 function _M:call(x, y, pos, e)
-	if not x or not y or x < 0 or y < 0 or x >= self.w or y >= self.h then return end
+	if not x or not y or x < 0 or y < 0 or x >= self.w or y >= self.h or not pos then return end
 	if e then
 		self.map[x + y * self.w][pos] = e
 		if e.__position_aware then e.x = x e.y = y end

game/modules/tome/data/zones/sandworm-lair/zone.lua

@@ -29,7 +29,7 @@ return {
 --	all_remembered = true,
 --	all_lited = true,
 	persistent = "zone",
-	ambient_music = "6_19.ogg",
+	ambient_music = "Suspicion.ogg",
 	min_material_level = function() return game.state:isAdvanced() and 3 or 2 end,
 	max_material_level = function() return game.state:isAdvanced() and 4 or 3 end,
 	generator =  {

game/modules/tome/dialogs/CharacterSheet.lua

@@ -394,7 +394,7 @@ function _M:drawDialog(kind, actor_to_compare)
 		if text then
 			self:mouseTooltip(self.TOOLTIP_VISION_SIGHT,  s:drawColorStringBlended(self.font, ("Vision range   : #00ff00#%s"):format(text), w, h, 255, 255, 255, true)) h = h + self.font_h
 		end
-		text = compare_fields(player, actor_to_compare, "infravision", "%d", "%+.0f")
+		text = compare_fields(player, actor_to_compare, function(actor) return (actor:attr("infravision") or actor:attr("heightened_senses")) and (actor.heightened_senses or 0) + (actor.infravision or 0) end, "%d", "%+.0f")
 		if text then
 			self:mouseTooltip(self.TOOLTIP_VISION_INFRA,  s:drawColorStringBlended(self.font, ("Infravision    : #00ff00#%s"):format(text), w, h, 255, 255, 255, true)) h = h + self.font_h
 		end