/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
*
* ---
*
- * landgun.c: Return values for land and ship gun firing damages
- *
+ * landgun.c: Fire weapons
+ *
* Known contributors to this file:
* Markus Armbruster, 2006-2008
*/
int
shp_dchrg(struct shpstr *sp)
{
- int shells;
+ int shells, dchrgs;
if (sp->shp_effic < 60 || (mchr[sp->shp_type].m_flags & M_DCH) == 0)
return -1;
shells = sp->shp_item[I_SHELL];
shells += supply_commod(sp->shp_own, sp->shp_x, sp->shp_y,
I_SHELL, 2 - shells);
- if (shells < 2)
+ if (shells == 0)
return -1;
- sp->shp_item[I_SHELL] = shells - 2;
- return (int)seagun(sp->shp_effic, 3);
+ dchrgs = MIN(2, shells);
+ sp->shp_item[I_SHELL] = shells - dchrgs;
+ return (int)seagun(sp->shp_effic, 2 * dchrgs - 1);
}
/*
int
lnd_fire(struct lndstr *lp)
{
- int guns, shells;
+ int guns, ammo, shells;
double d;
- int ammo = lchr[lp->lnd_type].l_ammo;
-
- if (CANT_HAPPEN(ammo == 0))
- ammo = 1;
if (lp->lnd_effic < LAND_MINFIREEFF)
return -1;
guns = MIN(guns, lp->lnd_item[I_GUN]);
if (guns == 0)
return -1;
+ ammo = lchr[lp->lnd_type].l_ammo;
+ if (CANT_HAPPEN(ammo == 0))
+ ammo = 1;
shells = lp->lnd_item[I_SHELL];
shells += supply_commod(lp->lnd_own, lp->lnd_x, lp->lnd_y,
I_SHELL, ammo - shells);