do not allow transfer of heros and limited units.

src/give.c

@@ -299,7 +299,7 @@ static bool can_give_men(const unit *u, const unit *dst, order *ord, message **m
     return false;
 }
 
-static bool rule_transfermen(void)
+bool rule_transfermen(void)
 {
     int rule = config_get_int("rules.transfermen", 1);
     return rule != 0;
@@ -472,9 +472,23 @@ message * disband_men(int n, unit * u, struct order *ord) {
     return msg_message("give_person_peasants", "unit amount", u, n);
 }
 
+int give_unit_allowed(const unit * u)
+{
+    if (unit_has_cursed_item(u)) {
+        return 78;
+    }
+    if (fval(u, UFL_HERO)) {
+        return 75;
+    }
+    if (fval(u, UFL_LOCKED) || fval(u, UFL_HUNGER)) {
+        return 74;
+    }
+    return 0;
+}
+
 void give_unit(unit * u, unit * u2, order * ord)
 {
-    int maxt = max_transfers();
+    int err, maxt = max_transfers();
 
     assert(u);
     if (!rule_transfermen() && u2 && u->faction != u2->faction) {
@@ -482,17 +496,9 @@ void give_unit(unit * u, unit * u2, order * ord)
         return;
     }
 
-    if (unit_has_cursed_item(u)) {
+    err = give_unit_allowed(u);
-        cmistake(u, ord, 78, MSG_COMMERCE);
+    if (err != 0) {
-        return;
+        cmistake(u, ord, err, MSG_COMMERCE);
-    }
-
-    if (fval(u, UFL_HERO)) {
-        cmistake(u, ord, 75, MSG_COMMERCE);
-        return;
-    }
-    if (fval(u, UFL_LOCKED) || fval(u, UFL_HUNGER)) {
-        cmistake(u, ord, 74, MSG_COMMERCE);
         return;
     }
 

src/give.h

@@ -29,10 +29,12 @@ extern "C" {
     struct message * disband_men(int n, struct unit * u, struct order *ord);
     struct message * give_men(int n, struct unit *u, struct unit *u2,
     struct order *ord);
+    int give_unit_allowed(const struct unit * u);
     void give_unit(struct unit *u, struct unit *u2, struct order *ord);
     void give_cmd(struct unit * u, struct order * ord);
     struct message * check_give(const struct unit * u, const struct unit * u2, struct order *ord);
     bool can_give_to(struct unit *u, struct unit *u2);
+    bool rule_transfermen(void);
 
 #ifdef __cplusplus
 }

src/laws.c

@@ -30,6 +30,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "battle.h"
 #include "contact.h"
 #include "economy.h"
+#include "give.h"
 #include "market.h"
 #include "morale.h"
 #include "monsters.h"
@@ -940,8 +941,13 @@ int leave_cmd(unit * u, struct order *ord)
     return 0;
 }
 
-int transfer_faction(faction *fsrc, faction *fdst) {
+void transfer_faction(faction *fsrc, faction *fdst) {
-    return 0;
+    unit *u;
+    for (u = fsrc->units; u != NULL; u = u->nextF) {
+        if (give_unit_allowed(u) == 0) {
+            u_setfaction(u, fdst);
+        }
+    }
 }
 
 int quit_cmd(unit * u, struct order *ord)
@@ -955,35 +961,37 @@ int quit_cmd(unit * u, struct order *ord)
     assert(kwd == K_QUIT);
     passwd = gettoken(token, sizeof(token));
     if (checkpasswd(f, (const char *)passwd)) {
+        int flags = FFL_QUIT;
+        if (rule_transfermen()) {
             param_t p;
             p = getparam(f->locale);
             if (p == P_FACTION) {
                 faction *f2 = getfaction();
                 if (f2 == NULL) {
                     cmistake(u, ord, 66, MSG_EVENT);
+                    flags = 0;
                 }
                 else if (f->race != f2->race) {
                     cmistake(u, ord, 281, MSG_EVENT);
+                    flags = 0;
                 }
                 else {
                     unit *u2;
                     for (u2 = u->region->units; u2; u2 = u2->next) {
                         if (u2->faction == f2 && ucontact(u2, u)) {
-                        int err = transfer_faction(u->faction, u2->faction);
+                            transfer_faction(u->faction, u2->faction);
-                        if (err != 0) {
-                            /* something went wrong */
-                            cmistake(u, ord, err, MSG_EVENT);
-                        }
                             break;
                         }
                     }
                     if (u2 == NULL) {
                         /* no target unit found */
                         cmistake(u, ord, 0, MSG_EVENT);
+                        flags = 0;
                     }
                 }
             }
-        fset(f, FFL_QUIT);
+        }
+        f->flags |= flags;
     }
     else {
         char buffer[64];

src/laws.test.c

@@ -1,6 +1,7 @@
 #include <platform.h>
 #include "laws.h"
 #include "battle.h"
+#include "contact.h"
 #include "guard.h"
 #include "monsters.h"
 
@@ -1868,6 +1869,49 @@ static void test_long_order_on_ocean(CuTest *tc) {
     test_teardown();
 }
 
+static void test_quit(CuTest *tc) {
+    faction *f;
+    unit *u;
+    region *r;
+
+    test_setup();
+    r = test_create_plain(0, 0);
+    f = test_create_faction(NULL);
+    u = test_create_unit(f, r);
+    u->thisorder = create_order(K_QUIT, f->locale, "password");
+
+    faction_setpassword(f, "passwort");
+    quit_cmd(u, u->thisorder);
+    CuAssertIntEquals(tc, 0, f->flags & FFL_QUIT);
+
+    faction_setpassword(f, "password");
+    quit_cmd(u, u->thisorder);
+    CuAssertIntEquals(tc, FFL_QUIT, f->flags & FFL_QUIT);
+
+    test_teardown();
+}
+
+static void test_quit_transfer(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));
+    quit_cmd(u1, u1->thisorder);
+    CuAssertIntEquals(tc, FFL_QUIT, f1->flags & FFL_QUIT);
+    CuAssertPtrEquals(tc, f2, u1->faction);
+    test_teardown();
+}
+
 CuSuite *get_laws_suite(void)
 {
     CuSuite *suite = CuSuiteNew();
@@ -1943,6 +1987,8 @@ CuSuite *get_laws_suite(void)
     SUITE_ADD_TEST(suite, test_nmr_timeout);
     SUITE_ADD_TEST(suite, test_long_orders);
     SUITE_ADD_TEST(suite, test_long_order_on_ocean);
+    SUITE_ADD_TEST(suite, test_quit);
+    SUITE_ADD_TEST(suite, test_quit_transfer);
 
     return suite;
 }