[Freeciv-Dev] Re: (PR#6718) Cannot client goto caravan into other player's city

["Raimar Falke" <i-freeciv-lists@xxxxxxxxxxxxx>]

On Sat, Nov 01, 2003 at 03:13:41AM -0800, Per I. Mathisen wrote:
> 
> Small bug: You cannot use client goto to send a caravan into a city owned
> by another player. Savegame attached.
> 
> (Since the savegame is made in civworld, you must give the caravan a home
> city before trying to use it.)

And the easy fix.

        Raimar

-- 
 email: rf13@xxxxxxxxxxxxxxxxx
 "The very concept of PNP is a lovely dream that simply does not translate to
  reality. The confusion of manually doing stuff is nothing compared to the
  confusion of computers trying to do stuff and getting it wrong, which they
  gleefully do with great enthusiasm." 
    -- Jinx Tigr in the SDM

Index: client/goto.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/goto.c,v
retrieving revision 1.61
diff -u -u -r1.61 goto.c
--- client/goto.c       2003/10/29 07:32:57     1.61
+++ client/goto.c       2003/11/05 20:05:36
@@ -352,7 +352,9 @@
   assert(parameter->get_EC == NULL);
   parameter->get_EC = get_EC;
   assert(parameter->get_TB == NULL);
-  if (unit_type(punit)->attack_strength > 0 || unit_flag(punit, F_DIPLOMAT)) {
+  if (unit_type(punit)->attack_strength > 0 || unit_flag(punit, F_DIPLOMAT)
+      || unit_flag(punit, F_TRADE_ROUTE)
+      || unit_flag(punit, F_HELP_WONDER)) {
     parameter->get_TB = get_TB_aggr;
   } else {
     parameter->get_TB = no_fights_or_unknown;