Author: sveinung
Date: Thu Oct  8 17:43:00 2015
New Revision: 30032

URL: http://svn.gna.org/viewcvs/freeciv?rev=30032&view=rev
Log:
client goto: take direction from final_order

Order direction is no longer exclusive to ORDER_MOVE. Both ORDER_ACTION_MOVE
and ORDER_PERFORM_ACTION can take it.

See patch #6395

Modified:
    branches/S2_6/client/goto.c

Modified: branches/S2_6/client/goto.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/goto.c?rev=30032&r1=30031&r2=30032&view=diff
==============================================================================
--- branches/S2_6/client/goto.c (original)
+++ branches/S2_6/client/goto.c Thu Oct  8 17:43:00 2015
@@ -1405,7 +1405,7 @@
 
   if (final_order) {
     p.orders[i] = final_order->order;
-    p.dir[i] = (final_order->order == ORDER_MOVE) ? final_order->dir : -1;
+    p.dir[i] = final_order->dir;
     p.activity[i] = (final_order->order == ORDER_ACTIVITY)
       ? final_order->activity : ACTIVITY_LAST;
     p.target[i] = final_order->target;


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

Reply via email to