Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv32227/src
Modified Files:
data.c death.c local.c
Log Message:
Yet another attempt at fixing border issues. Deals with problem of double
buffering and how it changes border on death, but not to the same "window"
that is used for the local/map windows. Forces a border redraw upon
reentry into game for all cases, to be safe.
Index: death.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/death.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- death.c 13 Mar 2007 18:35:00 -0000 1.15
+++ death.c 13 Mar 2007 22:31:17 -0000 1.16
@@ -59,6 +59,11 @@
else
alertBorderColor = W_White;
W_ChangeBorder (baseWin, gColor);
+ oldalert = PFGREEN;
+ /* Need a border refresh on death with double buffering, as the
+ W_ChangeBorder above does not change the double buffered local
+ or map windows, but rather than non-double buffered "entry" window*/
+ forceBorder = 1;
}
if (W_IsMapped (statwin))
{
Index: local.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- local.c 13 Mar 2007 19:24:18 -0000 1.68
+++ local.c 13 Mar 2007 22:31:17 -0000 1.69
@@ -2323,8 +2323,9 @@
}
/* Change border color to signify alert status */
- if (oldalert != (me->p_flags & (PFGREEN | PFYELLOW | PFRED)))
+ if (oldalert != (me->p_flags & (PFGREEN | PFYELLOW | PFRED)) || forceBorder)
{
+ forceBorder = 0;
oldalert = (me->p_flags & (PFGREEN | PFYELLOW | PFRED));
switch (oldalert)
{
Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- data.c 13 Mar 2007 18:35:00 -0000 1.60
+++ data.c 13 Mar 2007 22:31:17 -0000 1.61
@@ -64,6 +64,7 @@
unsigned int oldalert = 0;
unsigned char oldtourn = (unsigned char) 2; /* placeholder starting status */
int alertBorderColor = 0;
+int forceBorder = 0;
int remap[16] = { 0, 1, 2, 0, 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0 };
int messpend = 0;
#ifdef XTRA_MESSAGE_UI