Skip to content
Snippets Groups Projects
Commit 27f64331 authored by Gordon Acocella's avatar Gordon Acocella
Browse files

Load quickhotkeys prior to loading the game to fix hotkey ordering for...

Load quickhotkeys prior to loading the game to fix hotkey ordering for "restart the same character".
parent 8420a752
No related branches found
No related tags found
No related merge requests found
......@@ -1048,6 +1048,9 @@ function _M:instanciate(mod, name, new_game, no_reboot, extra_module_info)
_G.world:run()
end
-- TODO: Replace this with loading quickhotkeys from the profile.
if engine.interface.PlayerHotkeys then engine.interface.PlayerHotkeys:loadQuickHotkeys(mod.short_name, Savefile.hotkeys_file) end
-- Load the savefile if it exists, or create a new one if not (or if requested)
local save = engine.Savefile.new(_G.game.save_name)
if save:check() and not new_game then
......@@ -1111,9 +1114,6 @@ function _M:instanciate(mod, name, new_game, no_reboot, extra_module_info)
profile:saveGenericProfile("modules_loaded", {name=mod.short_name, nb={"inc", 1}})
profile:setConfigsBatch(false)
-- TODO: Replace this with loading quickhotkeys from the profile.
if engine.interface.PlayerHotkeys then engine.interface.PlayerHotkeys:loadQuickHotkeys(mod.short_name, Savefile.hotkeys_file) end
core.wait.disable()
profile.waiting_auth_no_redraw = false
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment