Author: mir3x
Date: Mon Jan 16 14:00:42 2017
New Revision: 34847

URL: http://svn.gna.org/viewcvs/freeciv?rev=34847&view=rev
Log:
Qt client - fix build road/rail menu entry

See bug #25428


Modified:
    branches/S2_6/client/gui-qt/menu.cpp

Modified: branches/S2_6/client/gui-qt/menu.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/menu.cpp?rev=34847&r1=34846&r2=34847&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/menu.cpp        (original)
+++ branches/S2_6/client/gui-qt/menu.cpp        Mon Jan 16 14:00:42 2017
@@ -1820,10 +1820,28 @@
         break;
 
       case ROAD:
+      {
+        char road_item[500];
+        struct extra_type *pextra = nullptr;
+
         if (can_units_do_any_road(punits)) {
           i.value()->setEnabled(true);
         }
-        break;
+        unit_list_iterate(punits, punit) {
+          pextra = next_extra_for_tile(unit_tile(punit), EC_ROAD,
+                                       unit_owner(punit), punit);
+          if (pextra != nullptr) {
+            break;
+          }
+        } unit_list_iterate_end;
+
+        if (pextra != nullptr) {
+          fc_snprintf(road_item, sizeof(road_item), _("Build %s"),
+                   extra_name_translation(pextra));
+          i.value()->setText(road_item);
+        }
+      }
+      break;
 
       case FORTIFY:
         if (can_units_do_activity(punits, ACTIVITY_FORTIFYING)) {


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

Reply via email to