? rc
? no_research1.diff
? msgfmt1.diff
? tech_info1.diff
? tech_fix1.diff
? no_tech_loss1.diff
? check_headers.sh
? test.c
? missing_includes1.diff
? num_unknown_fix1.diff
? local_warmap131201.diff
? queue
? unit_move_turns1.diff
Index: client/gui-gtk/repodlgs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/repodlgs.c,v
retrieving revision 1.42
diff -u -r1.42 repodlgs.c
--- client/gui-gtk/repodlgs.c	2001/12/21 11:17:36	1.42
+++ client/gui-gtk/repodlgs.c	2002/01/14 12:09:43
@@ -161,8 +161,7 @@
 
   gtk_window_set_title (GTK_WINDOW(science_dialog_shell), _("Science"));
 
-  my_snprintf(text, sizeof(text), _("Research speed: %d turns/advance"),
-	      tech_turns_to_advance(game.player_ptr));
+  my_snprintf(text, sizeof(text), "no text set yet");
   science_label = gtk_label_new(text);
 
   gtk_box_pack_start( GTK_BOX( GTK_DIALOG(science_dialog_shell)->vbox ),
@@ -376,8 +375,13 @@
 
   if(delay_report_update) return;
 
-  my_snprintf(text, sizeof(text), _("Research speed: %d turns/advance"),
-	      tech_turns_to_advance(game.player_ptr));
+  i = tech_turns_to_advance(game.player_ptr);
+  if (i == INFINITY) {
+    my_snprintf(text, sizeof(text), _("Research speed: no research"));
+  } else {
+    my_snprintf(text, sizeof(text), _("Research speed: %d turns/advance"),
+		i);
+  }
   gtk_set_label(science_label, text);
 
   for (i=0; i<4; i++) {
Index: client/gui-mui/repodlgs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-mui/repodlgs.c,v
retrieving revision 1.15
diff -u -r1.15 repodlgs.c
--- client/gui-mui/repodlgs.c	2001/12/21 11:17:37	1.15
+++ client/gui-mui/repodlgs.c	2002/01/14 12:09:44
@@ -336,7 +336,14 @@
   if (science_wnd)
   {
     char *report_title = get_report_title(_("Science Advisor"));
-    settextf(science_title_text, _("%s\n(%d turns/advance)"), report_title,tech_turns_to_advance(game.player_ptr));
+
+    j = tech_turns_to_advance(game.player_ptr);
+    if (j == INFINITY) {
+      settextf(science_title_text, _("%s\n(no research)"), report_title);
+    } else {
+      settextf(science_title_text, _("%s\n(%d turns/advance)"),
+	       report_title, j);
+    }
     free(report_title);
 
     DoMethod(science_cycle_group, MUIM_Group_InitChange);
Index: client/gui-win32/repodlgs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/repodlgs.c,v
retrieving revision 1.4
diff -u -r1.4 repodlgs.c
--- client/gui-win32/repodlgs.c	2001/12/21 11:17:38	1.4
+++ client/gui-win32/repodlgs.c	2002/01/14 12:09:44
@@ -113,8 +113,14 @@
   if (!science_dlg) return;            
   report_title=get_report_title(_("Science"));
   sz_strlcpy(text, report_title);
-  my_snprintf(rate, sizeof(rate), _("\n(%d turns/advance)"),
-              tech_turns_to_advance(game.player_ptr));
+
+  i = tech_turns_to_advance(game.player_ptr);
+  if (i == INFINITY) {
+    my_snprintf(rate, sizeof(rate), _("\n(no research)"));
+  } else {
+    my_snprintf(rate, sizeof(rate), _("\n(%d turns/advance)"), i);
+  }
+
   sz_strlcat(text, rate);
   SetWindowText(GetDlgItem(science_dlg,ID_SCIENCE_TOP),text);
   ListBox_ResetContent(GetDlgItem(science_dlg,ID_SCIENCE_LIST));
Index: client/gui-xaw/repodlgs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/repodlgs.c,v
retrieving revision 1.28
diff -u -r1.28 repodlgs.c
--- client/gui-xaw/repodlgs.c	2001/12/21 11:17:39	1.28
+++ client/gui-xaw/repodlgs.c	2002/01/14 12:09:45
@@ -266,8 +266,7 @@
 					 science_dialog_shell,
 					 NULL);   
 
-  my_snprintf(rate_text, sizeof(rate_text), _("\n(%d turns/advance)"),
-	      tech_turns_to_advance(game.player_ptr));
+  my_snprintf(rate_text, sizeof(rate_text), "\ntext not set yet");
   report_title=get_report_title_plus(_("Science"), rate_text);
   science_label = XtVaCreateManagedWidget("sciencelabel", 
 					  labelWidgetClass, 
@@ -384,6 +383,7 @@
   XtVaSetValues(science_label, XtNwidth, &width, NULL);
 
   toggle_callback(science_help_toggle, NULL, NULL);
+  science_dialog_update();
 }
 
 
@@ -503,8 +503,13 @@
     char rate_text[128];
     char *report_title;
 
-    my_snprintf(rate_text, sizeof(rate_text), _("\n(%d turns/advance)"),
-		tech_turns_to_advance(game.player_ptr));
+    j = tech_turns_to_advance(game.player_ptr);
+    if (j == INFINITY) {
+      my_snprintf(rate_text, sizeof(rate_text), _("\n(no research)"));
+    } else {
+      my_snprintf(rate_text, sizeof(rate_text), _("\n(%d turns/advance)"),
+		  j);
+    }
     report_title=get_report_title_plus(_("Science"), rate_text);
     xaw_set_label(science_label, report_title);
     free(report_title);