From 8c502d40c6d855dba5214b821edb97e164f37602 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sun, 13 Jun 2010 17:54:27 +0200 Subject: [PATCH] Fix bogus message when deity attempts to navigate foreign ship Much of the code assumes that only the ship's owner can navigate it. The assumption is correct, because shp_nav() leaves foreign ships behind with a bogus "was sunk at" message (suppressed for country #0). It would be nice to let deities navigate foreign ships, but the assumption is not trivial to remove. For now, just avoid the bogus message. Historical note: it looks like deities used to be able to navigate foreign ships just fine until Empire 2 factored common code out of navigate, sail and autonav. --- src/lib/subs/shpsub.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/lib/subs/shpsub.c b/src/lib/subs/shpsub.c index 0eded2d6..8731a3a5 100644 --- a/src/lib/subs/shpsub.c +++ b/src/lib/subs/shpsub.c @@ -65,7 +65,12 @@ shp_sel(struct nstr_item *ni, struct emp_qelem *list) emp_initque(list); while (nxtitem(ni, &ship)) { - if (!player->owner) + /* + * It would be nice to let deities navigate foreign ships, but + * much of the code assumes that only the ship's owner can + * navigate it. + */ + if (ship.shp_own != player->cnum) continue; mcp = &mchr[(int)ship.shp_type]; if (opt_MARKET) {