empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

retreat: Clear mission only when ship or land unit moves

Browse source 
The mission gets cleared whenever a retreat is triggered, even for
ships and land units that are unable to retreat.

Clear it only when the ship or land unit actually retreats.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2014-01-20 21:05:57 +01:00
parent 2cc0664e3e
commit e7949e20f3
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/lib/subs/retreat.c
View file

@ -140,7 +140,6 @@ retreat_ship1(struct shpstr *sp, char code, int orig)
struct mchrstr *mcp;
int changed;
sp->shp_mission = 0;
if (sp->shp_own == 0)
return 0;
@ -260,6 +259,7 @@ retreat_ship1(struct shpstr *sp, char code, int orig)
sp->shp_x = newx;
sp->shp_y = newy;
sp->shp_mobil -= mobcost;
sp->shp_mission = 0;
if (stopping)
continue;
@ -399,7 +399,6 @@ retreat_land1(struct lndstr *lp, char code, int orig)
double mobcost;
struct lchrstr *lcp;
lp->lnd_mission = 0;
if (lp->lnd_own == 0)
return 0;
@ -471,6 +470,7 @@ retreat_land1(struct lndstr *lp, char code, int orig)
lp->lnd_x = newx;
lp->lnd_y = newy;
lp->lnd_mobil -= mobcost;
lp->lnd_mission = 0;
if (stopping)
continue;