/*
* 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,
* 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/>.
*
* ---
*
* ---
*
* offe.c: Offer a loan or treaty
- *
+ *
* Known contributors to this file:
* Pat Loney, 1992
* Steve McClure, 1996
char *cp;
char buf[1024];
- if (!(cp = getstarg(player->argp[1], "loan or treaty? ", buf)) || !*cp)
+ cp = getstarg(player->argp[1], "loan or treaty? ", buf);
+ if (!cp || !*cp)
return RET_SYN;
switch (*cp) {
theircond = 0;
for (tfp = treaty_flags; tfp && tfp->name; tfp++) {
sprintf(prompt, "%s? ", tfp->name);
- if ((cp = getstring(prompt, buf)) == 0)
+ if (!(cp = getstring(prompt, buf)))
return RET_FAIL;
if (*cp == 'y')
theircond |= tfp->value;
ourcond = 0;
for (tfp = treaty_flags; tfp && tfp->name; tfp++) {
sprintf(prompt, "%s? ", tfp->name);
- if ((cp = getstring(prompt, buf)) == 0)
+ if (!(cp = getstring(prompt, buf)))
return RET_FAIL;
if (*cp == 'y')
ourcond |= tfp->value;
return RET_SYN;
}
cp = getstring("Proposed treaty duration? (days) ", buf);
- if (cp == 0)
+ if (!cp)
return RET_FAIL;
j = atoi(cp);
if (j <= 0) {