Author: sveinung
Date: Fri Nov 20 14:38:38 2015
New Revision: 30703
URL: http://svn.gna.org/viewcvs/freeciv?rev=30703&view=rev
Log:
save games: ORDER_ACTION_MOVE needs a direction
See bug #24097
Modified:
branches/S2_6/server/savegame2.c
Modified: branches/S2_6/server/savegame2.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/savegame2.c?rev=30703&r1=30702&r2=30703&view=diff
==============================================================================
--- branches/S2_6/server/savegame2.c (original)
+++ branches/S2_6/server/savegame2.c Fri Nov 20 14:38:38 2015
@@ -5872,6 +5872,8 @@
order->activity = char2activity(act_unitstr[j]);
if (order->order == ORDER_LAST
|| (order->order == ORDER_MOVE && !direction8_is_valid(order->dir))
+ || (order->order == ORDER_ACTION_MOVE
+ && !direction8_is_valid(order->dir))
|| (order->order == ORDER_ACTIVITY
&& order->activity == ACTIVITY_LAST)) {
/* An invalid order. Just drop the orders for this unit. */
@@ -6115,6 +6117,7 @@
tgt_buf[j] = '?';
switch (punit->orders.list[j].order) {
case ORDER_MOVE:
+ case ORDER_ACTION_MOVE:
dir_buf[j] = dir2char(punit->orders.list[j].dir);
break;
case ORDER_ACTIVITY:
@@ -6127,7 +6130,6 @@
case ORDER_BUILD_WONDER:
case ORDER_TRADE_ROUTE:
case ORDER_HOMECITY:
- case ORDER_ACTION_MOVE:
case ORDER_LAST:
break;
}
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
