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

Modified Files:
	data.c death.c map.c mswindow.c newwin.c 
Log Message:
Added a 2nd geno pic, randomly chooses which one to show on a geno.  Also added the geno pics for the rarer true genocide case (most of the time game ends by conquer not genocide)
Attempt to fix problem with ships at warp 0 being overdrawn by planet redraws.

Index: mswindow.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- mswindow.c	6 Jun 2006 19:50:39 -0000	1.33
+++ mswindow.c	11 Jun 2006 20:53:52 -0000	1.34
@@ -608,6 +608,7 @@
     free (cloakicon);
     free (stipple);
     free (genopic);
+    free (genopic2);
 
     //Remove default objects
     while (defaults)

Index: newwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- newwin.c	6 Jun 2006 05:14:14 -0000	1.36
+++ newwin.c	11 Jun 2006 20:53:52 -0000	1.37
@@ -1327,7 +1327,10 @@
     genopic =
         W_StoreBitmap3 ("bitmaps/misclib/color/genocide.bmp", WINSIDE,
                         WINSIDE, BMP_GENO, w, LR_DEFAULTCOLOR);
-                        
+
+    genopic2 =
+        W_StoreBitmap3 ("bitmaps/misclib/color/genocide2.bmp", WINSIDE,
+                        WINSIDE, BMP_GENO2, w, LR_DEFAULTCOLOR);                      
 }
 
 

Index: death.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/death.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- death.c	2 Jun 2006 21:06:55 -0000	1.10
+++ death.c	11 Jun 2006 20:53:52 -0000	1.11
@@ -38,7 +38,7 @@
 death (void)
 {
     W_Event event;
-
+    int i;
     ingame = 0;
 #ifdef AUTOKEY
     if (autoKey)
@@ -140,7 +140,18 @@
                  shipnos[players[me->p_whodead].p_no],
                  teamstring[players[me->p_whodead].p_team]);
         deathFont = W_BoldFont;
-        W_TileWindow (mapw, genopic);
+        srand ((unsigned) time (NULL));
+        i = RANDOM() % 2;
+        switch (i)
+        {
+            case 0:
+                W_TileWindow (mapw, genopic);
+                break;
+            case 1:
+            default:
+                W_TileWindow (mapw, genopic2);
+                break;
+        }
         break;
     case KGHOST:
         strcpy (deathmessage, "You were killed by a confused daemon.");
@@ -153,6 +164,18 @@
                  shipnos[me->p_whodead],
                  teamstring[players[me->p_whodead].p_team]);
         deathFont = W_BoldFont;
+        srand ((unsigned) time (NULL));
+        i = RANDOM() % 2;
+        switch (i)
+        {
+            case 0:
+                W_TileWindow (mapw, genopic);
+                break;
+            case 1:
+            default:
+                W_TileWindow (mapw, genopic2);
+                break;
+        }
         break;
     case KPROVIDENCE:
         strcpy (deathmessage, "You were nuked by GOD.");

Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- data.c	6 Jun 2006 19:50:39 -0000	1.34
+++ data.c	11 Jun 2006 20:53:52 -0000	1.35
@@ -246,7 +246,7 @@
 
 extern double Sin[], Cos[];
 
-W_Icon stipple, clockpic, clockhandpic, clockhandmask, genopic, icon;
+W_Icon stipple, clockpic, clockhandpic, clockhandmask, genopic, genopic2, icon;
 
 W_Color borderColor, backColor, textColor, myColor, warningColor, shipCol[5],
     rColor, yColor, gColor, unColor, foreColor;

Index: map.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/map.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- map.c	6 Jun 2006 19:50:39 -0000	1.18
+++ map.c	11 Jun 2006 20:53:52 -0000	1.19
@@ -809,7 +809,7 @@
 
                 *update = 0;
             }
-            else if (*update == 10)
+            else if (*update == 1)
             {
                 /*
                  *  Redraw stationary ships every update so that these