/*
* 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-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,
* 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/>.
*
* ---
*
* ---
*
* expl.c: Take over unoccupied sectors
- *
+ *
* Known contributors to this file:
* Jeff Wallace, 1989
*/
pr("You can only explore with civs and mil.\n");
return RET_FAIL;
}
- if ((p = getstarg(player->argp[2], "from sector : ", buf)) == 0)
+ if (!(p = getstarg(player->argp[2], "from sector : ", buf)))
return RET_SYN;
if (!sarg_xy(p, &x, &y))
return RET_SYN;
sprintf(prompt, "Number of %s to explore with? (max %d) ",
ip->i_name, amt_src);
amount = onearg(player->argp[3], prompt);
+ if (amount <= 0)
+ return RET_SYN;
if (!check_sect_ok(§))
return RET_FAIL;
if (amount > amt_src) {
pr("Only exploring with %d.\n", amount);
}
- if (!want_to_abandon(§, vtype, amount, 0)) {
+ if (!want_to_abandon(§, vtype, amount, NULL)) {
pr("Explore cancelled.\n");
return RET_FAIL;
}
if (!check_sect_ok(§))
return RET_FAIL;
- if (amount <= 0)
- return RET_SYN;
weight = (double)amount * ip->i_lbs;
/* remove commodities from source sector */
getsect(x, y, &start);