define global vars with `extern' in "back.h", and only define once in

[bsdgames-darwin.git] / rogue / zap.c

diff --git a/rogue/zap.c b/rogue/zap.c
index 401d44932faf4b094ee9c8309bd15e057b66e4bc..09b30797845a0c9bee920dd5f87bb3acacaa7280 100644 (file)
--- a/rogue/zap.c
+++ b/rogue/zap.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: zap.c,v 1.3 1995/04/22 10:28:41 cgd Exp $      */
+/*     $NetBSD: zap.c,v 1.4 1997/10/12 11:46:15 lukem Exp $    */
 
 /*
  * Copyright (c) 1988, 1993
@@ -36,11 +36,12 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)zap.c      8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: zap.c,v 1.3 1995/04/22 10:28:41 cgd Exp $";
+__RCSID("$NetBSD: zap.c,v 1.4 1997/10/12 11:46:15 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -60,9 +61,7 @@ static char rcsid[] = "$NetBSD: zap.c,v 1.3 1995/04/22 10:28:41 cgd Exp $";
 
 boolean wizard = 0;
 
-extern boolean being_held, score_only, detect_monster;
-extern short cur_room;
-
+void
 zapp()
 {
        short wch;
@@ -119,8 +118,8 @@ zapp()
 
 object *
 get_zapped_monster(dir, row, col)
-short dir;
-short *row, *col;
+       short dir;
+       short *row, *col;
 {
        short orow, ocol;
 
@@ -140,9 +139,10 @@ short *row, *col;
        }
 }
 
+void
 zap_monster(monster, kind)
-object *monster;
-unsigned short kind;
+       object *monster;
+       unsigned short kind;
 {
        short row, col;
        object *nm;
@@ -207,8 +207,9 @@ unsigned short kind;
        }
 }
 
+void
 tele_away(monster)
-object *monster;
+       object *monster;
 {
        short row, col;
 
@@ -226,6 +227,7 @@ object *monster;
        }
 }
 
+void
 wizardize()
 {
        char buf[100];
@@ -248,8 +250,9 @@ wizardize()
        }
 }
 
+void
 wdrain_life(monster)
-object *monster;
+       object *monster;
 {
        short hp;
        object *lmon, *nm;
@@ -277,8 +280,9 @@ object *monster;
        relight();
 }
 
+void
 bounce(ball, dir, row, col, r)
-short ball, dir, row, col, r;
+       short ball, dir, row, col, r;
 {
        short orow, ocol;
        char buf[DCOLS], *s;