speed limit 80

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

diff --git a/robots/move.c b/robots/move.c
index bc229ac308bc265c96e8c9cdbd9c991c35f4f3cd..3b13d1f8347809870528a285aaca5a5d246e5dd4 100644 (file)
--- a/robots/move.c
+++ b/robots/move.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: move.c,v 1.14 2009/07/20 06:00:56 dholland Exp $       */
+/*     $NetBSD: move.c,v 1.16 2009/08/12 08:30:55 dholland Exp $       */
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,14 +34,23 @@
 #if 0
 static char sccsid[] = "@(#)move.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: move.c,v 1.14 2009/07/20 06:00:56 dholland Exp $");
+__RCSID("$NetBSD: move.c,v 1.16 2009/08/12 08:30:55 dholland Exp $");
 #endif
 #endif /* not lint */
 
+#include <sys/types.h>
+#include <sys/ttydefaults.h>  /* for CTRL */
+#include <ctype.h>
+#include <curses.h>
+#include <unistd.h>
 #include "robots.h"
 
 #define ESC    '\033'
 
+static bool do_move(int, int);
+static bool eaten(const COORD *);
+static bool must_telep(void);
+
 /*
  * get_move:
  *     Get and execute a move from the player
@@ -151,7 +160,7 @@ over:
                  case 'Y': case 'U': case 'H': case 'J':
                  case 'K': case 'L': case 'B': case 'N':
                  case '>':
-                       Running = TRUE;
+                       Running = true;
                        if (c == '>')
                                Run_ch = ' ';
                        else
@@ -166,13 +175,13 @@ over:
                        break;
                  case 'w':
                  case 'W':
-                       Waiting = TRUE;
+                       Waiting = true;
                        leaveok(stdscr, TRUE);
                        goto ret;
                  case 't':
                  case 'T':
 teleport:
-                       Running = FALSE;
+                       Running = false;
                        mvaddch(My_pos.y, My_pos.x, ' ');
                        My_pos = *rnd_pos();
                        telmsg(1);
@@ -207,7 +216,7 @@ ret:
  *     Must I teleport; i.e., is there anywhere I can move without
  * being eaten?
  */
-bool
+static bool
 must_telep(void)
 {
        int x, y;
@@ -215,7 +224,7 @@ must_telep(void)
 
 #ifdef FANCY
        if (Stand_still && Num_robots > 1 && eaten(&My_pos))
-               return TRUE;
+               return true;
 #endif
 
        for (y = -1; y <= 1; y++) {
@@ -229,17 +238,17 @@ must_telep(void)
                        if (Field[newpos.y][newpos.x] > 0)
                                continue;
                        if (!eaten(&newpos))
-                               return FALSE;
+                               return false;
                }
        }
-       return TRUE;
+       return true;
 }
 
 /*
  * do_move:
  *     Execute a move
  */
-bool
+static bool
 do_move(int dy, int dx)
 {
        static COORD newpos;
@@ -250,7 +259,7 @@ do_move(int dy, int dx)
            newpos.x <= 0 || newpos.x >= X_FIELDSIZE ||
            Field[newpos.y][newpos.x] > 0 || eaten(&newpos)) {
                if (Running) {
-                       Running = FALSE;
+                       Running = false;
                        leaveok(stdscr, FALSE);
                        move(My_pos.y, My_pos.x);
                        refresh();
@@ -259,23 +268,23 @@ do_move(int dy, int dx)
                        putchar(CTRL('G'));
                        reset_count();
                }
-               return FALSE;
+               return false;
        }
        else if (dy == 0 && dx == 0)
-               return TRUE;
+               return true;
        mvaddch(My_pos.y, My_pos.x, ' ');
        My_pos = newpos;
        mvaddch(My_pos.y, My_pos.x, PLAYER);
        if (!jumping())
                refresh();
-       return TRUE;
+       return true;
 }
 
 /*
  * eaten:
  *     Player would get eaten at this place
  */
-bool
+static bool
 eaten(const COORD *pos)
 {
        int x, y;
@@ -287,10 +296,10 @@ eaten(const COORD *pos)
                        if (x <= 0 || x >= X_FIELDSIZE)
                                continue;
                        if (Field[y][x] == 1)
-                               return TRUE;
+                               return true;
                }
        }
-       return FALSE;
+       return false;
 }
 
 /*
@@ -301,7 +310,7 @@ void
 reset_count(void)
 {
        Count = 0;
-       Running = FALSE;
+       Running = false;
        leaveok(stdscr, FALSE);
        refresh();
 }