Update copyright notice

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

diff --git a/src/lib/commands/sabo.c b/src/lib/commands/sabo.c
index eb1a15c60ef2a547550d1d84460d422282b251f5..bb62fb080d74506b2d97bafc87ad0fae47630d7f 100644 (file)
--- a/src/lib/commands/sabo.c
+++ b/src/lib/commands/sabo.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-2012, 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,9 +25,10 @@
  *  ---
  *
  *  sabo.c: Spy terrorist bombing
- * 
+ *
  *  Known contributors to this file:
  *     John Yockey, 2001
+ *     Markus Armbruster, 2003-2010
  */
 
 #include <config.h>
@@ -40,12 +40,12 @@ int
 sabo(void)
 {
     struct nstr_item ni;
-    struct lndstr land;
+    struct lndstr land, tmp;
     struct sctstr sect;
     double odds;
     int dam;
 
-    if (!snxtitem(&ni, EF_LAND, player->argp[1]))
+    if (!snxtitem(&ni, EF_LAND, player->argp[1], NULL))
        return RET_SYN;
 
     while (nxtitem(&ni, &land)) {
@@ -69,7 +69,6 @@ sabo(void)
            pr("%s has no shells.\n", prland(&land));
            continue;
        }
-       --land.lnd_item[I_SHELL];
 
        odds = LND_SPY_DETECT_CHANCE(land.lnd_effic);
        if (chance(odds)) {
@@ -83,16 +82,12 @@ sabo(void)
            continue;
        }
 
-       dam = landgun(3 * land.lnd_effic, 7);
-       if (sect.sct_item[I_SHELL] > 20)
-           dam += seagun(land.lnd_effic,
-                         random() % (sect.sct_item[I_SHELL] / 10));
-       if (sect.sct_item[I_PETROL] > 100)
-           dam += seagun(land.lnd_effic,
-                         random() % (sect.sct_item[I_PETROL] / 50));
+       dam = lnd_sabo(&land, sect.sct_item);
+       if (dam < 0)
+           continue;
 
        pr("Explosion in %s causes %d damage.\n",
-          xyas(land.lnd_x, land.lnd_y, land.lnd_own), dam);
+          xyas(land.lnd_x, land.lnd_y, player->cnum), dam);
        if (sect.sct_own) {
            wu(0, sect.sct_own,
               "Sabotage in sector %s caused %d damage.\n",
@@ -100,13 +95,14 @@ sabo(void)
        }
 
        /* hack: hide the spy so it don't gets blasted by sectdamage() */
-       land.lnd_own = 0;
-       putland(land.lnd_uid, &land);
+       tmp = land;
+       tmp.lnd_own = 0;
+       putland(land.lnd_uid, &tmp);
+       land.lnd_seqno = tmp.lnd_seqno;
 
-       sectdamage(&sect, dam, 0);
+       sectdamage(&sect, dam);
        putsect(&sect);
 
-       land.lnd_own = player->cnum;
        if (chance(odds)) {
            pr("%s dies in explosion.\n", prland(&land));
            land.lnd_effic = 0;