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

retreat: Don't report a destroyed ship/land unit couldn't retreat

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2014-01-20 22:51:11 +01:00
parent c3a839934f
commit df8a1ffc1b
2 changed files with 2 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -96,7 +96,7 @@ retreat_ship(struct shpstr *sp, char code)
struct nstr_item ni; struct nstr_item ni;
struct shpstr ship; struct shpstr ship;
if (CANT_HAPPEN(!sp->shp_own)) if (sp->shp_effic < SHIP_MINEFF || CANT_HAPPEN(!sp->shp_own))
return; return;
retreat_ship1(sp, code, 1); retreat_ship1(sp, code, 1);
@ -141,15 +141,6 @@ retreat_ship1(struct shpstr *sp, char code, int orig)
struct mchrstr *mcp; struct mchrstr *mcp;
int changed; int changed;
if (sp->shp_effic < SHIP_MINEFF) {
wu(0, sp->shp_own,
"%s %s,\nbut it died in the attack, and so couldn't retreat!\n",
prship(sp), conditions[findcondition(code)].desc[orig]);
if (!orig)
putship(sp->shp_uid, sp);
return 0;
}
if (opt_SAIL) { if (opt_SAIL) {
/* can't retreat a ship that's sailin, bad things happend */ /* can't retreat a ship that's sailin, bad things happend */
if (*sp->shp_path) { if (*sp->shp_path) {
@ -352,7 +343,7 @@ retreat_land(struct lndstr *lp, char code)
struct nstr_item ni; struct nstr_item ni;
struct lndstr land; struct lndstr land;
if (CANT_HAPPEN(!lp->lnd_own)) if (lp->lnd_effic < LAND_MINEFF || CANT_HAPPEN(!lp->lnd_own))
return; return;
retreat_land1(lp, code, 1); retreat_land1(lp, code, 1);
@ -396,15 +387,6 @@ retreat_land1(struct lndstr *lp, char code, int orig)
double mobcost; double mobcost;
struct lchrstr *lcp; struct lchrstr *lcp;
if (lp->lnd_effic < LAND_MINEFF) {
wu(0, lp->lnd_own,
"%s %s,\nbut it died in the attack, and so couldn't retreat!\n",
prland(lp), conditions[findcondition(code)].desc[orig]);
if (!orig)
putland(lp->lnd_uid, lp);
return 0;
}
getsect(lp->lnd_x, lp->lnd_y, &sect); getsect(lp->lnd_x, lp->lnd_y, &sect);
if (lp->lnd_mobil <= 0.0) { if (lp->lnd_mobil <= 0.0) {

4
tests/retreat/journal.log
View file

@ -1266,8 +1266,6 @@
Play#0 output Play#0 1 > BULLETIN from POGO, (#0) dated Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 > BULLETIN from POGO, (#0) dated Thu Jan 1 00:00:00 1970
Play#0 output Play#0 1 Country #1 shelled cs cargo ship (#30) in 0,2 for 10 damage. Play#0 output Play#0 1 Country #1 shelled cs cargo ship (#30) in 0,2 for 10 damage.
Play#0 output Play#0 1 cs cargo ship (#30) takes 8 Play#0 output Play#0 1 cs cargo ship (#30) takes 8
Play#0 output Play#0 1 cs cargo ship (#30) was damaged,
Play#0 output Play#0 1 but it died in the attack, and so couldn't retreat!
Play#0 output Play#0 1 cs cargo ship (#30) sunk! Play#0 output Play#0 1 cs cargo ship (#30) sunk!
Play#0 output Play#0 1 Country #1 shelled cs cargo ship (#31) in 0,2 for 8 damage. Play#0 output Play#0 1 Country #1 shelled cs cargo ship (#31) in 0,2 for 8 damage.
Play#0 output Play#0 1 cs cargo ship (#31) takes 6 Play#0 output Play#0 1 cs cargo ship (#31) takes 6
@ -1411,8 +1409,6 @@
Play#0 output Play#0 1 1 planes spotted over 1,1 Play#0 output Play#0 1 1 planes spotted over 1,1
Play#0 output Play#0 1 1 pinpoint bombing raid did 40 damage to inf infantry #30 Play#0 output Play#0 1 1 pinpoint bombing raid did 40 damage to inf infantry #30
Play#0 output Play#0 1 inf infantry #30 takes 12 Play#0 output Play#0 1 inf infantry #30 takes 12
Play#0 output Play#0 1 inf infantry #30 was bombed,
Play#0 output Play#0 1 but it died in the attack, and so couldn't retreat!
Play#0 output Play#0 1 1,1 takes 4% collateral damage Play#0 output Play#0 1 1,1 takes 4% collateral damage
Play#0 output Play#0 1 tra train #9 takes 1 Play#0 output Play#0 1 tra train #9 takes 1
Play#0 output Play#0 1 1 planes spotted over -1,1 Play#0 output Play#0 1 1 planes spotted over -1,1