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

subs: Split lnd_mar_put() off lnd_put() and specialize

Browse source 
lnd_put() serves two masters: march, which wants it to report
"stopped" and write back struct ulist member mobility to
unit.land.lnd_mobil, and ground combat, which doesn't.

lnd_put() assumes march when actor is non-zero.  Correct (but see
commit 8c502d4).  Dates back to Empire 2.

Too ugly for my taste.  Specialize for each master instead:
lnd_mar_put() for march, and lnd_put() for ground combat.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2014-01-25 15:57:12 +01:00
parent b5ffc1ca49
commit 18bf9e0b34
3 changed files with 26 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1959,7 +1959,7 @@ att_fight(int combat_mode, struct combat *off, struct emp_qelem *olist,
send_reacting_units_home(dlist);
/* putland the defending land */
lnd_put(dlist, 0);
lnd_put(dlist);
/* putland the attacking land */
put_oland(olist);
@ -2340,7 +2340,7 @@ move_in_land(int combat_mode, struct combat *off, struct emp_qelem *olist,
}
if (QEMPTY(olist))
return;
lnd_put(olist, 0);
lnd_put(olist);
}
/*