From 30e9565ae68302a5120a211780f1276d121084fb Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Wed, 23 Jul 2014 12:19:24 +0200
Subject: [PATCH] update config files to use game.rules from eressea.ini. ToDo:
 set rules from command line with -r

---
 conf/eressea.ini         | 3 ++-
 core/scripts/init.lua    | 4 ++--
 core/scripts/setup.lua   | 6 +++---
 scripts/eressea/main.lua | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/conf/eressea.ini b/conf/eressea.ini
index 8874b3df3..7ac09f4c8 100644
--- a/conf/eressea.ini
+++ b/conf/eressea.ini
@@ -8,8 +8,9 @@ memcheck = 0
 locales = de,en
 
 [config]
-source_dir = ../server
+source_dir = ../git
 maxnmrs = 20
+rules = eressea ; use -r to override
 
 [editor]
 color = 1
diff --git a/core/scripts/init.lua b/core/scripts/init.lua
index b184887c3..d60434df2 100755
--- a/core/scripts/init.lua
+++ b/core/scripts/init.lua
@@ -1,4 +1,4 @@
-require(config.game .. ".modules")
+require(config.rules .. ".modules")
 require "default"
 require "resources"
 
@@ -25,7 +25,7 @@ function run_tests()
 end
 
 function run_turn()
-  require(config.game .. ".main")
+  require(config.rules .. ".main")
 
   local turn = get_turn()
   if turn<0 then
diff --git a/core/scripts/setup.lua b/core/scripts/setup.lua
index e4bfb726b..f54f36661 100644
--- a/core/scripts/setup.lua
+++ b/core/scripts/setup.lua
@@ -1,6 +1,6 @@
 local srcpath = config.source_dir
-local respath = srcpath .. '/' .. config.game .. '/res/'
-local paths = { config.game..'/scripts/?.lua';'lunit/?.lua','external/lunit/?.lua','scripts/?.lua';'scripts/?' }
+local respath = srcpath .. '/' .. config.rules .. '/res/'
+local paths = { config.rules..'/scripts/?.lua';'lunit/?.lua','external/lunit/?.lua','scripts/?.lua';'scripts/?' }
 
 tests = {'common'}
 for idx, test in pairs(tests) do
@@ -11,6 +11,6 @@ for idx, path in pairs(paths) do
   package.path = srcpath .. '/' .. path .. ';' .. package.path
 end
 
-read_xml(respath..'config-'..config.game..'.xml', respath..'catalog-'..config.game..'.xml')
+read_xml('config.xml', 'catalog.xml')
 
 require "init"
diff --git a/scripts/eressea/main.lua b/scripts/eressea/main.lua
index 33544da09..46d4b476c 100644
--- a/scripts/eressea/main.lua
+++ b/scripts/eressea/main.lua
@@ -2,7 +2,7 @@ require "multis"
 
 function apply_fixes()
   local turn = get_turn()
-  if config.game=="eressea" and turn>654 and turn<662 then
+  if config.rules=="eressea" and turn>654 and turn<662 then
     print("Fixing familiars")
     fix_familiars()
   end