Update copyright notice

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

diff --git a/src/lib/commands/torp.c b/src/lib/commands/torp.c
index 867ab50eed278e9cb7cdf5962f8e8dbc51df11fb..db4b7b10ca8ad1733633138d174daae82438bac7 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
@@ -58,6 +58,7 @@ torp(void)
     double hitchance;
     struct shpstr vship;
     struct shpstr sub;
+    struct mchrstr *sub_mcp;
     char *ptr;
     struct nstr_item nbst;
     char buf[1024];
@@ -90,9 +91,10 @@ torp(void)
        if (sub.shp_own != player->cnum) {
            continue;
        }
-       if ((mchr[(int)sub.shp_type].m_flags & M_TORP) == 0) {
+       sub_mcp = &mchr[sub.shp_type];
+       if (!(sub_mcp->m_flags & M_TORP)) {
            pr("Ship # %d: A %s can't fire torpedoes!\n",
-              sub.shp_uid, mchr[(int)sub.shp_type].m_name);
+              sub.shp_uid, sub_mcp->m_name);
            continue;
        }
        if (sub.shp_item[I_GUN] == 0
@@ -130,7 +132,7 @@ torp(void)
            continue;
        }
        if (mchr[(int)vship.shp_type].m_flags & M_SUB) {
-           if (!(mchr[(int)sub.shp_type].m_flags & M_SUBT)) {
+           if (!(sub_mcp->m_flags & M_SUBT)) {
                pr("You can't torpedo a submarine!\n");
                continue;
            }
@@ -143,8 +145,10 @@ torp(void)
            continue;
        }
 
-       if ((mchr[(int)sub.shp_type].m_flags & M_SUB) == 0)
+       if (!(sub_mcp->m_flags & M_SUB)) {
+           pr("Starting our attack run...\n");
            anti_torp(sub.shp_uid, ntorping, vshipown);
+       }
        getship(sub.shp_uid, &sub);
        if (sub.shp_own == 0)
            continue;
@@ -157,26 +161,24 @@ 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);
        }
-       /* Now, can the torpedo even get there? */
-       if (!line_of_sight(NULL, sub.shp_x, sub.shp_y,
-                          vship.shp_x, vship.shp_y)) {
+       if (range > erange)
+           pr("Out of range\n");
+       else if (!line_of_sight(NULL, sub.shp_x, sub.shp_y,
+                               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 (range <= erange) {
-               if (vshipown != 0)
-                   wu(0, vshipown, "Torpedo sighted @ %s by %s\n",
-                      xyas(sub.shp_x, sub.shp_y, vshipown),
-                      prship(&vship));
-           }
-       } else if (range > erange) {
-           pr("Out of range\n");
+           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",
-                  prsub(&sub), xyas(sub.shp_x, sub.shp_y, vshipown),
+                  sub_mcp->m_flags & M_SUB ? "sub" : prship(&sub),
+                  xyas(sub.shp_x, sub.shp_y, vshipown),
                   prship(&vship), dam);
            pr("Torpedo hit %s for %d damage.\n", prsub(&vship), dam);
            if (!(mchr[vship.shp_type].m_flags & M_SUB)) {
@@ -189,16 +191,16 @@ torp(void)
            if (vship.shp_effic < SHIP_MINEFF)
                pr("%s sunk!\n", prsub(&vship));
            if (vship.shp_rflags & RET_TORPED)
-               retreat_ship(&vship, 't');
+               retreat_ship(&vship, vshipown, 't');
            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));
        }
 
-       if (mchr[(int)sub.shp_type].m_flags & M_SUB)
+       if (sub_mcp->m_flags & M_SUB)
            anti_torp(sub.shp_uid, ntorping, vshipown);
     }
     return RET_OK;
@@ -216,9 +218,6 @@ anti_torp(int f, int ntorping, int vshipown)
     if (sub.shp_own == vshipown)
        return;
 
-    if ((mchr[(int)sub.shp_type].m_flags & M_SUB) == 0)
-       pr("Starting our attack run...\n");
-
     x = 0;
     while (getship(x++, &dd) && sub.shp_effic >= SHIP_MINEFF) {
        if (dd.shp_own == 0)
@@ -336,7 +335,7 @@ char *
 prsub(struct shpstr *sp)
 {
     if (mchr[(int)sp->shp_type].m_flags & M_SUB)
-       return "sub";
+       return prbuf("sub #%d", sp->shp_uid);
     else
        return prship(sp);
 }