? gotocleanup1.diff
Index: common/packets.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/packets.c,v
retrieving revision 1.208
diff -u -r1.208 packets.c
--- common/packets.c	2002/07/14 13:40:25	1.208
+++ common/packets.c	2002/07/20 14:14:11
@@ -444,7 +444,6 @@
   case PACKET_UNIT_CHANGE_HOMECITY:
   case PACKET_UNIT_ESTABLISH_TRADE:
   case PACKET_UNIT_HELP_BUILD_WONDER:
-  case PACKET_UNIT_GOTO_TILE:
   case PACKET_UNIT_AUTO:
   case PACKET_UNIT_UNLOAD:
   case PACKET_UNIT_UPGRADE:
@@ -521,6 +520,10 @@
 
   case PACKET_ATTRIBUTE_CHUNK:
     return receive_packet_attribute_chunk(pc);
+
+  case PACKET_UNIT_GOTO_TILE:
+    freelog(LOG_ERROR, "Obsolete goto packet received!");
+    return NULL;
 
   default:
     freelog(LOG_ERROR, "unknown packet type %d received from %s",
Index: server/srv_main.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/srv_main.c,v
retrieving revision 1.85
diff -u -r1.85 srv_main.c
--- server/srv_main.c	2002/07/03 08:05:08	1.85
+++ server/srv_main.c	2002/07/20 14:14:12
@@ -771,10 +771,6 @@
     handle_unit_help_build_wonder(pplayer, (struct packet_unit_request *)packet);
     break;
 
-  case PACKET_UNIT_GOTO_TILE:
-    handle_unit_goto_tile(pplayer, (struct packet_unit_request *)packet);
-    break;
-    
   case PACKET_DIPLOMAT_ACTION:
     handle_diplomat_action(pplayer, (struct packet_diplomat_action *)packet);
     break;
Index: server/unithand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/unithand.c,v
retrieving revision 1.228
diff -u -r1.228 unithand.c
--- server/unithand.c	2002/07/18 08:58:59	1.228
+++ server/unithand.c	2002/07/20 14:14:12
@@ -61,37 +61,6 @@
 /**************************************************************************
 ...
 **************************************************************************/
-void handle_unit_goto_tile(struct player *pplayer, 
-			   struct packet_unit_request *req)
-{
-  struct unit *punit = player_find_unit_by_id(pplayer, req->unit_id);
-
-  if (!is_normal_map_pos(req->x, req->y) || !punit) {
-    return;
-  }
-
-  punit->goto_dest_x = req->x;
-  punit->goto_dest_y = req->y;
-
-  set_unit_activity(punit, ACTIVITY_GOTO);
-
-  send_unit_info(NULL, punit);
-
-  /* 
-   * Normally units on goto does not pick up extra units, even if the
-   * units are in a city and are sentried. But if we just started the
-   * goto We want to take them with us, so we do this. 
-   */
-  if (get_transporter_capacity(punit) > 0) {
-    assign_units_to_transporter(punit, TRUE);
-  }
-
-  do_unit_goto(punit, GOTO_MOVE_ANY, TRUE);
-}
-
-/**************************************************************************
-...
-**************************************************************************/
 void handle_unit_airlift(struct player *pplayer,
 			 struct packet_unit_request *req)
 {