Simplify syncing with upstream

[bsdgames-darwin.git] / larn / object.c

diff --git a/larn/object.c b/larn/object.c
index 691f978091258dc4dce0c54ad8e66d8f82ff65bd..942b6bce3e522d1eacb08a799ae299108b605a1a 100644 (file)
--- a/larn/object.c
+++ b/larn/object.c
@@ -1,28 +1,41 @@
-/*     $NetBSD: object.c,v 1.13 2008/02/03 21:24:59 dholland Exp $     */
+/*     $NetBSD: object.c,v 1.17 2019/02/03 03:19:25 mrg Exp $  */
 
 /* object.c            Larn is copyrighted 1986 by Noah Morgan. */
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: object.c,v 1.13 2008/02/03 21:24:59 dholland Exp $");
+__RCSID("$NetBSD: object.c,v 1.17 2019/02/03 03:19:25 mrg Exp $");
 #endif                         /* not lint */
 #include "header.h"
 #include "extern.h"
 
+static void finditem(int);
+static void ostairs(int);
+static void opotion(int);
+static void oscroll(int);
+static void oorb(void);
+static void opit(void);
+static void obottomless(void);
+static void oelevator(int);
+static void ostatue(void);
+static void omirror(void);
+static void obook(void);
+static void ocookie(void);
+static void ogold(int);
+static void ohome(void);
+
 /*
-       ***************
-       LOOK_FOR_OBJECT
-       ***************
+       lookforobject
 
        subroutine to look for an object and give the player his options
        if an object was found.
  */
 void
