/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2008, 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-2008
*/
#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 "lost.h"
+#include "news.h"
#include "optlist.h"
-#include "commands.h"
+#include "plague.h"
+#include "plane.h"
+#include "ship.h"
#define END -1
static void benefit(natid, int);
-static int docountry(char, int, char *, float, struct natstr *);
+static int docountry(char, int, char *, struct natstr *);
static int doland(char, int, char *, struct sctstr *);
static int doplane(char, int, char *, struct plnstr *);
static int doship(char, int, char *, struct shpstr *);
-static int dounit(char, int, char *, float, struct lndstr *);
+static int dounit(char, int, char *, struct lndstr *);
static int getin(char *, char **);
-static void noise(struct sctstr *, int, char *, int, int);
+static void noise(struct sctstr *, char *, int, int);
static void pr_land(struct lndstr *);
static void pr_plane(struct plnstr *);
static void pr_ship(struct shpstr *);
int err;
int arg_index = 3;
coord x, y;
- float farg;
struct natstr *np;
char buf[1024];
char 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)
switch (ewhat) {
case 'c':
- farg = (float)atof(ptr);
- if ((err = docountry(thing, arg, ptr, farg, np)) != RET_OK)
+ if ((err = docountry(thing, arg, ptr, np)) != RET_OK)
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':
- farg = (float)atof(ptr);
- if ((err = dounit(thing, arg, ptr, farg, &land)) != RET_OK)
+ 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;
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))
}
static void
-noise(struct sctstr *sptr, int public_amt, char *name, int old, int new)
+noise(struct sctstr *sptr, char *name, int old, int new)
{
- 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
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);
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++) {
static void
pr_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)
{
- 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]);
if ((natp = getnatp(ship->shp_own)) == 0)
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 (#%d) %s\n", natp->nat_cnam, ship->shp_own, 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);
+ 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");
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;
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));
+ "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));
break;
case 'e':
new = errcheck(arg, 0, 100);
- noise(sect, 1, "Efficiency", (int)sect->sct_effic, new);
+ noise(sect, "Efficiency", sect->sct_effic, new);
sect->sct_effic = (unsigned char)new;
break;
case 'm':
new = errcheck(arg, -127, 255);
- noise(sect, 1, "Mobility", (int)sect->sct_mobil, new);
+ 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);
+ 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);
+ 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);
+ 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);
+ 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);
+ 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);
+ noise(sect, "Workforce percentage", sect->sct_work, new);
sect->sct_work = (unsigned char)new;
break;
case 'l':
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",
+ pr("Che target of %s changed from %s (#%d) to %s (#%d).\n",
xyas(sect->sct_x, sect->sct_y, player->cnum),
cname(old), old, cname(new), new);
sect->sct_che_target = new;
+ if (new == 0)
+ sect->sct_che = 0;
break;
case 'p':
old = sect->sct_pstage;
break;
case 'a':
new = errcheck(arg, 0, 9999);
- noise(sect, 1, "Available workforce", (int)sect->sct_avail, new);
+ noise(sect, "Available workforce", sect->sct_avail, new);
sect->sct_avail = new;
break;
case 'M':
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))
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':
arg = 100;
if (arg < 0)
arg = 0;
- noise(sect, 1, "Road percentage", (int)sect->sct_road, arg);
+ noise(sect, "Road percentage", sect->sct_road, arg);
sect->sct_road = arg;
break;
case 'r':
arg = 100;
if (arg < 0)
arg = 0;
- noise(sect, 1, "Rail percentage", (int)sect->sct_rail, arg);
+ noise(sect, "Rail percentage", sect->sct_rail, arg);
sect->sct_rail = arg;
break;
case 'd':
arg = 100;
if (arg < 0)
arg = 0;
- noise(sect, 1, "Defense percentage", (int)sect->sct_defense, arg);
+ noise(sect, "Defense percentage", sect->sct_defense, arg);
sect->sct_defense = arg;
break;
default:
static int
-docountry(char op, int arg, char *p, float farg, struct natstr *np)
+docountry(char op, int arg, char *p, struct natstr *np)
{
coord newx, newy;
natid nat = np->nat_cnum;
+ float farg = (float)atof(p);
switch (op) {
case '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);
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':
- 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_mobil = arg;
break;
case 'B':
- ship->shp_fuel = errcheck(arg, 0, 255);
+ warn_deprecated(op);
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(char op, int arg, char *p, float farg, struct lndstr *land)
+dounit(char op, int arg, char *p, struct lndstr *land)
{
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))
break;
case 'a':
if (p[0] == '~')
- land->lnd_army = ' ';
+ land->lnd_army = 0;
else if (isalpha(p[0]))
land->lnd_army = p[0];
else {
land->lnd_harden = errcheck(arg, 0, 255);
break;
case 'B':
- land->lnd_fuel = errcheck(arg, 0, 255);
- break;
- case 'X':
- land->lnd_nxlight = arg;
+ warn_deprecated(op);
break;
case 'S':
land->lnd_ship = 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;
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) {
+ } 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);
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 = arg;
- break;
- case 'd':
- plane->pln_def = arg;
- break;
case 'r':
plane->pln_range = (unsigned char)arg;
break;
projects / empserver / blobdiff