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

Don't store ship stats in struct shpstr

Browse source 
New shp_armor(), shp_speed(), shp_visib(), shp_frnge(), shp_glim()
replace the struct shpstr members with the same names.
This commit is contained in:
Markus Armbruster 2008-03-04 21:15:59 +01:00
parent ffc5d0cfd7
commit f86d726406
13 changed files with 73 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/lib/subs/landgun.c
View file

@ -222,7 +222,7 @@ lnd_fire(struct lndstr *lp)
int
shp_usable_guns(struct shpstr *sp)
{
return MIN(sp->shp_glim, sp->shp_item[I_GUN]);
return MIN(shp_glim(sp), sp->shp_item[I_GUN]);
}
/*
@ -259,7 +259,7 @@ fortrange(struct sctstr *sp)
double
shp_fire_range(struct shpstr *sp)
{
return effrange(sp->shp_frnge, sp->shp_tech);
return effrange(shp_frnge(sp), sp->shp_tech);
}
/*
@ -268,7 +268,7 @@ shp_fire_range(struct shpstr *sp)
double
torprange(struct shpstr *sp)
{
return effrange(sp->shp_frnge * 2, sp->shp_tech)
return effrange(shp_frnge(sp) * 2, sp->shp_tech)
* sp->shp_effic / 100.0;
}
@ -278,7 +278,7 @@ torprange(struct shpstr *sp)
double
shp_torp_hitchance(struct shpstr *sp, int range)
{
return DTORP_HITCHANCE(range, sp->shp_visib);
return DTORP_HITCHANCE(range, shp_visib(sp));
}
/*