update config files to use game.rules from eressea.ini.

ToDo: set rules from command line with -r
This commit is contained in:
Enno Rehling 2014-07-23 12:19:24 +02:00
parent 2bec7e2bbe
commit 30e9565ae6
4 changed files with 8 additions and 7 deletions

View File

@ -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

View File

@ -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

View File

@ -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"

View File

@ -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