Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove test for bug 2253

This commit is contained in:
Enno Rehling 2017-02-12 19:32:27 +01:00
parent 4828045fd7
commit 182fc3fa3c
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/give.test.c
View File

@ -124,12 +124,6 @@ static void test_give_men_magicians(CuTest * tc) {
CuAssertIntEquals(tc, 1, env.src->number); CuAssertIntEquals(tc, 1, env.src->number);
msg_release(msg); msg_release(msg);
set_number(env.dst, 0);
CuAssertPtrEquals(tc, NULL, give_men(1, env.src, env.dst, NULL));
CuAssertIntEquals(tc, 1, env.dst->number);
CuAssertIntEquals(tc, 0, env.src->number);
p = rpeasants(env.r); p = rpeasants(env.r);
CuAssertPtrNotNull(tc, msg = disband_men(1, env.dst, NULL)); CuAssertPtrNotNull(tc, msg = disband_men(1, env.dst, NULL));
CuAssertStrEquals(tc, "give_person_peasants", (const char *)msg->parameters[0].v); CuAssertStrEquals(tc, "give_person_peasants", (const char *)msg->parameters[0].v);

9
src/spells.c
View File

@ -4714,7 +4714,6 @@ static int sp_gbdreams(castorder * co, const char *curse_name, int effect)
int cast_level = co->level; int cast_level = co->level;
double power = co->force; double power = co->force;
region *r = co_get_region(co); region *r = co_get_region(co);
curse *c;
/* wirkt erst in der Folgerunde, soll mindestens eine Runde wirken, /* wirkt erst in der Folgerunde, soll mindestens eine Runde wirken,
* also duration+2 */ * also duration+2 */
@ -4722,7 +4721,7 @@ static int sp_gbdreams(castorder * co, const char *curse_name, int effect)
duration = 2 + rng_int() % duration; duration = 2 + rng_int() % duration;
/* Nichts machen als ein entsprechendes Attribut in die Region legen. */ /* Nichts machen als ein entsprechendes Attribut in die Region legen. */
c = create_curse(mage, &r->attribs, ct_find(curse_name), power, duration, effect, 0); create_curse(mage, &r->attribs, ct_find(curse_name), power, duration, effect, 0);
/* Erfolg melden */ /* Erfolg melden */
ADDMSG(&mage->faction->msgs, msg_message("regionmagic_effect", ADDMSG(&mage->faction->msgs, msg_message("regionmagic_effect",
@ -4841,7 +4840,6 @@ int sp_sweetdreams(castorder * co)
/* Schleife ueber alle angegebenen Einheiten */ /* Schleife ueber alle angegebenen Einheiten */
for (n = 0; n < pa->length; n++) { for (n = 0; n < pa->length; n++) {
curse *c;
unit *u; unit *u;
double effect; double effect;
message *msg; message *msg;
@ -4865,7 +4863,7 @@ int sp_sweetdreams(castorder * co)
/* Nichts machen als ein entsprechendes Attribut an die Einheit legen. */ /* Nichts machen als ein entsprechendes Attribut an die Einheit legen. */
effect = 0.05f; effect = 0.05f;
c = create_curse(mage, &u->attribs, ct_find("orcish"), power, duration, effect, men); create_curse(mage, &u->attribs, ct_find("orcish"), power, duration, effect, men);
msg = msg_message("sp_sweetdreams_effect", "mage unit region", mage, u, r); msg = msg_message("sp_sweetdreams_effect", "mage unit region", mage, u, r);
r_addmessage(r, mage->faction, msg); r_addmessage(r, mage->faction, msg);
@ -4886,10 +4884,9 @@ int sp_disturbingdreams(castorder * co)
double power = co->force; double power = co->force;
int duration = 1 + (int)(power / 6); int duration = 1 + (int)(power / 6);
double effect; double effect;
curse *c;
effect = 10; effect = 10;
c = create_curse(mage, &r->attribs, ct_find("badlearn"), power, duration, effect, 0); create_curse(mage, &r->attribs, ct_find("badlearn"), power, duration, effect, 0);
ADDMSG(&mage->faction->msgs, msg_message("sp_disturbingdreams_effect", ADDMSG(&mage->faction->msgs, msg_message("sp_disturbingdreams_effect",
"mage region", mage, r)); "mage region", mage, r));