[Freeciv-Dev] (PR#6931) Goto waypoint bug

["Arnstein Lindgard" <a-l@xxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=6931 >

Bug: maybe_cancel_goto_due_to_enemy() should idle the unit,
like in maybe_cancel_patrol_due_to_enemy().

Otherwise, unit retains the goto state when a non-attackable unit
unexpectedly exists on a waypoint (only when using waypoint).

Patch.


Arnstein

--- freeciv/server/unittools.c  Mon Nov 17 18:18:34 2003
+++ maybe_cancel_goto/server/unittools.c        Sun Nov 23 00:36:43 2003
@@ -3083,6 +3083,7 @@
   
   if (is_non_allied_unit_tile(ptile, pplayer) 
       || is_non_allied_city_tile(ptile, pplayer)) {
+    handle_unit_activity_request(punit, ACTIVITY_IDLE);
     notify_player_ex(pplayer, punit->x, punit->y, E_NOEVENT,
                      _("Game: %s aborted GOTO "
                        "as there are units in the way."),