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

(M_TORP_SHELLS): New.

Browse source 
(perform_mission, torp, fire_torp, quiet_bigdef, use_ammo): Use it.
Closes #917459.
This commit is contained in:
Markus Armbruster 2004-05-09 20:55:30 +00:00
parent a6bd408323
commit d7e697b1f9
4 changed files with 26 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/lib/commands/torp.c
View file

@ -88,11 +88,10 @@ torp(void)
if ((mchr[(int)sub.shp_type].m_flags & M_TORP) == 0)
continue;
shells = sub.shp_item[I_SHELL];
if (shells < 3)
shells +=
supply_commod(sub.shp_own, sub.shp_x, sub.shp_y, I_SHELL,
3 - shells);
if (sub.shp_item[I_GUN] == 0 || shells < 3)
if (shells < M_TORP_SHELLS)
shells += supply_commod(sub.shp_own, sub.shp_x, sub.shp_y,
I_SHELL, M_TORP_SHELLS - shells);
if (sub.shp_item[I_GUN] == 0 || shells < M_TORP_SHELLS)
continue;
if (sub.shp_item[I_MILIT] < 1)
continue;
@ -116,11 +115,10 @@ torp(void)
continue;
}
shells = sub.shp_item[I_SHELL];
if (shells < 3)
shells +=
supply_commod(sub.shp_own, sub.shp_x, sub.shp_y, I_SHELL,
3 - shells);
if (sub.shp_item[I_GUN] == 0 || shells < 3) {
if (shells < M_TORP_SHELLS)
shells += supply_commod(sub.shp_own, sub.shp_x, sub.shp_y,
I_SHELL, M_TORP_SHELLS - shells);
if (sub.shp_item[I_GUN] == 0 || shells < M_TORP_SHELLS) {
pr("Ship #%d has insufficient armament\n", sub.shp_uid);
continue;
}
@ -169,7 +167,7 @@ torp(void)
techfact(sub.shp_tech, ((double)sub.shp_frnge));
erange = (double)roundrange(erange);
pr("Effective torpedo range is %.1f\n", erange);
shells -= 3;
shells -= M_TORP_SHELLS;
sub.shp_item[I_SHELL] = shells;
putship(sub.shp_uid, &sub);
mcp = &mchr[(int)sub.shp_type];
@ -409,11 +407,11 @@ fire_torp(struct shpstr *sp, struct shpstr *targ, int range, int ntargets)
shells = sp->shp_item[I_SHELL];
if (shells < 3)
if (shells < M_TORP_SHELLS)
shells += supply_commod(sp->shp_own, sp->shp_x, sp->shp_y, I_SHELL,
3 - shells);
M_TORP_SHELLS - shells);
if (sp->shp_item[I_GUN] == 0 || shells < 3)
if (sp->shp_item[I_GUN] == 0 || shells < M_TORP_SHELLS)
return 0;
if (sp->shp_item[I_MILIT] < 1)
@ -426,7 +424,7 @@ fire_torp(struct shpstr *sp, struct shpstr *targ, int range, int ntargets)
return 0;
/* All set.. fire! */
shells -= 3;
shells -= M_TORP_SHELLS;
sp->shp_item[I_SHELL] = shells;
putship(sp->shp_uid, sp);