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

Fix use of uninitialized variable in multifire()

Browse source 
multifire() used shots to print either shell or shells.  4.2.3 removed
its initialization for land unit fire, and commit 22c6fd8b removed it
for ship fire.  Fix by just printing shells always.
This commit is contained in:
Markus Armbruster 2008-03-15 07:51:25 +01:00
parent 975419e7d3
commit 7d14fb4495
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -73,7 +73,6 @@ multifire(void)
coord x; coord x;
coord y; coord y;
int mil; int mil;
int shots;
int dam; int dam;
int totaldefdam = 0; int totaldefdam = 0;
int vshipno; int vshipno;
@ -111,7 +110,6 @@ multifire(void)
return RET_FAIL; return RET_FAIL;
} }
orig_attacker = attacker = targ_land; orig_attacker = attacker = targ_land;
shots = 1;
} else if (type == EF_SHIP) { } else if (type == EF_SHIP) {
orig_attacker = attacker = targ_ship; orig_attacker = attacker = targ_ship;
} else if (type == EF_LAND) { } else if (type == EF_LAND) {
@ -496,7 +494,7 @@ multifire(void)
prb = range2 ? (double)trange / range2 : 1.0; prb = range2 ? (double)trange / range2 : 1.0;
prb *= prb; prb *= prb;
if (chance(prb)) { if (chance(prb)) {
pr("Wind deflects shell%s.\n", splur(shots)); pr("Wind deflects shells.\n");
/* dam = (int)(dam / 2.0);*/ /* dam = (int)(dam / 2.0);*/
dam *= (90 - (random() % 11)) / 100.0; dam *= (90 - (random() % 11)) / 100.0;
if (dam < 0) if (dam < 0)
@ -512,8 +510,8 @@ multifire(void)
wu(0, vict, wu(0, vict,
"Country #%d shelled sector %s for %d damage.\n", "Country #%d shelled sector %s for %d damage.\n",
player->cnum, xyas(x, y, vict), dam); player->cnum, xyas(x, y, vict), dam);
pr("Shell%s hit sector %s for %d damage.\n", pr("Shells hit sector %s for %d damage.\n",
splur(shots), xyas(x, y, player->cnum), dam); xyas(x, y, player->cnum), dam);
/* Ok, it wasn't a bogus target, so do damage. */ /* Ok, it wasn't a bogus target, so do damage. */
if (target != targ_bogus) if (target != targ_bogus)
sectdamage(&vsect, dam, 0); sectdamage(&vsect, dam, 0);
@ -533,8 +531,8 @@ multifire(void)
player->cnum, prship(&vship), player->cnum, prship(&vship),
xyas(vship.shp_x, vship.shp_y, vict), dam); xyas(vship.shp_x, vship.shp_y, vict), dam);
} }
pr("Shell%s hit %s in %s for %d damage.\n", pr("Shells hit %s in %s for %d damage.\n",
splur(shots), prsub(&vship), prsub(&vship),
xyas(vship.shp_x, vship.shp_y, player->cnum), dam); xyas(vship.shp_x, vship.shp_y, player->cnum), dam);
if (vship.shp_effic < SHIP_MINEFF) if (vship.shp_effic < SHIP_MINEFF)