WARNS=5

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

diff --git a/hack/hack.wield.c b/hack/hack.wield.c
index ebdef0a4bf070847f34529083199a6857b7dd571..2a03b9014b8eebda654cff200d42d3709c5c8c0f 100644 (file)
--- a/hack/hack.wield.c
+++ b/hack/hack.wield.c
@@ -1,26 +1,82 @@
-/*     $NetBSD: hack.wield.c,v 1.5 2001/03/25 20:44:03 jsm Exp $       */
+/*     $NetBSD: hack.wield.c,v 1.8 2011/07/02 02:09:08 mrg 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.wield.c,v 1.5 2001/03/25 20:44:03 jsm Exp $");
+__RCSID("$NetBSD: hack.wield.c,v 1.8 2011/07/02 02:09:08 mrg Exp $");
 #endif                         /* not lint */
 
 #include "hack.h"
 #include "extern.h"
 
 void
-setuwep(obj)
-       struct obj     *obj;
+setuwep(struct obj *obj)
 {
        setworn(obj, W_WEP);
 }
 
 int
-dowield()
+dowield(void)
 {
        struct obj     *wep;
        int             res = 0;
@@ -59,7 +115,7 @@ dowield()
 }
 
 void
-corrode_weapon()
+corrode_weapon(void)
 {
        if (!uwep || uwep->olet != WEAPON_SYM)
                return;         /* %% */
@@ -72,12 +128,10 @@ corrode_weapon()
 }
 
 int
-chwepon(otmp, amount)
-       struct obj     *otmp;
-       int amount;
+chwepon(struct obj *otmp, int amount)
 {
        const char *color = (amount < 0) ? "black" : "green";
-       const char *time;
+       const char *stime;
        if (!uwep || uwep->olet != WEAPON_SYM) {
                strange_feeling(otmp,
                                (amount > 0) ? "Your hands twitch."
@@ -106,9 +160,9 @@ chwepon(otmp, amount)
        }
        if (!rn2(6))
                amount *= 2;
-       time = (amount * amount == 1) ? "moment" : "while";
+       stime = (amount * amount == 1) ? "moment" : "while";
        pline("Your %s %s for a %s.",
-             aobjnam(uwep, "glow"), color, time);
+             aobjnam(uwep, "glow"), color, stime);
        uwep->spe += amount;
        if (amount > 0)
                uwep->cursed = 0;