/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
* ---
*
* 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
- * Markus Armbruster, 2003-2006
+ * Ron Koenderink, 2003-2009
+ * Markus Armbruster, 2003-2009
*/
#include <config.h>
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) {
pr("huh?\n");
return RET_SYN;
}
- if (player->argp[3] == 0) {
+ if (!player->argp[3]) {
switch (ewhat) {
case 'l':
prsect(§);
}
}
for (;;) {
- if (player->argp[arg_index] != 0) {
- if (player->argp[arg_index+1] != 0) {
+ 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);
return err;
break;
case 'l':
+ if (!check_sect_ok(§))
+ return RET_FAIL;
if ((err = doland(thing, arg, ptr, §)) != RET_OK)
return err;
if (!putsect(§))
return RET_FAIL;
break;
case 's':
+ if (!check_ship_ok(&ship))
+ return RET_FAIL;
if ((err = doship(thing, arg, ptr, &ship)) != RET_OK)
return err;
if (!ef_ensure_space(EF_SHIP, ship.shp_uid, 50))
return RET_FAIL;
break;
case 'u':
+ if (!check_land_ok(&land))
+ return RET_FAIL;
if ((err = dounit(thing, arg, ptr, &land)) != RET_OK)
return err;
if (!ef_ensure_space(EF_LAND, land.lnd_uid, 50))
return RET_FAIL;
break;
case 'p':
+ if (!check_plane_ok(&plane))
+ return RET_FAIL;
if ((err = doplane(thing, arg, ptr, &plane)) != RET_OK)
return err;
if (!ef_ensure_space(EF_PLANE, plane.pln_uid, 50))
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("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++) {
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("Tech <t>: %d\t\t", land->lnd_tech);
pr("Army <a>: %.1s\n", &land->lnd_army);
pr("Fortification <F>: %d\t", land->lnd_harden);
- pr("Fuel <B>: %d\n", land->lnd_fuel);
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", land->lnd_retreat);
pr("Retreat path <R>: '%s'\t\tRetreat Flags <W>: %d\n",
land->lnd_rpath, land->lnd_rflags);
{
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, ship->shp_own, prship(ship));
pr("UID <U>: %d\n", ship->shp_uid);
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);
- /* could depend on opt_FUEL - but a deity might want to set this
- up before enabling the option */
- pr("Fuel <B>: %d\n", ship->shp_fuel);
pr("Retreat path <R>: '%s'\t\tRetreat Flags <W>: %d\n",
ship->shp_rpath, ship->shp_rflags);
pr("Plague Stage <a>: %d\t\t",ship->shp_pstage);
int new, old;
int des;
switch (op) {
- case 'C':
- warn_deprecated(op);
- 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;
xyas(sect->sct_x, sect->sct_y, player->cnum),
cname(sect->sct_own), sect->sct_own, cname(newown), 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));
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));
case 'e':
new = errcheck(arg, 0, 100);
noise(sect, "Efficiency", sect->sct_effic, new);
- sect->sct_effic = (unsigned char)new;
+ sect->sct_effic = new;
break;
case 'm':
new = errcheck(arg, -127, 255);
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))
switch (op) {
case 'n':
+ if (!check_nat_name(p))
+ 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_yorg = newy;
break;
case 's':
- np->nat_stat = (nat_status)errcheck(arg, STAT_UNUSED, STAT_GOD);
+ np->nat_stat = errcheck(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 = errcheck(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);
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;
case 'W':
ship->shp_rflags = arg;
break;
- case 'H':
- warn_deprecated(op);
- ship->shp_nchoppers = arg;
- break;
- case 'X':
- warn_deprecated(op);
- 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)
ship->shp_effic = 0;
break;
ship->shp_mobil = arg;
break;
case 'B':
- ship->shp_fuel = errcheck(arg, 0, 255);
+ warn_deprecated(op);
break;
case 'F':
if (p[0] == '~')
return RET_FAIL;
}
break;
- case 'Y':
- warn_deprecated(op);
- ship->shp_nland = errcheck(arg, 0, 100);
- break;
- case 'P':
- warn_deprecated(op);
- ship->shp_nplane = errcheck(arg, 0, 100);
- break;
case 'c':
ship->shp_item[I_CIVIL] = arg;
break;
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)
land->lnd_effic = 0;
break;
land->lnd_harden = errcheck(arg, 0, 255);
break;
case 'B':
- land->lnd_fuel = errcheck(arg, 0, 255);
- break;
- case 'X':
warn_deprecated(op);
- land->lnd_nxlight = arg;
break;
case 'S':
land->lnd_ship = arg;
break;
case 'P':
- land->lnd_rad_max = arg;
+ warn_deprecated(op);
break;
case 'Z':
land->lnd_retreat = arg;
}
-int
+static int
doplane(char op, int arg, char *p, struct plnstr *plane)
{
coord newx, newy;
switch (op) {
case 'n':
- plane->pln_nuketype = arg;
+ warn_deprecated(op);
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)
return RET_FAIL;
}
break;
- case 'a':
- warn_deprecated(op);
- plane->pln_att = arg;
- break;
- case 'd':
- warn_deprecated(op);
- plane->pln_def = arg;
- break;
case 'r':
plane->pln_range = (unsigned char)arg;
break;
projects / empserver / blobdiff