empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

edit: Factor edit_item() out of edit_ship(), edit_land()

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2013-12-29 11:51:57 +01:00
parent 2936e07f41
commit 3be53fddb3
1 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/lib/commands/edit.c
View file

@ -824,12 +824,23 @@ edit_unit(struct empobj *unit, char *key, char *p,
return RET_OK; return RET_OK;
} }
static void
edit_item(struct empobj *unit, short item[], struct ichrstr *ip, int arg,
short lim[])
{
arg = LIMIT_TO(arg, 0, lim[ip->i_uid]);
divine_unit_change_quiet(unit, ip->i_name, arg != item[ip->i_uid],
"from %d to %d", item[ip->i_uid], arg);
report_divine_gift(unit->own, ip, arg - item[ip->i_uid],
unit_nameof(unit));
item[ip->i_uid] = arg;
}
static int static int
edit_ship(struct shpstr *ship, char *key, char *p) edit_ship(struct shpstr *ship, char *key, char *p)
{ {
struct mchrstr *mcp = &mchr[ship->shp_type]; struct mchrstr *mcp = &mchr[ship->shp_type];
int arg = atoi(p); int arg = atoi(p);
struct ichrstr *ip;
switch (*key) { switch (*key) {
case 'U': case 'U':
@ -886,15 +897,8 @@ edit_ship(struct shpstr *ship, char *key, char *p)
case 'l': case 'l':
case 'h': case 'h':
case 'r': case 'r':
ip = item_by_name(key); edit_item((struct empobj *)ship, ship->shp_item, item_by_name(key),
arg = LIMIT_TO(arg, 0, mchr[ship->shp_type].m_item[ip->i_uid]); arg, mcp->m_item);
divine_unit_change_quiet((struct empobj *)ship, ip->i_name,
arg != ship->shp_item[ip->i_uid],
"from %d to %d",
ship->shp_item[ip->i_uid], arg);
report_divine_gift(ship->shp_own, ip,
arg - ship->shp_item[ip->i_uid], prship(ship));
ship->shp_item[ip->i_uid] = arg;
break; break;
default: default:
pr("huh? (%s)\n", key); pr("huh? (%s)\n", key);
@ -908,7 +912,6 @@ edit_land(struct lndstr *land, char *key, char *p)
{ {
struct lchrstr *lcp = &lchr[land->lnd_type]; struct lchrstr *lcp = &lchr[land->lnd_type];
int arg = atoi(p); int arg = atoi(p);
struct ichrstr *ip;
switch (*key) { switch (*key) {
case 'U': case 'U':
@ -996,15 +999,8 @@ edit_land(struct lndstr *land, char *key, char *p)
case 'l': case 'l':
case 'h': case 'h':
case 'r': case 'r':
ip = item_by_name(key); edit_item((struct empobj *)land, land->lnd_item, item_by_name(key),
arg = LIMIT_TO(arg, 0, lchr[land->lnd_type].l_item[ip->i_uid]); arg, lcp->l_item);
divine_unit_change_quiet((struct empobj *)land, ip->i_name,
arg != land->lnd_item[ip->i_uid],
"from %d to %d",
land->lnd_item[ip->i_uid], arg);
report_divine_gift(land->lnd_own, ip,
arg - land->lnd_item[ip->i_uid], prland(land));
land->lnd_item[ip->i_uid] = arg;
break; break;
default: default:
pr("huh? (%s)\n", key); pr("huh? (%s)\n", key);