[netrek-cvs] client/netrekxp/src local.c, 1.123, 1.124 newwin.c, 1.86, 1.87

[Bill Balcerski]

Update of /cvsroot/netrek/client/netrekxp/src
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8922/src

Modified Files:
	local.c newwin.c 
Log Message:
Add bug.
Fix bug with tips text displaying on tactical window.
Fix bug with beeplite circle not disappearing around ships that cloak.

Index: newwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- newwin.c	10 Jun 2009 23:25:44 -0000	1.86
+++ newwin.c	16 Mar 2010 04:35:17 -0000	1.87
@@ -2357,6 +2357,7 @@
         W_ClearWindow (w);
         ClearMotd ();
         statmode = 0;
+        W_FastClear = 1;
         return;
     }
     

Index: local.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- local.c	24 Jun 2009 00:52:22 -0000	1.123
+++ local.c	16 Mar 2010 04:35:17 -0000	1.124
@@ -988,11 +988,27 @@
                                     BMP_CLOAK_WIDTH,
                                     BMP_CLOAK_HEIGHT,
                                     0, cloakicon, myColor, w);
+#if defined (BEEPLITE)
+                clearzone[0][clearcount] = dx - (shield_width / 2 + 6) * SCALE / scaleFactor;
+                clearzone[1][clearcount] = dy - (shield_height / 2 + 6) * SCALE / scaleFactor;
+                clearzone[2][clearcount] = (shield_width + 12) * SCALE / scaleFactor;
+                clearzone[3][clearcount] = (shield_height + 12) * SCALE / scaleFactor;
+                clearcount++;
+#else
+                clearzone[0][clearcount] = dx - (shield_width / 2) * SCALE / scaleFactor;
+                clearzone[1][clearcount] = dy - (shield_height / 2) * SCALE / scaleFactor);
+                clearzone[2][clearcount] = shield_width * SCALE / scaleFactor;
+                clearzone[3][clearcount] = shield_height * SCALE / scaleFactor;
+                clearcount++;
+#endif
+                /* Old clear code, before had to worry about seeing shields and beeplite for cloaked ships */
+                /*
                 clearzone[0][clearcount] = dx - (BMP_CLOAK_WIDTH / 2) * SCALE / scaleFactor;
                 clearzone[1][clearcount] = dy - (BMP_CLOAK_HEIGHT / 2) * SCALE / scaleFactor;
                 clearzone[2][clearcount] = BMP_CLOAK_WIDTH * SCALE / scaleFactor;
                 clearzone[3][clearcount] = BMP_CLOAK_HEIGHT * SCALE / scaleFactor;
                 clearcount++;
+                */
 
                 goto shieldlabel;       /* draw the shield even when
                                          * cloaked */