? 3clads-against-4dest.gz
? city_incite_cost-2.1.diff
? city_incite_cost-2.2.0.diff
? city_incite_cost-2.2.1.diff
? city_incite_cost-2.2.diff
? city_incite_cost-2.diff
? city_incite_cost.diff
? city_incite_cost3.diff
? city_incite_cost4.diff
? def_ships_moves1.diff
? dipl1.diff
? dipl2.diff
? test-prize-2.gz
? test-the-price.gz
Index: server/unithand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/unithand.c,v
retrieving revision 1.234
diff -u -r1.234 unithand.c
--- server/unithand.c	2002/09/27 12:32:48	1.234
+++ server/unithand.c	2002/10/03 15:26:40
@@ -637,6 +637,7 @@
   struct packet_unit_combat combat;
   struct unit *plooser, *pwinner;
   struct unit old_punit = *punit;	/* Used for new ship algorithm. -GJW */
+  struct unit old_pdefender = *pdefender; /* Same for defenders */
   struct city *pcity;
   int def_x = pdefender->x, def_y = pdefender->y;
   
@@ -700,6 +701,14 @@
   } else {
     punit->moves_left -= SINGLE_MOVE;
   }
+
+  if (is_sailing_unit (pdefender)) {
+    int def_moves_used = unit_move_rate (&old_pdefender) 
+	                 - old_pdefender.moves_left;
+    pdefender->moves_left = unit_move_rate (pdefender) - def_moves_used;
+  } else {}
+
+  
   if(punit->moves_left<0)
     punit->moves_left=0;