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

Simplify automatic bmap update from ship radar

Browse source 
Inline radmap2() into radmapupd() and simplify.  Drop unused parameter
seesub.  Rename to rad_map_set().
This commit is contained in:
Markus Armbruster 2010-06-20 13:43:16 +02:00
parent 27f22f36bb
commit 0d477e5df1
4 changed files with 39 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/lib/subs/shpsub.c
View file

@ -733,7 +733,6 @@ shp_nav_one_sector(struct emp_qelem *list, int dir, natid actor,
int stopping = 0;
double mobcost;
double tech; /* for mapping */
double tf; /* for mapping */
char dp[80];
int navigate;
@ -788,13 +787,9 @@ shp_nav_one_sector(struct emp_qelem *list, int dir, natid actor,
/* Now update the map for this ship */
tech = techfact(mlp->unit.ship.shp_tech,
((struct mchrstr *)mlp->chrp)->m_vrnge);
if (((struct mchrstr *)mlp->chrp)->m_flags & M_SONAR)
tf = techfact(mlp->unit.ship.shp_tech, 1.0);
else
tf = 0.0;
radmapupd(mlp->unit.ship.shp_own,
mlp->unit.ship.shp_x, mlp->unit.ship.shp_y,
(int)mlp->unit.ship.shp_effic, (int)tech, tf);
rad_map_set(mlp->unit.ship.shp_own,
mlp->unit.ship.shp_x, mlp->unit.ship.shp_y,
mlp->unit.ship.shp_effic, (int)tech);
}
if (QEMPTY(list))
return stopping;