use a more suitable type

[bsdgames-darwin.git] / rogue / use.c

diff --git a/rogue/use.c b/rogue/use.c
index 21136aa30e916da2a7073fe3b22a8ef4c53a1c17..8371a6f0f5a302f9e00f3e277331b056574c828e 100644 (file)
--- a/rogue/use.c
+++ b/rogue/use.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: use.c,v 1.8 2008/01/14 00:23:53 dholland Exp $ */
+/*     $NetBSD: use.c,v 1.10 2009/08/12 08:44:45 dholland Exp $        */

 
 /*
  * Copyright (c) 1988, 1993
 
 /*
  * Copyright (c) 1988, 1993


@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)use.c      8.1 (Berkeley) 5/31/93";
 #else
 #if 0
 static char sccsid[] = "@(#)use.c      8.1 (Berkeley) 5/31/93";
 #else

-__RCSID("$NetBSD: use.c,v 1.8 2008/01/14 00:23:53 dholland Exp $");
+__RCSID("$NetBSD: use.c,v 1.10 2009/08/12 08:44:45 dholland Exp $");

 #endif
 #endif /* not lint */
 
 #endif
 #endif /* not lint */
 


@@ -64,10 +64,19 @@ boolean see_invisible = 0;
 short extra_hp = 0;
 boolean detect_monster = 0;
 boolean con_mon = 0;
 short extra_hp = 0;
 boolean detect_monster = 0;
 boolean con_mon = 0;

-const char *strange_feeling = "you have a strange feeling for a moment, then it passes";
+
+static const char strange_feeling[] = 
+       "you have a strange feeling for a moment, then it passes";
+
+static const char *get_ench_color(void);
+static void go_blind(void);
+static void hold_monster(void);
+static void idntfy(void);
+static void potion_heal(int);
+static void uncurse_all(void);

 
 void
 
 void

-quaff()
+quaff(void)

 {
        short ch;
        object *obj;
 {
        short ch;
        object *obj;


@@ -179,7 +188,7 @@ quaff()
 }
 
 void
 }
 
 void

-read_scroll()
+read_scroll(void)

 {
        short ch;
        object *obj;
 {
        short ch;
        object *obj;


@@ -288,10 +297,7 @@ read_scroll()
  */
 
 void
  */
 
 void

-vanish(obj, rm, pack)
-       object *obj;
-       short rm;
-       object *pack;
+vanish(object *obj, short rm, object *pack)

 {
        if (obj->quantity > 1) {
                obj->quantity--;
 {
        if (obj->quantity > 1) {
                obj->quantity--;


@@ -311,9 +317,8 @@ vanish(obj, rm, pack)
        }
 }
 
        }
 }
 

-void
-potion_heal(extra)
-       int extra;
+static void
+potion_heal(int extra)

 {
        float ratio;
        short add;
 {
        float ratio;
        short add;


@@ -337,7 +342,7 @@ potion_heal(extra)
                if (extra) {
                        ratio += ratio;
                }
                if (extra) {
                        ratio += ratio;
                }

-               add = (short)(ratio * ((float)rogue.hp_max - rogue.hp_current));
+               add = (short)(ratio * (rogue.hp_max - rogue.hp_current));

                rogue.hp_current += add;
                if (rogue.hp_current > rogue.hp_max) {
                        rogue.hp_current = rogue.hp_max;
                rogue.hp_current += add;
                if (rogue.hp_current > rogue.hp_max) {
                        rogue.hp_current = rogue.hp_max;


@@ -347,7 +352,7 @@ potion_heal(extra)
                unblind();
        }
        if (confused && extra) {
                unblind();
        }
        if (confused && extra) {

-                       unconfuse();
+               unconfuse();

        } else if (confused) {
                confused = (confused / 2) + 1;
        }
        } else if (confused) {
                confused = (confused / 2) + 1;
        }


@@ -358,8 +363,8 @@ potion_heal(extra)
        }
 }
 
        }
 }
 

