Author: cazfi
Date: Sun Mar  8 00:33:52 2015
New Revision: 28458

URL: http://svn.gna.org/viewcvs/freeciv?rev=28458&view=rev
Log:
List terrain specific extra build time in terrain help pages.

See patch #5895

Modified:
    branches/S2_6/client/gui-gtk-2.0/helpdlg.c
    branches/S2_6/client/gui-gtk-3.0/helpdlg.c

Modified: branches/S2_6/client/gui-gtk-2.0/helpdlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/helpdlg.c?rev=28458&r1=28457&r2=28458&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-2.0/helpdlg.c  (original)
+++ branches/S2_6/client/gui-gtk-2.0/helpdlg.c  Sun Mar  8 00:33:52 2015
@@ -1082,15 +1082,19 @@
 /**************************************************************************
   Create widgets about all extras of one cause buildable to the terrain.
 **************************************************************************/
-static void help_extras_of_cause_for_terrain(struct terrain *pterr, enum 
extra_cause cause,
-                                             char *label)
+static void help_extras_of_act_for_terrain(struct terrain *pterr,
+                                           enum unit_activity act,
+                                           char *label)
 {
   struct universal for_terr = { .kind = VUT_TERRAIN, .value = { .terrain = 
pterr }};
+  enum extra_cause cause = activity_to_extra_cause(act);
 
   extra_type_by_cause_iterate(cause, pextra) {
     if (pextra->buildable && universal_fulfills_requirement(FALSE, 
&(pextra->reqs), &for_terr)) {
       GtkWidget *w;
       GtkWidget *hbox;
+      char buffer[1024];
+      int btime;
 
       hbox = gtk_hbox_new(FALSE, 0);
       gtk_container_add(GTK_CONTAINER(help_vbox), hbox);
@@ -1098,6 +1102,12 @@
       gtk_box_pack_start(GTK_BOX(hbox), w, FALSE, FALSE, 0);
       w = help_slink_new(extra_name_translation(pextra), HELP_EXTRA);
       gtk_box_pack_start(GTK_BOX(hbox), w, FALSE, FALSE, 0);
+
+      btime = terrain_extra_build_time(pterr, act, pextra);
+      fc_snprintf(buffer, sizeof(buffer), PL_("%d turn", "%d turns", btime), 
btime);
+      w = gtk_label_new(buffer);
+      gtk_box_pack_start(GTK_BOX(hbox), w, FALSE, FALSE, 0);
+
       gtk_widget_show_all(hbox);
     }
   } extra_type_by_cause_iterate_end;
@@ -1178,14 +1188,14 @@
     gtk_container_foreach(GTK_CONTAINER(help_vbox), 
(GtkCallback)gtk_widget_destroy, NULL);
     if (pterrain->irrigation_result == pterrain
         && effect_cumulative_max(EFT_IRRIG_POSSIBLE, &for_terr) > 0) {
-      help_extras_of_cause_for_terrain(pterrain, EC_IRRIGATION, _("Build as 
irrigation"));
+      help_extras_of_act_for_terrain(pterrain, ACTIVITY_IRRIGATE, _("Build as 
irrigation"));
     }
     if (pterrain->mining_result == pterrain
         && effect_cumulative_max(EFT_MINING_POSSIBLE, &for_terr) > 0) {
-      help_extras_of_cause_for_terrain(pterrain, EC_MINE, _("Build as mine"));
-    }
-    help_extras_of_cause_for_terrain(pterrain, EC_ROAD, _("Build as road"));
-    help_extras_of_cause_for_terrain(pterrain, EC_BASE, _("Build as base"));
+      help_extras_of_act_for_terrain(pterrain, ACTIVITY_MINE, _("Build as 
mine"));
+    }
+    help_extras_of_act_for_terrain(pterrain, ACTIVITY_GEN_ROAD, _("Build as 
road"));
+    help_extras_of_act_for_terrain(pterrain, ACTIVITY_BASE, _("Build as 
base"));
     gtk_widget_show(help_vbox);
   }
 

Modified: branches/S2_6/client/gui-gtk-3.0/helpdlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/helpdlg.c?rev=28458&r1=28457&r2=28458&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-3.0/helpdlg.c  (original)
+++ branches/S2_6/client/gui-gtk-3.0/helpdlg.c  Sun Mar  8 00:33:52 2015
@@ -1105,24 +1105,34 @@
 }
 
 /**************************************************************************
-  Create widgets about all extras of one cause buildable to the terrain.
-**************************************************************************/
-static void help_extras_of_cause_for_terrain(struct terrain *pterr, enum 
extra_cause cause,
-                                             char *label)
+  Create widgets about all extras of one cause activity to the terrain.
+**************************************************************************/
+static void help_extras_of_act_for_terrain(struct terrain *pterr,
+                                           enum unit_activity act,
+                                           char *label)
 {
   struct universal for_terr = { .kind = VUT_TERRAIN, .value = { .terrain = 
pterr }};
+  enum extra_cause cause = activity_to_extra_cause(act);
 
   extra_type_by_cause_iterate(cause, pextra) {
     if (pextra->buildable && universal_fulfills_requirement(FALSE, 
&(pextra->reqs), &for_terr)) {
       GtkWidget *w;
       GtkWidget *hbox;
+      char buffer[1024];
+      int btime;
 
       hbox = gtk_grid_new();
       gtk_container_add(GTK_CONTAINER(help_vbox), hbox);
-      w = gtk_label_new((label));
+      w = gtk_label_new(label);
       gtk_container_add(GTK_CONTAINER(hbox), w);
       w = help_slink_new(extra_name_translation(pextra), HELP_EXTRA);
       gtk_container_add(GTK_CONTAINER(hbox), w);
+
+      btime = terrain_extra_build_time(pterr, act, pextra);
+      fc_snprintf(buffer, sizeof(buffer), PL_("%d turn", "%d turns", btime), 
btime);
+      w = gtk_label_new(buffer);
+      gtk_container_add(GTK_CONTAINER(hbox), w);
+
       gtk_widget_show_all(hbox);
     }
   } extra_type_by_cause_iterate_end;
@@ -1203,14 +1213,14 @@
     gtk_container_foreach(GTK_CONTAINER(help_vbox), 
(GtkCallback)gtk_widget_destroy, NULL);
     if (pterrain->irrigation_result == pterrain
         && effect_cumulative_max(EFT_IRRIG_POSSIBLE, &for_terr) > 0) {
-      help_extras_of_cause_for_terrain(pterrain, EC_IRRIGATION, _("Build as 
irrigation"));
+      help_extras_of_act_for_terrain(pterrain, ACTIVITY_IRRIGATE, _("Build as 
irrigation"));
     }
     if (pterrain->mining_result == pterrain
         && effect_cumulative_max(EFT_MINING_POSSIBLE, &for_terr) > 0) {
-      help_extras_of_cause_for_terrain(pterrain, EC_MINE, _("Build as mine"));
-    }
-    help_extras_of_cause_for_terrain(pterrain, EC_ROAD, _("Build as road"));
-    help_extras_of_cause_for_terrain(pterrain, EC_BASE, _("Build as base"));
+      help_extras_of_act_for_terrain(pterrain, ACTIVITY_MINE, _("Build as 
mine"));
+    }
+    help_extras_of_act_for_terrain(pterrain, ACTIVITY_GEN_ROAD, _("Build as 
road"));
+    help_extras_of_act_for_terrain(pterrain, ACTIVITY_BASE, _("Build as 
base"));
     gtk_widget_show(help_vbox);
   }
 


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to