Update copyright notice

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

diff --git a/src/lib/commands/torp.c b/src/lib/commands/torp.c
index b0ce4befe07a7bcbf3fc292b84c78e0dce53a713..1801a8229d96cefdb30e7f77b53de919fb536718 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-2010
  */
 
 #include <config.h>
 
+#include "chance.h"
 #include "commands.h"
 #include "news.h"
-#include "optlist.h"
 #include "retreat.h"
 #include "ship.h"
 
@@ -115,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;
@@ -319,7 +318,7 @@ fire_torp(struct shpstr *sp, struct shpstr *targ, int ntargets)
        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);
+           nreport(targ->shp_own, N_SHIP_TORP, sp->shp_own, 1);
     } else {
        pr("Missed!\n");
        if (sp->shp_own != 0)