retreat: Fix group retreat after failed board sinks ship

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

diff --git a/src/lib/commands/torp.c b/src/lib/commands/torp.c
index 91ab882f7aed5ebbd4c820eff3904809e3011386..d945d180860f60d8c68352e2275d7123a7a241c0 100644 (file)
--- a/src/lib/commands/torp.c
+++ b/src/lib/commands/torp.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2015, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -26,20 +25,20 @@
  *  ---
  *
  *  torp.c: Fire torpedoes at enemy ships
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare
  *     Thomas Ruschak, 1992
  *     Ken Stevens, 1995
  *     Steve McClure, 2000
- *     Markus Armbruster, 2004-2008
+ *     Markus Armbruster, 2004-2015
  */
 
 #include <config.h>
 
+#include "chance.h"
 #include "commands.h"
 #include "news.h"
-#include "optlist.h"
 #include "retreat.h"
 #include "ship.h"
 
@@ -62,13 +61,10 @@ torp(void)
     char *ptr;
     struct nstr_item nbst;
     char buf[1024];
-    char *sav;
     int ntorping = 0;
     char prompt[128];
 
-    if (!(sav = getstarg(player->argp[1], "From ship(s)? ", buf)))
-       return RET_SYN;
-    if (!snxtitem(&nbst, EF_SHIP, sav))
+    if (!snxtitem(&nbst, EF_SHIP, player->argp[1], "From ship(s)? "))
        return RET_SYN;
     while (nxtitem(&nbst, &sub)) {
        if (sub.shp_own != player->cnum)
@@ -86,8 +82,8 @@ torp(void)
            continue;
        ntorping++;
     }
-    pr("%d ships are eligible to torp\n", ntorping);
-    snxtitem(&nbst, EF_SHIP, sav);
+    pr("%d ships are eligible to torpedo\n", ntorping);
+    snxtitem_rewind(&nbst);
     while (nxtitem(&nbst, &sub)) {
        if (!sub.shp_own)
            continue;
@@ -118,7 +114,7 @@ torp(void)
        }
        subno = sub.shp_uid;
        sprintf(prompt, "Ship %d, target? ", sub.shp_uid);
-       if ((ptr = getstarg(player->argp[2], prompt, buf)) == 0)
+       if (!(ptr = getstarg(player->argp[2], prompt, buf)))
            return RET_SYN;
        if (!check_ship_ok(&sub))
            return RET_FAIL;
@@ -182,20 +178,19 @@ torp(void)
                wu(0, vshipown, "%s in %s torpedoed %s for %d damage.\n",
                   prsub(&sub), xyas(sub.shp_x, sub.shp_y, vshipown),
                   prship(&vship), dam);
-           if (vship.shp_rflags & RET_TORPED) {
-               retreat_ship(&vship, 't');
-               shipdamage(&vship, dam);
-           } else
-               shipdamage(&vship, dam);
-           pr("Torpedo hit %s for %d damage.\n", prship(&vship), dam);
-
+           pr("Torpedo hit %s for %d damage.\n", prsub(&vship), dam);
+           if (!(mchr[vship.shp_type].m_flags & M_SUB)) {
+               if (mchr[sub.shp_type].m_flags & M_SUB)
+                   nreport(vshipown, N_TORP_SHIP, 0, 1);
+               else
+                   nreport(vshipown, N_SHIP_TORP, player->cnum, 1);
+           }
+           shipdamage(&vship, dam);
            if (vship.shp_effic < SHIP_MINEFF)
-               pr("%s sunk!\n", prship(&vship));
+               pr("%s sunk!\n", prsub(&vship));
+           if (vship.shp_rflags & RET_TORPED)
+               retreat_ship(&vship, vshipown, 't');
            putship(vship.shp_uid, &vship);
-           if (mchr[(int)sub.shp_type].m_flags & M_SUB)
-               nreport(vshipown, N_TORP_SHIP, 0, 1);
-           else
-               nreport(vshipown, N_SHIP_TORP, player->cnum, 1);
        } else {
            pr("Missed\n");
            if (vshipown != 0)
@@ -309,6 +304,12 @@ fire_torp(struct shpstr *sp, struct shpstr *targ, int ntargets)
 
     if (chance(shp_torp_hitchance(sp, range))) {
        pr("BOOM!...\n");
+       if (!(mchr[targ->shp_type].m_flags & M_SUB)) {
+           if (mchr[sp->shp_type].m_flags & M_SUB)
+               nreport(targ->shp_own, N_TORP_SHIP, 0, 1);
+           else
+               nreport(targ->shp_own, N_SHIP_TORP, sp->shp_own, 1);
+       }
        if (sp->shp_own != 0)
            wu(0, sp->shp_own, "%s @ %s torpedoed %s\n",
               prship(sp),
@@ -319,15 +320,11 @@ fire_torp(struct shpstr *sp, struct shpstr *targ, int ntargets)
        shipdamage(targ, dam);
        putship(targ->shp_uid, targ);
 
-       if (mchr[(int)sp->shp_type].m_flags & M_SUB)
-           nreport(targ->shp_own, N_TORP_SHIP, 0, 1);
-       else
-           nreport(targ->shp_own, N_SHIP_TORP, player->cnum, 1);
     } else {
        pr("Missed!\n");
        if (sp->shp_own != 0)
            wu(0, sp->shp_own,
-              "%s missed %s with a torp at %s\n",
+              "%s missed %s with a torpedo at %s\n",
               prship(sp), prsub(targ),
               xyas(sp->shp_x, sp->shp_y, sp->shp_own));
     }