[netrek-cvs] client/netrekxp/src death.c, 1.16, 1.17 newwin.c, 1.54, 1.55

[Bill Balcerski]

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

Modified Files:
	death.c newwin.c 
Log Message:
Don't unmap planet window on death.
Safety check against missing high res ship bitmaps.

Index: death.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/death.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- death.c	13 Mar 2007 22:31:17 -0000	1.16
+++ death.c	17 Mar 2007 03:05:44 -0000	1.17
@@ -76,7 +76,7 @@
     }
     if (infomapped)
         destroyInfo ();
-    W_UnmapWindow (planetw);
+//    W_UnmapWindow (planetw);
     W_UnmapWindow (rankw);
     W_UnmapWindow (war);
     if (optionWin)

Index: newwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- newwin.c	15 Mar 2007 04:34:44 -0000	1.54
+++ newwin.c	17 Mar 2007 03:05:44 -0000	1.55
@@ -464,8 +464,13 @@
 	                        BMP_SHIP_HEIGHT_HR, BMP_ROM_SHIP, w,
 	                        LR_DEFAULTCOLOR);
     }
-    else  // No bitmaps, doh!
+    else  // No bitmaps, doh!  Force to mono and don't allow swapping
+    {
+        LineToConsole("Failed to load high res ship bitmaps, defaulting to mono.\n");
+        dynamicBitmaps = 0;
+        colorClient = 0;
         return;
+    }
     
     for (j = 0; j < NUM_TYPES; j++)
     {