[netrek-cvs] client/netrekxp/src map.c, 1.32, 1.33 mswindow.c, 1.48, 1.49

[Bill Balcerski]

Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv9565/src

Modified Files:
	map.c mswindow.c 
Log Message:
WriteCircle - set background to black in case of dashed pen.
Make drawRange turn red when cloaked.
Use entire circle for clearzone instead of only dashed region.

Index: mswindow.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- mswindow.c	19 Mar 2007 00:05:13 -0000	1.48
+++ mswindow.c	19 Mar 2007 02:20:26 -0000	1.49
@@ -3317,7 +3317,10 @@
     }
 
     if (dashed)
+    {
+        SetBkColor (hdc, colortable[BLACK].rgb);
         SelectObject (hdc, colortable[color].dashedpen);
+    }
     else
         SelectObject (hdc, colortable[color].pen);
     SelectObject (hdc, GetStockObject (NULL_BRUSH));

Index: map.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/map.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- map.c	19 Mar 2007 00:05:13 -0000	1.32
+++ map.c	19 Mar 2007 02:20:26 -0000	1.33
@@ -1042,14 +1042,24 @@
             int planx, plany;
             int distx, disty;
             int rad;
+            int color;
 
 #ifdef BEEPLITE
             pRadius = 3 * BMP_MPLANET_WIDTH / 5;
 #else
             pRadius = BMP_MPLANET_WIDTH / 2;
 #endif
-            rad = (j->p_flags & PFCLOAK) ? MAXDISTCLOAK : MAXDISTVIS;
-            W_WriteCircle(mapw, dx, dy, rad, 0, 1, W_White);
+            if (j->p_flags & PFCLOAK)
+            {
+                rad = MAXDISTCLOAK;
+                color = W_Red;
+            }
+            else
+            {
+                rad = MAXDISTVIS;
+                color = W_White;
+            }
+            W_WriteCircle(mapw, dx, dy, rad, 0, 1, color);
             mclearx = dx;
             mcleary = dy;
             mclearr = rad;
@@ -1305,7 +1315,7 @@
     
     if (mclearccount)
     {
-        W_WriteCircle(mapw, mclearx, mcleary, mclearr, 0, 1, backColor);
+        W_WriteCircle(mapw, mclearx, mcleary, mclearr, 0, 0, backColor);
         mclearccount--;
     }
 }