/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
int
orde(void)
{
- int diffeachship = 0;
- int orders, sub, level;
+ int sub, level;
int scuttling = 0;
struct nstr_item nb;
struct shpstr ship;
- struct shpstr start; /* Used for checking database */
struct ichrstr *i1;
coord p0x, p0y, p1x, p1y;
int i;
continue;
if (opt_SAIL) {
if (*ship.shp_path) {
- if (!diffeachship)
- pr("Ship #%d has a \"sail\" path!\n", ship.shp_uid);
+ pr("Ship #%d has a \"sail\" path!\n", ship.shp_uid);
continue;
}
}
- memcpy(&start, &ship, sizeof(struct shpstr));
sprintf(prompt,
"Ship #%d, declare, cancel, suspend, resume, level? ",
ship.shp_uid);
p = getstarg(player->argp[2], prompt, buf);
- if (player->aborted || !p)
+ if (player->aborted || !p || !*p)
+ return RET_FAIL;
+ if (!check_ship_ok(&ship))
return RET_FAIL;
- if (!*p) {
- if (!diffeachship)
- return RET_FAIL;
- else
- continue;
- }
switch (*p) {
default:
pr("Bad order type!\n");
ship.shp_autonav &= ~AN_STANDBY;
break;
case 'd': /* declare path */
- orders = 0;
scuttling = 0;
/* Need location */
p = getstarg(player->argp[3], "Destination? ", buf);
p1x = p0x;
p1y = p0y;
-
-
- if (!orders) {
- p = getstarg(player->argp[4], "Second dest? ", buf);
- if (!p)
- return RET_FAIL;
- if (!*p || !strcmp(p, "-")) {
- orders = 1;
- pr("A one-way order has been accepted.\n");
- } else if (!strncmp(p, "s", 1)) {
- if (opt_TRADESHIPS) {
- if (!(mchr[(int)ship.shp_type].m_flags & M_TRADE)) {
- pr("You can't auto-scuttle that ship!\n");
- return RET_SYN;
- }
- } else {
+ p = getstarg(player->argp[4], "Second dest? ", buf);
+ if (!p)
+ return RET_FAIL;
+ if (!check_ship_ok(&ship))
+ return RET_FAIL;
+ if (!*p || !strcmp(p, "-")) {
+ pr("A one-way order has been accepted.\n");
+ } else if (!strncmp(p, "s", 1)) {
+ if (opt_TRADESHIPS) {
+ if (!(mchr[(int)ship.shp_type].m_flags & M_TRADE)) {
pr("You can't auto-scuttle that ship!\n");
return RET_SYN;
}
- pr("A scuttle order has been accepted.\n");
- scuttling = 1;
} else {
- if (!sarg_xy(p, &p1x, &p1y))
- return RET_SYN;
- pr("A circular order has been accepted.\n");
+ pr("You can't auto-scuttle that ship!\n");
+ return RET_SYN;
}
+ pr("A scuttle order has been accepted.\n");
+ scuttling = 1;
+ } else {
+ if (!sarg_xy(p, &p1x, &p1y))
+ return RET_SYN;
+ pr("A circular order has been accepted.\n");
}
/*
case 'l':
/* convert player->argp[3] to an integer */
- if (player->argp[3])
- sub = atoi(player->argp[3]);
- else {
- sprintf(buf1, "Field (1-%d) ", TMAX);
- if (!getstarg(player->argp[3], buf1, buf))
- return RET_SYN;
- sub = atoi(buf);
- }
+ sprintf(buf1, "Field (1-%d) ", TMAX);
+ if (!getstarg(player->argp[3], buf1, buf))
+ return RET_SYN;
+ if (!check_ship_ok(&ship))
+ return RET_FAIL;
+ sub = atoi(buf);
/* check to make sure value in within range. */
if (sub > TMAX || sub < 1) {
pr("Value must range from 1 to %d\n", TMAX);
- break;
+ return RET_FAIL;
}
/* to keep sub in range of our arrays
sub = sub - 1;;
if (ship.shp_autonav & AN_AUTONAV) {
- orders = 1;
dest = getstarg(player->argp[4], "Start or End? ", buf);
- if (orders) { /* before dest check */
- if (!dest)
- break;
- switch (*dest) {
- default:
- pr("You must enter 'start' or 'end'\n");
+ if (!dest)
+ return RET_FAIL;
+ switch (*dest) {
+ default:
+ pr("You must enter 'start' or 'end'\n");
+ return RET_SYN;
+ case 'e':
+ case 'E':
+ i1 = whatitem(player->argp[5], "Commodity? ");
+ if (!i1)
+ return RET_FAIL;
+ p1 = getstarg(player->argp[6], "Amount? ",
+ buf);
+ if (!p1)
return RET_SYN;
- case 'e':
- case 'E':
- i1 = whatitem(player->argp[5], "Commodity? ");
- if (!i1)
- break;
- else {
- p1 = getstarg(player->argp[6], "Amount? ",
- buf);
- if (!p1)
- return RET_SYN;
- level = atoi(p1);
- }
- if (level < 0) {
- level = 0; /* prevent negatives. */
- pr("You must use positive number! Level set to 0.\n");
- }
- ship.shp_tstart[sub] = i1->i_uid;
- ship.shp_lstart[sub] = level;
- pr("Order Set \n");
- break;
- case 's':
- case 'S':
- i1 = whatitem(player->argp[5], "Commodity? ");
- if (!i1)
- break;
- else {
- p1 = getstarg(player->argp[6], "Amount? ",
- buf);
- if (!p1)
- return RET_SYN;
- level = atoi(p1);
- }
- if (level < 0) {
- level = 0;
- pr("You must use positive number! Level set to 0.\n");
- }
- ship.shp_tend[sub] = i1->i_uid;
- ship.shp_lend[sub] = level;
- pr("Order Set \n");
- break;
+ if (!check_ship_ok(&ship))
+ return RET_FAIL;
+ level = atoi(p1);
+ if (level < 0) {
+ level = 0; /* prevent negatives. */
+ pr("You must use positive number! Level set to 0.\n");
}
+ ship.shp_tstart[sub] = i1->i_uid;
+ ship.shp_lstart[sub] = level;
+ pr("Order Set \n");
+ break;
+ case 's':
+ case 'S':
+ i1 = whatitem(player->argp[5], "Commodity? ");
+ if (!i1)
+ return RET_FAIL;
+ p1 = getstarg(player->argp[6], "Amount? ",
+ buf);
+ if (!p1)
+ return RET_SYN;
+ if (!check_ship_ok(&ship))
+ return RET_FAIL;
+ level = atoi(p1);
+ if (level < 0) {
+ level = 0;
+ pr("You must use positive number! Level set to 0.\n");
+ }
+ ship.shp_tend[sub] = i1->i_uid;
+ ship.shp_lend[sub] = level;
+ pr("Order Set \n");
+ break;
}
} else
pr("You need to 'declare' a ship path first, see 'info order'\n");
ship.shp_tend[i] = tcomm;
}
}
- /*
- ** Write ship back to database, then give it
- ** a kick down the autonav route if necessary.
- */
-
-
- /* Now do a sanity check. */
- if (!check_ship_ok(&start))
- return RET_SYN;
putship(ship.shp_uid, &ship);
}
projects / empserver / blobdiff