forked from github/server
monsters should not be anonymous.
This commit is contained in:
parent
af7e291923
commit
6403c75c85
|
@ -492,36 +492,6 @@ void destroyfaction(faction ** fp)
|
||||||
}
|
}
|
||||||
|
|
||||||
handle_event(f->attribs, "destroy", f);
|
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) {
|
if (f->alliance) {
|
||||||
setalliance(f, 0);
|
setalliance(f, 0);
|
||||||
}
|
}
|
||||||
|
|
|
@ -755,6 +755,11 @@ void plan_monsters(faction * f)
|
||||||
if (u->faction!=f)
|
if (u->faction!=f)
|
||||||
continue;
|
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: */
|
/* Befehle m<>ssen jede Runde neu gegeben werden: */
|
||||||
free_orders(&u->orders);
|
free_orders(&u->orders);
|
||||||
if (skill_enabled(SK_PERCEPTION)) {
|
if (skill_enabled(SK_PERCEPTION)) {
|
||||||
|
|
Loading…
Reference in New Issue