Update copyright notice

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

diff --git a/src/lib/commands/shar.c b/src/lib/commands/shar.c
index 49d41b13b5b49b01c6b31047fb0fe1ff97c52d13..acae9e61c7b74d6651d3e391546a3435c5d04125 100644 (file)
--- a/src/lib/commands/shar.c
+++ b/src/lib/commands/shar.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2014, 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,67 +14,61 @@
  *  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/>.
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
  *  shar.c: share a bmap with a friend
- * 
+ *
  *  Known contributors to this file:
  *     Ken Stevens, 1995
  */
 
-#include "misc.h"
-#include "nsc.h"
-#include "nat.h"
-#include "player.h"
-#include "file.h"
+#include <config.h>
+
 #include "commands.h"
+#include "map.h"
 
 int
 shar(void)
 {
-       int     to;
-       struct  nstr_sect ns;
-       s_char  des = 0;
-       int     n;
+    int to;
+    struct nstr_sect ns;
+    char des = 0;
+    int n;
 
-       if (!player->argp[1] ||
-           !*player->argp[1] ||
-           (to = natarg(player->argp[1], "Share bmap with which country? ")) < 0)
-               return RET_SYN;
+    to = natarg(player->argp[1], "Share bmap with which country? ");
+    if (to < 0)
+       return RET_SYN;
 
-       if (getrel(getnatp(to), player->cnum) < FRIENDLY) {
-               pr("%s does not have friendly relations towards you\n",
-                  cname(to));
-               return RET_FAIL;
-       }
+    if (relations_with(to, player->cnum) < FRIENDLY) {
+       pr("%s does not have friendly relations towards you\n", cname(to));
+       return RET_FAIL;
+    }
 
-       if (!snxtsct(&ns, player->argp[2]))
-               return RET_SYN;
+    if (!snxtsct(&ns, player->argp[2]))
+       return RET_SYN;
 
-       if (player->argp[3] && *player->argp[3]) {
-               if (typematch(player->argp[3], EF_SECTOR) < 0)
-                       return RET_SYN;
-               else
-                       des = *player->argp[3];
-       }
+    if (player->argp[3] && *player->argp[3]) {
+       if (sct_typematch(player->argp[3]) < 0)
+           return RET_SYN;
+       else
+           des = *player->argp[3];
+    }
 
-       if (!bmaps_intersect(player->cnum, to)) {
-               pr("Your bmap does not intersect %s's bmap.\n", cname(to));
-               return RET_FAIL;
-       }
+    if (!bmaps_intersect(player->cnum, to)) {
+       pr("Your bmap does not intersect %s's bmap.\n", cname(to));
+       return RET_FAIL;
+    }
 
-       n = share_bmap(player->cnum, to, &ns, des, cname(player->cnum));
-       pr("%d designations transmitted\n", n);
+    n = share_bmap(player->cnum, to, &ns, des, cname(player->cnum));
+    pr("%d designations transmitted\n", n);
 
-       return RET_OK;
+    return RET_OK;
 }
-