From 29fc0fe6c3205147372eb78edff5687d6fa8974c Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Fri, 9 Jan 2015 20:41:48 +0100 Subject: [PATCH 1/9] preview build script checks for a branch to build from (in build/.preview) fix int to bool conversions --- s/cron/previews.sh | 16 ++++++++++------ src/kernel/order.c | 6 ++---- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/s/cron/previews.sh b/s/cron/previews.sh index 7c9f8bb95..6e30c75c5 100755 --- a/s/cron/previews.sh +++ b/s/cron/previews.sh @@ -1,9 +1,13 @@ #!/bin/sh -[ -z $ERESSEA ] && ERESSEA=$HOME/eressea -SRC=$ERESSEA/git -$SRC/s/preview build master -$SRC/s/preview version +[ -z ${ERESSEA} ] && ERESSEA=~/eressea +branch="master" +if [ -e ${ERESSEA}/build/.preview ]; then + branch=`cat ${ERESSEA}/build/.preview` +fi +SRC=${ERESSEA}/git +${SRC}/s/preview build ${branch} +${SRC}/s/preview version for game in 2 3 4 ; do - $SRC/s/preview -g $game run && \ - $SRC/s/preview -g $game send + ${SRC}/s/preview -g ${game} run && \ + ${SRC}/s/preview -g ${game} send done diff --git a/src/kernel/order.c b/src/kernel/order.c index 165769807..83171ddfe 100644 --- a/src/kernel/order.c +++ b/src/kernel/order.c @@ -472,7 +472,6 @@ bool is_exclusive(const order * ord) bool is_long(const order * ord) { keyword_t kwd = ORD_KEYWORD(ord); - bool result = false; switch (kwd) { case K_CAST: @@ -499,9 +498,9 @@ bool is_long(const order * ord) return true; default: - result = false; + break; } - return result; + return false; } /** @@ -529,7 +528,6 @@ bool is_persistent(const order * ord) default: return persist || is_repeated(ord); } - } char *write_order(const order * ord, char *buffer, size_t size) From 468882f974fb0e5bebdd01e20992324f3d583949 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Wed, 14 Jan 2015 07:46:42 +0100 Subject: [PATCH 2/9] test that money has weight, add weight in init_resources (TODO: use the config files). --- scripts/tests/e3/rules.lua | 17 +++++++++++++++++ src/kernel/item.c | 1 + 2 files changed, 18 insertions(+) diff --git a/scripts/tests/e3/rules.lua b/scripts/tests/e3/rules.lua index 07fbb1a60..5350df169 100644 --- a/scripts/tests/e3/rules.lua +++ b/scripts/tests/e3/rules.lua @@ -712,6 +712,23 @@ function test_golem_use_four_iron() assert_equal(4, u1:get_item("towershield")) end +function test_silver_weight_stops_movement() + local r1 = region.create(1, 1, "plain") + local r2 = region.create(2, 1, "plain") + region.create(3, 1, "plain") + local f1 = faction.create("noreply@eressea.de", "human", "de") + local u1 = unit.create(f1, r1, 1) + u1:clear_orders() + u1:add_order("NACH OST") + u1:add_item("money", 540) + assert_equal(1540, u1.weight) + process_orders() + assert_equal(r2, u1.region) + u1:add_item("money", 1) + process_orders() + assert_equal(r2, u1.region) +end + function test_building_owner_can_enter_ship() local r1 = region.create(1, 2, "plain") local f1 = faction.create("noreply@eressea.de", "human", "de") diff --git a/src/kernel/item.c b/src/kernel/item.c index b09ea1b67..1592d1a93 100644 --- a/src/kernel/item.c +++ b/src/kernel/item.c @@ -960,6 +960,7 @@ void init_resources(void) rtype->uchange = res_changeitem; rtype->itype = it_get_or_create(rtype); rtype->itype->give = give_money; + rtype->itype->weight = 1; // R_PERMAURA rtype = rt_get_or_create(resourcenames[R_PERMAURA]); From 6fb23af66a2b2e14ceb88132a9686f1644189098 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Wed, 14 Jan 2015 17:49:48 +0100 Subject: [PATCH 3/9] test that ships are encumbered by money. define money in XML, not just in code. --- res/core/common/items.xml | 4 ++++ scripts/tests/e3/rules.lua | 19 +++++++++++++++++++ src/kernel/item.c | 1 - src/kernel/item.test.c | 22 ++++++++++++++++++++++ 4 files changed, 45 insertions(+), 1 deletion(-) diff --git a/res/core/common/items.xml b/res/core/common/items.xml index d867a3126..c8910e695 100644 --- a/res/core/common/items.xml +++ b/res/core/common/items.xml @@ -1,6 +1,10 @@ + + + + diff --git a/scripts/tests/e3/rules.lua b/scripts/tests/e3/rules.lua index 5350df169..57c19522d 100644 --- a/scripts/tests/e3/rules.lua +++ b/scripts/tests/e3/rules.lua @@ -729,6 +729,25 @@ function test_silver_weight_stops_movement() assert_equal(r2, u1.region) end +function test_silver_weight_stops_ship() + local r1 = region.create(1, 1, "ocean") + local r2 = region.create(2, 1, "ocean") + region.create(3, 1, "ocean") + local f1 = faction.create("noreply@eressea.de", "human", "de") + local u1 = unit.create(f1, r1, 1) + u1:set_skill("sailing", 3) + local s1 = ship.create(r1, "canoe") + u1.ship = s1 + u1:clear_orders() + u1:add_order("NACH OST") + u1:add_item("money", 2000) + process_orders() + assert_equal(r2, u1.region) + u1:add_item("money", 1) + process_orders() + assert_equal(r2, u1.region) +end + function test_building_owner_can_enter_ship() local r1 = region.create(1, 2, "plain") local f1 = faction.create("noreply@eressea.de", "human", "de") diff --git a/src/kernel/item.c b/src/kernel/item.c index 1592d1a93..b09ea1b67 100644 --- a/src/kernel/item.c +++ b/src/kernel/item.c @@ -960,7 +960,6 @@ void init_resources(void) rtype->uchange = res_changeitem; rtype->itype = it_get_or_create(rtype); rtype->itype->give = give_money; - rtype->itype->weight = 1; // R_PERMAURA rtype = rt_get_or_create(resourcenames[R_PERMAURA]); diff --git a/src/kernel/item.test.c b/src/kernel/item.test.c index dcb7ca878..981edf641 100644 --- a/src/kernel/item.test.c +++ b/src/kernel/item.test.c @@ -143,6 +143,27 @@ static void test_fix_demand(CuTest *tc) { test_cleanup(); } +static void test_core_resources(CuTest *tc) { + resource_type * rtype; + test_cleanup(); + init_resources(); + CuAssertPtrNotNull(tc, rtype = rt_find("money")); + CuAssertPtrNotNull(tc, rtype->itype); + CuAssertPtrNotNull(tc, rtype->uchange); + CuAssertPtrNotNull(tc, rtype->itype->give); + CuAssertPtrNotNull(tc, rtype = rt_find("peasant")); + CuAssertPtrEquals(tc, 0, rtype->itype); + CuAssertPtrNotNull(tc, rtype = rt_find("person")); + CuAssertPtrEquals(tc, 0, rtype->itype); + CuAssertPtrNotNull(tc, rtype = rt_find("permaura")); + CuAssertPtrEquals(tc, 0, rtype->itype); + CuAssertPtrNotNull(tc, rtype = rt_find("hp")); + CuAssertPtrEquals(tc, 0, rtype->itype); + CuAssertPtrNotNull(tc, rtype = rt_find("aura")); + CuAssertPtrEquals(tc, 0, rtype->itype); + test_cleanup(); +} + CuSuite *get_item_suite(void) { CuSuite *suite = CuSuiteNew(); @@ -153,5 +174,6 @@ CuSuite *get_item_suite(void) SUITE_ADD_TEST(suite, test_finditemtype); SUITE_ADD_TEST(suite, test_findresourcetype); SUITE_ADD_TEST(suite, test_fix_demand); + SUITE_ADD_TEST(suite, test_core_resources); return suite; } From 490782e75096ffb50ab2cb4326b79ab768748290 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Thu, 15 Jan 2015 16:40:19 +0100 Subject: [PATCH 4/9] add some simple tests for messages, prior to any refactorings. --- src/kernel/CMakeLists.txt | 1 + src/kernel/messages.c | 11 +++++----- src/kernel/messages.h | 1 + src/kernel/messages.test.c | 44 ++++++++++++++++++++++++++++++++++++++ src/test_eressea.c | 1 + src/util/message.c | 2 +- 6 files changed, 53 insertions(+), 7 deletions(-) create mode 100644 src/kernel/messages.test.c diff --git a/src/kernel/CMakeLists.txt b/src/kernel/CMakeLists.txt index 9dbb73b49..bc2c20418 100644 --- a/src/kernel/CMakeLists.txt +++ b/src/kernel/CMakeLists.txt @@ -21,6 +21,7 @@ race.test.c spellbook.test.c curse.test.c jsonconf.test.c +messages.test.c ) SET(_FILES diff --git a/src/kernel/messages.c b/src/kernel/messages.c index f7297f832..46329d66b 100644 --- a/src/kernel/messages.c +++ b/src/kernel/messages.c @@ -17,7 +17,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. **/ #include -#include #include "messages.h" /* kernel includes */ @@ -140,7 +139,7 @@ struct message *msg_feedback(const struct unit *u, struct order *ord, message *msg_message(const char *name, const char *sig, ...) /* msg_message("oops_error", "unit region command", u, r, cmd) */ { - va_list marker; + va_list vargs; const message_type *mtype = mt_find(name); char paramname[64]; const char *ic = sig; @@ -155,7 +154,7 @@ message *msg_message(const char *name, const char *sig, ...) return NULL; } - va_start(marker, sig); + va_start(vargs, sig); while (*ic && !isalnum(*ic)) ic++; while (*ic) { @@ -172,9 +171,9 @@ message *msg_message(const char *name, const char *sig, ...) } if (i != mtype->nparameters) { if (mtype->types[i]->vtype == VAR_VOIDPTR) { - args[i].v = va_arg(marker, void *); + args[i].v = va_arg(vargs, void *); } else if (mtype->types[i]->vtype == VAR_INT) { - args[i].i = va_arg(marker, int); + args[i].i = va_arg(vargs, int); } else { assert(!"unknown variant type"); } @@ -185,7 +184,7 @@ message *msg_message(const char *name, const char *sig, ...) while (*ic && !isalnum(*ic)) ic++; } - va_end(marker); + va_end(vargs); return msg_create(mtype, args); } diff --git a/src/kernel/messages.h b/src/kernel/messages.h index 83c0f2613..b9c07b0c9 100644 --- a/src/kernel/messages.h +++ b/src/kernel/messages.h @@ -22,6 +22,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. extern "C" { #endif +#include #include struct faction; diff --git a/src/kernel/messages.test.c b/src/kernel/messages.test.c new file mode 100644 index 000000000..e237ab8de --- /dev/null +++ b/src/kernel/messages.test.c @@ -0,0 +1,44 @@ +#include +#include "messages.h" + +#include +#include + +void test_missing_message(CuTest *tc) { + message *msg; + msg = msg_message("unknown", "unit", NULL); + CuAssertPtrNotNull(tc, msg); + CuAssertPtrNotNull(tc, msg->type); + CuAssertStrEquals(tc, msg->type->name, "missing_message"); + msg_release(msg); +} + +void test_message(CuTest *tc) { + message *msg; +// const char * args[] = { } + message_type *mtype = mt_new("custom", NULL); + mt_register(mtype); + CuAssertPtrEquals(tc, mtype, (void *)mt_find("custom")); + CuAssertIntEquals(tc, 0, mtype->nparameters); + CuAssertPtrEquals(tc, NULL, (void *)mtype->pnames); + CuAssertPtrEquals(tc, NULL, (void *)mtype->types); + msg = msg_message("custom", ""); + CuAssertPtrNotNull(tc, msg); + CuAssertIntEquals(tc, 1, msg->refcount); + CuAssertPtrEquals(tc, NULL, msg->parameters); + CuAssertPtrEquals(tc, mtype, (void *)msg->type); + + CuAssertPtrEquals(tc, msg, msg_addref(msg)); + CuAssertIntEquals(tc, 2, msg->refcount); + msg_release(msg); + CuAssertIntEquals(tc, 1, msg->refcount); + msg_release(msg); + test_cleanup(); +} + +CuSuite *get_messages_suite(void) { + CuSuite *suite = CuSuiteNew(); + SUITE_ADD_TEST(suite, test_missing_message); + SUITE_ADD_TEST(suite, test_message); + return suite; +} \ No newline at end of file diff --git a/src/test_eressea.c b/src/test_eressea.c index b8ff259b6..ca6ebf604 100644 --- a/src/test_eressea.c +++ b/src/test_eressea.c @@ -71,6 +71,7 @@ int RunAllTests(void) RUN_TESTS(suite, building); RUN_TESTS(suite, spell); RUN_TESTS(suite, ally); + RUN_TESTS(suite, messages); /* gamecode */ RUN_TESTS(suite, battle); RUN_TESTS(suite, economy); diff --git a/src/util/message.c b/src/util/message.c index 7e9c1a9f0..b557e4832 100644 --- a/src/util/message.c +++ b/src/util/message.c @@ -146,7 +146,7 @@ message *msg_create(const struct message_type *mtype, variant args[]) return NULL; } msg->type = mtype; - msg->parameters = (variant *) calloc(mtype->nparameters, sizeof(variant)); + msg->parameters = (variant *)mtype->nparameters ? calloc(mtype->nparameters, sizeof(variant)) : NULL; msg->refcount = 1; for (i = 0; i != mtype->nparameters; ++i) { msg->parameters[i] = copy_arg(mtype->types[i], args[i]); From 9f542e081b8c5ae43f04e2d179fda6e7bf8c5684 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Thu, 15 Jan 2015 17:17:32 +0100 Subject: [PATCH 5/9] fix last commit, broke the gcc travis build. --- src/util/message.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/message.c b/src/util/message.c index b557e4832..79c1949f5 100644 --- a/src/util/message.c +++ b/src/util/message.c @@ -146,7 +146,7 @@ message *msg_create(const struct message_type *mtype, variant args[]) return NULL; } msg->type = mtype; - msg->parameters = (variant *)mtype->nparameters ? calloc(mtype->nparameters, sizeof(variant)) : NULL; + msg->parameters = (variant *)(mtype->nparameters ? calloc(mtype->nparameters, sizeof(variant)) : NULL); msg->refcount = 1; for (i = 0; i != mtype->nparameters; ++i) { msg->parameters[i] = copy_arg(mtype->types[i], args[i]); From dadf7734a5d53eb4213225028b18fecafc97efa4 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Thu, 15 Jan 2015 17:17:58 +0100 Subject: [PATCH 6/9] set defaults in the race constructor, add test. --- src/kernel/race.c | 4 ++++ src/kernel/race.test.c | 28 +++++++++++++++++++++++++++- src/kernel/xmlreader.c | 24 ++++++++++++------------ 3 files changed, 43 insertions(+), 13 deletions(-) diff --git a/src/kernel/race.c b/src/kernel/race.c index 14541346e..2919fdb8b 100644 --- a/src/kernel/race.c +++ b/src/kernel/race.c @@ -177,7 +177,11 @@ race *rc_get_or_create(const char *zName) rc = (race *)calloc(sizeof(race), 1); rc->hitpoints = 1; + rc->weight = PERSON_WEIGHT; + rc->capacity = 540; rc->recruit_multi = 1.0F; + rc->regaura = 1.0F; + rc->speed = 1.0F; if (strchr(zName, ' ') != NULL) { log_error("race '%s' has an invalid name. remove spaces\n", zName); assert(strchr(zName, ' ') == NULL); diff --git a/src/kernel/race.test.c b/src/kernel/race.test.c index 31c058bea..ef4fc640e 100644 --- a/src/kernel/race.test.c +++ b/src/kernel/race.test.c @@ -8,17 +8,43 @@ #include static void test_rc_name(CuTest *tc) { - struct race *rc = test_create_race("human"); + struct race *rc; + test_cleanup(); + rc = test_create_race("human"); CuAssertStrEquals(tc, "race::human", rc_name_s(rc, NAME_SINGULAR)); CuAssertStrEquals(tc, "race::human_p", rc_name_s(rc, NAME_PLURAL)); CuAssertStrEquals(tc, "race::human_d", rc_name_s(rc, NAME_DEFINITIVE)); CuAssertStrEquals(tc, "race::human_x", rc_name_s(rc, NAME_CATEGORY)); + test_cleanup(); +} + +static void test_rc_defaults(CuTest *tc) { + struct race *rc; + test_cleanup(); + rc = rc_get_or_create("human"); + CuAssertStrEquals(tc, "human", rc->_name); + CuAssertDblEquals(tc, 0.0, rc->magres, 0.0); + CuAssertDblEquals(tc, 0.0, rc->maxaura, 0.0); + CuAssertDblEquals(tc, 1.0, rc->recruit_multi, 0.0); + CuAssertDblEquals(tc, 1.0, rc->regaura, 0.0); + CuAssertDblEquals(tc, 1.0, rc->speed, 0.0); + CuAssertIntEquals(tc, 0, rc->flags); + CuAssertIntEquals(tc, 0, rc->recruitcost); + CuAssertIntEquals(tc, 0, rc->maintenance); + CuAssertIntEquals(tc, 540, rc->capacity); + CuAssertIntEquals(tc, 1, rc->hitpoints); + CuAssertIntEquals(tc, 0, rc->armor); + CuAssertIntEquals(tc, 0, rc->at_bonus); + CuAssertIntEquals(tc, 0, rc->df_bonus); + CuAssertIntEquals(tc, PERSON_WEIGHT, rc->weight); + test_cleanup(); } CuSuite *get_race_suite(void) { CuSuite *suite = CuSuiteNew(); SUITE_ADD_TEST(suite, test_rc_name); + SUITE_ADD_TEST(suite, test_rc_defaults); return suite; } diff --git a/src/kernel/xmlreader.c b/src/kernel/xmlreader.c index 1b1c6b356..5061abb07 100644 --- a/src/kernel/xmlreader.c +++ b/src/kernel/xmlreader.c @@ -1626,22 +1626,22 @@ static int parse_races(xmlDocPtr doc) rc->def_damage = _strdup((const char *)propValue); xmlFree(propValue); - rc->magres = (float)xml_fvalue(node, "magres", 0.0); - rc->maxaura = (float)xml_fvalue(node, "maxaura", 0.0); - rc->regaura = (float)xml_fvalue(node, "regaura", 1.0); - rc->recruitcost = xml_ivalue(node, "recruitcost", 0); - rc->maintenance = xml_ivalue(node, "maintenance", 0); - rc->weight = xml_ivalue(node, "weight", PERSON_WEIGHT); - rc->capacity = xml_ivalue(node, "capacity", 540); - rc->speed = (float)xml_fvalue(node, "speed", 1.0F); - rc->hitpoints = xml_ivalue(node, "hp", 0); - rc->armor = (char)xml_ivalue(node, "ac", 0); + rc->magres = (float)xml_fvalue(node, "magres", rc->magres); + rc->maxaura = (float)xml_fvalue(node, "maxaura", rc->maxaura); + rc->regaura = (float)xml_fvalue(node, "regaura", rc->regaura); + rc->recruitcost = xml_ivalue(node, "recruitcost", rc->recruitcost); + rc->maintenance = xml_ivalue(node, "maintenance", rc->maintenance); + rc->weight = xml_ivalue(node, "weight", rc->weight); + rc->capacity = xml_ivalue(node, "capacity", rc->capacity); + rc->speed = (float)xml_fvalue(node, "speed", rc->speed); + rc->hitpoints = xml_ivalue(node, "hp", rc->hitpoints); + rc->armor = (char)xml_ivalue(node, "ac", rc->armor); study_speed_base = xml_ivalue(node, "studyspeed", 0); rc->at_default = (char)xml_ivalue(node, "unarmedattack", -2); rc->df_default = (char)xml_ivalue(node, "unarmeddefense", -2); - rc->at_bonus = (char)xml_ivalue(node, "attackmodifier", 0); - rc->df_bonus = (char)xml_ivalue(node, "defensemodifier", 0); + rc->at_bonus = (char)xml_ivalue(node, "attackmodifier", rc->at_bonus); + rc->df_bonus = (char)xml_ivalue(node, "defensemodifier", rc->df_bonus); if (!xml_bvalue(node, "playerrace", false)) rc->flags |= RCF_NPC; From c7b28e7b39d6c6f2e823b6d152c5b7ebfd939a8b Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Mon, 26 Jan 2015 07:17:19 +0100 Subject: [PATCH 7/9] disable ORIGIN at the source, prevent gcc warnings. --- src/laws.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/laws.c b/src/laws.c index 0c01f0471..36171ed2b 100755 --- a/src/laws.c +++ b/src/laws.c @@ -4318,7 +4318,7 @@ void init_processor(void) p += 10; add_proc_order(p, K_QUIT, &quit_cmd, 0, NULL); - add_proc_order(p, K_URSPRUNG, &origin_cmd, 0, NULL); + // add_proc_order(p, K_URSPRUNG, &origin_cmd, 0, NULL); add_proc_order(p, K_ALLY, &ally_cmd, 0, NULL); add_proc_order(p, K_PREFIX, &prefix_cmd, 0, NULL); add_proc_order(p, K_SETSTEALTH, &setstealth_cmd, 0, NULL); From 7527e6e90372fe78cf0b0f615c68f8059c82758a Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Thu, 29 Jan 2015 16:56:21 +0100 Subject: [PATCH 8/9] disable silver weight for the initial rollout of version 3.4 two weeks after launch, revert this commit --- res/core/common/items.xml | 2 +- scripts/tests/e3/rules.lua | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/res/core/common/items.xml b/res/core/common/items.xml index c8910e695..9508653e7 100644 --- a/res/core/common/items.xml +++ b/res/core/common/items.xml @@ -2,7 +2,7 @@ - + diff --git a/scripts/tests/e3/rules.lua b/scripts/tests/e3/rules.lua index 57c19522d..193551ea9 100644 --- a/scripts/tests/e3/rules.lua +++ b/scripts/tests/e3/rules.lua @@ -712,7 +712,7 @@ function test_golem_use_four_iron() assert_equal(4, u1:get_item("towershield")) end -function test_silver_weight_stops_movement() +function skip_test_silver_weight_stops_movement() local r1 = region.create(1, 1, "plain") local r2 = region.create(2, 1, "plain") region.create(3, 1, "plain") @@ -729,7 +729,7 @@ function test_silver_weight_stops_movement() assert_equal(r2, u1.region) end -function test_silver_weight_stops_ship() +function skip_test_silver_weight_stops_ship() local r1 = region.create(1, 1, "ocean") local r2 = region.create(2, 1, "ocean") region.create(3, 1, "ocean") @@ -770,3 +770,12 @@ function test_building_owner_can_enter_ship() assert_equal(s1, u1.ship) assert_equal(null, u1.building, "owner of the building can not go into a ship") end + +function test_weightless_silver() + local r1 = region.create(1, 2, "plain") + local f1 = faction.create("noreply@eressea.de", "human", "de") + local u1 = unit.create(f1, r1, 1) + assert_equal(1000, u1.weight) + u1:add_item("money", 540) + assert_equal(1000, u1.weight) +end From 372e8ff20f0b1fffc18d0ff641717cd3ccedcc06 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Thu, 29 Jan 2015 17:00:23 +0100 Subject: [PATCH 9/9] remove old configuration files, they are confusing and no longer valid. --- game-e2/catalog.xml | 16 ---- game-e2/config.xml | 114 --------------------------- game-e2/eressea.ini | 16 ---- game-e2/runtests.lua | 2 - game-e2/setup.lua | 14 ---- game-e3/catalog.xml | 16 ---- game-e3/config.xml | 182 ------------------------------------------- game-e3/eressea.ini | 16 ---- game-e3/runtests.lua | 2 - game-e3/setup.lua | 14 ---- 10 files changed, 392 deletions(-) delete mode 100644 game-e2/catalog.xml delete mode 100644 game-e2/config.xml delete mode 100644 game-e2/eressea.ini delete mode 100644 game-e2/runtests.lua delete mode 100644 game-e2/setup.lua delete mode 100644 game-e3/catalog.xml delete mode 100644 game-e3/config.xml delete mode 100644 game-e3/eressea.ini delete mode 100644 game-e3/runtests.lua delete mode 100644 game-e3/setup.lua diff --git a/game-e2/catalog.xml b/game-e2/catalog.xml deleted file mode 100644 index a6c2882c8..000000000 --- a/game-e2/catalog.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - diff --git a/game-e2/config.xml b/game-e2/config.xml deleted file mode 100644 index ec8a8855e..000000000 --- a/game-e2/config.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - eressea-server@eressea.de - eressea-server@eressea.de - - - Bitte denke daran, deine Befehle mit dem Betreff - ERESSEA BEFEHLE an eressea-server@eressea.de zu senden. - Remember to send your orders to - eressea-server@eressea.de with the subject ERESSEA ORDERS. - - - ERESSEA BEFEHLE - ERESSEA ORDERS - - - diff --git a/game-e2/eressea.ini b/game-e2/eressea.ini deleted file mode 100644 index 1abf1be35..000000000 --- a/game-e2/eressea.ini +++ /dev/null @@ -1,16 +0,0 @@ -[eressea] -base = . -report = reports -verbose = 0 -lomem = 0 -debug = 0 -memcheck = 0 -locales = de,en - -[config] -rules = eressea -source_dir = .. -maxnmrs = 10 - -[editor] -color = 1 diff --git a/game-e2/runtests.lua b/game-e2/runtests.lua deleted file mode 100644 index 423094391..000000000 --- a/game-e2/runtests.lua +++ /dev/null @@ -1,2 +0,0 @@ -require "setup" -run_tests() diff --git a/game-e2/setup.lua b/game-e2/setup.lua deleted file mode 100644 index ccd43719d..000000000 --- a/game-e2/setup.lua +++ /dev/null @@ -1,14 +0,0 @@ -local srcpath = config.source_dir -local respath = srcpath .. '/res' -local paths = { - 'scripts/?.lua', - 'core/scripts/?.lua', - 'lunit/?.lua' -} - -for idx, path in pairs(paths) do - package.path = srcpath .. '/' .. path .. ';' .. package.path -end - -assert(read_xml()) -require "init" diff --git a/game-e3/catalog.xml b/game-e3/catalog.xml deleted file mode 100644 index 3d82919cd..000000000 --- a/game-e3/catalog.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - diff --git a/game-e3/config.xml b/game-e3/config.xml deleted file mode 100644 index a66b20393..000000000 --- a/game-e3/config.xml +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - eressea-server@eressea.de - eressea-server@eressea.de - - - Bitte denke daran, deine Befehle mit dem Betreff - ERESSEA 4 BEFEHLE an eressea-server@eressea.de zu senden. - Remember to send your orders to - eressea-server@eressea.de with the subject ERESSEA 4 ORDERS. - - - ERESSEA 4 BEFEHLE - ERESSEA 4 ORDERS - - - diff --git a/game-e3/eressea.ini b/game-e3/eressea.ini deleted file mode 100644 index fdfe6277c..000000000 --- a/game-e3/eressea.ini +++ /dev/null @@ -1,16 +0,0 @@ -[eressea] -base = . -report = reports -verbose = 0 -lomem = 0 -debug = 0 -memcheck = 0 -locales = de,en - -[config] -rules = e3a -source_dir = .. -maxnmrs = 20 - -[editor] -color = 1 diff --git a/game-e3/runtests.lua b/game-e3/runtests.lua deleted file mode 100644 index 423094391..000000000 --- a/game-e3/runtests.lua +++ /dev/null @@ -1,2 +0,0 @@ -require "setup" -run_tests() diff --git a/game-e3/setup.lua b/game-e3/setup.lua deleted file mode 100644 index ccd43719d..000000000 --- a/game-e3/setup.lua +++ /dev/null @@ -1,14 +0,0 @@ -local srcpath = config.source_dir -local respath = srcpath .. '/res' -local paths = { - 'scripts/?.lua', - 'core/scripts/?.lua', - 'lunit/?.lua' -} - -for idx, path in pairs(paths) do - package.path = srcpath .. '/' .. path .. ';' .. package.path -end - -assert(read_xml()) -require "init"