[Freeciv-Dev] (PR#11152) goto vs. sentry bug

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

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

> [chrisk - Mon Nov 22 20:09:51 2004]:
> 
> 
> CVS 22 NOV 2004 S2 GTK2
> 
> In attached game I have 4 ironclads NE of Cirith Ungol, on GOTO to that
> city.
> 
> When I open unit dialog and put them on sentry all, the icons show an 'S'
> and a 'C' in the topleft corner. Middle click shows still the GOTO target.

This patch (untested) removes the orders when an activity is set by the
client.

> Next turn they are still there (didn't move). Now I wake them up. Then I
> have 2 ironclads active and the other 2 still on GOTO.
> 
> What does the 'C' mean?

'C' means connect.  A unit on orders with an activity is assumed to be a
connecting settler and is given the 'C' graphic.

jason

Index: server/unithand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/unithand.c,v
retrieving revision 1.314
diff -u -r1.314 unithand.c
--- server/unithand.c   25 Nov 2004 05:46:48 -0000      1.314
+++ server/unithand.c   29 Nov 2004 20:07:12 -0000
@@ -1488,6 +1488,7 @@
     enum unit_activity old_activity = punit->activity;
     enum tile_special_type old_target = punit->activity_target;
 
+    free_unit_orders(punit);
     set_unit_activity(punit, new_activity);
     send_unit_info(NULL, punit);
     handle_unit_activity_dependencies(punit, old_activity, old_target);
@@ -1507,6 +1508,7 @@
     enum unit_activity old_activity = punit->activity;
     enum tile_special_type old_target = punit->activity_target;
 
+    free_unit_orders(punit);
     set_unit_activity_targeted(punit, new_activity, new_target);
     send_unit_info(NULL, punit);    
     handle_unit_activity_dependencies(punit, old_activity, old_target);