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;
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;
- switch (op) {
+ switch (*key) {
case 'o':
if (arg < 0 || arg >= MAXNOC)
return RET_SYN;
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;
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 'c':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_CIVIL]);
- ship->shp_item[I_CIVIL] = arg;
- break;
case 'm':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_MILIT]);
- ship->shp_item[I_MILIT] = arg;
- break;
case 'u':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_UW]);
- ship->shp_item[I_UW] = arg;
- break;
case 'f':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_FOOD]);
- ship->shp_item[I_FOOD] = arg;
- break;
case 's':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_SHELL]);
- ship->shp_item[I_SHELL] = arg;
- break;
case 'g':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_GUN]);
- ship->shp_item[I_GUN] = arg;
- break;
case 'p':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_PETROL]);
- ship->shp_item[I_PETROL] = arg;
- break;
case 'i':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_IRON]);
- ship->shp_item[I_IRON] = arg;
- break;
case 'd':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_DUST]);
- ship->shp_item[I_DUST] = arg;
- break;
case 'o':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_OIL]);
- ship->shp_item[I_OIL] = arg;
- break;
case 'l':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_LCM]);
- ship->shp_item[I_LCM] = arg;
- break;
case 'h':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_HCM]);
- ship->shp_item[I_HCM] = arg;
- break;
case 'r':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_RAD]);
- 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;
land->lnd_rflags = arg;
break;
case 'c':
- arg = LIMIT_TO(arg, 0, lcp->l_item[I_CIVIL]);
- land->lnd_item[I_CIVIL] = arg;
- break;
case 'm':
- arg = LIMIT_TO(arg, 0, lcp->l_item[I_MILIT]);
- land->lnd_item[I_MILIT] = arg;
- break;
case 'u':
- arg = LIMIT_TO(arg, 0, lcp->l_item[I_UW]);
- land->lnd_item[I_UW] = arg;
- break;
case 'f':
- arg = LIMIT_TO(arg, 0, lcp->l_item[I_FOOD]);
- land->lnd_item[I_FOOD] = arg;
- break;
case 's':
- arg = LIMIT_TO(arg, 0, lcp->l_item[I_SHELL]);
- land->lnd_item[I_SHELL] = arg;
- break;
case 'g':
- arg = LIMIT_TO(arg, 0, lcp->l_item[I_GUN]);
- land->lnd_item[I_GUN] = arg;
- break;
case 'p':
- arg = LIMIT_TO(arg, 0, lcp->l_item[I_PETROL]);
- land->lnd_item[I_PETROL] = arg;
- break;
case 'i':
- arg = LIMIT_TO(arg, 0, lcp->l_item[I_IRON]);
- land->lnd_item[I_IRON] = arg;
- break;
case 'd':
- arg = LIMIT_TO(arg, 0, lcp->l_item[I_DUST]);
- land->lnd_item[I_DUST] = arg;
- break;
case 'o':
- arg = LIMIT_TO(arg, 0, lcp->l_item[I_OIL]);
- land->lnd_item[I_OIL] = arg;
- break;
case 'l':
- arg = LIMIT_TO(arg, 0, lcp->l_item[I_LCM]);
- land->lnd_item[I_LCM] = arg;
- break;
case 'h':
- arg = LIMIT_TO(arg, 0, lcp->l_item[I_HCM]);
- land->lnd_item[I_HCM] = arg;
- break;
case 'r':
- arg = LIMIT_TO(arg, 0, lcp->l_item[I_RAD]);
- 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;
plane->pln_flags = arg;
break;
default:
- pr("huh? (%c)\n", op);
+ pr("huh? (%s)\n", key);
return RET_FAIL;
}
return RET_OK;