Refer to 'O' rather than 'o' as command to set options. Bug reported

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

diff --git a/hack/hack.invent.c b/hack/hack.invent.c
index 2c8b94cfc8fada40b1eb62c7ec30307501a870d2..d4a7d2e633eb0b14e61ba79244918dff4b48e1d8 100644 (file)
--- a/hack/hack.invent.c
+++ b/hack/hack.invent.c
@@ -1,12 +1,69 @@
-/*     $NetBSD: hack.invent.c,v 1.5 1997/10/19 16:58:05 christos Exp $ */
+/*     $NetBSD: hack.invent.c,v 1.8 2003/04/02 18:36:37 jsm 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.invent.c,v 1.5 1997/10/19 16:58:05 christos Exp $");
+__RCSID("$NetBSD: hack.invent.c,v 1.8 2003/04/02 18:36:37 jsm Exp $");
 #endif                         /* not lint */
 
 #include <stdlib.h>
@@ -335,7 +392,7 @@ mkgoldobj(q)
  */
 struct obj     *
 getobj(let, word)
-       char           *let, *word;
+       const char           *let, *word;
 {
        struct obj     *otmp;
        char            ilet, ilet1, ilet2;
@@ -508,7 +565,7 @@ ckunpaid(otmp)
 /* return the number of times fn was called successfully */
 int
 ggetobj(word, fn, max)
-       char *word;
+       const char *word;
        int (*fn)  __P((struct obj *));
        int max;
 {
@@ -797,9 +854,9 @@ dotypeinv()
 int
 dolook()
 {
-       struct obj     *otmp, *otmp0;
-       struct gold    *gold;
-       char           *verb = Blind ? "feel" : "see";
+       struct obj     *otmp = NULL, *otmp0 = NULL;
+       struct gold    *gold = NULL;
+       const char     *verb = Blind ? "feel" : "see";
        int             ct = 0;
 
        if (!u.uswallow) {
@@ -866,6 +923,7 @@ stackobj(obj)
 int
 merged(otmp, obj, lose)
        struct obj     *otmp, *obj;
+       int lose;
 {
        if (obj->otyp == otmp->otyp &&
            obj->unpaid == otmp->unpaid &&