mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-25 19:20:46 +00:00
LunaCON standalone: don't try default path on file-not-found for root names.
git-svn-id: https://svn.eduke32.com/eduke32@3809 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
487d54793f
commit
f568f34636
1 changed files with 11 additions and 11 deletions
|
@ -764,7 +764,7 @@ end
|
||||||
|
|
||||||
local function parse(contents) end -- fwd-decl
|
local function parse(contents) end -- fwd-decl
|
||||||
|
|
||||||
local function do_include_file(dirname, filename)
|
local function do_include_file(dirname, filename, isroot)
|
||||||
assert(type(filename)=="string")
|
assert(type(filename)=="string")
|
||||||
|
|
||||||
if (g_have_file[filename] ~= nil) then
|
if (g_have_file[filename] ~= nil) then
|
||||||
|
@ -783,7 +783,7 @@ local function do_include_file(dirname, filename)
|
||||||
local io = require("io")
|
local io = require("io")
|
||||||
|
|
||||||
local fd, msg = io.open(dirname..filename)
|
local fd, msg = io.open(dirname..filename)
|
||||||
if (fd == nil) then
|
if (fd == nil and not isroot) then
|
||||||
-- strip up to and including first slash:
|
-- strip up to and including first slash:
|
||||||
filename = filename:gsub("^.-/", "")
|
filename = filename:gsub("^.-/", "")
|
||||||
fd, msg = io.open(dirname..filename)
|
fd, msg = io.open(dirname..filename)
|
||||||
|
@ -795,13 +795,13 @@ local function do_include_file(dirname, filename)
|
||||||
dirname = g_defaultDir.."/"
|
dirname = g_defaultDir.."/"
|
||||||
fd, msg = io.open(dirname..filename)
|
fd, msg = io.open(dirname..filename)
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
if (fd == nil) then
|
if (fd == nil) then
|
||||||
printf("[%d] Fatal error: couldn't open %s", g_recurslevel, msg)
|
printf("[%d] Fatal error: couldn't open %s", g_recurslevel, msg)
|
||||||
g_numerrors = inf
|
g_numerrors = inf
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
contents = fd:read("*all")
|
contents = fd:read("*all")
|
||||||
fd:close()
|
fd:close()
|
||||||
|
@ -841,7 +841,7 @@ function Cmd.nyi(msg)
|
||||||
end
|
end
|
||||||
|
|
||||||
function Cmd.include(filename)
|
function Cmd.include(filename)
|
||||||
do_include_file(g_directory, filename)
|
do_include_file(g_directory, filename, false)
|
||||||
end
|
end
|
||||||
|
|
||||||
--- Per-module game data
|
--- Per-module game data
|
||||||
|
@ -3364,9 +3364,9 @@ if (string.dump) then
|
||||||
|
|
||||||
-- NOTE: xpcall isn't useful here since the traceback won't give us
|
-- NOTE: xpcall isn't useful here since the traceback won't give us
|
||||||
-- anything inner to the lpeg.match call
|
-- anything inner to the lpeg.match call
|
||||||
local ok, msg = pcall(do_include_file, g_directory, filename)
|
local ok, msg = pcall(do_include_file, g_directory, filename, true)
|
||||||
-- ^v Swap commenting (comment top, uncomment bottom line) to get backtraces
|
-- ^v Swap commenting (comment top, uncomment bottom line) to get backtraces
|
||||||
-- local ok, msg = true, do_include_file(g_directory, filename)
|
-- local ok, msg = true, do_include_file(g_directory, filename, true)
|
||||||
|
|
||||||
if (not ok) then
|
if (not ok) then
|
||||||
print_on_failure(msg)
|
print_on_failure(msg)
|
||||||
|
@ -3434,7 +3434,7 @@ else
|
||||||
reset_all()
|
reset_all()
|
||||||
|
|
||||||
for _, fname in ipairs(filenames) do
|
for _, fname in ipairs(filenames) do
|
||||||
local ok, msg = pcall(do_include_file, "", fname)
|
local ok, msg = pcall(do_include_file, "", fname, true)
|
||||||
if (not ok or g_numerrors > 0) then
|
if (not ok or g_numerrors > 0) then
|
||||||
if (not ok) then
|
if (not ok) then
|
||||||
-- Unexpected error in the Lua code (i.e. a bug here).
|
-- Unexpected error in the Lua code (i.e. a bug here).
|
||||||
|
|
Loading…
Reference in a new issue