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

edit: Suppress "sunk!" after "taken from you by deity"

Browse source 
The fact that the ship wasn't given to anyone is none of the
ex-owner's business.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2013-01-15 21:00:44 +01:00
parent 381c479ff8
commit 29c7ae3d80
2 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -741,12 +741,10 @@ edit_ship(struct shpstr *ship, char op, int arg, char *p)
if (ship->shp_own) if (ship->shp_own)
wu(player->cnum, ship->shp_own, wu(player->cnum, ship->shp_own,
"%s taken from you by deity intervention!\n", prship(ship)); "%s taken from you by deity intervention!\n", prship(ship));
if (arg) { if (arg)
wu(player->cnum, (natid)arg, wu(player->cnum, (natid)arg,
"%s given to you by deity intervention!\n", prship(ship)); "%s given to you by deity intervention!\n", prship(ship));
ship->shp_own = (natid)arg; ship->shp_own = arg;
} else
ship->shp_effic = 0;
break; break;
case 'L': case 'L':
if (!sarg_xy(p, &newx, &newy)) if (!sarg_xy(p, &newx, &newy))
@ -839,12 +837,10 @@ edit_land(struct lndstr *land, char op, int arg, char *p)
if (land->lnd_own) if (land->lnd_own)
wu(player->cnum, land->lnd_own, wu(player->cnum, land->lnd_own,
"%s taken from you by deity intervention!\n", prland(land)); "%s taken from you by deity intervention!\n", prland(land));
if (arg) { if (arg)
wu(player->cnum, (natid)arg, wu(player->cnum, (natid)arg,
"%s given to you by deity intervention!\n", prland(land)); "%s given to you by deity intervention!\n", prland(land));
land->lnd_own = (natid)arg; land->lnd_own = arg;
} else
land->lnd_effic = 0;
break; break;
case 'L': case 'L':
if (!sarg_xy(p, &newx, &newy)) if (!sarg_xy(p, &newx, &newy))
@ -955,12 +951,10 @@ edit_plane(struct plnstr *plane, char op, int arg, char *p)
wu(player->cnum, plane->pln_own, wu(player->cnum, plane->pln_own,
"%s taken from you by deity intervention!\n", "%s taken from you by deity intervention!\n",
prplane(plane)); prplane(plane));
if (arg) { if (arg)
plane->pln_own = (natid)arg; wu(player->cnum, arg,
wu(player->cnum, plane->pln_own,
"%s given to you by deity intervention!\n", prplane(plane)); "%s given to you by deity intervention!\n", prplane(plane));
} else plane->pln_own = arg;
plane->pln_effic = 0;
break; break;
case 'e': case 'e':
plane->pln_effic = LIMIT_TO(arg, PLANE_MINEFF, 100); plane->pln_effic = LIMIT_TO(arg, PLANE_MINEFF, 100);

1
tests/actofgod/journal.log
View file

@ -1558,7 +1558,6 @@
Play#0 output Play#0 1 Play#0 output Play#0 1
Play#0 output Play#0 1 > BULLETIN from POGO, (#0) dated Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 > BULLETIN from POGO, (#0) dated Thu Jan 1 00:00:00 1970
Play#0 output Play#0 1 cs cargo ship (#0) taken from you by deity intervention! Play#0 output Play#0 1 cs cargo ship (#0) taken from you by deity intervention!
Play#0 output Play#0 1 cs cargo ship (#0) sunk!
Play#0 output Play#0 1 cs cargo ship (#1) taken from you by deity intervention! Play#0 output Play#0 1 cs cargo ship (#1) taken from you by deity intervention!
Play#0 output Play#0 1 cs cargo ship (#2) taken from you by deity intervention! Play#0 output Play#0 1 cs cargo ship (#2) taken from you by deity intervention!
Play#0 output Play#0 1 f1 Sopwith Camel #0 taken from you by deity intervention! Play#0 output Play#0 1 f1 Sopwith Camel #0 taken from you by deity intervention!