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

Clean up confusing use of def->own in move_in_land()

Browse source 
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().
This commit is contained in:
Markus Armbruster 2010-06-20 10:40:00 +02:00
parent 2960ac40db
commit a207032625
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/lib/subs/attsub.c
View file

@ -2379,7 +2379,7 @@ move_in_land(int combat_mode, struct combat *off, struct emp_qelem *olist,
return; return;
if (def->type == EF_SECTOR) { if (def->type == EF_SECTOR) {
if (opt_INTERDICT_ATT) { if (opt_INTERDICT_ATT) {
lnd_sweep(olist, 0, 0, def->own); lnd_sweep(olist, 0, 0, player->cnum);
lnd_check_mines(olist); lnd_check_mines(olist);
} }
sprintf(buf, "now occupies %s", prcom(0, def)); sprintf(buf, "now occupies %s", prcom(0, def));