caesar: WARNS=6, strict bool mode

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

diff --git a/hack/hack.potion.c b/hack/hack.potion.c
index a94df1d9d748ce461598ea73fe9ff81802681b88..09c00bc9481c3cd15bf964261bc40bbeb3133f09 100644 (file)
--- a/hack/hack.potion.c
+++ b/hack/hack.potion.c
@@ -1,19 +1,78 @@
-/*     $NetBSD: hack.potion.c,v 1.4 1997/10/19 16:58:48 christos Exp $ */
+/*     $NetBSD: hack.potion.c,v 1.9 2011/05/23 22:53:25 joerg 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.potion.c,v 1.4 1997/10/19 16:58:48 christos Exp $");
+__RCSID("$NetBSD: hack.potion.c,v 1.9 2011/05/23 22:53:25 joerg Exp $");
 #endif                         /* not lint */
 
 #include "hack.h"
 #include "extern.h"
 
+static void ghost_from_bottle(void);
+
 int
-dodrink()
+dodrink(void)
 {
        struct obj     *otmp, *objs;
        struct monst   *mtmp;
@@ -206,7 +265,7 @@ use_it:
 }
 
 void
-pluslvl()
+pluslvl(void)
 {
        int num;
 
@@ -222,29 +281,25 @@ pluslvl()
 }
 
 void
-strange_feeling(obj, txt)
-       struct obj     *obj;
-       char           *txt;
+strange_feeling(struct obj *obj, const char *txt)
 {
        if (flags.beginner)
                pline("You have a strange feeling for a moment, then it passes.");
        else
-               pline(txt);
+               pline("%s", txt);
        if (!objects[obj->otyp].oc_name_known && !objects[obj->otyp].oc_uname)
                docall(obj);
        useup(obj);
 }
 
-char           *bottlenames[] = {
+static const char *const bottlenames[] = {
        "bottle", "phial", "flagon", "carafe", "flask", "jar", "vial"
 };
 
 void
-potionhit(mon, obj)
-       struct monst   *mon;
-       struct obj     *obj;
+potionhit(struct monst *mon, struct obj *obj)
 {
-       char           *botlnam = bottlenames[rn2(SIZE(bottlenames))];
+       const char           *botlnam = bottlenames[rn2(SIZE(bottlenames))];
        boolean         uclose, isyou = (mon == &youmonst);
 
        if (isyou) {
@@ -310,8 +365,7 @@ potionhit(mon, obj)
 }
 
 void
-potionbreathe(obj)
-       struct obj     *obj;
+potionbreathe(struct obj *obj)
 {
        switch (obj->otyp) {
        case POT_RESTORE_STRENGTH:
@@ -373,7 +427,7 @@ potionbreathe(obj)
  * --   become a jug? Etc.
  */
 int
-dodip()
+dodip(void)
 {
        struct obj     *potion, *obj;
 
@@ -393,8 +447,8 @@ dodip()
        return (1);
 }
 
-void
-ghost_from_bottle()
+static void
+ghost_from_bottle(void)
 {
        struct monst   *mtmp;