Update known contributors comments

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

diff --git a/src/lib/commands/torp.c b/src/lib/commands/torp.c
index 829c719ec4b13567e71dd9e08ab44e0b8d8d8545..2aef2a1798bbf0f9f1a0623ab3eddf230ae5c57c 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-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,18 +26,18 @@
  *  ---
  *
  *  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-2009
  */
 
 #include <config.h>
 
 #include "commands.h"
-#include "damage.h"
 #include "news.h"
 #include "optlist.h"
 #include "retreat.h"
@@ -62,13 +62,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)
@@ -87,7 +84,7 @@ torp(void)
        ntorping++;
     }
     pr("%d ships are eligible to torp\n", ntorping);
-    snxtitem(&nbst, EF_SHIP, sav);
+    snxtitem_rewind(&nbst);
     while (nxtitem(&nbst, &sub)) {
        if (!sub.shp_own)
            continue;
@@ -118,7 +115,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;
@@ -159,7 +156,7 @@ torp(void)
        getship(victno, &vship);
        vshipown = vship.shp_own;
        range = mapdist(sub.shp_x, sub.shp_y, vship.shp_x, vship.shp_y);
-       hitchance = DTORP_HITCHANCE(range, sub.shp_visib);
+       hitchance = shp_torp_hitchance(&sub, range);
        if (range <= erange) {
            pr("Hitchance = %d%%\n", (int)(hitchance * 100));
        }
@@ -241,7 +238,7 @@ fire_dchrg(struct shpstr *sp, struct shpstr *targ, int ntargets)
 {
     int range, erange, dam;
 
-    erange = roundrange(effrange(sp->shp_frnge, sp->shp_tech));
+    erange = roundrange(shp_fire_range(sp));
     range = mapdist(sp->shp_x, sp->shp_y, targ->shp_x, targ->shp_y);
     if (range > erange)
        return;
@@ -307,7 +304,7 @@ fire_torp(struct shpstr *sp, struct shpstr *targ, int ntargets)
 
     pr("Captain! Torpedoes sighted!\n");
 
-    if (chance(DTORP_HITCHANCE(range, sp->shp_visib))) {
+    if (chance(shp_torp_hitchance(sp, range))) {
        pr("BOOM!...\n");
        if (sp->shp_own != 0)
            wu(0, sp->shp_own, "%s @ %s torpedoed %s\n",