License upgrade to GPL version 3 or later

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

diff --git a/src/lib/commands/laun.c b/src/lib/commands/laun.c
index dac323240bc94560bdfc8d25a5f8bb0a9dbaba5f..a2fa234d83d5497bc579cb11c49e75f8d0f95f71 100644 (file)
--- a/src/lib/commands/laun.c
+++ b/src/lib/commands/laun.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/>.
  *
  *  ---
  *
@@ -182,8 +181,6 @@ launch_missile(struct plnstr *pp)
     struct mchrstr *mcp;
     struct shpstr target_ship;
     struct sctstr sect;
-    int rel;
-    struct natstr *natp;
     struct nukstr nuke;
     char buf[1024];
 
@@ -230,18 +227,6 @@ launch_missile(struct plnstr *pp)
        if (msl_equip(pp, 's') < 0)
            return RET_FAIL;
        getsect(sx, sy, &sect);
-       if (opt_SLOW_WAR) {
-           natp = getnatp(player->cnum);
-           rel = getrel(natp, sect.sct_own);
-           if ((rel != AT_WAR) && (sect.sct_own != player->cnum) &&
-               (sect.sct_own) && (sect.sct_oldown != player->cnum)) {
-               pr("You are not at war with the player->owner of the target sector!\n");
-               pr_beep();
-               pr("Kaboom!!!\n");
-               pr("Missile monitoring officer destroys RV before detonation.\n");
-               return RET_OK;
-           }
-       }
        if (msl_launch(pp, EF_SECTOR, "sector", sx, sy, sect.sct_own,
                       &sublaunch) < 0)
            return RET_OK;