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 *);
+static char *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 shpstr ship;
struct lndstr land;
char *what;
- char *ptr;
- char thing;
+ char *key, *ptr;
int num;
int arg;
int err;
for (;;) {
if (player->argp[arg_index]) {
if (player->argp[arg_index+1]) {
- thing = player->argp[arg_index++][0];
+ key = player->argp[arg_index++];
ptr = player->argp[arg_index++];
arg = atoi(ptr);
} else
return RET_SYN;
} else if (arg_index == 3) {
- err = getin(buf, &ptr);
- if (err < 0)
+ key = getin(buf, &ptr);
+ if (!key)
return RET_SYN;
- if (err == 0) {
+ if (!*key) {
switch (ewhat) {
case 'c':
print_nat(np);
}
return RET_OK;
}
- thing = err;
arg = atoi(ptr);
} else
return RET_OK;
switch (ewhat) {
case 'c':
- if ((err = edit_nat(np, thing, arg, ptr)) != RET_OK)
+ if ((err = edit_nat(np, key, arg, ptr)) != RET_OK)
return err;
break;
case 'l':
if (!check_sect_ok(§))
return RET_FAIL;
- if ((err = edit_sect(§, thing, arg, ptr)) != RET_OK)
+ if ((err = edit_sect(§, key, arg, ptr)) != RET_OK)
return err;
if (!putsect(§))
return RET_FAIL;
case 's':
if (!check_ship_ok(&ship))
return RET_FAIL;
- if ((err = edit_ship(&ship, thing, arg, ptr)) != RET_OK)
+ if ((err = edit_ship(&ship, key, arg, ptr)) != RET_OK)
return err;
if (!ef_ensure_space(EF_SHIP, ship.shp_uid, 50))
return RET_FAIL;
case 'u':
if (!check_land_ok(&land))
return RET_FAIL;
- if ((err = edit_land(&land, thing, arg, ptr)) != RET_OK)
+ if ((err = edit_land(&land, key, arg, ptr)) != RET_OK)
return err;
if (!ef_ensure_space(EF_LAND, land.lnd_uid, 50))
return RET_FAIL;
case 'p':
if (!check_plane_ok(&plane))
return RET_FAIL;
- if ((err = edit_plane(&plane, thing, arg, ptr)) != RET_OK)
+ if ((err = edit_plane(&plane, key, arg, ptr)) != RET_OK)
return err;
if (!ef_ensure_space(EF_PLANE, plane.pln_uid, 50))
return RET_FAIL;
}
static void
-benefit(natid who, int good)
+benefit(natid who, int goodness)
{
- if (!opt_GODNEWS)
- return;
-
- if (good) {
- if (who)
- nreport(player->cnum, N_AIDS, who, 1);
- } else {
- if (who)
- nreport(player->cnum, N_HURTS, who, 1);
- }
+ if (opt_GODNEWS && who && goodness)
+ nreport(player->cnum, goodness > 0 ? N_AIDS : N_HURTS, who, 1);
}
static void
{
pr("%s of %s changed from %d to %d\n",
name, xyas(sptr->sct_x, sptr->sct_y, player->cnum), old, new);
- if (sptr->sct_own)
- wu(player->cnum, sptr->sct_own,
+ if (sptr->sct_own && new != old)
+ wu(0, sptr->sct_own,
"%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),
old, new, cname(player->cnum));
- benefit(sptr->sct_own, old < new);
+ benefit(sptr->sct_own, new - old);
}
static void
pr("\n");
}
-static int
+static char *
getin(char *buf, char **valp)
{
+ char line[1024];
+ char *argp[128];
char *p;
- unsigned char thing;
- p = getstarg(NULL, "%c xxxxx -- thing value : ", buf);
+ *valp = NULL;
+ p = getstarg(NULL, "%c xxxxx -- thing value : ", line);
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;
+ return NULL;
+ switch (parse(p, buf, argp, NULL, NULL, NULL)) {
+ case 0:
+ return "";
+ case 1:
+ return NULL;
+ default:
+ *valp = argp[1];
+ return argp[0];
+ }
}
#if 0 /* not needed right now */
#endif
static int
-edit_sect(struct sctstr *sect, char op, int arg, char *p)
+edit_sect(struct sctstr *sect, char *key, int arg, char *p)
{
coord newx, newy;
- int new, old;
- int des;
- switch (op) {
+ int new;
+
+ switch (*key) {
case 'o':
if (arg < 0 || arg >= MAXNOC)
return RET_SYN;
pr("Owner of %s changed from %s to %s.\n",
xyas(sect->sct_x, sect->sct_y, player->cnum),
prnatid(sect->sct_own), prnatid(arg));
+ if (arg == sect->sct_own)
+ break;
if (sect->sct_own) {
- wu(player->cnum, sect->sct_own,
- "Sector %s lost to deity intervention\n",
- xyas(sect->sct_x, sect->sct_y, sect->sct_own));
+ wu(0, sect->sct_own,
+ "Sector %s taken from you by an act of %s!\n",
+ xyas(sect->sct_x, sect->sct_y, sect->sct_own),
+ cname(player->cnum));
}
- benefit(sect->sct_own, 0);
+ benefit(sect->sct_own, -1);
sect->sct_own = arg;
if (arg) {
- wu(player->cnum, arg,
- "Sector %s gained from deity intervention\n",
- xyas(sect->sct_x, sect->sct_y, arg));
+ wu(0, arg,
+ "Sector %s given to you by an act of %s!\n",
+ xyas(sect->sct_x, sect->sct_y, arg),
+ cname(player->cnum));
}
benefit(arg, 1);
break;
sect->sct_effic = new;
break;
case 'm':
- new = LIMIT_TO(arg, -127, 255);
+ new = LIMIT_TO(arg, -127, 127);
noise(sect, "Mobility", sect->sct_mobil, new);
sect->sct_mobil = new;
break;
sect->sct_loyal = (unsigned char)new;
break;
case 'x':
- old = sect->sct_che;
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);
+ xyas(sect->sct_x, sect->sct_y, player->cnum),
+ sect->sct_che, new);
sect->sct_che = new;
break;
case 'X':
sect->sct_che = 0;
break;
case 'p':
- old = sect->sct_pstage;
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);
+ xyas(sect->sct_x, sect->sct_y, player->cnum),
+ sect->sct_pstage, new);
sect->sct_pstage = new;
break;
case 't':
- old = sect->sct_ptime;
- new = LIMIT_TO(arg, 0, 255);
+ new = LIMIT_TO(arg, 0, 32767);
pr("Plague time of %s changed from %d to %d\n",
- xyas(sect->sct_x, sect->sct_y, player->cnum), old, new);
+ xyas(sect->sct_x, sect->sct_y, player->cnum),
+ sect->sct_ptime, new);
sect->sct_ptime = new;
break;
case 'F':
- old = sect->sct_fallout;
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);
+ xyas(sect->sct_x, sect->sct_y, player->cnum),
+ sect->sct_fallout, new);
sect->sct_fallout = new;
break;
case 'a':
sect->sct_dist_y = newy;
break;
case 's':
- des = sct_typematch(p);
- if (des < 0)
+ new = sct_typematch(p);
+ if (new < 0)
return RET_SYN;
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, sect->sct_type, des);
- sect->sct_type = des;
+ dchr[sect->sct_type].d_mnem, dchr[new].d_mnem);
+ set_coastal(sect, sect->sct_type, new);
+ sect->sct_type = new;
break;
case 'S':
- des = sct_typematch(p);
- if (des < 0)
+ new = sct_typematch(p);
+ if (new < 0)
return RET_SYN;
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;
+ dchr[sect->sct_newtype].d_mnem, dchr[new].d_mnem);
+ sect->sct_newtype = new;
break;
case 'R':
new = LIMIT_TO(arg, 0, 100);
sect->sct_defense = new;
break;
default:
- pr("huh? (%c)\n", op);
+ pr("huh? (%s)\n", key);
return RET_SYN;
}
return RET_OK;
}
static int
-edit_nat(struct natstr *np, char op, int arg, char *p)
+edit_nat(struct natstr *np, char *key, int arg, char *p)
{
coord newx, newy;
natid nat = np->nat_cnum;
float farg = (float)atof(p);
- switch (op) {
+ switch (*key) {
case 'n':
if (!check_nat_name(p, nat))
return RET_SYN;
strncpy(np->nat_pnam, p, sizeof(np->nat_pnam) - 1);
break;
case 't':
+ arg = LIMIT_TO(arg, 0, USHRT_MAX);
np->nat_tgms = arg;
break;
case 'b':
- arg = LIMIT_TO(arg, 0, 1024);
+ arg = LIMIT_TO(arg, 0, max_btus);
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);
+ arg = LIMIT_TO(arg, 0, INT_MAX);
+ benefit(nat, arg - np->nat_reserve);
pr("Military reserves changed from %d to %d\n",
np->nat_reserve, arg);
- wu(player->cnum, nat,
- "Military reserves changed from %d to %d by divine intervention.\n",
- np->nat_reserve, arg);
+ if (arg == np->nat_reserve)
+ break;
+ wu(0, nat,
+ "Military reserves changed from %d to %d by an act of %s\n",
+ np->nat_reserve, arg, cname(player->cnum));
np->nat_reserve = arg;
break;
case 'c':
break;
case 'M':
pr("Money changed from %d to %d\n", np->nat_money, arg);
- wu(player->cnum, nat,
- "Money changed from %d to %d by divine intervention.\n",
- np->nat_money, arg);
+ if (arg == np->nat_money)
+ break;
+ wu(0, nat, "Money changed from %d to %d by an act of %s\n",
+ np->nat_money, arg, cname(player->cnum));
np->nat_money = arg;
break;
case 'T':
+ farg = MAX(0.0, farg);
pr("Tech changed from %.2f to %.2f.\n",
np->nat_level[NAT_TLEV], farg);
np->nat_level[NAT_TLEV] = farg;
break;
case 'R':
+ farg = MAX(0.0, farg);
pr("Research changed from %.2f to %.2f.\n",
np->nat_level[NAT_RLEV], farg);
np->nat_level[NAT_RLEV] = farg;
break;
case 'E':
+ farg = MAX(0.0, farg);
pr("Education changed from %.2f to %.2f.\n",
np->nat_level[NAT_ELEV], farg);
np->nat_level[NAT_ELEV] = farg;
break;
case 'H':
+ farg = MAX(0.0, farg);
pr("Happiness changed from %.2f to %.2f.\n",
np->nat_level[NAT_HLEV], farg);
np->nat_level[NAT_HLEV] = farg;
break;
default:
- pr("huh? (%c)\n", op);
+ pr("huh? (%s)\n", key);
break;
}
putnat(np);
}
static int
-edit_ship(struct shpstr *ship, char op, int arg, char *p)
+edit_ship(struct shpstr *ship, char *key, int arg, char *p)
{
+ struct mchrstr *mcp = &mchr[ship->shp_type];
coord newx, newy;
+ struct ichrstr *ip;
newx = newy = 0;
- switch (op) {
+ switch (*key) {
case 'a':
+ arg = LIMIT_TO(arg, 0, PLG_EXPOSED);
ship->shp_pstage = arg;
break;
case 'b':
+ arg = LIMIT_TO(arg, 0, 32767);
ship->shp_ptime = arg;
break;
case 'R':
case 'O':
if (arg < 0 || arg >= MAXNOC)
return RET_SYN;
+ if (arg == ship->shp_own)
+ break;
if (ship->shp_own)
- wu(player->cnum, ship->shp_own,
- "%s taken from you by deity intervention!\n", prship(ship));
- if (arg) {
- wu(player->cnum, (natid)arg,
- "%s given to you by deity intervention!\n", prship(ship));
- ship->shp_own = (natid)arg;
- } else
- ship->shp_effic = 0;
+ wu(0, ship->shp_own, "%s taken from you by an act of %s!\n",
+ prship(ship), cname(player->cnum));
+ if (arg)
+ wu(0, arg, "%s given to you by an act of %s!\n",
+ prship(ship), cname(player->cnum));
+ ship->shp_own = arg;
break;
case 'L':
if (!sarg_xy(p, &newx, &newy))
ship->shp_y = newy;
break;
case 'T':
- arg = LIMIT_TO(arg, mchr[(int)ship->shp_type].m_tech, SHRT_MAX);
+ arg = LIMIT_TO(arg, mcp->m_tech, SHRT_MAX);
shp_set_tech(ship, arg);
break;
case 'E':
ship->shp_effic = LIMIT_TO(arg, SHIP_MINEFF, 100);
break;
case 'M':
+ arg = LIMIT_TO(arg, -127, 127);
ship->shp_mobil = arg;
break;
case 'F':
}
break;
case 'c':
- ship->shp_item[I_CIVIL] = arg;
- break;
case 'm':
- ship->shp_item[I_MILIT] = arg;
- break;
case 'u':
- ship->shp_item[I_UW] = arg;
- break;
case 'f':
- ship->shp_item[I_FOOD] = arg;
- break;
case 's':
- ship->shp_item[I_SHELL] = arg;
- break;
case 'g':
- ship->shp_item[I_GUN] = arg;
- break;
case 'p':
- ship->shp_item[I_PETROL] = arg;
- break;
case 'i':
- ship->shp_item[I_IRON] = arg;
- break;
case 'd':
- ship->shp_item[I_DUST] = arg;
- break;
case 'o':
- ship->shp_item[I_OIL] = arg;
- break;
case 'l':
- ship->shp_item[I_LCM] = arg;
- break;
case 'h':
- ship->shp_item[I_HCM] = arg;
- break;
case 'r':
- ship->shp_item[I_RAD] = arg;
+ ip = item_by_name(key);
+ arg = LIMIT_TO(arg, 0, mchr[ship->shp_type].m_item[ip->i_uid]);
+ ship->shp_item[ip->i_uid] = arg;
break;
default:
- pr("huh? (%c)\n", op);
+ pr("huh? (%s)\n", key);
return RET_FAIL;
}
return RET_OK;
}
static int
-edit_land(struct lndstr *land, char op, int arg, char *p)
+edit_land(struct lndstr *land, char *key, int arg, char *p)
{
+ struct lchrstr *lcp = &lchr[land->lnd_type];
coord newx, newy;
+ struct ichrstr *ip;
newx = newy = 0;
- switch (op) {
+ switch (*key) {
case 'Y':
+ if (arg < -1 || arg >= ef_nelem(EF_LAND))
+ return RET_SYN;
+ if (arg >= 0 && arg != land->lnd_land)
+ land->lnd_ship = -1;
land->lnd_land = arg;
break;
case 'U':
case 'O':
if (arg < 0 || arg >= MAXNOC)
return RET_SYN;
+ if (arg == land->lnd_own)
+ break;
if (land->lnd_own)
- wu(player->cnum, land->lnd_own,
- "%s taken from you by deity intervention!\n", prland(land));
- if (arg) {
- wu(player->cnum, (natid)arg,
- "%s given to you by deity intervention!\n", prland(land));
- land->lnd_own = (natid)arg;
- } else
- land->lnd_effic = 0;
+ wu(0, land->lnd_own, "%s taken from you by an act of %s!\n",
+ prland(land), cname(player->cnum));
+ if (arg)
+ wu(0, arg, "%s given to you by an act of %s!\n",
+ prland(land), cname(player->cnum));
+ land->lnd_own = arg;
break;
case 'L':
if (!sarg_xy(p, &newx, &newy))
land->lnd_effic = LIMIT_TO(arg, LAND_MINEFF, 100);
break;
case 'M':
+ arg = LIMIT_TO(arg, -127, 127);
land->lnd_mobil = arg;
break;
case 't':
- arg = LIMIT_TO(arg, lchr[(int)land->lnd_type].l_tech, SHRT_MAX);
+ arg = LIMIT_TO(arg, lcp->l_tech, SHRT_MAX);
lnd_set_tech(land, arg);
break;
case 'a':
}
break;
case 'F':
- land->lnd_harden = LIMIT_TO(arg, 0, 255);
+ land->lnd_harden = LIMIT_TO(arg, 0, 127);
break;
case 'S':
+ if (arg < -1 || arg >= ef_nelem(EF_SHIP))
+ return RET_SYN;
+ if (arg >= 0 && arg != land->lnd_ship)
+ land->lnd_land = -1;
land->lnd_ship = arg;
break;
case 'Z':
+ arg = LIMIT_TO(arg, 0, 100);
land->lnd_retreat = arg;
break;
case 'R':
land->lnd_rflags = arg;
break;
case 'c':
- land->lnd_item[I_CIVIL] = arg;
- break;
case 'm':
- land->lnd_item[I_MILIT] = arg;
- break;
case 'u':
- land->lnd_item[I_UW] = arg;
- break;
case 'f':
- land->lnd_item[I_FOOD] = arg;
- break;
case 's':
- land->lnd_item[I_SHELL] = arg;
- break;
case 'g':
- land->lnd_item[I_GUN] = arg;
- break;
case 'p':
- land->lnd_item[I_PETROL] = arg;
- break;
case 'i':
- land->lnd_item[I_IRON] = arg;
- break;
case 'd':
- land->lnd_item[I_DUST] = arg;
- break;
case 'o':
- land->lnd_item[I_OIL] = arg;
- break;
case 'l':
- land->lnd_item[I_LCM] = arg;
- break;
case 'h':
- land->lnd_item[I_HCM] = arg;
- break;
case 'r':
- land->lnd_item[I_RAD] = arg;
+ ip = item_by_name(key);
+ arg = LIMIT_TO(arg, 0, lchr[land->lnd_type].l_item[ip->i_uid]);
+ land->lnd_item[ip->i_uid] = arg;
break;
default:
- pr("huh? (%c)\n", op);
+ pr("huh? (%s)\n", key);
return RET_FAIL;
}
return RET_OK;
}
static int
-edit_plane(struct plnstr *plane, char op, int arg, char *p)
+edit_plane(struct plnstr *plane, char *key, int arg, char *p)
{
+ struct plchrstr *pcp = &plchr[plane->pln_type];
coord newx, newy;
- switch (op) {
+ switch (*key) {
case 'U':
ef_set_uid(EF_PLANE, plane, arg);
break;
case 'O':
if (arg < 0 || arg >= MAXNOC)
return RET_SYN;
+ if (arg == plane->pln_own)
+ break;
if (plane->pln_own)
- wu(player->cnum, plane->pln_own,
- "%s taken from you by deity intervention!\n",
- prplane(plane));
- if (arg) {
- plane->pln_own = (natid)arg;
- wu(player->cnum, plane->pln_own,
- "%s given to you by deity intervention!\n", prplane(plane));
- } else
- plane->pln_effic = 0;
+ wu(0, plane->pln_own, "%s taken from you by an act of %s!\n",
+ prplane(plane), cname(player->cnum));
+ if (arg)
+ wu(0, arg, "%s given to you by an act of %s!\n",
+ prplane(plane), cname(player->cnum));
+ plane->pln_own = arg;
break;
case 'e':
plane->pln_effic = LIMIT_TO(arg, PLANE_MINEFF, 100);
break;
case 'm':
- plane->pln_mobil = LIMIT_TO(arg, -127, 255);
+ plane->pln_mobil = LIMIT_TO(arg, -127, 127);
break;
case 't':
- arg = LIMIT_TO(arg, plchr[(int)plane->pln_type].pl_tech, SHRT_MAX);
+ arg = LIMIT_TO(arg, pcp->pl_tech, SHRT_MAX);
pln_set_tech(plane, arg);
break;
case 'w':
}
break;
case 'r':
+ arg = LIMIT_TO(arg, 0, pl_range(pcp, plane->pln_tech));
plane->pln_range = (unsigned char)arg;
break;
case 's':
+ if (arg < -1 || arg >= ef_nelem(EF_SHIP))
+ return RET_SYN;
+ if (arg >= 0 && arg != plane->pln_ship)
+ plane->pln_land = -1;
plane->pln_ship = arg;
break;
case 'y':
+ if (arg < -1 || arg >= ef_nelem(EF_LAND))
+ return RET_SYN;
+ if (arg >= 0 && arg != plane->pln_land)
+ plane->pln_ship = -1;
plane->pln_land = arg;
break;
case 'f':
plane->pln_flags = arg;
break;
default:
- pr("huh? (%c)\n", op);
+ pr("huh? (%s)\n", key);
return RET_FAIL;
}
return RET_OK;
projects / empserver / blobdiff