[src/netbsd-1-5]: src/games/battlestar Approved by thorpej:

[mycroft <mycroft%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0632ce37c221
branches:  netbsd-1-5
changeset: 488735:0632ce37c221
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Wed Jul 26 22:59:49 2000 +0000

description:
Approved by thorpej:
Rename move() to moveplayer() to avoid clashing with libcurses.

basesrc/games/battlestar/com1.c                         1.9 -> 1.10
basesrc/games/battlestar/com7.c                         1.6 -> 1.7
basesrc/games/battlestar/cypher.c                       1.10 -> 1.11
basesrc/games/battlestar/extern.h                       1.15 -> 1.16

diffstat:

 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(-)

diffs (150 lines):

diff -r d4a7211de6e1 -r 0632ce37c221 games/battlestar/com1.c
--- a/games/battlestar/com1.c   Wed Jul 26 22:46:37 2000 +0000
+++ b/games/battlestar/com1.c   Wed Jul 26 22:59:49 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: com1.c,v 1.9 1999/09/18 19:38:46 jsm Exp $     */
+/*     $NetBSD: com1.c,v 1.9.8.1 2000/07/26 22:59:49 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.9.8.1 2000/07/26 22:59:49 mycroft Exp $");
 #endif
 #endif                         /* not lint */
 
 #include "extern.h"
 
 int
-move(thataway, token)
+moveplayer(thataway, token)
        int     thataway, token;
 {
        wordnumber++;
diff -r d4a7211de6e1 -r 0632ce37c221 games/battlestar/com7.c
--- a/games/battlestar/com7.c   Wed Jul 26 22:46:37 2000 +0000
+++ b/games/battlestar/com7.c   Wed Jul 26 22:59:49 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: com7.c,v 1.6 1997/10/11 02:07:10 lukem Exp $   */
+/*     $NetBSD: com7.c,v 1.6.12.1 2000/07/26 22:59:49 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.6.12.1 2000/07/26 22:59:49 mycroft Exp $");
 #endif
 #endif                         /* not lint */
 
@@ -206,18 +206,18 @@
                        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 -r d4a7211de6e1 -r 0632ce37c221 games/battlestar/cypher.c
--- a/games/battlestar/cypher.c Wed Jul 26 22:46:37 2000 +0000
+++ b/games/battlestar/cypher.c Wed Jul 26 22:59:49 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cypher.c,v 1.10 1999/09/18 16:41:38 jsm Exp $  */
+/*     $NetBSD: cypher.c,v 1.10.8.1 2000/07/26 22:59:49 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.10.8.1 2000/07/26 22:59:49 mycroft Exp $");
 #endif
 #endif                         /* not lint */
 
@@ -63,7 +63,7 @@
                        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 @@
                        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 -r d4a7211de6e1 -r 0632ce37c221 games/battlestar/extern.h
--- a/games/battlestar/extern.h Wed Jul 26 22:46:37 2000 +0000
+++ b/games/battlestar/extern.h Wed Jul 26 22:59:49 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: extern.h,v 1.15 1999/09/14 19:54:47 jsm Exp $ */
+/*     $NetBSD: extern.h,v 1.15.8.1 2000/07/26 22:59:49 mycroft Exp $ */
 
 /*
  * Copyright (c) 1983, 1993
@@ -335,7 +335,7 @@
 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));