diff --git a/src/lib/commands/edit.c b/src/lib/commands/edit.c index c3e04b68..1c5886ac 100644 --- 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 29091e1a..5ca2388a 100644 --- 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!