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

Modified Files:
	data.c defaults.c option.c ping.c playerlist.c 
Log Message:
Added torp to middle mouse button on keymap.
Fixed cloak phases to match 10 updates/second that is now the standard for servers.
Fixed planet rotate option menu line that was too long.
Netrekrc option playerListBlankZeroKills to not display kills for ships with 0.00 kills.
Removal of some fixed server issues from todo list.
Ping fix (following Quozl).

Index: ping.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/ping.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ping.c	7 May 2006 16:59:27 -0000	1.3
+++ ping.c	21 Feb 2007 11:43:38 -0000	1.4
@@ -120,8 +120,15 @@
     if (gwrite (s, (char *) &packet, sizeof (struct ping_cpacket)) !=
         sizeof (struct ping_cpacket))
     {
-        LineToConsole ("gwrite failed.\n");
-        serverDead = 1;
+        if (s == udpSock) {
+            s = sock;
+            if (gwrite(s, (char *) &packet, sizeof(struct ping_cpacket)) !=
+                sizeof  (struct ping_cpacket))
+            {
+                serverDead = 1;
+                LineToConsole("gwrite failed again.\n");
+            }
+        }
     }
 }
 

Index: playerlist.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/playerlist.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- playerlist.c	7 May 2006 21:10:52 -0000	1.8
+++ playerlist.c	21 Feb 2007 11:43:38 -0000	1.9
@@ -1141,7 +1141,16 @@
         case 'K':              /* Kills */
             if (*(ptr + 1) >= '0' && *(ptr + 1) <= '2')
             {
-                if (j->p_kills > 100.0)
+            	if (j->p_kills == 0.00 && playerListBlankZeroKills)
+                {
+                    if (*(ptr + 1) == '0')
+                        format (buffPoint, "   ", 3, 0);
+                    else if (*(ptr + 1) == '1')
+                        format (buffPoint, "    ", 4, 0);
+                    else
+                        format (buffPoint, "     ", 5, 0);
+                }
+                else if (j->p_kills >= 100.0)
                     /* Cheat a bit */
                     ftoa (j->p_kills, buffPoint - 1, 0, 3, (*(ptr + 1) - '0'));
                 else
@@ -1151,7 +1160,9 @@
             }
             else
             {
-                if (j->p_kills > 100.0)
+                if (j->p_kills == 0.00 && playerListBlankZeroKills)
+                    format (buffPoint, "     ", 5, 0);
+                else if (j->p_kills >= 100.0)
                     /* Cheat a bit */
                     ftoa (j->p_kills, buffPoint - 1, 0, 3, 2);
                 else

Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- defaults.c	7 Feb 2007 23:04:57 -0000	1.40
+++ defaults.c	21 Feb 2007 11:43:38 -0000	1.41
@@ -431,6 +431,12 @@
             NULL
         }
     },
+    {"playerListBlankZeroKills", &playerListBlankZeroKills, RC_BOOL,
+        {
+            "Don't display player's kills if they have zero kills",
+            NULL
+        }
+    },
     {"playerListHack", &playerListHack, RC_BOOL,
         {
             "Suppose that players with letter greater than \'f\' are observers",
@@ -1545,6 +1551,8 @@
     saveRCM = booleanDefault ("saveRCM", saveRCM);
 #endif
 
+    playerListBlankZeroKills =
+        booleanDefault ("playerListBlankZeroKills", playerListBlankZeroKills);
     playerListHack = booleanDefault ("playerListHack", playerListHack);
     keepInfo = intDefault ("keepInfo", keepInfo);
     showPlanetOwner = booleanDefault ("showPlanetOwner", showPlanetOwner);

Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- data.c	31 Jan 2007 07:06:37 -0000	1.48
+++ data.c	21 Feb 2007 11:43:38 -0000	1.49
@@ -423,6 +423,7 @@
 
 int showIND = 0;
 int newPlist = 0;
+int playerListBlankZeroKills = 1;
 int playerListHack = 0;
 int playerListMessaging = 1;
 

Index: option.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- option.c	25 Jun 2006 08:19:40 -0000	1.24
+++ option.c	21 Feb 2007 11:43:38 -0000	1.25
@@ -284,7 +284,7 @@
     {1, "", &planetBitmap, 0, 0, 0, planetbitmapmess, &planetbitmaprange},
     {1, "", &planetBitmapGalaxy, 0, 0, 0, planetbitmapgalaxymess, &planetbitmapgalaxyrange},
     {1, "highlight planets", &planetHighlighting, 0, 0, 0, NULL, NULL},
-    {1, "rotate planets (new planets only)", &rotatePlanets, 0, 0, 0, NULL, NULL},
+    {1, "rotate new planets", &rotatePlanets, 0, 0, 0, NULL, NULL},
     {1, "show planet names on local", &showPlanetNames, 0, 0, 0, NULL, NULL},
     {1, "show army count on orbit", &showArmy, 0, 0, 0, NULL, NULL},
     {1, "show owner on galactic", &showPlanetOwner, 0, 0, 0, NULL, NULL},
@@ -365,6 +365,7 @@
     {1, "put my team first in the list", &sortMyTeamFirst, 0, 0, 0, NULL, 0},
     {1, "partition the playerlist", &partitionPlist, 0, 0, 0, NULL, 0},
     {1, "", &playerListObserver, 0, 0, 0, playerlistobservermess, &playerlistobserver_range},
+    {1, "blank zero kills", &playerListBlankZeroKills, 0, 0, 0, NULL, 0},
     {1, "hack player list", &playerListHack, 0, 0, 0, NULL, 0},
     {1, "done", &notdone, 0, 0, 0, NULL, NULL},
     {-1, NULL, 0, 0, 0, 0, NULL, NULL}