Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix xml catalog references for E2 and E3. 

Fix a bug in the new get_arg function.
This commit is contained in:
Enno Rehling 2013-12-27 01:54:02 +01:00
parent ca79c28eaf
commit bef560d92a
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
game-e2/setup.lua
View File

@ -2,7 +2,7 @@ local srcpath = config.source_dir
local respath = srcpath .. '/res' local respath = srcpath .. '/res'
local paths = { local paths = {
'scripts/?.lua', 'scripts/?.lua',
'eressea/scripts/?.lua', 'core/scripts/?.lua',
'lunit/?.lua' 'lunit/?.lua'
} }

2
game-e3/setup.lua
View File

@ -2,7 +2,7 @@ local srcpath = config.source_dir
local respath = srcpath .. '/res' local respath = srcpath .. '/res'
local paths = { local paths = {
'scripts/?.lua', 'scripts/?.lua',
'eressea/scripts/?.lua', 'core/scripts/?.lua',
'lunit/?.lua' 'lunit/?.lua'
} }

2
res/catalog-e3a.xml
View File

@ -6,5 +6,5 @@
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<rewriteURI <rewriteURI
uriStartString="eressea:///core/" uriStartString="eressea:///core/"
rewritePrefix="../eressea/res/" /> rewritePrefix="../core/res/" />
</catalog> </catalog>

2
res/catalog-eressea.xml
View File

@ -6,5 +6,5 @@
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<rewriteURI <rewriteURI
uriStartString="eressea:///core/" uriStartString="eressea:///core/"
rewritePrefix="../eressea/res/" /> rewritePrefix="../core/res/" />
</catalog> </catalog>

2
src/main.c
View File

@ -84,7 +84,7 @@ static int get_arg(int argc, char **argv, size_t len, int index, const char **re
return index; return index;
} }
if (index+1 < argc) { if (index+1 < argc) {
*result = argv[index]; *result = argv[index+1];
return index+1; return index+1;
} }
*result = def; *result = def;