Fixed a bug with variable talent cooldowns

typos


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

game/engines/default/engine/Shader.lua

@@ -32,7 +32,7 @@ function _M:init(name, args)
 	self.args = args or {}
 	self.name = name
 	self.totalname = self:makeTotalName()
-	print("[SHADER] making shader from", name, " into ", self.totalname)
+--	print("[SHADER] making shader from", name, " into ", self.totalname)
 
 	if core.shader.active() then self:loaded() end
 end
@@ -108,7 +108,7 @@ end
 function _M:loaded()
 	if _M.progs[self.totalname] then
 		self.shad = _M.progs[self.totalname]
-		print("[SHADER] using cached shader "..self.totalname)
+--		print("[SHADER] using cached shader "..self.totalname)
 		self.shad = _M.progs[self.totalname]
 	else
 		print("[SHADER] Loading from /data/gfx/shaders/"..self.name..".lua")

game/modules/tome/class/Actor.lua

@@ -1149,6 +1149,7 @@ end
 function _M:startTalentCooldown(t)
 	if not t.cooldown then return end
 	local cd = t.cooldown
+	if type(cd) == "function" then cd = cd(self, t) end
 	if self.talent_cd_reduction[t.id] then cd = cd - self.talent_cd_reduction[t.id] end
 	if t.type[1]:find("^spell/") then
 		self.talents_cd[t.id] = math.ceil(cd * (1 - self.spell_cooldown_reduction or 0))

game/modules/tome/class/Game.lua

@@ -359,7 +359,9 @@ function _M:changeLevel(lev, zone, keep_old_lev, force_down)
 
 	-- Tell the map to use path strings to speed up path calculations
 	for uid, e in pairs(self.level.entities) do
-		self.level.map:addPathString(e:getPathString())
+		if e.getPathString then
+			self.level.map:addPathString(e:getPathString())
+		end
 	end
 	self.zone_name_s = nil
 	self.level.map:redisplay()

game/modules/tome/data/talents/gifts/sand-drake.lua

@@ -49,7 +49,7 @@ newTalent{
 		return true
 	end,
 	info = function(self, t)
-		return ([[When your target is below %d life you can try to swallow it, killing it automatically and regaining life and equilibrium.]]):
+		return ([[When your target is below %d%% life you can try to swallow it, killing it automatically and regaining life and equilibrium.]]):
 		format(10 + 3 * self:getTalentLevel(t))
 	end,
 }

game/modules/tome/dialogs/Quit.lua

@@ -32,6 +32,10 @@ function _M:init()
 		end,
 	}, {
 		ACCEPT = function()
+			local d = engine.Dialog:simplePopup("Quitting...", "Quitting...")
+			d.__show_popup = false
+			core.display.forceRedraw()
+
 			-- savefile_pipe is created as a global by the engine
 			savefile_pipe:push(game.save_name, "game", game)
 			util.showMainMenu()

src/main.c

@@ -611,7 +611,7 @@ int main(int argc, char *argv[])
 		return -1;
 	}
 
-	SDL_WM_SetIcon(IMG_Load_RW(PHYSFSRWOPS_openRead("/data/gfx/te4-icon.png"), TRUE), NULL);
+	SDL_WM_SetIcon(IMG_Load_RW(PHYSFSRWOPS_openRead("engines/default/engine/data/gfx/te4-icon.png"), TRUE), NULL);
 
 //	screen = SDL_SetVideoMode(WIDTH, HEIGHT, 32, SDL_OPENGL | SDL_GL_DOUBLEBUFFER | SDL_HWPALETTE | SDL_HWSURFACE | SDL_RESIZABLE);
 //	glewInit();