Author: sveinung
Date: Wed Aug 12 12:29:56 2015
New Revision: 29471

URL: http://svn.gna.org/viewcvs/freeciv?rev=29471&view=rev
Log:
orders system: support the "Join City" action

See patch #6219

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=29471&r1=29470&r2=29471&view=diff
==============================================================================
--- trunk/server/savecompat.c   (original)
+++ trunk/server/savecompat.c   Wed Aug 12 12:29:56 2015
@@ -1059,9 +1059,9 @@
        * possible for rulesets to allow joining foreign cities before 3.0.
        * This means that a converted build city order only can be a Join
        * City order if it targets a domestic city. */
-      /* TODO: Support ACTION_JOIN_CITY orders. */
-      return ACTION_COUNT;
+      return ACTION_JOIN_CITY;
     } else {
+      /* Assume that the intention was to found a new city. */
       return ACTION_FOUND_CITY;
     }
   case ORDER_OLD_BUILD_WONDER:

Modified: trunk/server/unithand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/unithand.c?rev=29471&r1=29470&r2=29471&view=diff
==============================================================================
--- trunk/server/unithand.c     (original)
+++ trunk/server/unithand.c     Wed Aug 12 12:29:56 2015
@@ -3645,6 +3645,7 @@
       case ACTION_ESTABLISH_EMBASSY:
       case ACTION_TRADE_ROUTE:
       case ACTION_HELP_WONDER:
+      case ACTION_JOIN_CITY:
         /* Don't validate that the target tile really contains a city or
          * that the actor player's map think the target tile has one.
          * The player may target a city from its player map that isn't


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

Reply via email to