From 2cb42872685b4812ccb34ae2b5f51af227e5c9f8 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sat, 4 May 2019 10:55:13 +0200
Subject: [PATCH] do not transfer migrants. comments are good.

---
 src/laws.c      | 26 ++++++++++---------
 src/laws.test.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+), 12 deletions(-)

diff --git a/src/laws.c b/src/laws.c
index f1e69b231..2f86e79a6 100644
--- a/src/laws.c
+++ b/src/laws.c
@@ -964,22 +964,24 @@ void transfer_faction(faction *fsrc, faction *fdst) {
     }
 
     for (u = fsrc->units; u != NULL; u = u->nextF) {
-        if (give_unit_allowed(u) == 0) {
-            if (u->skills) {
-                int i;
+        if (u_race(u) == fdst->race) {
+            if (give_unit_allowed(u) == 0) {
+                if (u->skills) {
+                    int i;
 
-                for (i = 0; i != u->skill_size; ++i) {
-                    const skill *sv = u->skills + i;
-                    skill_t sk = (skill_t)sv->id;
-                    if (skill_count[sk] + u->number > skill_limit[sk]) {
-                        break;
+                    for (i = 0; i != u->skill_size; ++i) {
+                        const skill *sv = u->skills + i;
+                        skill_t sk = (skill_t)sv->id;
+                        if (skill_count[sk] + u->number > skill_limit[sk]) {
+                            break;
+                        }
+                    }
+                    if (i != u->skill_size) {
+                        continue;
                     }
                 }
-                if (i != u->skill_size) {
-                    continue;
-                }
+                u_setfaction(u, fdst);
             }
-            u_setfaction(u, fdst);
         }
     }
 }
diff --git a/src/laws.test.c b/src/laws.test.c
index f82ec52e5..c5dafd851 100644
--- a/src/laws.test.c
+++ b/src/laws.test.c
@@ -1891,6 +1891,9 @@ static void test_quit(CuTest *tc) {
     test_teardown();
 }
 
+/**
+ * Gifting units to another faction upon voluntary death (QUIT).
+ */ 
 static void test_quit_transfer(CuTest *tc) {
     faction *f1, *f2;
     unit *u1, *u2;
@@ -1912,6 +1915,12 @@ static void test_quit_transfer(CuTest *tc) {
     test_teardown();
 }
 
+/**
+ * Gifting units with limited skills to another faction.
+ *
+ * This is allowed only up to the limit of the target faction.
+ * Units that would break the limit are not transferred.
+ */
 static void test_quit_transfer_limited(CuTest *tc) {
     faction *f1, *f2;
     unit *u1, *u2;
@@ -1946,6 +1955,62 @@ static void test_quit_transfer_limited(CuTest *tc) {
     test_teardown();
 }
 
+/**
+ * Only units of the same race can be gifted to another faction.
+ */
+static void test_quit_transfer_migrants(CuTest *tc) {
+    faction *f1, *f2;
+    unit *u1, *u2;
+    region *r;
+
+    test_setup();
+    r = test_create_plain(0, 0);
+    f1 = test_create_faction(NULL);
+    faction_setpassword(f1, "password");
+    u1 = test_create_unit(f1, r);
+    f2 = test_create_faction(NULL);
+    u2 = test_create_unit(f2, r);
+    contact_unit(u2, u1);
+    u1->thisorder = create_order(K_QUIT, f1->locale, "password %s %s",
+        LOC(f1->locale, parameters[P_FACTION]), itoa36(f2->no));
+
+    u_setrace(u1, test_create_race("smurf"));
+
+    quit_cmd(u1, u1->thisorder);
+    CuAssertIntEquals(tc, FFL_QUIT, f1->flags & FFL_QUIT);
+    CuAssertPtrEquals(tc, f1, u1->faction);
+
+    test_teardown();
+}
+
+/**
+ * Heroes cannot be gifted to another faction.
+ */
+static void test_quit_transfer_hero(CuTest *tc) {
+    faction *f1, *f2;
+    unit *u1, *u2;
+    region *r;
+
+    test_setup();
+    r = test_create_plain(0, 0);
+    f1 = test_create_faction(NULL);
+    faction_setpassword(f1, "password");
+    u1 = test_create_unit(f1, r);
+    f2 = test_create_faction(NULL);
+    u2 = test_create_unit(f2, r);
+    contact_unit(u2, u1);
+    u1->thisorder = create_order(K_QUIT, f1->locale, "password %s %s",
+        LOC(f1->locale, parameters[P_FACTION]), itoa36(f2->no));
+
+    u1->flags |= UFL_HERO;
+
+    quit_cmd(u1, u1->thisorder);
+    CuAssertIntEquals(tc, FFL_QUIT, f1->flags & FFL_QUIT);
+    CuAssertPtrEquals(tc, f1, u1->faction);
+
+    test_teardown();
+}
+
 CuSuite *get_laws_suite(void)
 {
     CuSuite *suite = CuSuiteNew();
@@ -2024,6 +2089,8 @@ CuSuite *get_laws_suite(void)
     SUITE_ADD_TEST(suite, test_quit);
     SUITE_ADD_TEST(suite, test_quit_transfer);
     SUITE_ADD_TEST(suite, test_quit_transfer_limited);
+    SUITE_ADD_TEST(suite, test_quit_transfer_migrants);
+    SUITE_ADD_TEST(suite, test_quit_transfer_hero);
 
     return suite;
 }