iamgreaser/buldthensnip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed genmap due to variable renaming

Browse Source
This commit is contained in:
Ben Russell (300178622) 2013-02-01 11:32:18 +13:00
parent f3a27b3943
commit 96ff1d290c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/base/main_server.lua
View File

@ -501,7 +501,7 @@ end
-- parse arguments -- parse arguments
local loose, user_toggles, server_settings = parse_commandline_options({...}) local loose, server_toggles, server_settings = parse_commandline_options({...})
local server_config_filename = server_settings['server'] or "svsave/pub/server.json" local server_config_filename = server_settings['server'] or "svsave/pub/server.json"
server_config = common.json_load(server_config_filename) server_config = common.json_load(server_config_filename)
-- TODO: Check that server_config ~= nil -- TODO: Check that server_config ~= nil
@ -565,7 +565,7 @@ map_loaded = common.map_load(map_fname, "auto")
if map_fname then if map_fname then
map_loaded = common.map_load(map_fname, "auto") map_loaded = common.map_load(map_fname, "auto")
else else
map_loaded = loadfile("pkg/base/gen_classic.lua")(loose, user_toggles, user_settings) map_loaded = loadfile("pkg/base/gen_classic.lua")(loose, server_toggles, server_settings)
end end
common.map_set(map_loaded) common.map_set(map_loaded)