minimalist UI done, kinda

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

game/modules/tome/class/Game.lua

@@ -1013,13 +1013,6 @@ function _M:displayMap(nb_keyframes)
 		if self.level.data.ambient_bg_sounds then self.state:playAmbientSounds(self.level, self.level.data.ambient_bg_sounds, nb_keyframes) end
 
 		if not self.zone_name_s then self:updateZoneName() end
-		self.zone_name_s:toScreenFull(
-			map.display_x + map.viewport.width - self.zone_name_w - 15,
---			map.display_y + map.viewport.height - self.zone_name_h - 5,
-			map.display_y + 5,
-			self.zone_name_w, self.zone_name_h,
-			self.zone_name_tw, self.zone_name_th
-		)
 
 		-- emotes display
 		map:displayEmotes(nb_keyframe or 1)

game/modules/tome/class/Tooltip.lua

@@ -23,7 +23,7 @@ local Map = require "engine.Map"
 
 module(..., package.seeall, class.inherit(Tooltip))
 
-tooltip_bound_y2 = function() return game.uiset.map_h_stop end
+tooltip_bound_y2 = function() return game.uiset.map_h_stop_tooltip end
 
 function _M:init(...)
 	Tooltip.init(self, ...)

game/modules/tome/class/uiset/Classic.lua

@@ -104,6 +104,7 @@ function _M:resizeIconsHotkeysToolbar()
 
 	local oldstop = self.map_h_stop or (game.h - h)
 	self.map_h_stop = game.h - h
+	self.map_h_stop_tooltip = game.h - h
 
 	self.hotkeys_display_icons = HotkeysIconsDisplay.new(nil, 216, game.h - h, game.w - 216, h, "/data/gfx/ui/talents-list.png", self.init_font_mono, self.init_size_mono, config.settings.tome.hotkey_icons_size, config.settings.tome.hotkey_icons_size)
 	self.hotkeys_display_icons:enableShadow(0.6)
@@ -313,6 +314,14 @@ function _M:display(nb_keyframes)
 
 	-- Minimap display
 	if game.level and game.level.map and not self.no_minimap then
+		game.zone_name_s:toScreenFull(
+			map.display_x + map.viewport.width - game.zone_name_w - 15,
+			map.display_y + 5,
+			game.zone_name_w, game.zone_name_h,
+			game.zone_name_tw, game.zone_name_th
+		)
+
+
 		local map = game.level.map
 --		if self.mm_fbo then
 --			self.mm_fbo:use(true)