From 7aa0e85917c815d00cbe27a9ad5ff5ce35c99f17 Mon Sep 17 00:00:00 2001 From: Enno Date: Sun, 8 Aug 2010 11:28:43 +0200 Subject: [PATCH] small fixes to directories and hings --- game-e3/setup.lua | 2 +- res/catalog-e3a.xml | 2 +- res/catalog-eressea.xml | 2 +- scripts/e3a/modules.lua | 2 +- scripts/eressea/modules.lua | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/game-e3/setup.lua b/game-e3/setup.lua index 9c263b4ee..5175c8e84 100644 --- a/game-e3/setup.lua +++ b/game-e3/setup.lua @@ -2,7 +2,7 @@ local srcpath = config.source_dir local respath = srcpath .. '/eressea/res' local paths = { 'eressea/scripts/?.lua', - 'server/scripts/?.lua', + 'shared/scripts/?.lua', 'external/lunit/?.lua' } diff --git a/res/catalog-e3a.xml b/res/catalog-e3a.xml index 661a6cedb..7cdc8196f 100644 --- a/res/catalog-e3a.xml +++ b/res/catalog-e3a.xml @@ -6,5 +6,5 @@ + rewritePrefix="../../shared/res/" /> diff --git a/res/catalog-eressea.xml b/res/catalog-eressea.xml index 661a6cedb..7cdc8196f 100644 --- a/res/catalog-eressea.xml +++ b/res/catalog-eressea.xml @@ -6,5 +6,5 @@ + rewritePrefix="../../shared/res/" /> diff --git a/scripts/e3a/modules.lua b/scripts/e3a/modules.lua index aac9e864a..59a3aef7f 100644 --- a/scripts/e3a/modules.lua +++ b/scripts/e3a/modules.lua @@ -7,6 +7,6 @@ local srcpath = config.source_dir tests = { srcpath .. '/eressea/scripts/tests/castles.lua', srcpath .. '/eressea/scripts/tests/morale.lua', - srcpath .. '/server/scripts/tests/common.lua', + srcpath .. '/shared/scripts/tests/common.lua', srcpath .. '/eressea/scripts/tests/e3a.lua', } diff --git a/scripts/eressea/modules.lua b/scripts/eressea/modules.lua index aa6c14114..b70af6e57 100644 --- a/scripts/eressea/modules.lua +++ b/scripts/eressea/modules.lua @@ -16,6 +16,6 @@ require "eressea.ents" local srcpath = config.source_dir tests = { - srcpath .. '/server/scripts/tests/common.lua', + srcpath .. '/shared/scripts/tests/common.lua', srcpath .. '/eressea/scripts/tests/eressea.lua', }