retreat: Fix group retreat after failed board sinks ship

[empserver] / src / lib / commands / bomb.c

diff --git a/src/lib/commands/bomb.c b/src/lib/commands/bomb.c
index c98c8656e423083ab5d60e2cd21b1add215d117b..5e4888cd223b2f296070abab3cee746597ef38f2 100644 (file)
--- a/src/lib/commands/bomb.c
+++ b/src/lib/commands/bomb.c
@@ -475,16 +475,15 @@ ship_bomb(struct emp_qelem *list, struct sctstr *target)
                prship(&ship),
                xyas(target->sct_x, target->sct_y, ship.shp_own));
        }
-       pr("\n");
        shipdamage(&ship, dam);
        if (ship.shp_effic < SHIP_MINEFF)
            pr("%s at %s sunk!\n",
               prship(&ship),
               xyas(target->sct_x, target->sct_y, player->cnum));
        if (dam && (ship.shp_rflags & RET_INJURED))
-           retreat_ship(&ship, 'i');
+           retreat_ship(&ship, ship.shp_own, 'i');
        else if (ship.shp_rflags & RET_BOMBED)
-           retreat_ship(&ship, 'b');
+           retreat_ship(&ship, ship.shp_own, 'b');
        putship(ship.shp_uid, &ship);
        collateral_damage(target->sct_x, target->sct_y, dam / 2);
     }
@@ -672,9 +671,9 @@ land_bomb(struct emp_qelem *list, struct sctstr *target)
                xyas(target->sct_x, target->sct_y, own));
        landdamage(&land, dam);
        if (dam && (land.lnd_rflags & RET_INJURED))
-           retreat_land(&land, 'i');
+           retreat_land(&land, own, 'i');
        else if (land.lnd_rflags & RET_BOMBED)
-           retreat_land(&land, 'b');
+           retreat_land(&land, own, 'b');
        nreport(player->cnum, N_UNIT_BOMB, own, 1);
        putland(land.lnd_uid, &land);
        collateral_damage(target->sct_x, target->sct_y, dam);