Merge pull request #721 from ennorehling/master

BUG 2357: new players must be able to recruit
eressea · Aug 18, 2017 · d13cd0d · d13cd0d
2 parents b8e755c + aa61860
commit d13cd0d
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/kernel/faction.c b/src/kernel/faction.c
@@ -283,12 +283,20 @@ faction *addfaction(const char *email, const char *password,
     return f;
 }
 
+#define PEASANT_MIN (10 * RECRUITFRACTION)
+#define PEASANT_MAX (20 * RECRUITFRACTION)
+
 unit *addplayer(region * r, faction * f)
 {
     unit *u;
     const char * name;
     const struct equipment* eq;
 
+    assert(r->land);
+    if (rpeasants(r) < PEASANT_MIN) {
+        rsetpeasants(r, PEASANT_MIN + rng_int() % (PEASANT_MAX - PEASANT_MIN));
+    }
+
     assert(f->units == NULL);
     faction_setorigin(f, 0, r->x, r->y);
     u = create_unit(r, f, 1, f->race, 0, NULL, NULL);