forked from github/server
- Kein Test auf UFL_MOVED (weil sonst teleports vorm Kampf den Kampf verhindern)
- Dafür LONGACTION setzen bei einer Flucht
This commit is contained in:
parent
b15e0d3ad2
commit
a240be83a2
|
@ -3299,7 +3299,7 @@ join_allies(battle * b)
|
||||||
int size = cv_size(&b->sides);
|
int size = cv_size(&b->sides);
|
||||||
for (u=r->units;u;u=u->next)
|
for (u=r->units;u;u=u->next)
|
||||||
/* Was ist mit Schiffen? */
|
/* Was ist mit Schiffen? */
|
||||||
if (u->status != ST_FLEE && u->status != ST_AVOID && !fval(u, UFL_MOVED) && u->number > 0)
|
if (u->status != ST_FLEE && u->status != ST_AVOID && !fval(u, UFL_LONGACTION) && u->number > 0)
|
||||||
{
|
{
|
||||||
int si;
|
int si;
|
||||||
faction * f = u->faction;
|
faction * f = u->faction;
|
||||||
|
|
Loading…
Reference in New Issue