Fix merge conflicts

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

diff --git a/robots/move.c b/robots/move.c
index 443fdde38cb5c0f2dcb0db8187270da3d593e07e..3b13d1f8347809870528a285aaca5a5d246e5dd4 100644 (file)
--- a/robots/move.c
+++ b/robots/move.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: move.c,v 1.15 2009/07/20 06:39:06 dholland Exp $       */
+/*     $NetBSD: move.c,v 1.16 2009/08/12 08:30:55 dholland Exp $       */
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)move.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: move.c,v 1.15 2009/07/20 06:39:06 dholland Exp $");
+__RCSID("$NetBSD: move.c,v 1.16 2009/08/12 08:30:55 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -47,6 +47,10 @@ __RCSID("$NetBSD: move.c,v 1.15 2009/07/20 06:39:06 dholland Exp $");
 
 #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
@@ -212,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;
@@ -244,7 +248,7 @@ must_telep(void)
  * do_move:
  *     Execute a move
  */
-bool
+static bool
 do_move(int dy, int dx)
 {
        static COORD newpos;
@@ -280,7 +284,7 @@ do_move(int dy, int dx)
  * eaten:
  *     Player would get eaten at this place
  */
-bool
+static bool
 eaten(const COORD *pos)
 {
        int x, y;