Index: ai/aiair.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/ai/aiair.c,v
retrieving revision 1.24
diff -u -r1.24 aiair.c
--- ai/aiair.c	25 Feb 2004 20:23:49 -0000	1.24
+++ ai/aiair.c	11 Jun 2004 13:46:03 -0000
@@ -301,13 +301,13 @@
 				 goto_dest_x(punit), goto_dest_y(punit),
 				 pplayer) >= 0) {
       /* It's an ok GOTO, just go there */
-      ai_unit_gothere(punit);
+      ai_unit_goto(punit, goto_dest_x(punit), goto_dest_y(punit));
     } else if (find_nearest_airbase(punit->x, punit->y, punit, 
 			     &refuel_x, &refuel_y)) {
       /* Go refuelling */
       set_goto_dest(punit, refuel_x, refuel_y);
       freelog(LOG_DEBUG, "Sent %s to refuel", unit_type(punit)->name);
-      ai_unit_gothere(punit);
+      ai_unit_goto(punit, goto_dest_x(punit), goto_dest_y(punit));
     } else {
       if (punit->fuel == 1) {
 	freelog(LOG_DEBUG, "Oops, %s is fallin outta sky", 
@@ -324,7 +324,7 @@
        * TODO: separate attacking into a function, check for the best 
        * tile to attack from */
       assert(is_goto_dest_set(punit));
-      if (!ai_unit_gothere(punit)) {
+      if (!ai_unit_goto(punit, goto_dest_x(punit), goto_dest_y(punit))) {
         return; /* died */
       }
 
@@ -343,7 +343,7 @@
               (map_get_city(dest_x, dest_y) ? 
                map_get_city(dest_x, dest_y)->name : ""));
       set_goto_dest(punit, dest_x, dest_y);
-      ai_unit_gothere(punit);
+      ai_unit_goto(punit, goto_dest_x(punit), goto_dest_y(punit));
     } else {
       freelog(LOG_DEBUG, "%s cannot find anything to kill and is staying put", 
               unit_type(punit)->name);
Index: ai/aitools.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/ai/aitools.c,v
retrieving revision 1.108
diff -u -r1.108 aitools.c
--- ai/aitools.c	4 Jun 2004 15:25:13 -0000	1.108
+++ ai/aitools.c	11 Jun 2004 13:46:04 -0000
@@ -132,22 +132,6 @@
   return TRUE;
 }
 
-/**************************************************************************
-  This will eventually become the ferry-enabled goto. For now, it just
-  wraps ai_unit_goto()
-
-  TODO: Kill me.  Use ai_gothere instead.
-**************************************************************************/
-bool ai_unit_gothere(struct unit *punit)
-{
-  CHECK_UNIT(punit);
-  if (ai_unit_goto(punit, goto_dest_x(punit), goto_dest_y(punit))) {
-    return TRUE; /* ... and survived */
-  } else {
-    return FALSE; /* we died */
-  }
-}
-
 /****************************************************************************
   A helper function for ai_gothere.  Estimates the dangers we will
   be facing at our destination and tries to find/request a bodyguard if 
Index: ai/aitools.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/ai/aitools.h,v
retrieving revision 1.42
diff -u -r1.42 aitools.h
--- ai/aitools.h	23 May 2004 02:05:37 -0000	1.42
+++ ai/aitools.h	11 Jun 2004 13:46:04 -0000
@@ -51,7 +51,6 @@
 int stack_cost(struct unit *pdef);
 
 bool ai_unit_execute_path(struct unit *punit, struct pf_path *path);
-bool ai_unit_gothere(struct unit *punit);
 bool ai_gothere(struct player *pplayer, struct unit *punit, 
                 int dest_x, int dest_y);
 bool ai_unit_goto(struct unit *punit, int x, int y);