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

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>

diff --git a/src/lib/commands/edit.c b/src/lib/commands/edit.c
index c3e04b68d730ccea8a3b3196000e4eb9654b4566..1c5886aca0e7350cdaf55980de11025e937101b8 100644 (file)
--- a/src/lib/commands/edit.c
+++ b/src/lib/commands/edit.c
@@ -741,12 +741,10 @@ edit_ship(struct shpstr *ship, char op, int arg, char *p)
        if (ship->shp_own)
            wu(player->cnum, ship->shp_own,
               "%s taken from you by deity intervention!\n", prship(ship));
-       if (arg) {
+       if (arg)
            wu(player->cnum, (natid)arg,
               "%s given to you by deity intervention!\n", prship(ship));
-           ship->shp_own = (natid)arg;
-       } else
-           ship->shp_effic = 0;
+       ship->shp_own = arg;
        break;
     case 'L':
        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)
            wu(player->cnum, land->lnd_own,
               "%s taken from you by deity intervention!\n", prland(land));
-       if (arg) {
+       if (arg)
            wu(player->cnum, (natid)arg,
               "%s given to you by deity intervention!\n", prland(land));
-           land->lnd_own = (natid)arg;
-       } else
-           land->lnd_effic = 0;
+       land->lnd_own = arg;
        break;
     case 'L':
        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,
               "%s taken from you by deity intervention!\n",
               prplane(plane));
-       if (arg) {
-           plane->pln_own = (natid)arg;
-           wu(player->cnum, plane->pln_own,
+       if (arg)
+           wu(player->cnum, arg,
               "%s given to you by deity intervention!\n", prplane(plane));
-       } else
-           plane->pln_effic = 0;
+       plane->pln_own = arg;
        break;
     case 'e':
        plane->pln_effic = LIMIT_TO(arg, PLANE_MINEFF, 100);

diff --git a/tests/actofgod/journal.log b/tests/actofgod/journal.log
index 29091e1abba695a7778d07d3a66dbf5cca94ed96..5ca2388a1a1328161d8808e79bbd1a67237de413 100644 (file)
--- a/tests/actofgod/journal.log
+++ b/tests/actofgod/journal.log
@@ -1558,7 +1558,6 @@
     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 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 (#2) taken from you by deity intervention!
     Play#0 output Play#0 1 f1   Sopwith Camel #0 taken from you by deity intervention!