[netrek-cvs] client/netrekxp/src local.c,1.114,1.115

[Bill Balcerski]

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

Modified Files:
	local.c 
Log Message:
Update changes.
Fix conquer/pause display.

Index: local.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- local.c	17 Jul 2008 02:55:23 -0000	1.114
+++ local.c	17 Jul 2008 22:59:48 -0000	1.115
@@ -1517,7 +1517,7 @@
             }
 #endif
 
-            if (context->gameup & GU_PAUSED)\
+            if ((context->gameup & GU_PAUSED) && !(context->gameup & GU_CONQUER))
             {
                 W_WriteTTSText(w, TWINSIDE, tts_ypos, "G A M E  P A U S E D", 20);
                 clearzone[0][clearcount] = last_tts_xpos;