diff --git a/game/engines/default/engine/init.lua b/game/engines/default/engine/init.lua index 1d5ff238ff7cc94ccacd28252e5e352d9dc222ea..010f37826a6d143c69c6100ece8172d8ad18898d 100644 --- a/game/engines/default/engine/init.lua +++ b/game/engines/default/engine/init.lua @@ -47,7 +47,6 @@ fs.setWritePath(fs.getHomePath()) -- Loads default config & user config fs.mount(engine.homepath, "/") config.loadString[[ -window.size = "800x600" sound.enabled = true music.volume = 60 aa_text = true @@ -65,6 +64,16 @@ for i, file in ipairs(fs.list("/settings/")) do end end +-- Default resolution as big as possible +if not config.settings.window or not config.settings.window.size then + local list = core.display.getModesList() + table.sort(list, function(a, b) return a.w > b.w end) + local r = list[1] or {w=800, h=600} + print("[RESOLUTION] no configured resolution, defaulting to biggest possible: ", r.w, r.h) + config.settings.window = config.settings.window or {} + config.settings.window.size = r.w.."x"..r.h +end + -- Load default keys engine.KeyBind:load("move,hotkeys,inventory,actions,interface,debug") diff --git a/game/modules/tome/data/chats/norgan-saved.lua b/game/modules/tome/data/chats/norgan-saved.lua index 302a91f1491bae27147a4c351926a76888cf43a4..68674813f91f114d853f29708969118959a83f61 100644 --- a/game/modules/tome/data/chats/norgan-saved.lua +++ b/game/modules/tome/data/chats/norgan-saved.lua @@ -22,7 +22,7 @@ newChat{ id="welcome", I do not think I want to see death so closely for some time now. Farewell.]], answers = { - {"For the Empite! Take care.", action=function(npc, player) + {"For the Empire! Take care.", action=function(npc, player) npc:disappear() world:gainAchievement("NORGAN_SAVED", player) end},