/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2006, 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,
* 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/>.
*
* ---
*
* ---
*
* give.c: give stuff to countries (deity)
- *
+ *
* Known contributors to this file:
* David Muir Sharnoff
* Steve McClure, 1997
+ * Markus Armbruster, 2004-2013
*/
#include <config.h>
return RET_SYN;
while (nxtsct(&nstr, §) > 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;
+ if (!check_sect_ok(§))
+ return RET_FAIL;
n = sect.sct_item[ip->i_uid];
- if (amt < 0 && -amt > n) {
+ if (amt < 0 && n + amt < 0)
m = 0;
- } else if (amt > 0 && amt + n > ITEM_MAX) {
+ else if (amt > 0 && n > ITEM_MAX - amt)
m = ITEM_MAX;
- } else
+ else
m = n + amt;
sect.sct_item[ip->i_uid] = m;
putsect(§);