From 272588cb0f3771b041c23eeaf0056a2a6e150194 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Fri, 2 Nov 2018 22:31:20 +0100
Subject: [PATCH] BUG 2509: fix travelthru faction reporting

---
 src/reports.c      |  3 +--
 src/reports.test.c | 22 ++++++++++++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/reports.c b/src/reports.c
index 12154b70d..dbea67489 100644
--- a/src/reports.c
+++ b/src/reports.c
@@ -916,7 +916,7 @@ bufunit(const faction * f, const unit * u, seen_mode mode, char *buf,
         }
         if (!isbattle) {
             int printed = 0;
-            order *ord;;
+            order *ord;
             for (ord = u->old_orders; ord; ord = ord->next) {
                 keyword_t kwd = getkeyword(ord);
                 if (is_repeated(kwd)) {
@@ -1133,7 +1133,6 @@ static void cb_add_address(region *r, unit *ut, void *cbdata) {
             if (data->lastf != sf && cansee_unit(ut, u, data->stealthmod)) {
                 add_seen_faction_i(data->flist, sf);
                 data->lastf = sf;
-                break;
             }
         }
     }
diff --git a/src/reports.test.c b/src/reports.test.c
index 247676451..b1cf36d99 100644
--- a/src/reports.test.c
+++ b/src/reports.test.c
@@ -440,22 +440,34 @@ static void test_get_addresses_fstealth(CuTest *tc) {
 
 static void test_get_addresses_travelthru(CuTest *tc) {
     report_context ctx;
-    faction *f, *f2, *f1;
+    faction *f, *f4, *f3, *f2, *f1;
     region *r1, *r2;
     unit *u;
+    race *rc;
 
     test_setup();
     f = test_create_faction(NULL);
-    f1 = test_create_faction(NULL);
-    f2 = test_create_faction(NULL);
     r1 = test_create_region(0, 0, NULL);
     r2 = test_create_region(1, 0, 0);
     u = test_create_unit(f, r2);
     travelthru_add(r1, u);
+
+    f1 = test_create_faction(NULL);
     u = test_create_unit(f1, r1);
+    f2 = test_create_faction(NULL);
     set_factionstealth(u, f2);
     u->building = test_create_building(u->region, test_create_buildingtype("tower"));
 
+    rc = rc_get_or_create("dragon");
+    rc->flags |= RCF_UNARMEDGUARD;
+    f3 = test_create_faction(rc);
+    u = test_create_unit(f3, r1);
+    setguard(u, true);
+
+    f4 = test_create_faction(NULL);
+    u = test_create_unit(f4, r1);
+    set_level(u, SK_STEALTH, 1);
+
     prepare_report(&ctx, f);
     CuAssertPtrEquals(tc, r1, ctx.first);
     CuAssertPtrEquals(tc, NULL, ctx.last);
@@ -464,7 +476,9 @@ static void test_get_addresses_travelthru(CuTest *tc) {
     CuAssertTrue(tc, selist_contains(ctx.addresses, f, NULL));
     CuAssertTrue(tc, !selist_contains(ctx.addresses, f1, NULL));
     CuAssertTrue(tc, selist_contains(ctx.addresses, f2, NULL));
-    CuAssertIntEquals(tc, 2, selist_length(ctx.addresses));
+    CuAssertTrue(tc, selist_contains(ctx.addresses, f3, NULL));
+    CuAssertTrue(tc, !selist_contains(ctx.addresses, f4, NULL));
+    CuAssertIntEquals(tc, 3, selist_length(ctx.addresses));
     finish_reports(&ctx);
     test_teardown();
 }