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

fire: Always clear mission when firing

Browse source 
Mission is cleared only when firing at a target that is out of range.
Screwed up when missions were added in Chainsaw.  Always clear it when
firing.  Matches torpedo.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2015-02-07 17:57:54 +01:00
parent 6d3106a582
commit 7b700e82c6
3 changed files with 7 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -286,6 +286,7 @@ multifire(void)
}
dam = shp_fire(&fship);
}
fship.shp_mission = 0;
putship(fship.shp_uid, &fship);
if (CANT_HAPPEN(dam < 0)) {
pr("Klick! ...\n");
@ -315,6 +316,7 @@ multifire(void)
}
dam = lnd_fire(&fland);
fland.lnd_mission = 0;
putland(fland.lnd_uid, &fland);
if (CANT_HAPPEN(dam < 0)) {
pr("Klick! ...\n");
@ -350,20 +352,6 @@ multifire(void)
}
if (trange > range2) {
pr("Target out of range.\n");
switch (type) {
case EF_SECTOR:
break;
case EF_LAND:
fland.lnd_mission = 0;
putland(fland.lnd_uid, &fland);
break;
case EF_SHIP:
fship.shp_mission = 0;
putship(fship.shp_uid, &fship);
break;
default:
CANT_REACH();
}
continue;
}