From a207032625a54a9123c7f5e3ac248650b672d456 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sun, 20 Jun 2010 10:40:00 +0200 Subject: [PATCH] Clean up confusing use of def->own in move_in_land() It passed def->own to lnd_sweep(), which looks like a bug. But it's actually player->cnum there, because take_def() already set def->own to player->owner: take_def() first changes the owner of the attacked sector by calling takeover(), then updates def->own from that in att_get_combat(). --- src/lib/subs/attsub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/subs/attsub.c b/src/lib/subs/attsub.c index c0f22dee..0edf5d14 100644 --- a/src/lib/subs/attsub.c +++ b/src/lib/subs/attsub.c @@ -2379,7 +2379,7 @@ move_in_land(int combat_mode, struct combat *off, struct emp_qelem *olist, return; if (def->type == EF_SECTOR) { if (opt_INTERDICT_ATT) { - lnd_sweep(olist, 0, 0, def->own); + lnd_sweep(olist, 0, 0, player->cnum); lnd_check_mines(olist); } sprintf(buf, "now occupies %s", prcom(0, def));