Fix darwin-amd64

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

diff --git a/larn/object.c b/larn/object.c
index 1c7e607dfdee3e41ca72cf10f3427602b8331a90..942b6bce3e522d1eacb08a799ae299108b605a1a 100644 (file)
--- a/larn/object.c
+++ b/larn/object.c
@@ -1,10 +1,10 @@
-/*     $NetBSD: object.c,v 1.15 2009/08/12 08:04:05 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.15 2009/08/12 08:04:05 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"
@@ -31,7 +31,7 @@ static void ohome(void);
        if an object was found.
  */
 void
-lookforobject()
+lookforobject(void)
 {
        int    i, j;
        if (c[TIMESTOP])
@@ -148,6 +148,7 @@ lookforobject()
                item[playerx][playery] = OTELEPORTER;
                know[playerx][playery] = 1;
 
+               /* FALLTHROUGH */
        case OTELEPORTER:
                lprcat("\nZaaaappp!  You've been teleported!\n");
                beep();
@@ -404,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 */
@@ -418,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 */
@@ -434,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)) {
@@ -554,8 +558,7 @@ finditem(int theitem)
        if dir > 0 the up else down
  */
 static void
-ostairs(dir)
-       int             dir;
+ostairs(int dir)
 {
        int    k;
        lprcat("\nDo you (s) stay here  ");
@@ -620,8 +623,7 @@ ostairs(dir)
        subroutine to handle a teleport trap +/- 1 level maximum
  */
 void
-oteleport(err)
-       int             err;
+oteleport(int err)
 {
        int    tmp;
        if (err)
@@ -657,8 +659,7 @@ oteleport(err)
        function to process a potion
  */
 static void
-opotion(pot)
-       int             pot;
+opotion(int pot)
 {
        lprcat("\nDo you (d) drink it, (t) take it");
        iopts();
@@ -687,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)
@@ -866,8 +866,7 @@ quaffpotion(pot)
        function to process a magic scroll
  */
 static void
-oscroll(typ)
-       int             typ;
+oscroll(int typ)
 {
        lprcat("\nDo you ");
        if (c[BLINDCOUNT] == 0)
@@ -927,8 +926,7 @@ static 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 */
@@ -942,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)
@@ -1098,12 +1095,12 @@ read_scroll(typ)
 
 
 static void
-oorb()
+oorb(void)
 {
 }
 
 static void
-opit()
+opit(void)
 {
        int    i;
        if (rnd(101) < 81) {
@@ -1132,7 +1129,7 @@ opit()
 }
 
 static void
-obottomless()
+obottomless(void)
 {
        lprcat("\nYou fell into a bottomless pit!");
        beep();
@@ -1141,8 +1138,7 @@ obottomless()
 }
 
 static void
-oelevator(dir)
-       int             dir;
+oelevator(int dir)
 {
 #ifdef lint
        int             x;
@@ -1152,17 +1148,17 @@ oelevator(dir)
 }
 
 static void
-ostatue()
+ostatue(void)
 {
 }
 
 static void
-omirror()
+omirror(void)
 {
 }
 
 static void
-obook()
+obook(void)
 {
        lprcat("\nDo you ");
        if (c[BLINDCOUNT] == 0)
@@ -1196,8 +1192,7 @@ obook()
        function to read a book
  */
 void
-readbook(lev)
-       int    lev;
+readbook(int lev)
 {
        int    i, tmp;
        if (lev <= 3)
@@ -1252,8 +1247,7 @@ ocookie(void)
  * 100* the argument
  */
 static void
-ogold(arg)
-       int             arg;
+ogold(int arg)
 {
        long   i;
        i = iarg[playerx][playery];
@@ -1270,7 +1264,7 @@ ogold(arg)
 }
 
 static void
-ohome()
+ohome(void)
 {
        int    i;
        nosignal = 1;           /* disable signals */
@@ -1334,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");
 }