-/* $NetBSD: hack.invent.c,v 1.5 1997/10/19 16:58:05 christos Exp $ */
+/* $NetBSD: hack.invent.c,v 1.10 2006/03/29 01:19:51 jnemeth 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.10 2006/03/29 01:19:51 jnemeth Exp $");
#endif /* not lint */
#include <stdlib.h>
static int lastinvnr = 51; /* 0 ... 51 */
-static void assigninvlet __P((struct obj *));
-static char *xprname __P((struct obj *, char));
+static void assigninvlet(struct obj *);
+static char *xprname(struct obj *, char);
static void
assigninvlet(otmp)
if (obj == fobj)
fobj = fobj->nobj;
else {
- for (otmp = fobj; otmp->nobj != obj; otmp = otmp->nobj)
- if (!otmp)
+ otmp = fobj;
+ while (otmp->nobj != obj) {
+ if (otmp->nobj == NULL)
panic("error in freeobj");
+ otmp = otmp->nobj;
+ }
otmp->nobj = obj->nobj;
}
}
if (gold == fgold)
fgold = gold->ngold;
else {
- for (gtmp = fgold; gtmp->ngold != gold; gtmp = gtmp->ngold)
- if (!gtmp)
+ gtmp = fgold;
+ while (gtmp->ngold != gold) {
+ if (gtmp->ngold == NULL)
panic("error in freegold");
+ gtmp = gtmp->ngold;
+ }
gtmp->ngold = gold->ngold;
}
free((char *) gold);
*/
struct obj *
getobj(let, word)
- char *let, *word;
+ const char *let, *word;
{
struct obj *otmp;
char ilet, ilet1, ilet2;
/* return the number of times fn was called successfully */
int
ggetobj(word, fn, max)
- char *word;
- int (*fn) __P((struct obj *));
+ const char *word;
+ int (*fn)(struct obj *);
int max;
{
char buf[BUFSZ];
int oletct = 0, iletct = 0;
boolean allflag = FALSE;
char olets[20], ilets[20];
- int (*ckfn) __P((struct obj *)) =
- (int (*) __P((struct obj *))) 0;
+ int (*ckfn)(struct obj *) =
+ (int (*)(struct obj *)) 0;
xchar allowgold = (u.ugold && !strcmp(word, "drop")) ? 1 : 0; /* BAH */
if (!invent && !allowgold) {
pline("You have nothing to %s.", word);
struct obj *objchn;
char *olets;
int allflag;
- int (*fn) __P((struct obj *));
- int (*ckfn) __P((struct obj *));
+ int (*fn)(struct obj *);
+ int (*ckfn)(struct obj *);
int max;
{
struct obj *otmp, *otmp2;
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) {
int
merged(otmp, obj, lose)
struct obj *otmp, *obj;
+ int lose;
{
if (obj->otyp == otmp->otyp &&
obj->unpaid == otmp->unpaid &&
git.ckatri.com / bsdgames-darwin.git / blobdiff