properly create missing monster faction when spawning dragons.

remove cached monster faction (static).
Conflicts:
	src/kernel/faction.c

src/kernel/faction.c

@@ -1,7 +1,7 @@
 /*
 Copyright (c) 1998-2010, Enno Rehling <enno@eressea.de>
-                         Katja Zedel <katze@felidae.kn-bremen.de
-                         Christian Schlittchen <corwin@amber.kn-bremen.de>
+Katja Zedel <katze@felidae.kn-bremen.de
+Christian Schlittchen <corwin@amber.kn-bremen.de>
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
@@ -105,32 +105,37 @@ void set_show_item(faction * f, const struct item_type *itype)
     a->data.v = (void *)itype;
 }
 
-faction *get_monsters(void)
-{
-  static faction *monsters;
-  static int gamecookie = -1;
-
-  if (gamecookie != global.cookie) {
-    monsters = NULL;
-    gamecookie = global.cookie;
-  }
-
-  if (!monsters) {
+faction *get_monsters(void) {
     faction *f;
+
     for (f = factions; f; f = f->next) {
         if ((f->flags & FFL_NPC) && !(f->flags & FFL_DEFENDER)) {
-        return monsters = f;
+            return f;
         }
     }
-    if (!monsters) {
+    return 0;
+}
+
+faction *get_or_create_monsters(void)
+{
+    faction *f = get_monsters();
+
+    if (!f) {
         /* shit! */
-      monsters = findfaction(666);
+        f = findfaction(666);
     }
-    if (monsters) {
-      fset(monsters, FFL_NPC | FFL_NOIDLEOUT);
+    if (!f) {
+        const race *rc = rc_find("dragon");
+            
+        f = addfaction("noreply@eressea.de", NULL, rc, NULL, 0);
+        renumber_faction(f, 666);
+        faction_setname(f, "Monster");
+        f->options = 0;
     }
+    if (f) {
+        fset(f, FFL_NPC | FFL_NOIDLEOUT);
     }
-  return monsters;
+    return f;
 }
 
 const unit *random_unit_in_faction(const faction * f)
@@ -162,7 +167,8 @@ const char *factionname(const faction * f)
 
     if (f && f->name) {
         slprintf(ibuf, sizeof(name), "%s (%s)", f->name, itoa36(f->no));
-  } else {
+    }
+    else {
         strcpy(ibuf, "Unbekannte Partei (?)");
     }
     return ibuf;
@@ -178,7 +184,7 @@ int resolve_faction(variant id, void *address)
             result = -1;
         }
     }
-  *(faction **) address = f;
+    *(faction **)address = f;
     return result;
 }
 
@@ -235,6 +241,10 @@ faction *addfaction(const char *email, const char *password,
     slprintf(buf, sizeof(buf), "%s %s", LOC(loc, "factiondefault"), factionid(f));
     f->name = _strdup(buf);
 
+    if (!f->race) {
+        log_warning("creating a faction that has no race", factionid(f));
+    }
+
     return f;
 }
 
@@ -256,7 +266,7 @@ unit *addplayer(region * r, faction * f)
         race_t urc;
         race *rc;
         do {
-      urc = (race_t) (rng_int() % MAXRACES);
+            urc = (race_t)(rng_int() % MAXRACES);
             rc = get_race(urc);
         } while (rc == NULL || urc == RC_DAEMON || !playerrace(rc));
         u->irace = rc;
@@ -315,7 +325,8 @@ void destroyfaction(faction * f)
             unit *zombie = u;
             u = u->nextF;
             make_zombie(zombie);
-    } else {
+        }
+        else {
             region *r = u->region;
 
             if (!fval(r->terrain, SEA_REGION) && !!playerrace(u_race(u))) {
@@ -331,7 +342,8 @@ void destroyfaction(faction * f)
                      * stammen */
                     if (rc->ec_flags & ECF_REC_HORSES) {  /* Zentauren an die Pferde */
                         h += u->number;
-          } else {              /* Orks zählen nur zur Hälfte */
+                    }
+                    else {              /* Orks zählen nur zur Hälfte */
                         p += (int)(u->number * rc->recruit_multi);
                     }
                     for (itm = u->items; itm; itm = itm->next) {
@@ -350,7 +362,7 @@ void destroyfaction(faction * f)
         }
     }
     f->alive = 0;
-/* no way!  f->units = NULL; */
+    /* no way!  f->units = NULL; */
     handle_event(f->attribs, "destroy", f);
     for (ff = factions; ff; ff = ff->next) {
         group *g;
@@ -498,7 +510,7 @@ bool valid_race(const struct faction *f, const struct race *rc)
     else {
         const char *str = get_param(f->race->parameters, "other_race");
         if (str)
-      return (bool) (rc_find(str) == rc);
+            return (bool)(rc_find(str) == rc);
         return false;
     }
 }
@@ -521,7 +533,7 @@ struct spellbook * faction_get_spellbook(struct faction *f)
     if (f->spellbook) {
         return f->spellbook;
     }
-  if (f->magiegebiet!=M_GRAY) {
+    if (f->magiegebiet != M_GRAY) {
         return get_spellbook(magic_school[f->magiegebiet]);
     }
     return 0;
@@ -535,7 +547,7 @@ static int allied_skillcount(const faction * f, skill_t sk)
     int qi;
 
     for (qi = 0; members; ql_advance(&members, &qi, 1)) {
-    faction *m = (faction *) ql_get(members, qi);
+        faction *m = (faction *)ql_get(members, qi);
         num += count_skill(m, sk);
     }
     return num;
@@ -584,7 +596,8 @@ int skill_limit(faction * f, skill_t sk)
     }
     if (sk == SK_MAGIC) {
         m = max_magicians(f);
-  } else if (sk == SK_ALCHEMY) {
+    }
+    else if (sk == SK_ALCHEMY) {
         m = get_param_int(global.parameters, "rules.maxskills.alchemy",
             MAXALCHEMISTS);
     }

src/kernel/faction.h

@@ -114,6 +114,7 @@ typedef struct faction {
 extern struct faction *factions;
 
 struct faction *get_monsters(void);
+struct faction *get_or_create_monsters(void);
 int max_magicians(const faction * f);
 void set_show_item(faction * f, const struct item_type *itype);
 

src/monsters.c

@@ -889,7 +889,7 @@ static int nrand(int start, int sub)
 void spawn_dragons(void)
 {
   region *r;
-  faction *monsters = get_monsters();
+  faction *monsters = get_or_create_monsters();
 
   for (r = regions; r; r = r->next) {
     unit *u;