Clean up superfluous includes

[empserver] / src / lib / subs / detonate.c

diff --git a/src/lib/subs/detonate.c b/src/lib/subs/detonate.c
index e571f1d2881b271d37eacfe5b4acd9166c78b365..01dc5d4c55b6d97132557e774ccec2337e0b4520 100644 (file)
--- a/src/lib/subs/detonate.c
+++ b/src/lib/subs/detonate.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, 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/>.
  *
  *  ---
  *
@@ -29,14 +28,13 @@
  *
  *  Known contributors to this file:
  *     Steve McClure, 1998-2000
- *     Markus Armbruster, 2004-2009
+ *     Markus Armbruster, 2004-2010
  */
 
 #include <config.h>
 
 #include "file.h"
 #include "land.h"
-#include "lost.h"
 #include "map.h"
 #include "misc.h"
 #include "nat.h"
@@ -63,9 +61,6 @@ detonate(struct nukstr *np, coord x, coord y, int airburst)
     struct shpstr ship;
     struct lndstr land;
     struct nukstr nuke;
-    char *bp;
-    char buf[128];
-    char buf2[128];
     natid own;
     int type;
     int damage;
@@ -116,30 +111,38 @@ detonate(struct nukstr *np, coord x, coord y, int airburst)
            sect.sct_own = 0;
            if (type == SCT_WATER || type == SCT_BSPAN ||
                type == SCT_BTOWER) {
-               bp = "left nothing but water in %s\n";
                if (type != SCT_WATER) {
+                   pr("left nothing but water in %s\n",
+                      xyas(ns.x, ns.y, player->cnum));
+                   if (own != player->cnum)
+                       mpr(own,
+                           "%s nuclear device left nothing but water in %s\n",
+                           cname(player->cnum), xyas(ns.x, ns.y, own));
                    sect.sct_newtype = SCT_WATER;
                    sect.sct_type = SCT_WATER;
                }
            } else {
                sect.sct_newtype = SCT_WASTE;
                sect.sct_type = SCT_WASTE;
-               bp = "turned %s into a radioactive wasteland\n";
+               pr("turned %s into a radioactive wasteland\n",
+                  xyas(ns.x, ns.y, player->cnum));
+               if (own != player->cnum)
+                   mpr(own,
+                       "%s nuclear device turned %s into a radioactive wasteland\n",
+                       cname(player->cnum), xyas(ns.x, ns.y, own));
            }
            changed |= map_set(player->cnum, sect.sct_x, sect.sct_y,
                               dchr[sect.sct_type].d_mnem, 0);
        } else {
-           sprintf(buf, "did %d%%%% damage in %%s\n", damage);
-           bp = buf;
+           pr("did %d%% damage in %s\n",
+              damage, xyas(ns.x, ns.y, player->cnum));
+           if (own != player->cnum)
+               mpr(own, "%s nuclear device did %d%% damage in %s\n",
+                   cname(player->cnum), damage, xyas(ns.x, ns.y, own));
        }
        (void)putsect(&sect);
        if (type != SCT_WATER)
            nreport(player->cnum, N_NUKE, own, 1);
-       pr(bp, xyas(ns.x, ns.y, player->cnum));
-       if (own != player->cnum && own != 0) {
-           (void)sprintf(buf2, bp, xyas(ns.x, ns.y, own));
-           mpr(own, "%s nuclear device %s", cname(player->cnum), buf2);
-       }
     }
 
     if (changed)
@@ -181,7 +184,7 @@ detonate(struct nukstr *np, coord x, coord y, int airburst)
        if (own == player->cnum) {
            pr("%s at %s reports %d%% damage\n",
               prplane(&plane),
-              xyas(plane.pln_x, plane.pln_y, own), damage);
+              xyas(plane.pln_x, plane.pln_y, player->cnum), damage);
        } else {
            mpr(own, "%s nuclear device did %d%% damage to %s at %s\n",
                cname(player->cnum), damage,
@@ -223,7 +226,8 @@ detonate(struct nukstr *np, coord x, coord y, int airburst)
        land_damage(&land, damage);
        if (own == player->cnum) {
            pr("%s at %s reports %d%% damage\n",
-              prland(&land), xyas(land.lnd_x, land.lnd_y, own), damage);
+              prland(&land), xyas(land.lnd_x, land.lnd_y, player->cnum),
+              damage);
        } else {
            mpr(own, "%s nuclear device did %d%% damage to %s at %s\n",
                cname(player->cnum), damage,
@@ -259,7 +263,8 @@ detonate(struct nukstr *np, coord x, coord y, int airburst)
        ship_damage(&ship, damage);
        if (own == player->cnum) {
            pr("%s at %s reports %d%% damage\n",
-              prship(&ship), xyas(ship.shp_x, ship.shp_y, own), damage);
+              prship(&ship), xyas(ship.shp_x, ship.shp_y, player->cnum),
+              damage);
        } else {
            mpr(own, "%s nuclear device did %d%% damage to %s at %s\n",
                cname(player->cnum), damage, prship(&ship),
@@ -279,10 +284,11 @@ detonate(struct nukstr *np, coord x, coord y, int airburst)
        nuke.nuk_effic = 0;
        if (own == player->cnum) {
            pr("%s at %s destroyed\n",
-              prnuke(&nuke), xyas(nuke.nuk_x, nuke.nuk_y, own));
+              prnuke(&nuke), xyas(nuke.nuk_x, nuke.nuk_y, player->cnum));
        } else {
-           mpr(own, "%s at %s destroyed\n",
-               prnuke(&nuke), xyas(nuke.nuk_x, nuke.nuk_y, own));
+           mpr(own, "%s nuclear device destroyed %s at %s\n",
+               cname(player->cnum), prnuke(&nuke),
+                     xyas(nuke.nuk_x, nuke.nuk_y, own));
        }
        putnuke(ni.cur, &nuke);
     }