Fix merge conflicts

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

diff --git a/hack/hack.do.c b/hack/hack.do.c
index b606edadb8b8d66340442e72f80aa33b583cf572..53f6df43f2b31f3f2490fb9034b6d28539904c98 100644 (file)
--- a/hack/hack.do.c
+++ b/hack/hack.do.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: hack.do.c,v 1.7 2004/01/27 20:30:29 jsm 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,29 +63,29 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.do.c,v 1.7 2004/01/27 20:30:29 jsm 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()
+dodrop(void)
 {
        return (drop(getobj("0$#", "drop")));
 }
 
 static int
-drop(obj)
-       struct obj     *obj;
+drop(struct obj *obj)
 {
        if (!obj)
                return (0);
@@ -101,7 +101,7 @@ drop(obj)
                        if (Invisible)
                                newsym(u.ux, u.uy);
                }
-               free((char *) obj);
+               free(obj);
                return (1);
        }
        if (obj->owornmask & (W_ARMOR | W_RING)) {
@@ -122,16 +122,14 @@ drop(obj)
 
 /* Called in several places - should not produce texts */
 void
-dropx(obj)
-       struct obj     *obj;
+dropx(struct obj *obj)
 {
        freeinv(obj);
        dropy(obj);
 }
 
-void
-dropy(obj)
-       struct obj     *obj;
+static void
+dropy(struct obj *obj)
 {
        if (obj->otyp == CRYSKNIFE)
                obj->otyp = WORM_TOOTH;
@@ -147,13 +145,13 @@ dropy(obj)
 
 /* drop several things */
 int
-doddrop()
+doddrop(void)
 {
        return (ggetobj("drop", drop, 0));
 }
 
 int
-dodown()
+dodown(void)
 {
        if (u.ux != xdnstair || u.uy != ydnstair) {
                pline("You can't go down here.");
@@ -172,7 +170,7 @@ dodown()
 }
 
 int
-doup()
+doup(void)
 {
        if (u.ux != xupstair || u.uy != yupstair) {
                pline("You can't go up here.");
@@ -191,9 +189,7 @@ doup()
 }
 
 void
-goto_level(newlevel, at_stairs)
-       int             newlevel;
-       boolean         at_stairs;
+goto_level(int newlevel, boolean at_stairs)
 {
        int fd;
        boolean         up = (newlevel < dlevel);
@@ -318,13 +314,13 @@ goto_level(newlevel, at_stairs)
 }
 
 int
-donull()
+donull(void)
 {
        return (1);             /* Do nothing, but let other things happen */
 }
 
 int
-dopray()
+dopray(void)
 {
        nomovemsg = "You finished your prayer.";
        nomul(-3);
@@ -332,7 +328,7 @@ dopray()
 }
 
 int
-dothrow()
+dothrow(void)
 {
        struct obj     *obj;
        struct monst   *mon;
@@ -531,9 +527,7 @@ dothrow()
 /* split obj so that it gets size num */
 /* remainder is put in the object structure delivered by this call */
 struct obj     *
-splitobj(obj, num)
-       struct obj     *obj;
-       int             num;
+splitobj(struct obj *obj, int num)
 {
        struct obj     *otmp;
        otmp = newobj(0);
@@ -551,8 +545,7 @@ splitobj(obj, num)
 }
 
 void
-more_experienced(exp, rexp)
-       int             exp, rexp;
+more_experienced(int exp, int rexp)
 {
        u.uexp += exp;
        u.urexp += 4 * exp + rexp;
@@ -563,9 +556,7 @@ more_experienced(exp, rexp)
 }
 
 void
-set_wounded_legs(side, timex)
-       long            side;
-       int             timex;
+set_wounded_legs(long side, int timex)
 {
        if (!Wounded_legs || (Wounded_legs & TIMEOUT))
                Wounded_legs |= side + timex;
@@ -574,7 +565,7 @@ set_wounded_legs(side, timex)
 }
 
 void
-heal_legs()
+heal_legs(void)
 {
        if (Wounded_legs) {
                if ((Wounded_legs & BOTH_SIDES) == BOTH_SIDES)