-lookforobject()
+lookforobject(void)
 {
        int    i, j;
        if (c[TIMESTOP])
-               return;         /* can't find objects is time is stopped         */
+               return;         /* can't find objects if time is stopped         */
        i = item[playerx][playery];
        if (i == 0)
                return;
@@ -135,6 +148,7 @@ lookforobject()
                item[playerx][playery] = OTELEPORTER;
                know[playerx][playery] = 1;
 
+               /* FALLTHROUGH */
        case OTELEPORTER:
                lprcat("\nZaaaappp!  You've been teleported!\n");
                beep();
@@ -391,6 +405,7 @@ lookforobject()
                item[playerx][playery] = OTRAPARROW;
                know[playerx][playery] = 0;
 
+               /* FALLTHROUGH */
        case OTRAPARROW:
                lprcat("\nYou are hit by an arrow");
                beep();         /* for an arrow trap */
@@ -405,6 +420,7 @@ lookforobject()
                item[playerx][playery] = ODARTRAP;
                know[playerx][playery] = 0;
 
+               /* FALLTHROUGH */
        case ODARTRAP:
                lprcat("\nYou are hit by a dart");
                beep();         /* for a dart trap */
@@ -421,6 +437,7 @@ lookforobject()
                item[playerx][playery] = OTRAPDOOR;
                know[playerx][playery] = 1;
 
+               /* FALLTHROUGH */
        case OTRAPDOOR:
                lastnum = 272;  /* a trap door */
                if ((level == MAXLEVEL - 1) || (level == MAXLEVEL + MAXVLEVEL - 1)) {
@@ -497,7 +514,7 @@ lookforobject()
 /*
        function to say what object we found and ask if player wants to take it
  */
-void
+static void
 finditem(int theitem)
 {
        int             tmp, i;
@@ -537,16 +554,11 @@ finditem(int theitem)
 
 
 /*
-       *******
-       OSTAIRS
-       *******
-
        subroutine to process the stair cases
        if dir > 0 the up else down
  */
-void
-ostairs(dir)
-       int             dir;
+static void
+ostairs(int dir)
 {
        int    k;
        lprcat("\nDo you (s) stay here  ");
@@ -608,15 +620,10 @@ ostairs(dir)
 
 
 /*
-       *********
-       OTELEPORTER
-       *********
-
        subroutine to handle a teleport trap +/- 1 level maximum
  */
 void
-oteleport(err)
-       int             err;
+oteleport(int err)
 {
        int    tmp;
        if (err)
@@ -649,15 +656,10 @@ oteleport(err)
 
 
 /*
-       *******
-       OPOTION
-       *******
-
        function to process a potion
  */
-void
-opotion(pot)
-       int             pot;
+static void
+opotion(int pot)
 {
        lprcat("\nDo you (d) drink it, (t) take it");
        iopts();
@@ -686,8 +688,7 @@ opotion(pot)
        function to drink a potion
  */
 void
-quaffpotion(pot)
-       int             pot;
+quaffpotion(int pot)
 {
        int    i, j, k;
        if (pot < 0 || pot >= MAXPOTION)
@@ -862,15 +863,10 @@ quaffpotion(pot)
 
 
 /*
-       *******
-       OSCROLL
-       *******
-
        function to process a magic scroll
  */
-void
-oscroll(typ)
-       int             typ;
+static void
+oscroll(int typ)
 {
        lprcat("\nDo you ");
        if (c[BLINDCOUNT] == 0)
@@ -918,7 +914,7 @@ static u_char     exten[] = {
        CANCELLATION, HASTESELF, GLOBE, SCAREMONST, HOLDMONST, TIMESTOP
 };
 
-u_char time_change[] = {
+static u_char time_change[] = {
        HASTESELF, HERO, ALTPRO, PROTECTIONTIME, DEXCOUNT, STRCOUNT,
        GIANTSTR, CHARMCOUNT, INVISIBILITY, CANCELLATION, HASTESELF,
        AGGRAVATE, SCAREMONST, STEALTH, AWARENESS, HOLDMONST,
@@ -930,8 +926,7 @@ u_char time_change[] = {
  *     function to adjust time when time warping and taking courses in school
  */
 void
-adjusttime(tim)
-       long   tim;
+adjusttime(long tim)
 {
        int    j;
        for (j = 0; j < 26; j++)/* adjust time related parameters */
@@ -945,8 +940,7 @@ adjusttime(tim)
        function to read a scroll
  */
 void
-read_scroll(typ)
-       int             typ;
+read_scroll(int typ)
 {
        int    i, j;
        if (typ < 0 || typ >= MAXSCROLL)
@@ -1100,13 +1094,13 @@ read_scroll(typ)
 
 
 
-void
-oorb()
+static void
+oorb(void)
 {
 }
 
-void
-opit()
+static void
+opit(void)
 {
        int    i;
        if (rnd(101) < 81) {
@@ -1134,17 +1128,17 @@ opit()
        }
 }
 
-void
-obottomless()
+static void
+obottomless(void)
 {
        lprcat("\nYou fell into a bottomless pit!");
        beep();
        nap(3000);
        died(262);
 }
-void
-oelevator(dir)
-       int             dir;
+
+static void
+oelevator(int dir)
 {
 #ifdef lint
        int             x;
@@ -1153,18 +1147,18 @@ oelevator(dir)
 #endif /* lint */
 }
 
-void
-ostatue()
+static void
+ostatue(void)
 {
 }
 
-void
-omirror()
+static void
+omirror(void)
 {
 }
 
-void
-obook()
+static void
+obook(void)
 {
        lprcat("\nDo you ");
        if (c[BLINDCOUNT] == 0)
@@ -1198,8 +1192,7 @@ obook()
        function to read a book
  */
 void
-readbook(lev)
-       int    lev;
+readbook(int lev)
 {
        int    i, tmp;
        if (lev <= 3)
@@ -1215,7 +1208,7 @@ readbook(lev)
        }
 }
 
-void
+static void
 ocookie(void)
 {
        const char *p;
@@ -1253,9 +1246,8 @@ ocookie(void)
  * routine to pick up some gold -- if arg==OMAXGOLD then the pile is worth
  * 100* the argument
  */
-void
-ogold(arg)
-       int             arg;
+static void
+ogold(int arg)
 {
        long   i;
        i = iarg[playerx][playery];
@@ -1271,8 +1263,8 @@ ogold(arg)
        item[playerx][playery] = know[playerx][playery] = 0;    /* destroy gold  */
 }
 
-void
-ohome()
+static void
+ohome(void)
 {
        int    i;
        nosignal = 1;           /* disable signals */
@@ -1336,13 +1328,13 @@ ohome()
 
 /* routine to save program space        */
 void
-iopts()
+iopts(void)
 {
        lprcat(", or (i) ignore it? ");
 }
 
 void
-ignore()
+ignore(void)
 {
        lprcat("ignore\n");
 }