[netrek-cvs] client/netrekxp/src data.c, 1.53, 1.54 defaults.c, 1.44, 1.45 input.c, 1.21, 1.22 option.c, 1.28, 1.29

[Bill Balcerski]

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

Modified Files:
	data.c defaults.c input.c option.c 
Log Message:
Changed keepInfo option from updates/sec to 1/10 second intervals, to
support variable update rates.

Index: input.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/input.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- input.c	23 Feb 2007 13:43:56 -0000	1.21
+++ input.c	25 Feb 2007 14:12:10 -0000	1.22
@@ -1700,7 +1700,7 @@
         if (!infomapped)
         {
             inform (data->Window, data->x, data->y, 'i');
-            opened_info = keepInfo;     /* 5/31/93 LAB */
+            opened_info = keepInfo * server_ups / 10;     /* 5/31/93 LAB */
         }
         else
         {
@@ -2635,7 +2635,7 @@
     if (!infomapped)
     {
         inform (data->Window, data->x, data->y, key);
-        opened_info = keepInfo; /* 5/31/93 LAB */
+        opened_info = keepInfo * server_ups / 10;
     }
     else
     {
@@ -3113,7 +3113,7 @@
     if (!infomapped)
     {
         inform (data->Window, data->x, data->y, key);
-        opened_info = keepInfo; /* 5/31/93 LAB */
+        opened_info = keepInfo * server_ups / 10;
     }
     else
     {

Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- defaults.c	24 Feb 2007 10:19:54 -0000	1.44
+++ defaults.c	25 Feb 2007 14:12:10 -0000	1.45
@@ -203,7 +203,7 @@
     },
     {"keepInfo", &keepInfo, RC_INT,
         {
-            "How many updates to keep info window on (default 15)",
+            "How many tenths of seconds to keep info window on (default 15)",
             NULL
         }
     },

Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- data.c	24 Feb 2007 10:19:54 -0000	1.53
+++ data.c	25 Feb 2007 14:12:10 -0000	1.54
@@ -38,8 +38,7 @@
                                  * restart? */
 int ghost_pno = 0;              /* is this a ghostbust
                                  * restart? */
-int keepInfo = 15;              /* how many updates to keep
-                                 * infowins 6/1/93 LAB */
+int keepInfo = 15;              /* how many tenths of seconds to keep infowins */
 int showPlanetOwner = 0;
 
 int phaserShrink = 0;

Index: option.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- option.c	24 Feb 2007 10:19:55 -0000	1.28
+++ option.c	25 Feb 2007 14:12:10 -0000	1.29
@@ -374,7 +374,7 @@
     {1, "Page %d (click to change)", &MenuPage, 0, 0, 0, NULL, &Menus_Range},
     {1, "", &newDashboard, 0, 0, 0, dashboardoptions, NULL},
     {1, "", &timerType, 0, 0, 0, timermess, NULL},
-    {1, "keep info %d upds (0=don't remove)", &keepInfo, 0, 0, 0, 0, &keepInfo_range},
+    {1, "keep info on for %d x .1s (0=perm)", &keepInfo, 0, 0, 0, 0, &keepInfo_range},
 #ifdef BEEPLITE
     {1, "use beeplite", &useLite, 0, 0, 0, NULL, NULL},
 #endif