Author: sveinung
Date: Fri Feb 10 09:15:56 2017
New Revision: 34999

URL: http://svn.gna.org/viewcvs/freeciv?rev=34999&view=rev
Log:
Drop custom target missing strings for orders.

See gna patch #8112

Modified:
    trunk/server/unittools.c

Modified: trunk/server/unittools.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/unittools.c?rev=34999&r1=34998&r2=34999&view=diff
==============================================================================
--- trunk/server/unittools.c    (original)
+++ trunk/server/unittools.c    Fri Feb 10 09:15:56 2017
@@ -4288,10 +4288,8 @@
          * outside of it. */
 
         cancel_orders(punit, "  target location doesn't exist");
-        notify_player(pplayer, unit_tile(punit), E_UNIT_ORDERS, ftc_server,
-                      _("%s could not do %s. No target tile."),
-                      unit_link(punit),
-                      action_id_name_translation(order.action));
+        illegal_action_msg(unit_owner(punit), E_UNIT_ORDERS, punit,
+                           order.action, dst_tile, NULL, NULL);
 
         return TRUE;
       }
@@ -4304,10 +4302,8 @@
         /* This action targets a city but no city target was found. */
 
         cancel_orders(punit, "  perform action vs city with no city");
-        notify_player(pplayer, unit_tile(punit), E_UNIT_ORDERS, ftc_server,
-                      _("%s could not do %s. No target city."),
-                      unit_link(punit),
-                      action_id_name_translation(order.action));
+        illegal_action_msg(unit_owner(punit), E_UNIT_ORDERS, punit,
+                           order.action, dst_tile, tgt_city, NULL);
 
         return TRUE;
       }
@@ -4320,10 +4316,8 @@
         /* This action targets a unit but no target unit was found. */
 
         cancel_orders(punit, "  perform action vs unit with no unit");
-        notify_player(pplayer, unit_tile(punit), E_UNIT_ORDERS, ftc_server,
-                      _("%s could not do %s. No target unit."),
-                      unit_link(punit),
-                      action_id_name_translation(order.action));
+        illegal_action_msg(unit_owner(punit), E_UNIT_ORDERS, punit,
+                           order.action, dst_tile, tgt_city, tgt_unit);
 
         return TRUE;
       }


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

Reply via email to