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

Merge pull request #210 from badgerman/develop 

fix pool test (GiveRestriction broke it).
This commit is contained in:
Enno Rehling 2015-05-24 09:48:06 +02:00
parent 3e93ebfcb7 e9992db51c
commit 4aceb204ea
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -36,3 +36,4 @@ game-e3/reports/
*.log.* *.log.*
tags tags
Thumbs.db Thumbs.db
.gdb_history

1
conf/eressea.ini
View File

@ -12,7 +12,6 @@ locales = de,en
install = . install = .
paths = lunit:scripts paths = lunit:scripts
maxnmrs = 20 maxnmrs = 20
rules = e2
[editor] [editor]
color = 1 color = 1

7
scripts/eressea/xmlconf.lua
View File

@ -2,9 +2,8 @@ local confdir = 'conf/'
if config.install then if config.install then
confdir = config.install .. '/' .. confdir confdir = config.install .. '/' .. confdir
end end
rules=''
if config.rules then if config.rules then
rules = config.rules .. '/' local rules = config.rules .. '/'
assert(0 == read_xml(confdir .. rules .. 'config.xml', confdir .. rules .. 'catalog.xml'), "could not load XML data, did you compile with LIBXML2 ?")
assert(0 == eressea.config.read(rules .. 'config.json', confdir), "could not read JSON data")
end end
assert(0 == read_xml(confdir .. rules .. 'config.xml', confdir .. rules .. 'catalog.xml'), "could not load XML data, did you compile with LIBXML2 ?")
assert(0 == eressea.config.read(rules .. 'config.json', confdir), "could not read JSON data")