Update copyright notice

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

diff --git a/src/lib/commands/give.c b/src/lib/commands/give.c
index 7b7533b1a1df1b74bef0a16e16d753b095c778a7..b8d4577bd8bace7e26c12263c7b3f07bc2fa3864 100644 (file)
--- a/src/lib/commands/give.c
+++ b/src/lib/commands/give.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2013, 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,35 +14,28 @@
  *  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.
  *
  *  ---
  *
  *  give.c: give stuff to countries (deity)
- * 
+ *
  *  Known contributors to this file:
  *     David Muir Sharnoff
  *     Steve McClure, 1997
  */
 
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "sect.h"
-#include "nat.h"
-#include "news.h"
-#include "xy.h"
-#include "nsc.h"
-#include "item.h"
-#include "file.h"
+#include <config.h>
+
 #include "commands.h"
+#include "item.h"
+#include "news.h"
 #include "optlist.h"
 
 /*
@@ -55,9 +48,9 @@ give(void)
     int amt;
     struct ichrstr *ip;
     int m, n;
-    s_char *p;
+    char *p;
     struct nstr_sect nstr;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!(ip = whatitem(player->argp[1], "which commodity? ")))
        return RET_SYN;
@@ -65,18 +58,19 @@ give(void)
        return RET_SYN;
     while (nxtsct(&nstr, &sect) > 0) {
        p = getstarg(player->argp[3], "how much : ", buf);
-       if (p == 0 || *p == '\0')
+       if (!p || !*p)
            return RET_SYN;
        if ((amt = atoi(p)) == 0)
            return RET_SYN;
-       n = sect.sct_item[ip->i_vtype];
+       check_sect_ok(&sect);
+       n = sect.sct_item[ip->i_uid];
        if (amt < 0 && -amt > n) {
            m = 0;
        } else if (amt > 0 && amt + n > ITEM_MAX) {
            m = ITEM_MAX;
        } else
            m = n + amt;
-       sect.sct_item[ip->i_vtype] = m;
+       sect.sct_item[ip->i_uid] = m;
        putsect(&sect);
        if (sect.sct_own != 0 && m != n) {
            if (m > n) {