/*
* 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/>.
*
* ---
*
* ---
*
* edit.c: Edit things (sectors, ships, planes, units, nukes, countries)
- *
+ *
* Known contributors to this file:
* David Muir Sharnoff
* Chad Zabel, 1994
* Steve McClure, 1998-2000
- * Ron Koenderink, 2003-2004
+ * Ron Koenderink, 2003-2009
+ * Markus Armbruster, 2003-2013
*/
#include <config.h>
#include <ctype.h>
#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-#include "misc.h"
-#include "player.h"
-#include "plague.h"
-#include "xy.h"
-#include "sect.h"
-#include "nat.h"
-#include "news.h"
-#include "nsc.h"
+#include "commands.h"
#include "item.h"
-#include "file.h"
-#include "plane.h"
-#include "ship.h"
#include "land.h"
+#include "news.h"
#include "optlist.h"
-#include "commands.h"
-
-#define END -1
-
-static void benefit(natid who, int good);
-static int docountry(s_char op, int arg, s_char *p, float farg,
- struct natstr *np);
-static int doland(s_char op, int arg, s_char *p, struct sctstr *sect);
-static int doplane(s_char op, int arg, s_char *p, struct plnstr *plane);
-static int doship(s_char op, int arg, s_char *p, struct shpstr *ship);
-static int dounit(s_char op, int arg, s_char *p, float farg, struct lndstr *land);
-static int getin(s_char **, s_char **, int *, s_char *);
-static void noise(struct sctstr *sptr, int public_amt, s_char *name,
- int old, int new);
-static void pr_land(struct lndstr *land);
-static void pr_plane(struct plnstr *plane);
-static void pr_ship(struct shpstr *ship);
-static void prnat(struct natstr *);
-static void prsect(struct sctstr *sect);
+#include "plague.h"
+#include "plane.h"
+#include "ship.h"
+static void print_sect(struct sctstr *);
+static void print_nat(struct natstr *);
+static void print_plane(struct plnstr *);
+static void print_land(struct lndstr *);
+static void print_ship(struct shpstr *);
+static int getin(char *, char **);
+static int edit_sect(struct sctstr *, char, int, char *);
+static int edit_nat(struct natstr *, char, int, char *);
+static int edit_ship(struct shpstr *, char, int, char *);
+static int edit_land(struct lndstr *, char, int, char *);
+static int edit_plane(struct plnstr *, char, int, char *);
int
edit(void)
struct plnstr plane;
struct shpstr ship;
struct lndstr land;
- s_char *what;
- s_char *ptr;
- s_char *thing;
+ char *what;
+ char *ptr;
+ char thing;
int num;
int arg;
int err;
int arg_index = 3;
coord x, y;
- float farg;
struct natstr *np;
- s_char buf[1024];
- s_char ewhat; /* saves information from the command line
- for use later on. */
+ char buf[1024];
+ char ewhat;
- if ((what = getstarg(player->argp[1],
- "Edit What (country, land, ship, plane, nuke, unit)? ",
- buf)) == 0)
+ what = getstarg(player->argp[1],
+ "Edit what (country, land, ship, plane, nuke, unit)? ",
+ buf);
+ if (!what)
return RET_SYN;
ewhat = what[0];
switch (ewhat) {
return RET_FAIL;
break;
case 'c':
- if (!(ptr = getstarg(player->argp[2], "Country number? ", buf)))
+ np = natargp(player->argp[2], "Country? ");
+ if (!np)
return RET_SYN;
- if (isdigit(*ptr))
- np = getnatp(atoi(ptr));
- else
- np = natargp(ptr, NULL);
break;
case 'p':
if ((num = onearg(player->argp[2], "Plane number? ")) < 0)
pr("huh?\n");
return RET_SYN;
}
- if (player->argp[3] == 0) {
+ if (!player->argp[3]) {
switch (ewhat) {
case 'l':
- prsect(§);
+ print_sect(§);
break;
case 'c':
- prnat(np);
+ print_nat(np);
break;
case 'p':
- pr_plane(&plane);
+ print_plane(&plane);
break;
case 's':
- pr_ship(&ship);
+ print_ship(&ship);
break;
case 'u':
- pr_land(&land);
+ print_land(&land);
break;
}
}
- ptr = &buf[0];
- *ptr = 0;
for (;;) {
- if (player->argp[arg_index] != 0) {
- if (player->argp[arg_index+1] != 0) {
- thing = player->argp[arg_index++];
+ if (player->argp[arg_index]) {
+ if (player->argp[arg_index+1]) {
+ thing = player->argp[arg_index++][0];
ptr = player->argp[arg_index++];
arg = atoi(ptr);
} else
return RET_SYN;
} else if (arg_index == 3) {
- if ((err = getin(&thing, &ptr, &arg, buf)) != RET_OK) {
- if (err == END) {
- switch (ewhat) {
- case 'c':
- prnat(np);
- break;
- case 'l':
- prsect(§);
- break;
- case 's':
- pr_ship(&ship);
- break;
- case 'u':
- pr_land(&land);
- break;
- case 'p':
- pr_plane(&plane);
- break;
- }
+ err = getin(buf, &ptr);
+ if (err < 0)
+ return RET_SYN;
+ if (err == 0) {
+ switch (ewhat) {
+ case 'c':
+ print_nat(np);
+ break;
+ case 'l':
+ print_sect(§);
break;
- } else
- return err;
+ case 's':
+ print_ship(&ship);
+ break;
+ case 'u':
+ print_land(&land);
+ break;
+ case 'p':
+ print_plane(&plane);
+ break;
+ }
+ return RET_OK;
}
+ thing = err;
+ arg = atoi(ptr);
} else
- break;
+ return RET_OK;
+
switch (ewhat) {
case 'c':
- farg = (float)atof(ptr);
- if ((err = docountry(thing[0], arg, ptr, farg, np))
- != RET_OK)
+ if ((err = edit_nat(np, thing, arg, ptr)) != RET_OK)
return err;
break;
case 'l':
- if ((err = doland(thing[0], arg, ptr, §)) != RET_OK)
+ if (!check_sect_ok(§))
+ return RET_FAIL;
+ if ((err = edit_sect(§, thing, arg, ptr)) != RET_OK)
return err;
if (!putsect(§))
return RET_FAIL;
break;
case 's':
- if ((err = doship(thing[0], arg, ptr, &ship)) != RET_OK)
+ if (!check_ship_ok(&ship))
+ return RET_FAIL;
+ if ((err = edit_ship(&ship, thing, arg, ptr)) != RET_OK)
return err;
if (!ef_ensure_space(EF_SHIP, ship.shp_uid, 50))
return RET_FAIL;
return RET_FAIL;
break;
case 'u':
- farg = (float)atof(ptr);
- if ((err = dounit(thing[0], arg, ptr, farg, &land))
- != RET_OK)
+ if (!check_land_ok(&land))
+ return RET_FAIL;
+ if ((err = edit_land(&land, thing, arg, ptr)) != RET_OK)
return err;
if (!ef_ensure_space(EF_LAND, land.lnd_uid, 50))
return RET_FAIL;
return RET_FAIL;
break;
case 'p':
- if ((err = doplane(thing[0], arg, ptr, &plane))
- != RET_OK)
+ if (!check_plane_ok(&plane))
+ return RET_FAIL;
+ if ((err = edit_plane(&plane, thing, arg, ptr)) != RET_OK)
return err;
if (!ef_ensure_space(EF_PLANE, plane.pln_uid, 50))
return RET_FAIL;
return RET_FAIL;
break;
}
- if (err != RET_OK)
- break;
- else
- ptr = 0;
}
- return RET_OK;
}
static void
}
static void
-noise(struct sctstr *sptr, int public_amt, s_char *name, int old, int new)
+noise(struct sctstr *sptr, char *name, int old, int new)
{
- s_char p[100];
-
pr("%s of %s changed from %d to %d\n",
name, xyas(sptr->sct_x, sptr->sct_y, player->cnum), old, new);
- if (public_amt)
- (void)sprintf(p, "changed from %d to %d", old, new);
- else
- (void)sprintf(p, "%s", (old < new ? "increased" : "decreased"));
if (sptr->sct_own)
wu(player->cnum, sptr->sct_own,
- "%s in %s was %s by an act of %s\n",
+ "%s in %s was changed from %d to %d by an act of %s\n",
name, xyas(sptr->sct_x, sptr->sct_y, sptr->sct_own),
- p, cname(player->cnum));
- benefit(sptr->sct_own, (old < new));
+ old, new, cname(player->cnum));
+ benefit(sptr->sct_own, old < new);
}
static void
-prsect(struct sctstr *sect)
+print_sect(struct sctstr *sect)
{
pr("Location <L>: %s\t", xyas(sect->sct_x, sect->sct_y, player->cnum));
pr("Distribution sector <D>: %s\n",
xyas(sect->sct_dist_x, sect->sct_dist_y, player->cnum));
- pr("Designation <s>: %c\t New designation <S>: %c\n",
+ pr("Designation <s>: %c\tNew designation <S>: %c\n",
dchr[sect->sct_type].d_mnem, dchr[sect->sct_newtype].d_mnem);
pr("own oo eff mob min gld frt oil urn wrk lty che ctg plg ptime fall avail\n");
pr(" o O e m i g f c u w l x X p t F a\n");
sect->sct_pstage, sect->sct_ptime,
sect->sct_fallout, sect->sct_avail);
- pr("Mines <M>: %d\t", sect->sct_mines);
- pr("Coastal <C>: %d\n", sect->sct_coastal);
+ pr("Mines <M>: %d\n", sect->sct_mines);
pr("Road %% <R>: %d\t", sect->sct_road);
pr("Rail %% <r>: %d\t", sect->sct_rail);
pr("Defense %% <d>: %d\n", sect->sct_defense);
}
-
static void
-prnat(struct natstr *np)
+print_nat(struct natstr *np)
{
int i;
pr("Name <n>: %-20s\t", np->nat_cnam);
pr("Representative <r>: %-20s\n", np->nat_pnam);
pr("BTUs <b>: %3d\t\t\t", np->nat_btu);
- pr("Reserves <m>: %5ld\n", np->nat_reserve);
+ pr("Reserves <m>: %5d\n", np->nat_reserve);
pr("Capital <c>: %s\t\t",
xyas(np->nat_xcap, np->nat_ycap, player->cnum));
pr("Origin <o>: %3s\n",
xyas(np->nat_xorg, np->nat_yorg, player->cnum));
pr("Status <s>: 0x%x\t\t\t", np->nat_stat);
- pr("Min Used <u>: %3d\n", np->nat_minused);
+ pr("Seconds Used <u>: %3d\n", np->nat_timeused);
pr("Technology <T>: %.2f\t\t", np->nat_level[NAT_TLEV]);
pr("Research <R>: %.2f\n", np->nat_level[NAT_RLEV]);
pr("Education <E>: %.2f\t\t", np->nat_level[NAT_ELEV]);
pr("Happiness <H>: %.2f\n", np->nat_level[NAT_HLEV]);
- pr("Money <M>: $%6ld\n", np->nat_money);
+ pr("Money <M>: $%6d\n", np->nat_money);
pr("Telegrams <t>: %6d\n", np->nat_tgms);
- if (opt_DEMANDUPDATE)
- pr("Updates missed <U>: %d\n", np->nat_missed);
if (opt_HIDDEN) {
pr("Countries contacted: ");
for (i = 0; i < MAXNOC; i++) {
}
static void
-pr_plane(struct plnstr *plane)
+print_plane(struct plnstr *plane)
{
- pr("UID <U>: %d\t\t", (int)plane->pln_uid);
- pr("Owner <O>: %d\t\t", (int)plane->pln_own);
+ pr("UID <U>: %d\t\t", plane->pln_uid);
+ pr("Owner <O>: %d\t\t", plane->pln_own);
pr("Location <l>: %s\n",
xyas(plane->pln_x, plane->pln_y, player->cnum));
- pr("Efficiency <e>: %d\t", (int)plane->pln_effic);
- pr("Mobility <m>: %d\n", (int)plane->pln_mobil);
+ pr("Efficiency <e>: %d\t", plane->pln_effic);
+ pr("Mobility <m>: %d\n", plane->pln_mobil);
pr("Tech <t>: %d\t\t", plane->pln_tech);
- pr("Wing <w>: %c\n", plane->pln_wing);
- pr("Attack <a>: %d\t\t", plane->pln_att);
- pr("Defense <d>: %d\n", plane->pln_def);
+ pr("Wing <w>: %.1s\n", &plane->pln_wing);
pr("Range <r>: %d\t\t", plane->pln_range);
pr("Flags <f>: %d\n", plane->pln_flags);
pr("Ship <s>: %d\t\t", plane->pln_ship);
pr("Land Unit <y>: %d\t", plane->pln_land);
- pr("Nuke Type <n>: %d\n", plane->pln_nuketype);
}
static void
-pr_land(struct lndstr *land)
+print_land(struct lndstr *land)
{
- pr("UID <U>: %d\n", (int)land->lnd_uid);
- pr("Owner <O>: %d\n", (int)land->lnd_own);
+ pr("UID <U>: %d\n", land->lnd_uid);
+ pr("Owner <O>: %d\n", land->lnd_own);
pr("Location <L>: %s\n", xyas(land->lnd_x, land->lnd_y, player->cnum));
- pr("Efficiency <e>: %d\t", (int)land->lnd_effic);
- pr("Mobility <M>: %d\n", (int)land->lnd_mobil);
+ pr("Efficiency <e>: %d\t", land->lnd_effic);
+ pr("Mobility <M>: %d\n", land->lnd_mobil);
pr("Tech <t>: %d\t\t", land->lnd_tech);
- pr("Army <a>: %c\n", land->lnd_army);
+ pr("Army <a>: %.1s\n", &land->lnd_army);
pr("Fortification <F>: %d\t", land->lnd_harden);
- pr("Fuel <B>: %d\n", land->lnd_fuel);
- count_land_planes(land);
- pr("Xlight planes <X>: %d\n", land->lnd_nxlight);
pr("Land unit <Y>: %d\n", land->lnd_land);
pr("Ship <S>: %d\t\t", land->lnd_ship);
- pr("Radius <P>: %d\n", land->lnd_rad_max);
- pr("Retreat percentage <Z>: %d\n", (int)land->lnd_retreat);
+ pr("Retreat percentage <Z>: %d\n", land->lnd_retreat);
pr("Retreat path <R>: '%s'\t\tRetreat Flags <W>: %d\n",
- land->lnd_rpath, (int)land->lnd_rflags);
+ land->lnd_rpath, land->lnd_rflags);
pr("civ mil uw food shl gun pet irn dst oil lcm hcm rad\n");
pr(" c m u f s g p i d o l h r\n");
pr("%3d", land->lnd_item[I_CIVIL]);
}
static void
-pr_ship(struct shpstr *ship)
+print_ship(struct shpstr *ship)
{
struct natstr *natp;
- if ((natp = getnatp(ship->shp_own)) == 0)
+ if (!(natp = getnatp(ship->shp_own)))
return;
- pr("%s (#%d) %s\n", natp->nat_cnam, (int)ship->shp_own, prship(ship));
- pr("UID <U>: %d\n", (int)ship->shp_uid);
- pr("Owner <O>: %d\t\t\t", (int)ship->shp_own);
+ pr("%s %s\n", prnat(natp), prship(ship));
+ pr("UID <U>: %d\n", ship->shp_uid);
+ pr("Owner <O>: %d\t\t\t", ship->shp_own);
pr("Location <L>: %s\n", xyas(ship->shp_x, ship->shp_y, player->cnum));
pr("Tech <T>: %d\t\t\t", ship->shp_tech);
- pr("Efficiency <E>: %d\n", (int)ship->shp_effic);
- pr("Mobility <M>: %d\t\t", (int)ship->shp_mobil);
- pr("Fleet <F>: %c\n", ship->shp_fleet);
- count_planes(ship);
- pr("Xlight planes <X>: %d\t\t", (int)ship->shp_nxlight);
- pr("Planes <P>: %d\n", (int)ship->shp_nplane);
- pr("Helos <H>: %d\t\t\t", (int)ship->shp_nchoppers);
- count_units(ship);
- pr("Units <Y>: %d\n", (int)ship->shp_nland);
- /* could depend on opt_FUEL - but a deity might want to set this
- up before enabling the option */
- pr("Fuel <B>: %d\t\t\t", (int)ship->shp_fuel);
+ pr("Efficiency <E>: %d\n", ship->shp_effic);
+ pr("Mobility <M>: %d\t\t", ship->shp_mobil);
+ pr("Fleet <F>: %.1s\n", &ship->shp_fleet);
pr("Retreat path <R>: '%s'\t\tRetreat Flags <W>: %d\n",
- ship->shp_rpath, (int)ship->shp_rflags);
- pr("Plague Stage <a>: %d\t\t",ship->shp_pstage);
+ ship->shp_rpath, ship->shp_rflags);
+ pr("Plague Stage <a>: %d\t\t", ship->shp_pstage);
pr("Plague Time <b>: %d\n", ship->shp_ptime);
pr("civ mil uw food shl gun pet irn dst oil lcm hcm rad\n");
pr(" c m u f s g p i d o l h r\n");
}
static int
-errcheck(int num, int min, int max)
-{
- if (num < min)
- return min;
- else if (num > max)
- return max;
- return num;
-}
-
-static int
-getin(s_char **what, s_char **p, int *arg, s_char *buf)
+getin(char *buf, char **valp)
{
- if (!(*what = getstarg(*p, "%c xxxxx -- thing value : ", buf))) {
- return RET_SYN;
- }
- if (**what == '\0')
- return END;
- while (**what && isspace(**what))
- (*what)++;
- if (**what == '\0')
- return RET_SYN;
- for (*p = *what; **p && !isspace(**p); (*p)++) /* skip non spaces */
- continue;
- while (**p && isspace(**p))
- (*p)++;
- if (**p == '\0')
- return RET_SYN;
- *arg = atoi(*p);
- return RET_OK;
+ char *p;
+ unsigned char thing;
+
+ p = getstarg(NULL, "%c xxxxx -- thing value : ", buf);
+ if (!p)
+ return -1;
+ if (!*p)
+ return 0;
+ for (; isspace(*p); p++) ;
+ if (!*p)
+ return -1;
+ thing = *p;
+ for (; *p && !isspace(*p); p++) ;
+ for (; isspace(*p); p++) ;
+ if (!*p)
+ return -1;
+ *valp = p;
+ return thing;
}
+#if 0 /* not needed right now */
static void
warn_deprecated(char key)
{
pr("Key <%c> is deprecated and will go away in a future release\n", key);
}
+#endif
static int
-doland(s_char op, int arg, s_char *p, struct sctstr *sect)
+edit_sect(struct sctstr *sect, char op, int arg, char *p)
{
natid newown, oldown;
coord newx, newy;
int new, old;
int des;
switch (op) {
- case 'C':
- if (arg < 0)
- return RET_SYN;
- sect->sct_coastal = (arg ? 1 : 0);
- pr("Coastal flag of %s changed to %d\n",
- xyas(sect->sct_x, sect->sct_y, player->cnum),
- sect->sct_coastal);
- break;
case 'o':
if (arg < 0)
return RET_SYN;
- newown = (natid)errcheck(arg, 0, MAXNOC - 1);
- pr("Owner of %s changed from %s (#%d) to %s (#%d).\n",
+ newown = (natid)LIMIT_TO(arg, 0, MAXNOC - 1);
+ pr("Owner of %s changed from %s to %s.\n",
xyas(sect->sct_x, sect->sct_y, player->cnum),
- cname(sect->sct_own), sect->sct_own, cname(newown), newown);
+ prnatid(sect->sct_own), prnatid(newown));
if (sect->sct_own) {
- makelost(EF_SECTOR, sect->sct_own, 0, sect->sct_x,
- sect->sct_y);
wu(player->cnum, sect->sct_own,
- "Sector %s lost to deity intervention\n", xyas(sect->sct_x,
- sect->sct_y,
- sect->
- sct_own));
+ "Sector %s lost to deity intervention\n",
+ xyas(sect->sct_x, sect->sct_y, sect->sct_own));
}
benefit(sect->sct_own, 0);
sect->sct_own = newown;
if (newown) {
- makenotlost(EF_SECTOR, newown, 0, sect->sct_x, sect->sct_y);
wu(player->cnum, newown,
"Sector %s gained from deity intervention\n",
- xyas(sect->sct_x, sect->sct_y, sect->sct_own));
+ xyas(sect->sct_x, sect->sct_y, newown));
}
benefit(newown, 1);
break;
case 'O':
if (arg < 0)
return RET_SYN;
- oldown = (natid)errcheck(arg, 0, MAXNOC - 1);
- pr("Old owner of %s changed from %s (#%d) to %s (#%d).\n",
+ oldown = (natid)LIMIT_TO(arg, 0, MAXNOC - 1);
+ pr("Old owner of %s changed from %s to %s.\n",
xyas(sect->sct_x, sect->sct_y, player->cnum),
- cname(sect->sct_oldown),
- sect->sct_oldown, cname(oldown), oldown);
+ prnatid(sect->sct_oldown), prnatid(oldown));
sect->sct_oldown = oldown;
break;
case 'e':
- new = errcheck(arg, 0, 100);
- noise(sect, 1, "Efficiency", (int)sect->sct_effic, new);
- sect->sct_effic = (unsigned char)new;
+ new = LIMIT_TO(arg, 0, 100);
+ noise(sect, "Efficiency", sect->sct_effic, new);
+ sect->sct_effic = new;
break;
case 'm':
- new = errcheck(arg, -127, 255);
- noise(sect, 1, "Mobility", (int)sect->sct_mobil, new);
+ new = LIMIT_TO(arg, -127, 255);
+ noise(sect, "Mobility", sect->sct_mobil, new);
sect->sct_mobil = new;
break;
case 'i':
- new = errcheck(arg, 0, 127);
- noise(sect, 1, "Iron ore content", (int)sect->sct_min, new);
+ new = LIMIT_TO(arg, 0, 127);
+ noise(sect, "Iron ore content", sect->sct_min, new);
sect->sct_min = (unsigned char)new;
break;
case 'g':
- new = errcheck(arg, 0, 127);
- noise(sect, 1, "Gold content", (int)sect->sct_gmin, new);
+ new = LIMIT_TO(arg, 0, 127);
+ noise(sect, "Gold content", sect->sct_gmin, new);
sect->sct_gmin = (unsigned char)new;
break;
case 'f':
- new = errcheck(arg, 0, 127);
- noise(sect, 1, "Fertility", (int)sect->sct_fertil, new);
+ new = LIMIT_TO(arg, 0, 127);
+ noise(sect, "Fertility", sect->sct_fertil, new);
sect->sct_fertil = (unsigned char)new;
break;
case 'c':
- new = errcheck(arg, 0, 127);
- noise(sect, 1, "Oil content", (int)sect->sct_oil, new);
+ new = LIMIT_TO(arg, 0, 127);
+ noise(sect, "Oil content", sect->sct_oil, new);
sect->sct_oil = (unsigned char)new;
break;
case 'u':
- new = errcheck(arg, 0, 127);
- noise(sect, 1, "Uranium content", (int)sect->sct_uran, new);
+ new = LIMIT_TO(arg, 0, 127);
+ noise(sect, "Uranium content", sect->sct_uran, new);
sect->sct_uran = (unsigned char)new;
break;
case 'w':
- new = errcheck(arg, 0, 100);
- noise(sect, 1, "Workforce percentage", (int)sect->sct_work, new);
+ new = LIMIT_TO(arg, 0, 100);
+ noise(sect, "Workforce percentage", sect->sct_work, new);
sect->sct_work = (unsigned char)new;
break;
case 'l':
- new = errcheck(arg, 0, 127);
+ new = LIMIT_TO(arg, 0, 127);
pr("Loyalty of %s changed from %d to %d%%\n",
xyas(sect->sct_x, sect->sct_y, player->cnum),
sect->sct_loyal, new);
break;
case 'x':
old = sect->sct_che;
- new = errcheck(arg, 0, CHE_MAX);
+ new = LIMIT_TO(arg, 0, CHE_MAX);
pr("Guerillas in %s changed from %d to %d\n",
xyas(sect->sct_x, sect->sct_y, player->cnum), old, new);
sect->sct_che = new;
break;
case 'X':
old = sect->sct_che_target;
- new = errcheck(arg, 0, MAXNOC - 1);
- pr("Old owner of %s changed from %s (#%d) to %s (#%d).\n",
+ new = LIMIT_TO(arg, 0, MAXNOC - 1);
+ pr("Che target of %s changed from %s to %s.\n",
xyas(sect->sct_x, sect->sct_y, player->cnum),
- cname(old), old, cname(new), new);
+ prnatid(old), prnatid(new));
sect->sct_che_target = new;
+ if (new == 0)
+ sect->sct_che = 0;
break;
case 'p':
old = sect->sct_pstage;
- new = errcheck(arg, 0, PLG_EXPOSED);
+ new = LIMIT_TO(arg, 0, PLG_EXPOSED);
pr("Plague stage of %s changed from %d to %d%%\n",
xyas(sect->sct_x, sect->sct_y, player->cnum), old, new);
sect->sct_pstage = new;
break;
case 't':
old = sect->sct_ptime;
- new = errcheck(arg, 0, 255);
+ new = LIMIT_TO(arg, 0, 255);
pr("Plague time of %s changed from %d to %d%%\n",
xyas(sect->sct_x, sect->sct_y, player->cnum), old, new);
sect->sct_ptime = new;
break;
case 'F':
old = sect->sct_fallout;
- new = errcheck(arg, 0, FALLOUT_MAX);
+ new = LIMIT_TO(arg, 0, FALLOUT_MAX);
pr("Fallout for sector %s changed from %d to %d\n",
xyas(sect->sct_x, sect->sct_y, player->cnum), old, new);
sect->sct_fallout = new;
break;
case 'a':
- new = errcheck(arg, 0, 9999);
- noise(sect, 1, "Available workforce", (int)sect->sct_avail, new);
+ new = LIMIT_TO(arg, 0, 9999);
+ noise(sect, "Available workforce", sect->sct_avail, new);
sect->sct_avail = new;
break;
case 'M':
- new = errcheck(arg, 0, MINES_MAX);
+ new = LIMIT_TO(arg, 0, MINES_MAX);
sect->sct_mines = new;
pr("Mines changed to %d\n", new);
break;
return RET_SYN;
sect->sct_x = newx;
sect->sct_y = newy;
+ ef_set_uid(EF_SECTOR, §, XYOFFSET(newx, newy));
break;
case 'D':
if (!sarg_xy(p, &newx, &newy))
return RET_SYN;
- pr("Distribtion Location for sector %s changed from %s to %s\n",
+ pr("Distribution location for sector %s changed from %s to %s\n",
xyas(sect->sct_x, sect->sct_y, player->cnum),
xyas(sect->sct_dist_x, sect->sct_dist_y, player->cnum),
xyas(newx, newy, player->cnum));
pr("Designation for sector %s changed from %c to %c\n",
xyas(sect->sct_x, sect->sct_y, player->cnum),
dchr[sect->sct_type].d_mnem, dchr[des].d_mnem);
- set_coastal(sect, des);
+ set_coastal(sect, sect->sct_type, des);
sect->sct_type = des;
break;
case 'S':
des = sct_typematch(p);
if (des < 0)
return RET_SYN;
- pr("New Designation for sector %s changed from %c to %c\n",
+ pr("New designation for sector %s changed from %c to %c\n",
xyas(sect->sct_x, sect->sct_y, player->cnum),
dchr[sect->sct_newtype].d_mnem, dchr[des].d_mnem);
sect->sct_newtype = des;
break;
case 'R':
- if (arg > 100)
- arg = 100;
- if (arg < 0)
- arg = 0;
- noise(sect, 1, "Road percentage", (int)sect->sct_road, arg);
- sect->sct_road = arg;
+ new = LIMIT_TO(arg, 0, 100);
+ noise(sect, "Road percentage", sect->sct_road, new);
+ sect->sct_road = new;
break;
case 'r':
- if (arg > 100)
- arg = 100;
- if (arg < 0)
- arg = 0;
- noise(sect, 1, "Rail percentage", (int)sect->sct_rail, arg);
- sect->sct_rail = arg;
+ new = LIMIT_TO(arg, 0, 100);
+ noise(sect, "Rail percentage", sect->sct_rail, new);
+ sect->sct_rail = new;
break;
case 'd':
- if (arg > 100)
- arg = 100;
- if (arg < 0)
- arg = 0;
- noise(sect, 1, "Defense percentage", (int)sect->sct_defense, arg);
- sect->sct_defense = arg;
+ new = LIMIT_TO(arg, 0, 100);
+ noise(sect, "Defense percentage", sect->sct_defense, new);
+ sect->sct_defense = new;
break;
default:
pr("huh? (%c)\n", op);
return RET_OK;
}
-
static int
-docountry(s_char op, int arg, s_char *p, float farg, struct natstr *np)
+edit_nat(struct natstr *np, char op, int arg, char *p)
{
coord newx, newy;
natid nat = np->nat_cnum;
+ float farg = (float)atof(p);
switch (op) {
case 'n':
+ if (!check_nat_name(p, nat))
+ return RET_SYN;
pr("Country name changed from %s to %s\n", np->nat_cnam, p);
- strncpy(np->nat_cnam, p, sizeof(np->nat_cnam) - 1);
+ strcpy(np->nat_cnam, p);
break;
case 'r':
pr("Country representative changed from %s to %s\n",
np->nat_tgms = arg;
break;
case 'b':
- arg = errcheck(arg, 0, 1024);
+ arg = LIMIT_TO(arg, 0, 1024);
pr("BTU's changed from %d to %d\n", np->nat_btu, arg);
np->nat_btu = arg;
break;
case 'm':
benefit(nat, np->nat_reserve < arg);
- pr("Military Reserves changed from %ld to %d\n",
+ pr("Military reserves changed from %d to %d\n",
np->nat_reserve, arg);
wu(player->cnum, nat,
- "Military Reserves changed from %ld to %d by divine intervention.\n",
+ "Military reserves changed from %d to %d by divine intervention.\n",
np->nat_reserve, arg);
np->nat_reserve = arg;
break;
np->nat_yorg = newy;
break;
case 's':
- np->nat_stat = (nat_status)errcheck(arg, STAT_UNUSED, STAT_GOD);
+ np->nat_stat = LIMIT_TO(arg, STAT_UNUSED, STAT_GOD);
break;
case 'u':
- arg = errcheck(arg, 0, m_m_p_d);
- pr("Number of minutes used changed from %d to %d.\n",
- np->nat_minused, arg);
- np->nat_minused = arg;
+ arg = LIMIT_TO(arg, 0, m_m_p_d * 60);
+ pr("Number of seconds used changed from %d to %d.\n",
+ np->nat_timeused, arg);
+ np->nat_timeused = arg;
break;
case 'M':
- pr("Money changed from %ld to %d\n", np->nat_money, arg);
+ pr("Money changed from %d to %d\n", np->nat_money, arg);
wu(player->cnum, nat,
- "Money changed from %ld to %d by divine intervention.\n",
+ "Money changed from %d to %d by divine intervention.\n",
np->nat_money, arg);
np->nat_money = arg;
break;
np->nat_level[NAT_HLEV], farg);
np->nat_level[NAT_HLEV] = farg;
break;
- case 'U':
- np->nat_missed = arg;
- break;
default:
pr("huh? (%c)\n", op);
break;
return RET_OK;
}
-
static int
-doship(s_char op, int arg, s_char *p, struct shpstr *ship)
+edit_ship(struct shpstr *ship, char op, int arg, char *p)
{
coord newx, newy;
ship->shp_ptime = arg;
break;
case 'R':
- memcpy(ship->shp_rpath, p, sizeof(ship->shp_rpath));
+ strncpy(ship->shp_rpath, p, sizeof(ship->shp_rpath) - 1);
break;
case 'W':
ship->shp_rflags = arg;
break;
- case 'H':
- ship->shp_nchoppers = arg;
- break;
- case 'X':
- ship->shp_nxlight = arg;
- break;
case 'U':
- ship->shp_uid = arg;
+ ef_set_uid(EF_SHIP, ship, arg);
break;
case 'O':
if (ship->shp_own)
if (arg && arg < MAXNOC) {
wu(player->cnum, (natid)arg,
"%s given to you by deity intervention!\n", prship(ship));
- makelost(EF_SHIP, ship->shp_own, ship->shp_uid, ship->shp_x,
- ship->shp_y);
ship->shp_own = (natid)arg;
- makenotlost(EF_SHIP, ship->shp_own, ship->shp_uid, ship->shp_x,
- ship->shp_y);
- } else if (!arg) {
+ } else if (!arg)
ship->shp_effic = 0;
- makelost(EF_SHIP, ship->shp_own, ship->shp_uid, ship->shp_x,
- ship->shp_y);
- ship->shp_own = (natid)0;
- }
break;
case 'L':
if (!sarg_xy(p, &newx, &newy))
ship->shp_y = newy;
break;
case 'T':
- shp_set_tech(ship,
- errcheck(arg,
- mchr[(int)ship->shp_type].m_tech, SHRT_MAX));
+ arg = LIMIT_TO(arg, mchr[(int)ship->shp_type].m_tech, SHRT_MAX);
+ shp_set_tech(ship, arg);
break;
case 'E':
- ship->shp_effic = errcheck(arg, SHIP_MINEFF, 100);
+ ship->shp_effic = LIMIT_TO(arg, SHIP_MINEFF, 100);
break;
case 'M':
ship->shp_mobil = arg;
break;
- case 'B':
- ship->shp_fuel = errcheck(arg, 0, 255);
- break;
case 'F':
if (p[0] == '~')
- ship->shp_fleet = ' ';
+ ship->shp_fleet = 0;
else if (isalpha(p[0]))
ship->shp_fleet = p[0];
else {
return RET_FAIL;
}
break;
- case 'Y':
- ship->shp_nland = errcheck(arg, 0, 100);
- break;
- case 'P':
- ship->shp_nplane = errcheck(arg, 0, 100);
- break;
case 'c':
ship->shp_item[I_CIVIL] = arg;
break;
case 'r':
ship->shp_item[I_RAD] = arg;
break;
- case 'D':
- warn_deprecated(op);
- ship->shp_armor = errcheck(arg, 0, SHRT_MAX);
- break;
default:
pr("huh? (%c)\n", op);
return RET_FAIL;
}
static int
-dounit(s_char op, int arg, s_char *p, float farg, struct lndstr *land)
+edit_land(struct lndstr *land, char op, int arg, char *p)
{
coord newx, newy;
land->lnd_land = arg;
break;
case 'U':
- land->lnd_uid = arg;
+ ef_set_uid(EF_LAND, land, arg);
break;
case 'O':
if (land->lnd_own)
if (arg && arg < MAXNOC) {
wu(player->cnum, (natid)arg,
"%s given to you by deity intervention!\n", prland(land));
- makelost(EF_LAND, land->lnd_own, land->lnd_uid, land->lnd_x,
- land->lnd_y);
land->lnd_own = (natid)arg;
- makenotlost(EF_LAND, land->lnd_own, land->lnd_uid, land->lnd_x,
- land->lnd_y);
- } else if (!arg) {
- makelost(EF_LAND, land->lnd_own, land->lnd_uid, land->lnd_x,
- land->lnd_y);
+ } else if (!arg)
land->lnd_effic = 0;
- land->lnd_own = (natid)0;
- }
break;
case 'L':
if (!sarg_xy(p, &newx, &newy))
land->lnd_y = newy;
break;
case 'e':
- land->lnd_effic = errcheck(arg, LAND_MINEFF, 100);
+ land->lnd_effic = LIMIT_TO(arg, LAND_MINEFF, 100);
break;
case 'M':
land->lnd_mobil = arg;
break;
case 't':
- lnd_set_tech(land,
- errcheck(arg,
- lchr[(int)land->lnd_type].l_tech, SHRT_MAX));
+ arg = LIMIT_TO(arg, lchr[(int)land->lnd_type].l_tech, SHRT_MAX);
+ lnd_set_tech(land, arg);
break;
case 'a':
if (p[0] == '~')
- land->lnd_army = ' ';
+ land->lnd_army = 0;
else if (isalpha(p[0]))
land->lnd_army = p[0];
else {
}
break;
case 'F':
- land->lnd_harden = errcheck(arg, 0, 255);
- break;
- case 'B':
- land->lnd_fuel = errcheck(arg, 0, 255);
- break;
- case 'X':
- land->lnd_nxlight = arg;
+ land->lnd_harden = LIMIT_TO(arg, 0, 255);
break;
case 'S':
land->lnd_ship = arg;
break;
- case 'P':
- land->lnd_rad_max = arg;
- break;
case 'Z':
land->lnd_retreat = arg;
break;
case 'R':
- memcpy(land->lnd_rpath, p, sizeof(land->lnd_rpath));
+ strncpy(land->lnd_rpath, p, sizeof(land->lnd_rpath) - 1);
break;
case 'W':
land->lnd_rflags = arg;
case 'r':
land->lnd_item[I_RAD] = arg;
break;
- case 'A':
- warn_deprecated(op);
- pr("Attack changed from %1.2f to %1.2f.\n",
- land->lnd_att, farg);
- land->lnd_att = farg;
- break;
- case 'D':
- warn_deprecated(op);
- pr("Defense changed from %1.2f to %1.2f.\n",
- land->lnd_def, farg);
- land->lnd_def = farg;
- break;
default:
pr("huh? (%c)\n", op);
return RET_FAIL;
return RET_OK;
}
-
-int
-doplane(s_char op, int arg, s_char *p, struct plnstr *plane)
+static int
+edit_plane(struct plnstr *plane, char op, int arg, char *p)
{
coord newx, newy;
switch (op) {
- case 'n':
- plane->pln_nuketype = arg;
- break;
case 'U':
- plane->pln_uid = arg;
+ ef_set_uid(EF_PLANE, plane, arg);
break;
case 'l':
if (!sarg_xy(p, &newx, &newy))
"%s taken from you by deity intervention!\n",
prplane(plane));
if (arg && arg < MAXNOC) {
- makelost(EF_PLANE, plane->pln_own, plane->pln_uid,
- plane->pln_x, plane->pln_y);
plane->pln_own = (natid)arg;
- makenotlost(EF_PLANE, plane->pln_own, plane->pln_uid,
- plane->pln_x, plane->pln_y);
wu(player->cnum, plane->pln_own,
"%s given to you by deity intervention!\n", prplane(plane));
- } else if (!arg) {
+ } else if (!arg)
plane->pln_effic = 0;
- makelost(EF_PLANE, plane->pln_own, plane->pln_uid,
- plane->pln_x, plane->pln_y);
- plane->pln_own = (natid)0;
- }
break;
case 'e':
- plane->pln_effic = errcheck(arg, PLANE_MINEFF, 100);
+ plane->pln_effic = LIMIT_TO(arg, PLANE_MINEFF, 100);
break;
case 'm':
- plane->pln_mobil = errcheck(arg, -127, 255);
+ plane->pln_mobil = LIMIT_TO(arg, -127, 255);
break;
case 't':
- pln_set_tech(plane,
- errcheck(arg,
- plchr[(int)plane->pln_type].pl_tech, SHRT_MAX));
+ arg = LIMIT_TO(arg, plchr[(int)plane->pln_type].pl_tech, SHRT_MAX);
+ pln_set_tech(plane, arg);
break;
case 'w':
if (p[0] == '~')
- plane->pln_wing = ' ';
+ plane->pln_wing = 0;
else if (isalpha(p[0]))
plane->pln_wing = p[0];
else {
return RET_FAIL;
}
break;
- case 'a':
- plane->pln_att = (s_char)errcheck(arg, 0, 127);
- break;
- case 'd':
- plane->pln_def = (s_char)arg;
- break;
case 'r':
plane->pln_range = (unsigned char)arg;
break;
projects / empserver / blobdiff