From 87ec33b1645ce0df4e10ca488963124aae5d6aba Mon Sep 17 00:00:00 2001
From: Paul Janzen <pjanzen@cvs.openbsd.org>
Date: Mon, 24 Jul 2000 01:02:45 +0000
Subject: Rename move() to moveplayer() to avoid clashing with curses; from
 mycroft@netbsd.org

---
 games/battlestar/com1.c   |  6 +++---
 games/battlestar/com7.c   | 14 +++++++-------
 games/battlestar/cypher.c | 16 ++++++++--------
 games/battlestar/extern.h |  4 ++--
 4 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'games')

diff --git a/games/battlestar/com1.c b/games/battlestar/com1.c
index 99f3a7d300e..dbf9b76b2cc 100644
--- a/games/battlestar/com1.c
+++ b/games/battlestar/com1.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: com1.c,v 1.8 2000/07/03 05:23:44 pjanzen Exp $	*/
+/*	$OpenBSD: com1.c,v 1.9 2000/07/24 01:02:43 pjanzen Exp $	*/
 /*	$NetBSD: com1.c,v 1.3 1995/03/21 15:06:51 cgd Exp $	*/
 
 /*
@@ -38,14 +38,14 @@
 #if 0
 static char sccsid[] = "@(#)com1.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$OpenBSD: com1.c,v 1.8 2000/07/03 05:23:44 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: com1.c,v 1.9 2000/07/24 01:02:43 pjanzen Exp $";
 #endif
 #endif /* not lint */
 
 #include "extern.h"
 
 int
-move(thataway, token)
+moveplayer(thataway, token)
 	int     thataway, token;
 {
 	wordnumber++;
diff --git a/games/battlestar/com7.c b/games/battlestar/com7.c
index eb02f15a74a..179107fc9cc 100644
--- a/games/battlestar/com7.c
+++ b/games/battlestar/com7.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: com7.c,v 1.7 1999/09/25 20:30:45 pjanzen Exp $	*/
+/*	$OpenBSD: com7.c,v 1.8 2000/07/24 01:02:43 pjanzen Exp $	*/
 /*	$NetBSD: com7.c,v 1.3 1995/03/21 15:07:12 cgd Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)com7.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$OpenBSD: com7.c,v 1.7 1999/09/25 20:30:45 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: com7.c,v 1.8 2000/07/24 01:02:43 pjanzen Exp $";
 #endif
 #endif /* not lint */
 
@@ -203,15 +203,15 @@ 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/games/battlestar/cypher.c b/games/battlestar/cypher.c
index 9f52dab4091..e4e6fa6799c 100644
--- a/games/battlestar/cypher.c
+++ b/games/battlestar/cypher.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cypher.c,v 1.8 2000/07/03 05:23:45 pjanzen Exp $	*/
+/*	$OpenBSD: cypher.c,v 1.9 2000/07/24 01:02:43 pjanzen Exp $	*/
 /*	$NetBSD: cypher.c,v 1.3 1995/03/21 15:07:15 cgd Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)cypher.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$OpenBSD: cypher.c,v 1.8 2000/07/03 05:23:45 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: cypher.c,v 1.9 2000/07/24 01:02:43 pjanzen Exp $";
 #endif
 #endif /* not lint */
 
@@ -64,7 +64,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.");
@@ -74,31 +74,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/games/battlestar/extern.h b/games/battlestar/extern.h
index 5188d7a56eb..f42e430a66e 100644
--- a/games/battlestar/extern.h
+++ b/games/battlestar/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.6 2000/07/03 05:23:45 pjanzen Exp $	*/
+/*	$OpenBSD: extern.h,v 1.7 2000/07/24 01:02:44 pjanzen Exp $	*/
 /*	$NetBSD: extern.h,v 1.5 1995/04/24 12:22:18 cgd Exp $	*/
 
 /*
@@ -350,7 +350,7 @@ void light __P((void));
 void live __P((void));
 struct wlist *lookup __P((const char *));
 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));
-- 
cgit v1.2.3