Skip to content
Snippets Groups Projects
Commit 466f1e72 authored by DarkGod's avatar DarkGod
Browse files

fix

parent 762fdb95
No related branches found
No related tags found
No related merge requests found
......@@ -2334,6 +2334,7 @@ function util.removeForceSafeBoot()
end
-- Alias os.exit to our own exit method for cleanliness
os.crash = os.exit
os.exit = core.game.exit_engine
-- Ultra weird, this is used by the C serialization code because I'm too dumb to make lua_dump() work on windows ...
......
......@@ -66,7 +66,9 @@ function _M:getLore(lore, silent)
self.lore_known = self.lore_known or {}
self.additional_lore = self.additional_lore or {}
if not silent then assert(self.lore_defs[lore] or self.additional_lore[lore], "bad lore id "..lore) end
local l = table.clone(self.lore_defs[lore] or self.additional_lore[lore])
local l = self.lore_defs[lore] or self.additional_lore[lore]
if not l then return end
l = table.clone(l)
if l.template then
local tpl = slt2.loadstring(l.lore)
......
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