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

edit: De-duplicate code for commodities on ships and land units

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2013-01-21 20:50:40 +01:00
parent cdfdbbe5ce
commit fb45b04420
1 changed files with 8 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -721,6 +721,7 @@ edit_ship(struct shpstr *ship, char *key, int arg, char *p)
{ {
struct mchrstr *mcp = &mchr[ship->shp_type]; struct mchrstr *mcp = &mchr[ship->shp_type];
coord newx, newy; coord newx, newy;
struct ichrstr *ip;
newx = newy = 0; newx = newy = 0;
switch (*key) { switch (*key) {
@ -780,56 +781,21 @@ edit_ship(struct shpstr *ship, char *key, int arg, char *p)
} }
break; break;
case 'c': case 'c':
arg = LIMIT_TO(arg, 0, mcp->m_item[I_CIVIL]);
ship->shp_item[I_CIVIL] = arg;
break;
case 'm': case 'm':
arg = LIMIT_TO(arg, 0, mcp->m_item[I_MILIT]);
ship->shp_item[I_MILIT] = arg;
break;
case 'u': case 'u':
arg = LIMIT_TO(arg, 0, mcp->m_item[I_UW]);
ship->shp_item[I_UW] = arg;
break;
case 'f': case 'f':
arg = LIMIT_TO(arg, 0, mcp->m_item[I_FOOD]);
ship->shp_item[I_FOOD] = arg;
break;
case 's': case 's':
arg = LIMIT_TO(arg, 0, mcp->m_item[I_SHELL]);
ship->shp_item[I_SHELL] = arg;
break;
case 'g': case 'g':
arg = LIMIT_TO(arg, 0, mcp->m_item[I_GUN]);
ship->shp_item[I_GUN] = arg;
break;
case 'p': case 'p':
arg = LIMIT_TO(arg, 0, mcp->m_item[I_PETROL]);
ship->shp_item[I_PETROL] = arg;
break;
case 'i': case 'i':
arg = LIMIT_TO(arg, 0, mcp->m_item[I_IRON]);
ship->shp_item[I_IRON] = arg;
break;
case 'd': case 'd':
arg = LIMIT_TO(arg, 0, mcp->m_item[I_DUST]);
ship->shp_item[I_DUST] = arg;
break;
case 'o': case 'o':
arg = LIMIT_TO(arg, 0, mcp->m_item[I_OIL]);
ship->shp_item[I_OIL] = arg;
break;
case 'l': case 'l':
arg = LIMIT_TO(arg, 0, mcp->m_item[I_LCM]);
ship->shp_item[I_LCM] = arg;
break;
case 'h': case 'h':
arg = LIMIT_TO(arg, 0, mcp->m_item[I_HCM]);
ship->shp_item[I_HCM] = arg;
break;
case 'r': case 'r':
arg = LIMIT_TO(arg, 0, mcp->m_item[I_RAD]); ip = item_by_name(key);
ship->shp_item[I_RAD] = arg; arg = LIMIT_TO(arg, 0, mchr[ship->shp_type].m_item[ip->i_uid]);
ship->shp_item[ip->i_uid] = arg;
break; break;
default: default:
pr("huh? (%s)\n", key); pr("huh? (%s)\n", key);
@ -843,6 +809,7 @@ edit_land(struct lndstr *land, char *key, int arg, char *p)
{ {
struct lchrstr *lcp = &lchr[land->lnd_type]; struct lchrstr *lcp = &lchr[land->lnd_type];
coord newx, newy; coord newx, newy;
struct ichrstr *ip;
newx = newy = 0; newx = newy = 0;
switch (*key) { switch (*key) {
@ -915,56 +882,21 @@ edit_land(struct lndstr *land, char *key, int arg, char *p)
land->lnd_rflags = arg; land->lnd_rflags = arg;
break; break;
case 'c': case 'c':
arg = LIMIT_TO(arg, 0, lcp->l_item[I_CIVIL]);
land->lnd_item[I_CIVIL] = arg;
break;
case 'm': case 'm':
arg = LIMIT_TO(arg, 0, lcp->l_item[I_MILIT]);
land->lnd_item[I_MILIT] = arg;
break;
case 'u': case 'u':
arg = LIMIT_TO(arg, 0, lcp->l_item[I_UW]);
land->lnd_item[I_UW] = arg;
break;
case 'f': case 'f':
arg = LIMIT_TO(arg, 0, lcp->l_item[I_FOOD]);
land->lnd_item[I_FOOD] = arg;
break;
case 's': case 's':
arg = LIMIT_TO(arg, 0, lcp->l_item[I_SHELL]);
land->lnd_item[I_SHELL] = arg;
break;
case 'g': case 'g':
arg = LIMIT_TO(arg, 0, lcp->l_item[I_GUN]);
land->lnd_item[I_GUN] = arg;
break;
case 'p': case 'p':
arg = LIMIT_TO(arg, 0, lcp->l_item[I_PETROL]);
land->lnd_item[I_PETROL] = arg;
break;
case 'i': case 'i':
arg = LIMIT_TO(arg, 0, lcp->l_item[I_IRON]);
land->lnd_item[I_IRON] = arg;
break;
case 'd': case 'd':
arg = LIMIT_TO(arg, 0, lcp->l_item[I_DUST]);
land->lnd_item[I_DUST] = arg;
break;
case 'o': case 'o':
arg = LIMIT_TO(arg, 0, lcp->l_item[I_OIL]);
land->lnd_item[I_OIL] = arg;
break;
case 'l': case 'l':
arg = LIMIT_TO(arg, 0, lcp->l_item[I_LCM]);
land->lnd_item[I_LCM] = arg;
break;
case 'h': case 'h':
arg = LIMIT_TO(arg, 0, lcp->l_item[I_HCM]);
land->lnd_item[I_HCM] = arg;
break;
case 'r': case 'r':
arg = LIMIT_TO(arg, 0, lcp->l_item[I_RAD]); ip = item_by_name(key);
land->lnd_item[I_RAD] = arg; arg = LIMIT_TO(arg, 0, lchr[land->lnd_type].l_item[ip->i_uid]);
land->lnd_item[ip->i_uid] = arg;
break; break;
default: default:
pr("huh? (%s)\n", key); pr("huh? (%s)\n", key);