Merge pull request #210 from badgerman/develop

fix pool test (GiveRestriction broke it).

.gitignore

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

conf/eressea.ini

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

scripts/eressea/xmlconf.lua

@@ -2,9 +2,8 @@ local confdir = 'conf/'
 if config.install then
     confdir = config.install .. '/' .. confdir
 end
-rules=''
 if config.rules then
-    rules = config.rules .. '/'
-end
+    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