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

edit: Don't permit putting a land unit or plane on two carriers

Browse source 
Only one of struct lndstr members lnd_ship, lnd_land may be
non-negative.  When a deity screws that up, the server oopses.  Be
nice: when setting one, zap the other.

Same for struct plnstr members pln_ship, pln_land.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2013-01-16 21:07:21 +01:00
parent 2b80ce93da
commit 546e1220e0
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -852,6 +852,8 @@ edit_land(struct lndstr *land, char op, int arg, char *p)
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':
@ -901,6 +903,8 @@ edit_land(struct lndstr *land, char op, int arg, char *p)
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':
@ -1027,11 +1031,15 @@ edit_plane(struct plnstr *plane, char op, int arg, char *p)
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':