Spelling and punctuation corrections or improvements from OpenBSD.

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

diff --git a/rogue/zap.c b/rogue/zap.c
index 7180ce59bb57eb957010fcd4653e1a1a01747f58..3c3fea5ea3d806ed681dc4fa735bca16d7f74b20 100644 (file)
--- a/rogue/zap.c
+++ b/rogue/zap.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: zap.c,v 1.5 1998/11/10 13:01:32 hubertf Exp $  */
+

 /*
 /*

- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * This code is derived from software contributed to Berkeley by
  * Timothy C. Stoehr.
  *
  * This code is derived from software contributed to Berkeley by
  * Timothy C. Stoehr.


@@ -34,9 +36,13 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

+#include <sys/cdefs.h>

 #ifndef lint
 #ifndef lint

-/*static char sccsid[] = "from: @(#)zap.c      5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: zap.c,v 1.2 1993/08/01 18:52:07 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)zap.c      8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: zap.c,v 1.5 1998/11/10 13:01:32 hubertf Exp $");
+#endif

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -55,9 +61,7 @@ static char rcsid[] = "$Id: zap.c,v 1.2 1993/08/01 18:52:07 mycroft Exp $";
 
 boolean wizard = 0;
 
 
 boolean wizard = 0;
 

-extern boolean being_held, score_only, detect_monster;
-extern short cur_room;
-
+void

 zapp()
 {
        short wch;
 zapp()
 {
        short wch;


@@ -114,8 +118,8 @@ zapp()
 
 object *
 get_zapped_monster(dir, row, col)
 
 object *
 get_zapped_monster(dir, row, col)

-short dir;
-short *row, *col;
+       short dir;
+       short *row, *col;

 {
        short orow, ocol;
 
 {
        short orow, ocol;
 


@@ -135,9 +139,10 @@ short *row, *col;
        }
 }
 
        }
 }
 

+void

 zap_monster(monster, kind)
 zap_monster(monster, kind)

-object *monster;
-unsigned short kind;
+       object *monster;
+       unsigned short kind;

 {
        short row, col;
        object *nm;
 {
        short row, col;
        object *nm;


@@ -202,8 +207,9 @@ unsigned short kind;
        }
 }
 
        }
 }
 

+void

 tele_away(monster)
 tele_away(monster)

-object *monster;
+       object *monster;

 {
        short row, col;
 
 {
        short row, col;
 


@@ -221,6 +227,7 @@ object *monster;
        }
 }
 
        }
 }
 

+void

 wizardize()
 {
        char buf[100];
 wizardize()
 {
        char buf[100];


@@ -243,8 +250,9 @@ wizardize()
        }
 }
 
        }
 }
 

+void

 wdrain_life(monster)
 wdrain_life(monster)

-object *monster;
+       object *monster;

 {
        short hp;
        object *lmon, *nm;
 {
        short hp;
        object *lmon, *nm;


@@ -272,11 +280,13 @@ object *monster;
        relight();
 }
 
        relight();
 }
 

+void

 bounce(ball, dir, row, col, r)
 bounce(ball, dir, row, col, r)

-short ball, dir, row, col, r;
+       short ball, dir, row, col, r;

 {
        short orow, ocol;
 {
        short orow, ocol;

-       char buf[DCOLS], *s;
+       char buf[DCOLS];
+       const char *s;

        short i, ch, new_dir = -1, damage;
        static short btime;
 
        short i, ch, new_dir = -1, damage;
        static short btime;