From e3d7d23d00a81bbe6552bae2847d75e66ddbc770 Mon Sep 17 00:00:00 2001 From: Steffen Mecke Date: Tue, 1 Dec 2015 22:01:28 +0100 Subject: [PATCH] re-enable sea serpent piracy --- src/monsters.c | 2 +- src/monsters.test.c | 2 +- src/piracy.test.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/monsters.c b/src/monsters.c index 47d355953..ab63cbb31 100644 --- a/src/monsters.c +++ b/src/monsters.c @@ -836,7 +836,7 @@ void plan_monsters(faction * f) switch (old_race(u_race(u))) { case RC_SEASERPENT: - // long_order = create_order(K_PIRACY, f->locale, NULL); + long_order = create_order(K_PIRACY, f->locale, NULL); break; #ifdef TODO_ALP case RC_ALP: diff --git a/src/monsters.test.c b/src/monsters.test.c index 2ba2e2ae0..9fce059f2 100644 --- a/src/monsters.test.c +++ b/src/monsters.test.c @@ -263,7 +263,7 @@ CuSuite *get_monsters_suite(void) CuSuite *suite = CuSuiteNew(); SUITE_ADD_TEST(suite, test_monsters_attack); SUITE_ADD_TEST(suite, test_monsters_attack_ocean); - DISABLE_TEST(suite, test_seaserpent_piracy); + SUITE_ADD_TEST(suite, test_seaserpent_piracy); SUITE_ADD_TEST(suite, test_monsters_waiting); SUITE_ADD_TEST(suite, test_monsters_attack_not); SUITE_ADD_TEST(suite, test_dragon_attacks_the_rich); diff --git a/src/piracy.test.c b/src/piracy.test.c index bf4b664fb..dee326980 100644 --- a/src/piracy.test.c +++ b/src/piracy.test.c @@ -188,7 +188,7 @@ static void test_piracy_cmd_land_to_land(CuTest * tc) { piracy_cmd(pirate, ord); CuAssertPtrEquals(tc, 0, pirate->thisorder); - CuAssertTrue(tc, "no piracy from land to adjacent land region", pirate->region == r); + CuAssertTrue(tc, pirate->region == r); /* TODO check message CuAssertPtrNotNullMsg(tc, "successful PIRACY movement", test_find_messagetype(pirate->faction->msgs, "travel")); */