Move save_dir back into cur_savegame

lethosor · lethosor · commit 955db4654977 · 2016-08-14T12:40:35.000-04:00
diff --git a/exportlegends.lua b/exportlegends.lua
@@ -110,7 +110,7 @@ function export_more_legends_xml()
     local year_str = string.format('%0'..math.max(5, string.len(''..df.global.cur_year))..'d', df.global.cur_year)
     local date_str = year_str..string.format('-%02d-%02d', month, day)
 
-    local filename = df.global.world.save_dir.."-"..date_str.."-legends_plus.xml"
+    local filename = df.global.world.cur_savegame.save_dir.."-"..date_str.."-legends_plus.xml"
     local file = io.open(filename, 'w')
     if not file then qerror("could not open file: " .. filename) end
 
diff --git a/lua.lua b/lua.lua
@@ -53,11 +53,11 @@ if cmd=="--file" or cmd=="-f" then
     end
     dfhack.safecall(f,table.unpack(args,3))
 elseif cmd=="--save" or cmd=="-s" then
-    if df.global.world.save_dir=="" then
+    if df.global.world.cur_savegame.save_dir=="" then
         qerror("Savefile not loaded")
     end
     local fname=args[2] or "dfhack.lua"
-    fname=string.format("data/save/%s/%s",df.global.world.save_dir,fname)
+    fname=string.format("data/save/%s/%s",df.global.world.cur_savegame.save_dir,fname)
     local f,err=loadfile (fname)
     if f==nil then
         qerror(err)
diff --git a/modtools/extra-gamelog.lua b/modtools/extra-gamelog.lua
@@ -44,7 +44,7 @@ function log_on_load(op)
     local function fullname(item)
         return dfhack.TranslateName(item.name)..' ('..dfhack.TranslateName(item.name ,true)..')'
     end
-    msg('Loaded '..df.global.world.save_dir..', '..fullname(df.global.world.world_data)..
+    msg('Loaded '..df.global.world.cur_savegame.save_dir..', '..fullname(df.global.world.world_data)..
         ' at coordinates ('..site.pos.x..','..site.pos.y..')')
     msg('Loaded the fortress '..fullname(site)..
         (fort_ent and ', colonized by the group '..fullname(fort_ent) or '')..
