Curses works - define USE_CURSES for BSD44 and don't try to do our own

[bsdgames-darwin.git] / robots / auto.c

diff --git a/robots/auto.c b/robots/auto.c
index f2621fff034e0e9757903520635e7ec639ba388c..c0a15bf88d01cd4eea839228195efb6267f67120 100644 (file)
--- a/robots/auto.c
+++ b/robots/auto.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: auto.c,v 1.1 1999/05/15 23:56:35 christos Exp $        */
+/*     $NetBSD: auto.c,v 1.4 1999/09/08 21:17:56 jsm Exp $     */

 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.


@@ -67,6 +67,16 @@
 
 #define CONSDEBUG(a)
 
 
 #define CONSDEBUG(a)
 

+static int distance __P((int, int, int, int));
+static int xinc __P((int));
+static int yinc __P((int));
+static const char *find_moves __P((void));
+static COORD *closest_robot __P((int *));
+static COORD *closest_heap __P((int *));
+static char move_towards __P((int, int));
+static char move_away __P((COORD *));
+static char move_between __P((COORD *, COORD *));
+static int between __P((COORD *, COORD *));

 
 /* distance():
  *     return "move" number distance of the two coordinates
 
 /* distance():
  *     return "move" number distance of the two coordinates


@@ -127,13 +137,14 @@ yinc(dir)
 /* find_moves():
  *     Find possible moves
  */
 /* find_moves():
  *     Find possible moves
  */

-static char *
+static const char *

 find_moves()
 {
         int x, y;
         COORD test;
 find_moves()
 {
         int x, y;
         COORD test;

-        char *m, *a;
-        static char moves[] = ".hjklyubn";
+        const char *m;
+        char *a;
+        static const char moves[] = ".hjklyubn";

         static char ans[sizeof moves];
         a = ans;
 
         static char ans[sizeof moves];
         a = ans;
 


@@ -157,10 +168,9 @@ find_moves()
         }
         *a = 0;
         if(ans[0])
         }
         *a = 0;
         if(ans[0])

-                a = ans;
+                return ans;

         else
         else

-                a = "t";
-        return a;
+                return "t";

 }
 
 /* closest_robot():
 }
 
 /* closest_robot():


@@ -171,7 +181,7 @@ static COORD *
 closest_robot(dist)
        int *dist;
 {
 closest_robot(dist)
        int *dist;
 {

-       COORD *rob, *end, *minrob;
+       COORD *rob, *end, *minrob = NULL;

        int tdist, mindist;
 
        mindist = 1000000;
        int tdist, mindist;
 
        mindist = 1000000;


@@ -195,7 +205,7 @@ static COORD *
 closest_heap(dist)
        int *dist;
 {
 closest_heap(dist)
        int *dist;
 {

-       COORD *hp, *end, *minhp;
+       COORD *hp, *end, *minhp = NULL;

        int mindist, tdist;
 
        mindist = 1000000;
        int mindist, tdist;
 
        mindist = 1000000;


@@ -266,9 +276,7 @@ move_between(rob, hp)
        COORD *rob;
        COORD *hp;
 {
        COORD *rob;
        COORD *hp;
 {

-       char ok_moves[10], best_move;
-       char *ptr;
-       int move_judge, cur_judge, dx, dy, mvx, mvy;
+       int dx, dy;

        float slope, cons;
 
        /* equation of the line between us and the closest robot */
        float slope, cons;
 
        /* equation of the line between us and the closest robot */


@@ -377,4 +385,4 @@ automove()
        
        return move_between(robot_close, heap_close);
 #endif
        
        return move_between(robot_close, heap_close);
 #endif

-} /* end get_move */
+} /* end automove */