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

Fix unlimbering, it had no effect

Browse source 
Broken by mismerging the rebase of Hvy Metal I in commit 5d0f5e69,
except for fire command when the target was out of range.
This commit is contained in:
Markus Armbruster 2008-06-10 07:29:04 +02:00 • committed by Markus Armbruster
parent dfcc13abdd
commit b8bdc32b3c
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/lib/commands/mfir.c
View file

@ -349,6 +349,7 @@ multifire(void)
range2 = -1; range2 = -1;
} }
lnd_unlimber(&fland);
dam = lnd_fire(&fland); dam = lnd_fire(&fland);
putland(fland.lnd_uid, &fland); putland(fland.lnd_uid, &fland);
if (dam < 0) { if (dam < 0) {
@ -356,7 +357,6 @@ multifire(void)
continue; continue;
} }
lnd_unlimber(&fland);
if (target == targ_ship) { if (target == targ_ship) {
if (chance(lnd_acc(&fland) / 100.0)) if (chance(lnd_acc(&fland) / 100.0))
dam = ldround(dam / 2.0, 1); dam = ldround(dam / 2.0, 1);
@ -713,13 +713,13 @@ quiet_bigdef(int type, struct emp_qelem *list, natid own, natid aown,
if (fp) if (fp)
dam2 = fp->defdam; dam2 = fp->defdam;
else { else {
lnd_unlimber(&land);
dam2 = lnd_fire(&land); dam2 = lnd_fire(&land);
putland(land.lnd_uid, &land); putland(land.lnd_uid, &land);
} }
if (dam2 < 0) if (dam2 < 0)
continue; continue;
lnd_unlimber(&land);
(*nfiring)++; (*nfiring)++;
if (!fp) if (!fp)
add_to_flist(list, (struct empobj *)&land, dam2, 0); add_to_flist(list, (struct empobj *)&land, dam2, 0);

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

@ -1142,12 +1142,12 @@ lnd_support(natid victim, natid attacker, coord x, coord y, int defending)
if (dist > range) if (dist > range)
continue; continue;
lnd_unlimber(&land);
dam2 = lnd_fire(&land); dam2 = lnd_fire(&land);
putland(land.lnd_uid, &land); putland(land.lnd_uid, &land);
if (dam2 < 0) if (dam2 < 0)
continue; continue;
lnd_unlimber(&land);
if (defending) if (defending)
nreport(land.lnd_own, N_FIRE_BACK, victim, 1); nreport(land.lnd_own, N_FIRE_BACK, victim, 1);
else else

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

@ -444,12 +444,12 @@ perform_mission(coord x, coord y, natid victim, struct emp_qelem *list,
if (md > range) if (md > range)
continue; continue;
lnd_unlimber(lp);
dam2 = lnd_fire(lp); dam2 = lnd_fire(lp);
putland(lp->lnd_uid, lp); putland(lp->lnd_uid, lp);
if (dam2 < 0) if (dam2 < 0)
continue; continue;
lnd_unlimber(lp);
if (sect.sct_type == SCT_WATER) { if (sect.sct_type == SCT_WATER) {
if (chance(lnd_acc(lp) / 100.0)) if (chance(lnd_acc(lp) / 100.0))
dam2 = ldround(dam2 / 2.0, 1); dam2 = ldround(dam2 / 2.0, 1);