/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2015, 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/>.
*
* ---
*
- * 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.
*
* ---
*
* deli.c: Set deliveries from a sector
- *
+ *
* Known contributors to this file:
- *
+ *
*/
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
+#include <config.h>
+
+#include "commands.h"
#include "item.h"
-#include "file.h"
#include "path.h"
-#include "nsc.h"
-#include "nat.h"
-#include "commands.h"
int
deli(void)
int thresh;
int sx, sy;
struct nstr_sect nstr;
- s_char buf[1024];
- s_char prompt[128];
- s_char *p;
+ char buf[1024];
+ char prompt[128];
+ char *p;
- if ((ich = whatitem(player->argp[1], "deliver what? ")) == 0)
+ if (!(ich = whatitem(player->argp[1], "deliver what? ")))
return RET_SYN;
- /*
- if (ich->i_vtype == I_CIVIL || ich->i_vtype == I_MILIT) {
- pr("You cannot deliver people!\n");
- return RET_FAIL;
- }
- */
if (!snxtsct(&nstr, player->argp[2]))
return RET_SYN;
- while (!player->aborted && nxtsct(&nstr, §) > 0) {
+ while (nxtsct(&nstr, §) > 0) {
if (!player->owner)
continue;
- del = sect.sct_del[ich->i_vtype];
+ del = sect.sct_del[ich->i_uid];
thresh = del & ~0x7;
dir = del & 0x7;
sprintf(prompt, "%s %s %s threshold or direction or 'query'? ",
xyas(nstr.x, nstr.y, player->cnum),
dchr[sect.sct_type].d_name, ich->i_name);
- if (!(p = getstarg(player->argp[3], prompt, buf)) || !*p)
+ p = getstarg(player->argp[3], prompt, buf);
+ if (!p || !*p)
return RET_SYN;
if (*p != 'q') {
- sprintf(prompt, "%s %s %s direction? ",
- xyas(nstr.x, nstr.y, player->cnum),
- dchr[sect.sct_type].d_name, ich->i_name);
if (((*p >= '0') && (*p <= '9')) || *p == '+') {
thresh = atoi(p) & ~0x7;
if (*p == '+')
p = NULL;
else {
+ sprintf(prompt, "%s %s %s direction? ",
+ xyas(nstr.x, nstr.y, player->cnum),
+ dchr[sect.sct_type].d_name, ich->i_name);
p = getstarg(player->argp[4], prompt, buf);
+ if (!p)
+ return RET_FAIL;
}
}
if (p && *p) {
if (!check_sect_ok(§))
continue;
- thresh = min(thresh, ITEM_MAX) & ~7;
+ thresh = MIN(thresh, ITEM_MAX) & ~7;
del = thresh | dir;
- sect.sct_del[ich->i_vtype] = del;
+ sect.sct_del[ich->i_uid] = del;
putsect(§);
}