sprinkle static

[bsdgames-darwin.git] / hack / hack.do_wear.c

diff --git a/hack/hack.do_wear.c b/hack/hack.do_wear.c
index c6274402e4589e2f803bcf6b2f788bba0ce9be3d..35e794a05df706b7bd46bc94fc95782b3a23a80a 100644 (file)
--- a/hack/hack.do_wear.c
+++ b/hack/hack.do_wear.c
@@ -1,26 +1,85 @@
-/*     $NetBSD: hack.do_wear.c,v 1.4 1997/10/19 16:57:48 christos Exp $        */
+/*     $NetBSD: hack.do_wear.c,v 1.7 2009/08/12 07:28:40 dholland Exp $        */
 
 /*
- * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985.
+ * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
+ * Amsterdam
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of the Stichting Centrum voor Wiskunde en
+ * Informatica, nor the names of its contributors may be used to endorse or
+ * promote products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Copyright (c) 1982 Jay Fenlason <hack@gnu.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.do_wear.c,v 1.4 1997/10/19 16:57:48 christos Exp $");
+__RCSID("$NetBSD: hack.do_wear.c,v 1.7 2009/08/12 07:28:40 dholland Exp $");
 #endif                         /* not lint */
 
 #include "hack.h"
 #include "extern.h"
 
-void
-off_msg(otmp)
-       struct obj     *otmp;
+static int dorr(struct obj *);
+static int cursed(struct obj *);
+
+static void
+off_msg(struct obj *otmp)
 {
        pline("You were wearing %s.", doname(otmp));
 }
 
 int
-doremarm()
+doremarm(void)
 {
        struct obj     *otmp;
        if (!uarm && !uarmh && !uarms && !uarmg) {
@@ -47,7 +106,7 @@ doremarm()
 }
 
 int
-doremring()
+doremring(void)
 {
        if (!uleft && !uright) {
                pline("Not wearing any ring.");
@@ -80,9 +139,8 @@ doremring()
        return (0);
 }
 
-int
-dorr(otmp)
-       struct obj     *otmp;
+static int
+dorr(struct obj *otmp)
 {
        if (cursed(otmp))
                return (0);
@@ -91,9 +149,8 @@ dorr(otmp)
        return (1);
 }
 
-int
-cursed(otmp)
-       struct obj     *otmp;
+static int
+cursed(struct obj *otmp)
 {
        if (otmp->cursed) {
                pline("You can't. It appears to be cursed.");
@@ -103,8 +160,7 @@ cursed(otmp)
 }
 
 int
-armoroff(otmp)
-       struct obj     *otmp;
+armoroff(struct obj *otmp)
 {
        int             delay = -objects[otmp->otyp].oc_delay;
        if (cursed(otmp))
@@ -129,7 +185,7 @@ armoroff(otmp)
 }
 
 int
-doweararm()
+doweararm(void)
 {
        struct obj     *otmp;
        int             delay;
@@ -194,7 +250,7 @@ doweararm()
 }
 
 int
-dowearring()
+dowearring(void)
 {
        struct obj     *otmp;
        long            mask = 0;
@@ -272,8 +328,7 @@ dowearring()
 }
 
 void
-ringoff(obj)
-       struct obj     *obj;
+ringoff(struct obj *obj)
 {
        long            mask;
        mask = obj->owornmask & W_RING;
@@ -311,7 +366,7 @@ ringoff(obj)
 }
 
 void
-find_ac()
+find_ac(void)
 {
        int             uac = 10;
        if (uarm)
@@ -335,7 +390,7 @@ find_ac()
 }
 
 void
-glibr()
+glibr(void)
 {
        struct obj     *otmp;
        int             xfl = 0;
@@ -364,7 +419,7 @@ glibr()
 }
 
 struct obj     *
-some_armor()
+some_armor(void)
 {
        struct obj     *otmph = uarm;
        if (uarmh && (!otmph || !rn2(4)))
@@ -377,7 +432,7 @@ some_armor()
 }
 
 void
-corrode_armor()
+corrode_armor(void)
 {
        struct obj     *otmph = some_armor();
        if (otmph) {