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

Fix bogus message when deity attempts to navigate foreign ship

Browse source 
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.
This commit is contained in:
Markus Armbruster 2010-06-13 17:54:27 +02:00
parent 9e6b5a9133
commit 8c502d40c6
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/lib/subs/shpsub.c
View file

@ -65,7 +65,12 @@ shp_sel(struct nstr_item *ni, struct emp_qelem *list)
emp_initque(list); emp_initque(list);
while (nxtitem(ni, &ship)) { 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; continue;
mcp = &mchr[(int)ship.shp_type]; mcp = &mchr[(int)ship.shp_type];
if (opt_MARKET) { if (opt_MARKET) {