Author: mir3x
Date: Mon Jan 16 14:00:51 2017
New Revision: 34848

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

See bug #25428


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

Modified: branches/S3_0/client/gui-qt/menu.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-qt/menu.cpp?rev=34848&r1=34847&r2=34848&view=diff
==============================================================================
--- branches/S3_0/client/gui-qt/menu.cpp        (original)
+++ branches/S3_0/client/gui-qt/menu.cpp        Mon Jan 16 14:00:51 2017
@@ -2001,8 +2001,26 @@
         break;
 
       case ROAD:
-        if (can_units_do_any_road(punits)) {
-          i.value()->setEnabled(true);
+        {
+          char road_item[500];
+          struct extra_type *pextra = nullptr;
+
+          if (can_units_do_any_road(punits)) {
+            i.value()->setEnabled(true);
+          }
+          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;
 


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

Reply via email to