Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

http://eressea.upb.de/mantis/view.php?id=847 

Frisch auferstandene Untote kämpfen mit

- join_allies checkt jetzt auf UFL_ISNEW
This commit is contained in:
Enno Rehling 2006-02-26 15:58:44 +00:00
parent 1d0bbfd0b8
commit cc9714fca6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/kernel/battle.c
View File

@ -3384,7 +3384,7 @@ join_allies(battle * b)
size_t size = cv_size(&b->sides);
for (u=r->units;u;u=u->next)
/* Was ist mit Schiffen? */
if (u->status != ST_FLEE && u->status != ST_AVOID && !fval(u, UFL_LONGACTION) && u->number > 0)
if (u->status != ST_FLEE && u->status != ST_AVOID && !fval(u, UFL_LONGACTION|UFL_ISNEW) && u->number > 0)
{
size_t si;
faction * f = u->faction;