From 7859253cd0818c01553715eb1c12cfb5d733c4c1 Mon Sep 17 00:00:00 2001 From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54> Date: Thu, 7 Oct 2010 22:24:26 +0000 Subject: [PATCH] The game will load the engine version requested by the module git-svn-id: http://svn.net-core.org/repos/t-engine4@1460 51575b47-30f0-44d4-a5cc-537603b46e54 --- game/engines/default/engine/Game.lua | 1 + game/engines/default/engine/Module.lua | 2 +- game/modules/tome/class/Game.lua | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/game/engines/default/engine/Game.lua b/game/engines/default/engine/Game.lua index d083289f96..4d7a608e47 100644 --- a/game/engines/default/engine/Game.lua +++ b/game/engines/default/engine/Game.lua @@ -295,6 +295,7 @@ function _M:onResolutionChange() self.change_res_dialog = require("engine.ui.Dialog"):yesnoPopup("Resolution changed", "Accept the new resolution?", function(ret) if ret then if not self.creating_player then self:saveGame() end + print("====",self.creating_player) util.showMainMenu(false, nil, nil, self.__mod_info.short_name, self.save_name, false) else self.change_res_dialog = "revert" diff --git a/game/engines/default/engine/Module.lua b/game/engines/default/engine/Module.lua index 840411b123..69e1260b99 100644 --- a/game/engines/default/engine/Module.lua +++ b/game/engines/default/engine/Module.lua @@ -154,7 +154,7 @@ function _M:instanciate(mod, name, new_game, no_reboot) popup.__showup = nil core.display.forceRedraw() - util.showMainMenu(false, "te4", "LATEST", mod.short_name, name, new_game) + util.showMainMenu(false, mod.engine[4] or "te4", ("%d.%d.%d"):format(mod.engine[1], mod.engine[2], mod.engine[3]), mod.short_name, name, new_game) return end diff --git a/game/modules/tome/class/Game.lua b/game/modules/tome/class/Game.lua index e87ee2d960..8b58470977 100644 --- a/game/modules/tome/class/Game.lua +++ b/game/modules/tome/class/Game.lua @@ -188,6 +188,7 @@ function _M:newGame() Map:setViewerFaction(self.player.faction) self.player:removeQuest(self.player.starting_quest) self.player:grantQuest(self.player.starting_quest) + self.creating_player = false else -- Continue as normal return Birther.quickBirth(b) -- GitLab