Author: sveinung
Date: Wed Aug 12 12:28:31 2015
New Revision: 29467
URL: http://svn.gna.org/viewcvs/freeciv?rev=29467&view=rev
Log:
orders system: support the "Establish Trade Route" action
See patch #6215
Modified:
trunk/server/savecompat.c
trunk/server/unithand.c
Modified: trunk/server/savecompat.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/savecompat.c?rev=29467&r1=29466&r2=29467&view=diff
==============================================================================
--- trunk/server/savecompat.c (original)
+++ trunk/server/savecompat.c Wed Aug 12 12:28:31 2015
@@ -1068,8 +1068,8 @@
/* Maps one to one with each other. */
return ACTION_HELP_WONDER;
case ORDER_TRADE_ROUTE:
- /* TODO: Support ACTION_TRADE_ROUTE orders. */
- return ACTION_COUNT;
+ /* Maps one to one with each other. */
+ return ACTION_TRADE_ROUTE;
case ORDER_MOVE:
case ORDER_ACTION_MOVE:
case ORDER_FULL_MP:
Modified: trunk/server/unithand.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/unithand.c?rev=29467&r1=29466&r2=29467&view=diff
==============================================================================
--- trunk/server/unithand.c (original)
+++ trunk/server/unithand.c Wed Aug 12 12:28:31 2015
@@ -3644,6 +3644,7 @@
}
break;
case ACTION_ESTABLISH_EMBASSY:
+ case ACTION_TRADE_ROUTE:
case ACTION_HELP_WONDER:
/* Don't validate that the target tile really contains a city or
* that the actor player's map think the target tile has one.
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
