Fix merge conflicts

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

diff --git a/hack/hack.do.c b/hack/hack.do.c
index 103e8a299abe282ddff4359dad4a8378e963856d..53f6df43f2b31f3f2490fb9034b6d28539904c98 100644 (file)
--- a/hack/hack.do.c
+++ b/hack/hack.do.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: hack.do.c,v 1.8 2009/06/07 18:30:39 dholland Exp $     */
+/*     $NetBSD: hack.do.c,v 1.11 2011/08/06 20:29:37 dholland Exp $    */
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,19 +63,20 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.do.c,v 1.8 2009/06/07 18:30:39 dholland Exp $");
+__RCSID("$NetBSD: hack.do.c,v 1.11 2011/08/06 20:29:37 dholland Exp $");
 #endif                         /* not lint */
 
 /* Contains code for 'd', 'D' (drop), '>', '<' (up, down) and 't' (throw) */
 
-#include "hack.h"
-#include "extern.h"
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include "hack.h"
+#include "extern.h"
 
 
 static int drop(struct obj *);
+static void dropy(struct obj *);
 
 int
 dodrop(void)
@@ -100,7 +101,7 @@ drop(struct obj *obj)
                        if (Invisible)
                                newsym(u.ux, u.uy);
                }
-               free((char *) obj);
+               free(obj);
                return (1);
        }
        if (obj->owornmask & (W_ARMOR | W_RING)) {
@@ -127,7 +128,7 @@ dropx(struct obj *obj)
        dropy(obj);
 }
 
-void
+static void
 dropy(struct obj *obj)
 {
        if (obj->otyp == CRYSKNIFE)