diff --git a/src/kernel/faction.c b/src/kernel/faction.c index 16c0c789c..b4dfe51ca 100755 --- a/src/kernel/faction.c +++ b/src/kernel/faction.c @@ -492,36 +492,6 @@ void destroyfaction(faction ** fp) } handle_event(f->attribs, "destroy", f); -#if 0 - faction *ff; - for (ff = factions; ff; ff = ff->next) { - group *g; - ally *sf, **sfp; - - for (sfp = &ff->allies; *sfp;) { - sf = *sfp; - if (sf->faction == f || sf->faction == NULL) { - *sfp = sf->next; - free(sf); - } - else - sfp = &(*sfp)->next; - } - for (g = ff->groups; g; g = g->next) { - for (sfp = &g->allies; *sfp; ) { - sf = *sfp; - if (sf->faction == f || sf->faction == NULL) { - *sfp = sf->next; - free(sf); - } - else { - sfp = &(*sfp)->next; - } - } - } - } -#endif - if (f->alliance) { setalliance(f, 0); } diff --git a/src/monsters.c b/src/monsters.c index 181615a40..bbeb483b8 100644 --- a/src/monsters.c +++ b/src/monsters.c @@ -755,6 +755,11 @@ void plan_monsters(faction * f) if (u->faction!=f) continue; + /* Parteitarnung von Monstern ist doof: */ + if (fval(u, UFL_ANON_FACTION)) { + u->flags &= ~UFL_ANON_FACTION; + } + /* Befehle m�ssen jede Runde neu gegeben werden: */ free_orders(&u->orders); if (skill_enabled(SK_PERCEPTION)) {