Rename move() to moveplayer() to avoid clashing with libcurses.

4 files changed, 20 insertions, 20 deletions

diff --git a/battlestar/com1.c b/battlestar/com1.c
index 5111236a..a2d37122 100644
--- a/battlestar/com1.c
+++ b/battlestar/com1.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com1.c,v 1.9 1999/09/18 19:38:46 jsm Exp $	*/
+/*	$NetBSD: com1.c,v 1.10 2000/07/23 23:57:23 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,14 +38,14 @@
 #if 0
 static char sccsid[] = "@(#)com1.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: com1.c,v 1.9 1999/09/18 19:38:46 jsm Exp $");
+__RCSID("$NetBSD: com1.c,v 1.10 2000/07/23 23:57:23 mycroft Exp $");
 #endif
 #endif				/* not lint */
 
 #include "extern.h"
 
 int
-move(thataway, token)
+moveplayer(thataway, token)
 	int     thataway, token;
 {
 	wordnumber++;
diff --git a/battlestar/com7.c b/battlestar/com7.c
index bc0ab4db..31b4c57e 100644
--- a/battlestar/com7.c
+++ b/battlestar/com7.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com7.c,v 1.6 1997/10/11 02:07:10 lukem Exp $	*/
+/*	$NetBSD: com7.c,v 1.7 2000/07/23 23:57:23 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)com7.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: com7.c,v 1.6 1997/10/11 02:07:10 lukem Exp $");
+__RCSID("$NetBSD: com7.c,v 1.7 2000/07/23 23:57:23 mycroft Exp $");
 #endif
 #endif				/* not lint */
 
@@ -206,18 +206,18 @@ fighton:
 			puts("You escape stunned and disoriented from the fight.");
 			puts("A victorious bellow echoes from the battlescene.");
 			if (back && position != back)
-				move(back, BACK);
+				moveplayer(back, BACK);
 			else
 				if (ahead && position != ahead)
-					move(ahead, AHEAD);
+					moveplayer(ahead, AHEAD);
 				else
 					if (left && position != left)
-						move(left, LEFT);
+						moveplayer(left, LEFT);
 					else
 						if (right && position != right)
-							move(right, RIGHT);
+							moveplayer(right, RIGHT);
 						else
-							move(location[position].down, AHEAD);
+							moveplayer(location[position].down, AHEAD);
 			return (0);
 		}
 
diff --git a/battlestar/cypher.c b/battlestar/cypher.c
index 63390a7d..0f37e8b6 100644
--- a/battlestar/cypher.c
+++ b/battlestar/cypher.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cypher.c,v 1.10 1999/09/18 16:41:38 jsm Exp $	*/
+/*	$NetBSD: cypher.c,v 1.11 2000/07/23 23:57:23 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)cypher.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: cypher.c,v 1.10 1999/09/18 16:41:38 jsm Exp $");
+__RCSID("$NetBSD: cypher.c,v 1.11 2000/07/23 23:57:23 mycroft Exp $");
 #endif
 #endif				/* not lint */
 
@@ -63,7 +63,7 @@ cypher()
 			if (location[position].access || wiz || tempwiz) {
 				if (!location[position].access)
 					puts("Zap!  A gust of wind lifts you up.");
-				if (!move(location[position].up, AHEAD))
+				if (!moveplayer(location[position].up, AHEAD))
 					return (-1);
 			} else {
 				puts("There is no way up");
@@ -73,31 +73,31 @@ cypher()
 			break;
 
 		case DOWN:
-			if (!move(location[position].down, AHEAD))
+			if (!moveplayer(location[position].down, AHEAD))
 				return (-1);
 			lflag = 0;
 			break;
 
 		case LEFT:
-			if (!move(left, LEFT))
+			if (!moveplayer(left, LEFT))
 				return (-1);
 			lflag = 0;
 			break;
 
 		case RIGHT:
-			if (!move(right, RIGHT))
+			if (!moveplayer(right, RIGHT))
 				return (-1);
 			lflag = 0;
 			break;
 
 		case AHEAD:
-			if (!move(ahead, AHEAD))
+			if (!moveplayer(ahead, AHEAD))
 				return (-1);
 			lflag = 0;
 			break;
 
 		case BACK:
-			if (!move(back, BACK))
+			if (!moveplayer(back, BACK))
 				return (-1);
 			lflag = 0;
 			break;
diff --git a/battlestar/extern.h b/battlestar/extern.h
index eac81756..7ffec2c9 100644
--- a/battlestar/extern.h
+++ b/battlestar/extern.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.h,v 1.15 1999/09/14 19:54:47 jsm Exp $ */
+/*	$NetBSD: extern.h,v 1.16 2000/07/23 23:57:23 mycroft Exp $ */
 
 /*
  * Copyright (c) 1983, 1993
@@ -335,7 +335,7 @@ int launch __P((void));
 void light __P((void));
 void live __P((void)) __attribute__((__noreturn__));
 void love __P((void));
-int move __P((int, int));
+int moveplayer __P((int, int));
 void moveenemy __P((int));
 void murder __P((void));
 void news __P((void));