Author: sveinung
Date: Sun May 17 10:47:06 2015
New Revision: 29101

URL: http://svn.gna.org/viewcvs/freeciv?rev=29101&view=rev
Log:
Don't set done_moving when executing a move order.

The next order may not need any move fragments.

See bug #23594

Modified:
    branches/S2_6/server/unittools.c

Modified: branches/S2_6/server/unittools.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/unittools.c?rev=29101&r1=29100&r2=29101&view=diff
==============================================================================
--- branches/S2_6/server/unittools.c    (original)
+++ branches/S2_6/server/unittools.c    Sun May 17 10:47:06 2015
@@ -3425,7 +3425,8 @@
   /* Move magic. */
   punit->moved = TRUE;
   punit->moves_left = MAX(0, punit->moves_left - move_cost);
-  if (punit->moves_left == 0) {
+  if (punit->moves_left == 0 && !unit_has_orders(punit)) {
+    /* The next order may not require any remaining move fragments. */
     punit->done_moving = TRUE;
   }
 


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

Reply via email to