-void
-idntfy()
+static void
+idntfy(void)

 {
        short ch;
        object *obj;
 {
        short ch;
        object *obj;


@@ -387,7 +392,7 @@ AGAIN:
 }
 
 void
 }
 
 void

-eat()
+eat(void)

 {
        short ch;
        short moves;
 {
        short ch;
        short moves;


@@ -426,8 +431,8 @@ eat()
        vanish(obj, 1, &rogue.pack);
 }
 
        vanish(obj, 1, &rogue.pack);
 }
 

-void
-hold_monster()
+static void
+hold_monster(void)

 {
        short i, j;
        short mcount = 0;
 {
        short i, j;
        short mcount = 0;


@@ -460,7 +465,7 @@ hold_monster()
 }
 
 void
 }
 
 void

-tele()
+tele(void)

 {
        mvaddch(rogue.row, rogue.col, get_dungeon_char(rogue.row, rogue.col));
 
 {
        mvaddch(rogue.row, rogue.col, get_dungeon_char(rogue.row, rogue.col));
 


@@ -473,7 +478,7 @@ tele()
 }
 
 void
 }
 
 void

-hallucinate()
+hallucinate(void)

 {
        object *obj, *monster;
        short ch;
 {
        object *obj, *monster;
        short ch;


@@ -503,7 +508,7 @@ hallucinate()
 }
 
 void
 }
 
 void

-unhallucinate()
+unhallucinate(void)

 {
        halluc = 0;
        relight();
 {
        halluc = 0;
        relight();


@@ -511,7 +516,7 @@ unhallucinate()
 }
 
 void
 }
 
 void

-unblind()
+unblind(void)

 {
        blind = 0;
        messagef(1, "the veil of darkness lifts");
 {
        blind = 0;
        messagef(1, "the veil of darkness lifts");


@@ -525,7 +530,7 @@ unblind()
 }
 
 void
 }
 
 void

-relight()
+relight(void)

 {
        if (cur_room == PASSAGE) {
                light_passage(rogue.row, rogue.col);
 {
        if (cur_room == PASSAGE) {
                light_passage(rogue.row, rogue.col);


@@ -536,7 +541,7 @@ relight()
 }
 
 void
 }
 
 void

-take_a_nap()
+take_a_nap(void)

 {
        short i;
 
 {
        short i;
 


@@ -550,8 +555,8 @@ take_a_nap()
        messagef(0, "%s", you_can_move_again);
 }
 
        messagef(0, "%s", you_can_move_again);
 }
 

-void
-go_blind()
+static void
+go_blind(void)

 {
        short i, j;
 
 {
        short i, j;
 


@@ -582,8 +587,8 @@ go_blind()
        mvaddch(rogue.row, rogue.col, rogue.fchar);
 }
 
        mvaddch(rogue.row, rogue.col, rogue.fchar);
 }
 

-const char *
-get_ench_color()
+static const char *
+get_ench_color(void)

 {
        if (halluc) {
                return(id_potions[get_rand(0, POTIONS-1)].title);
 {
        if (halluc) {
                return(id_potions[get_rand(0, POTIONS-1)].title);


@@ -594,20 +599,20 @@ get_ench_color()
 }
 
 void
 }
 
 void

-cnfs()
+cnfs(void)

 {
        confused += get_rand(12, 22);
 }
 
 void
 {
        confused += get_rand(12, 22);
 }
 
 void

-unconfuse()
+unconfuse(void)

 {
        confused = 0;
        messagef(1, "you feel less %s now", (halluc ? "trippy" : "confused"));
 }
 
 {
        confused = 0;
        messagef(1, "you feel less %s now", (halluc ? "trippy" : "confused"));
 }
 

-void
-uncurse_all()
+static void
+uncurse_all(void)

 {
        object *obj;
 
 {
        object *obj;