Wrap compiler-specific flags with HAVE_GCC and HAVE_PCC as necessary. Add a few flags...

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

diff --git a/hack/hack.shk.c b/hack/hack.shk.c
index 2e826bd76decede460c41f4603c9f0e39a6995cb..6f6abc4529b43ccc86a95e262d7db63f9306527f 100644 (file)
--- a/hack/hack.shk.c
+++ b/hack/hack.shk.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: hack.shk.c,v 1.6 2003/04/02 18:36:40 jsm Exp $ */
+/*     $NetBSD: hack.shk.c,v 1.8 2006/03/30 01:32:27 jnemeth Exp $     */
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.shk.c,v 1.6 2003/04/02 18:36:40 jsm Exp $");
+__RCSID("$NetBSD: hack.shk.c,v 1.8 2006/03/30 01:32:27 jnemeth Exp $");
 #endif                         /* not lint */
 
 #include <stdlib.h>
@@ -71,14 +71,14 @@ __RCSID("$NetBSD: hack.shk.c,v 1.6 2003/04/02 18:36:40 jsm Exp $");
 #include "extern.h"
 
 #ifndef QUEST
-static void setpaid __P((void));
-static void addupbill __P((void));
-static void findshk __P((int));
-static struct bill_x *onbill __P((struct obj *));
-static void pay __P((long, struct monst *));
-static int dopayobj __P((struct bill_x *));
-static int getprice __P((struct obj *));
-static int realhunger __P((void));
+static void setpaid(void);
+static void addupbill(void);
+static void findshk(int);
+static struct bill_x *onbill(struct obj *);
+static void pay(long, struct monst *);
+static int dopayobj(struct bill_x *);
+static int getprice(struct obj *);
+static int realhunger(void);
 #endif
 
 #ifdef QUEST
@@ -1100,6 +1100,8 @@ notonl_ok:
        if (nix != omx || niy != omy) {
                if (info[chi] & ALLOW_M) {
                        mtmp = m_at(nix, niy);
+                       if (mtmp == NULL)
+                               panic("error in shk_move");
                        if (hitmm(shkp, mtmp) == 1 && rn2(3) &&
                            hitmm(mtmp, shkp) == 2)
                                return (2);