From 6abf8f7adb09fc39b60c980e9c0ec93f948eab8e Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Wed, 8 Jul 2015 05:12:26 +0200 Subject: [PATCH] bug 1692: rewrite of magicresistance curse-info, especially for buildings (homestome spell). --- res/core/messages.xml | 12 ++++++++- src/kernel/messages.c | 2 -- src/spells/buildingcurse.c | 9 +++---- src/spells/magicresistance.c | 14 +++++++--- src/spells/magicresistance.test.c | 43 ++++++++++++++++++++++++++++--- src/spells/unitcurse.c | 1 + src/test_eressea.c | 1 + 7 files changed, 67 insertions(+), 15 deletions(-) diff --git a/res/core/messages.xml b/res/core/messages.xml index 22a8ea841..4e78fc094 100644 --- a/res/core/messages.xml +++ b/res/core/messages.xml @@ -392,13 +392,20 @@ - "Die natürliche Widerstandskraft gegen Verzauberung ist gestärkt. ($int36($id))" "The magical resistance has been strengthened. ($int36($id))" + + + + + + "Die natürliche Widerstandskraft gegen Verzauberung ist gestärkt. ($int36($id))" + "The magical resistance has been strengthened. ($int36($id))" + @@ -415,6 +422,7 @@ + "Diese Mauern wirken, als wären sie direkt aus der Erde gewachsen und nicht erbaut. ($int36($id))" @@ -422,6 +430,7 @@ + "Ein magischer Schimmer liegt auf diesen Mauern. ($int36($id))" @@ -542,6 +551,7 @@ + "Der Zahn der Zeit kann diesen Mauern nichts anhaben. ($int36($id))" "Time cannot touch these walls. ($int36($id))" diff --git a/src/kernel/messages.c b/src/kernel/messages.c index af0e4170b..cd5719c42 100644 --- a/src/kernel/messages.c +++ b/src/kernel/messages.c @@ -188,7 +188,6 @@ message *msg_message(const char *name, const char *sig, ...) } else { log_error("invalid parameter %s for message type %s\n", paramname, mtype->name); - assert(!"program aborted."); } while (*ic && !isalnum(*ic)) ic++; @@ -196,7 +195,6 @@ message *msg_message(const char *name, const char *sig, ...) va_end(vargs); if (argnum != mtype->nparameters) { log_error("not enough parameters for message type %s\n", mtype->name); - assert(!"program aborted."); } return msg_create(mtype, args); diff --git a/src/spells/buildingcurse.c b/src/spells/buildingcurse.c index ae2f941bb..d3b5ddf36 100644 --- a/src/spells/buildingcurse.c +++ b/src/spells/buildingcurse.c @@ -36,14 +36,13 @@ message *cinfo_building(const void *obj, objtype_t typ, const curse * c, int self) { + const building *b = (const building *)obj; unused_arg(typ); assert(typ == TYP_BUILDING); + assert(obj); + assert(c); - if (self != 0) { /* owner or inside */ - building *b = (building *)obj; - return msg_message(mkname("curseinfo", c->type->cname), "id building", c->no, b); - } - return msg_message(mkname("curseinfo", "buildingunknown"), "id", c->no); + return msg_message(mkname("curseinfo", self ? c->type->cname : "buildingunknown"), "id building", c->no, b); } /* CurseInfo mit Spezialabfragen */ diff --git a/src/spells/magicresistance.c b/src/spells/magicresistance.c index 3ec15011c..0a4ffaa9f 100644 --- a/src/spells/magicresistance.c +++ b/src/spells/magicresistance.c @@ -1,16 +1,22 @@ #include #include -#include "unitcurse.h" -#include "buildingcurse.h" #include +#include +#include static struct message *cinfo_magicresistance(const void *obj, objtype_t typ, const struct curse * c, int self) { if (typ == TYP_UNIT) { - return cinfo_unit(obj, typ, c, self); + if (self != 0) { + const struct unit *u = (const struct unit *)obj; + return msg_message(mkname("curseinfo", c->type->cname), "unit id", u, + c->no); + } + return NULL; } if (typ == TYP_BUILDING) { - return cinfo_building(obj, typ, c, self); + const struct building *b = (const struct building *)obj; + return msg_message(mkname("curseinfo", self ? "homestone" : "buildingunknown"), "id building", c->no, b); } return 0; } diff --git a/src/spells/magicresistance.test.c b/src/spells/magicresistance.test.c index bd2d4b69b..1a63fb737 100644 --- a/src/spells/magicresistance.test.c +++ b/src/spells/magicresistance.test.c @@ -1,11 +1,13 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include #include @@ -29,11 +31,11 @@ static struct castorder *test_create_castorder(castorder *order, unit *u, const return order = create_castorder(order, u, NULL, sp, u->region, level, force, range, create_order(K_CAST, lang, ""), NULL); } -static void test_magicresistance(CuTest *tc) { +static void test_magicresistance_unit(CuTest *tc) { struct region *r; struct faction *f1, *f2; unit *u1, *u2; - int level; + message *msg; curse *c; test_cleanup(); @@ -45,12 +47,47 @@ static void test_magicresistance(CuTest *tc) { f2 = test_create_faction(test_create_race("human")); u2 = test_create_unit(f2, r); + c = create_curse(u1, &u2->attribs, ct_find("magicresistance"), 10, 20, 30, u2->number); + CuAssertPtrNotNull(tc, u2->attribs); + CuAssertPtrEquals(tc, (void *)&at_curse, (void *)u2->attribs->type); + msg = c->type->curseinfo(u2, TYP_UNIT, c, 1); + CuAssertPtrNotNull(tc, msg); + CuAssertStrEquals(tc, "curseinfo::magicresistance", test_get_messagetype(msg)); + + test_cleanup(); +} + +static void test_magicresistance_building(CuTest *tc) { + struct region *r; + struct faction *f1, *f2; + unit *u1; + building *b1; + message *msg; + curse *c; + + test_cleanup(); + test_create_world(); + r = findregion(0, 0); + f1 = test_create_faction(test_create_race("human")); + u1 = test_create_unit(f1, r); + + f2 = test_create_faction(test_create_race("human")); + b1 = test_create_building(r, test_create_buildingtype("castle")); + + c = create_curse(u1, &b1->attribs, ct_find("magicresistance"), 10, 20, 30, 0); + CuAssertPtrNotNull(tc, b1->attribs); + CuAssertPtrEquals(tc, (void *)&at_curse, (void *)b1->attribs->type); + msg = c->type->curseinfo(b1, TYP_BUILDING, c, 1); + CuAssertPtrNotNull(tc, msg); + CuAssertStrEquals(tc, "curseinfo::homestone", test_get_messagetype(msg)); + test_cleanup(); } CuSuite *get_magicresistance_suite(void) { CuSuite *suite = CuSuiteNew(); - SUITE_ADD_TEST(suite, test_magicresistance); + SUITE_ADD_TEST(suite, test_magicresistance_unit); + SUITE_ADD_TEST(suite, test_magicresistance_building); return suite; } diff --git a/src/spells/unitcurse.c b/src/spells/unitcurse.c index 7e3f5e18e..73925a55a 100644 --- a/src/spells/unitcurse.c +++ b/src/spells/unitcurse.c @@ -159,6 +159,7 @@ message *cinfo_unit(const void *obj, objtype_t typ, const curse * c, int self) { unused_arg(typ); assert(typ == TYP_UNIT); + assert(obj); if (self != 0) { unit *u = (unit *)obj; diff --git a/src/test_eressea.c b/src/test_eressea.c index baa70ae2c..b5a2e2a42 100644 --- a/src/test_eressea.c +++ b/src/test_eressea.c @@ -74,6 +74,7 @@ int RunAllTests(void) RUN_TESTS(suite, building); RUN_TESTS(suite, spell); RUN_TESTS(suite, spells); + RUN_TESTS(suite, magicresistance); RUN_TESTS(suite, ally); RUN_TESTS(suite, messages); /* gamecode */