[Freeciv-Dev] (PR#6388)
[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
Another tiny patch ;-)
This one remove the (0/1) string after 'Researching: (Unknown)' in the
intelligence report when the player don't know the player research.
In addition, it update a comment in player.h that was wrong.
Remi
--- ../freeciv/client/gui-gtk-2.0/inteldlg.c 2003-05-18 18:19:29.000000000
+0200
+++ ./client/gui-gtk-2.0/inteldlg.c 2003-10-03 16:05:04.000000000 +0200
@@ -137,9 +137,13 @@
hbox=gtk_hbox_new(FALSE, 5);
gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, FALSE, 2);
- my_snprintf(buf, sizeof(buf), _("Researching: %s(%d/%d)"),
- get_tech_name(p, p->research.researching),
- p->research.bulbs_researched, total_bulbs_required(p));
+ if (p->research.researching != A_NOINFO) {
+ my_snprintf(buf, sizeof(buf), _("Researching: %s(%d/%d)"),
+ get_tech_name(p, p->research.researching),
+ p->research.bulbs_researched, total_bulbs_required(p));
+ } else {
+ my_snprintf(buf, sizeof(buf), _("Researching: (Unknown)"));
+ }
label=gtk_label_new(buf);
gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, FALSE, 2);
--- ../freeciv/common/player.h 2003-10-02 15:11:10.000000000 +0200
+++ ./common/player.h 2003-10-03 16:05:56.000000000 +0200
@@ -70,7 +70,7 @@
* Invention being researched in. Valid values for researching are:
* - any existing tech but not A_NONE or
* - A_FUTURE.
- * In addition A_UNSET is allowed at the client for enemies.
+ * In addition A_NOINFO is allowed at the client for enemies.
*/
int researching;
int changed_from; /* if the player changed techs, which one
- [Freeciv-Dev] (PR#6388),
Remi Bonnet <=
|
|