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 
Commit df8a1ff redone without breaking stuff.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2015-01-07 14:16:01 +01:00
parent cc8b92d555
commit 40d347ed85
2 changed files with 0 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -124,9 +124,6 @@ retreat_ship1(struct shpstr *sp, char code, int orig)
int changed; int changed;
if (sp->shp_effic < SHIP_MINEFF) { 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) if (!orig)
putship(sp->shp_uid, sp); putship(sp->shp_uid, sp);
return 0; return 0;
@ -322,9 +319,6 @@ retreat_land1(struct lndstr *lp, char code, int orig)
struct lchrstr *lcp; struct lchrstr *lcp;
if (lp->lnd_effic < LAND_MINEFF) { 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) if (!orig)
putland(lp->lnd_uid, lp); putland(lp->lnd_uid, lp);
return 0; return 0;

4
tests/retreat/journal.log
View file

@ -1108,8 +1108,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 (#32) retreated with a damaged friend, Play#0 output Play#0 1 cs cargo ship (#32) retreated with a damaged friend,
Play#0 output Play#0 1 but had no crew, and couldn't retreat! Play#0 output Play#0 1 but had no crew, and couldn't retreat!
Play#0 output Play#0 1 cs cargo ship (#35) retreated with a damaged friend, Play#0 output Play#0 1 cs cargo ship (#35) retreated with a damaged friend,
@ -1262,8 +1260,6 @@
Play#0 output Play#0 1 1 planes spotted over 0,2 Play#0 output Play#0 1 1 planes spotted over 0,2
Play#0 output Play#0 1 1 pinpoint bombing raid did 44 damage to cav cavalry #30 Play#0 output Play#0 1 1 pinpoint bombing raid did 44 damage to cav cavalry #30
Play#0 output Play#0 1 cav cavalry #30 takes 17 Play#0 output Play#0 1 cav cavalry #30 takes 17
Play#0 output Play#0 1 cav cavalry #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 cav cavalry #31 retreated with a bombed friend, and ended up at 2,2 Play#0 output Play#0 1 cav cavalry #31 retreated with a bombed friend, and ended up at 2,2
Play#0 output Play#0 1 cav cavalry #32 retreated with a bombed friend, and ended up at 2,2 Play#0 output Play#0 1 cav cavalry #32 retreated with a bombed friend, and ended up at 2,2
Play#0 output Play#0 1 cav cavalry #34 retreated with a bombed friend, and ended up at 2,2 Play#0 output Play#0 1 cav cavalry #34 retreated with a bombed friend, and ended up at 2,2