retreat: Drop unused parameter @code

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

diff --git a/src/lib/commands/torp.c b/src/lib/commands/torp.c
index 49948909bdb2d8e87328087c2ea73f3d21b1af5d..fc5d3d4a08df1d5bc5db31446564584646ff9a71 100644 (file)
--- a/src/lib/commands/torp.c
+++ b/src/lib/commands/torp.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2015, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -31,7 +31,7 @@
  *     Thomas Ruschak, 1992
  *     Ken Stevens, 1995
  *     Steve McClure, 2000
- *     Markus Armbruster, 2004-2015
+ *     Markus Armbruster, 2004-2021
  */
 
 #include <config.h>
@@ -161,7 +161,7 @@ torp(void)
        range = mapdist(sub.shp_x, sub.shp_y, vship.shp_x, vship.shp_y);
        hitchance = shp_torp_hitchance(&sub, range);
        if (range <= erange) {
-           pr("Hitchance = %d%%\n", (int)(hitchance * 100));
+           pr("Hit chance = %.0f%%\n", hitchance * 100);
        }
        if (range > erange)
            pr("Out of range\n");
@@ -169,13 +169,13 @@ torp(void)
                                vship.shp_x, vship.shp_y)) {
            pr("BOOM!... Torpedo slams into land before reaching target.\n");
            /* We only tell the victim if we were within range. */
-           if (vshipown != 0)
+           if (vshipown != 0 && vshipown != player->cnum)
                wu(0, vshipown, "Torpedo sighted @ %s by %s\n",
                   xyas(sub.shp_x, sub.shp_y, vshipown),
                   prship(&vship));
        } else if (chance(hitchance)) {
            pr("BOOM!...\n");
-           if (vshipown != 0)
+           if (vshipown != 0 && vshipown != player->cnum)
                wu(0, vshipown, "%s in %s torpedoed %s for %d damage.\n",
                   sub_mcp->m_flags & M_SUB ? "sub" : prship(&sub),
                   xyas(sub.shp_x, sub.shp_y, vshipown),
@@ -190,12 +190,12 @@ torp(void)
            shipdamage(&vship, dam);
            if (vship.shp_effic < SHIP_MINEFF)
                pr("%s sunk!\n", prsub(&vship));
-           putship(vship.shp_uid, &vship);
            if (vship.shp_rflags & RET_TORPED)
-               retreat_ship(&vship, vshipown, 't');
+               retreat_ship(&vship, vshipown);
+           putship(vship.shp_uid, &vship);
        } else {
            pr("Missed\n");
-           if (vshipown != 0)
+           if (vshipown != 0 && vshipown != player->cnum)
                wu(0, vshipown, "Torpedo sighted @ %s by %s\n",
                   xyas(sub.shp_x, sub.shp_y, vshipown), prship(&vship));
        }