Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv24810/src
Modified Files:
map.c
Log Message:
Bug fix for planet highlighting and unknown planets.
Cleaned up comments in map() redraw planet routine, and reverted the draw stationary ship counter back to 10 - blinking ships is a feature not a bug.
Index: map.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/map.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- map.c 12 Jun 2006 14:10:31 -0000 1.20
+++ map.c 4 Jul 2006 18:03:29 -0000 1.21
@@ -550,7 +550,7 @@
#ifdef BEEPLITE
}
#endif
- if (planetHighlighting) /* Draw halo */
+ if (planetHighlighting && (l->pl_info & me->p_team)) /* Draw halo */
W_WriteCircle(mapw, dx, dy, BMP_MPLANET_WIDTH / 2,
l->pl_armies > 4 ? 1 : 0, planetColor(l));
@@ -786,14 +786,12 @@
}
/* Erase the ships */
-
for (i = 0, update = lastUpdate; i < MAXPLAYER; i++, update++)
{
if (redrawPlayer[i])
{
/* Erase the player if redrawPlayer[i] is set
- * or lastUpdate allows it. */
-
+ or lastUpdate allows it. */
if (mclearzone[2][i])
{
/* XFIX */
@@ -803,25 +801,17 @@
checkRedraw (mclearzone[4][i], mclearzone[5][i]);
mclearzone[2][i] = 0;
}
-
-
/* Reset the last redrawn counter */
-
*update = 0;
}
- else if (*update == 1)
+ else if (*update == 10)
{
- /*
- * Redraw stationary ships every update so that these
- * ships are not hidden by planet updates.
- */
-
+ /* Redraw stationary ships every update so that these
+ ships are not hidden by planet updates. */
redrawPlayer[i] = 1;
}
else
- {
++(*update);
- }
}
}