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

update/revolt: Simplify take_casualties()

Browse source 
Since the previous commit fixed the update of mc, mc + taken remain
invariant.  Don't bother changing mc, use mc - taken instead.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-09-18 17:45:59 +02:00
parent 75c8d9c72f
commit c7195ed92e
1 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/lib/update/revolt.c
View file

@ -432,10 +432,6 @@ take_casualties(struct sctstr *sp, int mc)
} }
sp->sct_item[I_MILIT] = 0; sp->sct_item[I_MILIT] = 0;
/* remaining casualites */
mc -= orig_mil;
taken = orig_mil;
/* /*
* Need to take total_casualties and divide * Need to take total_casualties and divide
* them amongst the land units in the sector * them amongst the land units in the sector
@ -452,9 +448,10 @@ take_casualties(struct sctstr *sp, int mc)
} }
if (CANT_HAPPEN(!nunits)) if (CANT_HAPPEN(!nunits))
return taken; return orig_mil;
each = (mc / nunits) + 2; taken = orig_mil;
each = (mc - taken) / nunits + 2;
/* kill some security troops */ /* kill some security troops */
snxtitem_xy(&ni, EF_LAND, sp->sct_x, sp->sct_y); snxtitem_xy(&ni, EF_LAND, sp->sct_x, sp->sct_y);
@ -472,13 +469,12 @@ take_casualties(struct sctstr *sp, int mc)
if (deq <= 0) if (deq <= 0)
continue; continue;
mc -= deq;
taken += deq; taken += deq;
dam = ((double)deq / lp->lnd_item[I_MILIT]) * 100.0; dam = ((double)deq / lp->lnd_item[I_MILIT]) * 100.0;
lp->lnd_effic -= dam; lp->lnd_effic -= dam;
lp->lnd_mobil -= dam / 2; lp->lnd_mobil -= dam / 2;
lnd_submil(lp, deq); lnd_submil(lp, deq);
if (mc <= 0) if (taken >= mc)
return taken; return taken;
} }
@ -498,13 +494,12 @@ take_casualties(struct sctstr *sp, int mc)
if (deq <= 0) if (deq <= 0)
continue; continue;
mc -= deq;
taken += deq; taken += deq;
dam = ((double)deq / lp->lnd_item[I_MILIT]) * 100.0; dam = ((double)deq / lp->lnd_item[I_MILIT]) * 100.0;
lp->lnd_effic -= dam; lp->lnd_effic -= dam;
lp->lnd_mobil -= dam / 2; lp->lnd_mobil -= dam / 2;
lnd_submil(lp, deq); lnd_submil(lp, deq);
if (mc <= 0) if (taken >= mc)
return taken; return taken;
} }
@ -519,10 +514,9 @@ take_casualties(struct sctstr *sp, int mc)
if (lchr[(int)lp->lnd_type].l_flags & L_SECURITY) if (lchr[(int)lp->lnd_type].l_flags & L_SECURITY)
continue; continue;
mc -= lp->lnd_item[I_MILIT];
taken += lp->lnd_item[I_MILIT]; taken += lp->lnd_item[I_MILIT];
lnd_dies_fighting_che(lp); lnd_dies_fighting_che(lp);
if (mc <= 0) if (taken >= mc)
return taken; return taken;
} }
@ -537,10 +531,9 @@ take_casualties(struct sctstr *sp, int mc)
if (!(lchr[(int)lp->lnd_type].l_flags & L_SECURITY)) if (!(lchr[(int)lp->lnd_type].l_flags & L_SECURITY))
continue; continue;
mc -= lp->lnd_item[I_MILIT];
taken += lp->lnd_item[I_MILIT]; taken += lp->lnd_item[I_MILIT];
lnd_dies_fighting_che(lp); lnd_dies_fighting_che(lp);
if (mc <= 0) if (taken >= mc)
return taken; return taken;
} }