From 1cd063c2d66e106261aaa970a372de1791e23639 Mon Sep 17 00:00:00 2001
From: DarkGod <darkgod@net-core.org>
Date: Thu, 19 Sep 2013 12:48:40 +0200
Subject: [PATCH] ui settinfs better respected
---
game/engines/default/engine/Module.lua | 3 ++-
game/engines/default/engine/Tooltip.lua | 4 ++--
game/engines/default/engine/ui/Base.lua | 5 +++++
game/engines/default/modules/boot/class/Game.lua | 3 ++-
4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/game/engines/default/engine/Module.lua b/game/engines/default/engine/Module.lua
index 59ec6413b9..cf2d1cf778 100644
--- a/game/engines/default/engine/Module.lua
+++ b/game/engines/default/engine/Module.lua
@@ -19,7 +19,6 @@
-- darkgod@te4.org
require "engine.class"
-local Dialog = require "engine.ui.Dialog"
local Savefile = require "engine.Savefile"
local UIBase = require "engine.ui.Base"
require "engine.PlayerProfile"
@@ -725,6 +724,8 @@ function _M:instanciate(mod, name, new_game, no_reboot)
profile:loadModuleProfile(mod.short_name, mod)
profile:currentCharacter(mod.full_version_string, "game did not tell us")
+ UIBase:clearCache()
+
-- Init the module code
local M, W = mod.load("init")
class:runInherited()
diff --git a/game/engines/default/engine/Tooltip.lua b/game/engines/default/engine/Tooltip.lua
index 8f3ad5f998..cda55cfbac 100644
--- a/game/engines/default/engine/Tooltip.lua
+++ b/game/engines/default/engine/Tooltip.lua
@@ -62,7 +62,7 @@ function _M:init(fontname, fontsize, color, bgcolor, max, lockstatus_icon)
end
function _M:generate()
- self.frame = self:makeFrame("ui/tooltip/", self.w + 6, self.h + 6)
+ self.frame = Base:makeFrame("ui/tooltip/", self.w + 6, self.h + 6)
end
--- Set the tooltip text
@@ -323,4 +323,4 @@ function _M:getTooltipAtMap(tmx, tmy, mx, my)
return tt
end
return nil
-end
\ No newline at end of file
+end
diff --git a/game/engines/default/engine/ui/Base.lua b/game/engines/default/engine/ui/Base.lua
index f22e69b11f..2d7ea14ee0 100644
--- a/game/engines/default/engine/ui/Base.lua
+++ b/game/engines/default/engine/ui/Base.lua
@@ -90,6 +90,11 @@ function _M:init(t, no_gen)
if not no_gen then self:generate() end
end
+function _M:clearCache()
+ cache = {}
+ tcache = {}
+end
+
function _M:getImage(file, noerror)
if cache[file] then return unpack(cache[file]) end
local s = core.display.loadImage(gfx_prefix..file)
diff --git a/game/engines/default/modules/boot/class/Game.lua b/game/engines/default/modules/boot/class/Game.lua
index 35df6eefc7..42e4e381b3 100644
--- a/game/engines/default/modules/boot/class/Game.lua
+++ b/game/engines/default/modules/boot/class/Game.lua
@@ -63,7 +63,7 @@ function _M:init()
self.background, self.background_tw, self.background_th = self.background:glTexture()
end
- self.tooltip = Tooltip.new(nil, 14, nil, colors.DARK_GREY, 400)
+ self.tooltip = Tooltip.new(nil, 14, nil, colors.DARK_GREY, 380)
-- self.refuse_threads = true
self.normal_key = self.key
@@ -141,6 +141,7 @@ Now go and have some fun!]]
-- Setup FPS
core.game.setFPS(config.settings.display_fps)
+ self:triggerHook{"Boot:runEnd"}
end
function _M:newGame()
--
GitLab