Fix merge conflicts

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

diff --git a/larn/monster.c b/larn/monster.c
index eb80a9e8ccd5edb70d2cb57933f41d8bc9618986..1b325170c5e0e39913e3dcfe2a56f9f9a3e3c192 100644 (file)
--- a/larn/monster.c
+++ b/larn/monster.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: monster.c,v 1.9 2006/03/19 00:32:18 christos Exp $     */
+/*     $NetBSD: monster.c,v 1.20 2021/05/02 12:50:45 rillig Exp $      */

 
 /*
  * monster.c   Larn is copyrighted 1986 by Noah Morgan.
 
 /*
  * monster.c   Larn is copyrighted 1986 by Noah Morgan.


@@ -100,11 +100,12 @@
  */
 #include <sys/cdefs.h>
 #ifndef lint
  */
 #include <sys/cdefs.h>
 #ifndef lint

-__RCSID("$NetBSD: monster.c,v 1.9 2006/03/19 00:32:18 christos Exp $");
+__RCSID("$NetBSD: monster.c,v 1.20 2021/05/02 12:50:45 rillig Exp $");

 #endif                         /* not lint */
 
 #include <string.h>
 #include <stdlib.h>
 #endif                         /* not lint */
 
 #include <string.h>
 #include <stdlib.h>

+#include <ctype.h>

 #include "header.h"
 #include "extern.h"
 
 #include "header.h"
 #include "extern.h"
 


@@ -114,7 +115,24 @@ struct isave {                     /* used for altar reality */
        short           arg;    /* the type of item or hitpoints of monster */
 };
 
        short           arg;    /* the type of item or hitpoints of monster */
 };
 

+static int cgood(int, int, int, int);
+static void speldamage(int);
+static void loseint(void);
+static int isconfuse(void);
+static int nospell(int, int);
+static int fullhit(int);
+static void direct(int, int, const char *, int);
+static void ifblind(int, int);
+static void tdirect(int);
+static void omnidirect(int, int, const char *);

 static int dirsub(int *, int *);
 static int dirsub(int *, int *);

+static void dirpoly(int);
+static int hitm(int, int, int);
+static void dropsomething(int);
+static int spattack(int, int, int);
+static void sphboom(int, int);
+static void genmonst(void);
+

 /*
  * createmonster(monstno)      Function to create a monster next to the player
  *     int monstno;
 /*
  * createmonster(monstno)      Function to create a monster next to the player
  *     int monstno;


@@ -123,14 +141,13 @@ static int dirsub(int *, int *);
  * Returns no value.
  */
 void
  * Returns no value.
  */
 void

-createmonster(mon)
-       int             mon;
+createmonster(int mon)

 {
        int    x, y, k, i;
        if (mon < 1 || mon > MAXMONST + 8) {    /* check for monster number
                                                 * out of bounds */
                beep();
 {
        int    x, y, k, i;
        if (mon < 1 || mon > MAXMONST + 8) {    /* check for monster number
                                                 * out of bounds */
                beep();

-               lprintf("\ncan't createmonst(%d)\n", (long) mon);
+               lprintf("\ncan't createmonst(%ld)\n", (long) mon);

                nap(3000);
                return;
        }
                nap(3000);
                return;
        }


@@ -168,16 +185,15 @@ createmonster(mon)
  *               if monst==TRUE check for no monster at this location
  * This routine will return FALSE if at a wall or the dungeon exit on level 1
  */
  *               if monst==TRUE check for no monster at this location
  * This routine will return FALSE if at a wall or the dungeon exit on level 1
  */

-int 
-cgood(x, y, itm, monst)
-       int    x, y;
-       int             itm, monst;
+static int
+cgood(int x, int y, int theitem, int monst)

 {
 {

+#define itm __lose

        if ((y >= 0) && (y <= MAXY - 1) && (x >= 0) && (x <= MAXX - 1))
                /* within bounds? */
                if (item[x][y] != OWALL) /* can't make anything on walls */
                        /* is it free of items? */
        if ((y >= 0) && (y <= MAXY - 1) && (x >= 0) && (x <= MAXX - 1))
                /* within bounds? */
                if (item[x][y] != OWALL) /* can't make anything on walls */
                        /* is it free of items? */

-                       if (itm == 0 || (item[x][y] == 0))
+                       if (theitem == 0 || (item[x][y] == 0))

                                /* is it free of monsters? */
                                if (monst == 0 || (mitem[x][y] == 0))
                                        if ((level != 1) || (x != 33) ||
                                /* is it free of monsters? */
                                if (monst == 0 || (mitem[x][y] == 0))
                                        if ((level != 1) || (x != 33) ||


@@ -195,8 +211,7 @@ cgood(x, y, itm, monst)
  * Returns no value, thus we don't know about createitem() failures.
  */
 void
  * Returns no value, thus we don't know about createitem() failures.
  */
 void

-createitem(it, arg)
-       int             it, arg;
+createitem(int it, int arg)

 {
        int    x, y, k, i;
        if (it >= MAXOBJ)
 {
        int    x, y, k, i;
        if (it >= MAXOBJ)


@@ -223,7 +238,7 @@ createitem(it, arg)
  */
 static char     eys[] = "\nEnter your spell: ";
 void
  */
 static char     eys[] = "\nEnter your spell: ";
 void

-cast()
+cast(void)

 {
        int    i, j, a, b, d;
        cursors();
 {
        int    i, j, a, b, d;
        cursors();


@@ -233,16 +248,16 @@ cast()
        }
        lprcat(eys);
        --c[SPELLS];
        }
        lprcat(eys);
        --c[SPELLS];

-       while ((a = lgetchar()) == 'D') {
+       while ((a = ttgetch()) == 'D') {

                seemagic(-1);
                cursors();
                lprcat(eys);
        }
        if (a == '\33')
                goto over;      /* to escape casting a spell     */
                seemagic(-1);
                cursors();
                lprcat(eys);
        }
        if (a == '\33')
                goto over;      /* to escape casting a spell     */

-       if ((b = lgetchar()) == '\33')
+       if ((b = ttgetch()) == '\33')

                goto over;      /* to escape casting a spell     */
                goto over;      /* to escape casting a spell     */

-       if ((d = lgetchar()) == '\33') {
+       if ((d = ttgetch()) == '\33') {

 over:          lprcat(aborted);
                c[SPELLS]++;
                return;
 over:          lprcat(aborted);
                c[SPELLS]++;
                return;


@@ -270,13 +285,13 @@ over:             lprcat(aborted);
  * Enter with the spell number, returns no value.
  * Please insure that there are 2 spaces before all messages here
  */
  * Enter with the spell number, returns no value.
  * Please insure that there are 2 spaces before all messages here
  */

-void
-speldamage(x)
-       int             x;
+static void
+speldamage(int x)

 {
        int    i, j, clev;
        int             xl, xh, yl, yh;
 {
        int    i, j, clev;
        int             xl, xh, yl, yh;

-       char  *p, *kn, *pm;
+       u_char  *p, *kn, *pm;
+

        if (x >= SPNUM)
                return;         /* no such spell */
        if (c[TIMESTOP]) {
        if (x >= SPNUM)
                return;         /* no such spell */
        if (c[TIMESTOP]) {


@@ -313,10 +328,10 @@ speldamage(x)
                c[DEXCOUNT] += 400;
                return;
 
                c[DEXCOUNT] += 400;
                return;
 

-       case 3:
+       case 3:         /* sleep                 */

                i = rnd(3) + 1;
                i = rnd(3) + 1;

-               p = "  While the %s slept, you smashed it %d times";
-ws:            direct(x, fullhit(i), p, i);    /* sleep         */
+               direct(x, fullhit(i),
+                      "  While the %s slept, you smashed it %ld times", i);

                return;
 
        case 4:         /* charm monster         */
                return;
 
        case 4:         /* charm monster         */


@@ -329,10 +344,11 @@ ws:               direct(x, fullhit(i), p, i);    /* sleep         */
 
                /* ----- LEVEL 2 SPELLS ----- */
 
 
                /* ----- LEVEL 2 SPELLS ----- */
 

-       case 6:
+       case 6:         /* web                  */

                i = rnd(3) + 2;
                i = rnd(3) + 2;

-               p = "  While the %s is entangled, you hit %d times";
-               goto ws;        /* web */
+               direct(x, fullhit(i),
+                      "  While the %s is entangled, you hit %ld times", i);
+               return;

 
        case 7:
                if (c[STRCOUNT] == 0)
 
        case 7:
                if (c[STRCOUNT] == 0)


@@ -623,7 +639,7 @@ ws:         direct(x, fullhit(i), p, i);    /* sleep         */
                return;
 
        default:
                return;
 
        default:

-               lprintf("  spell %d not available!", (long) x);
+               lprintf("  spell %ld not available!", (long) x);

                beep();
                return;
        };
                beep();
                return;
        };


@@ -634,8 +650,8 @@ ws:         direct(x, fullhit(i), p, i);    /* sleep         */
  *
  * No arguments and no return value
  */
  *
  * No arguments and no return value
  */

-void
-loseint()
+static void
+loseint(void)

 {
        if (--c[INTELLIGENCE] < 3)
                c[INTELLIGENCE] = 3;
 {
        if (--c[INTELLIGENCE] < 3)
                c[INTELLIGENCE] = 3;


@@ -647,8 +663,8 @@ loseint()
  * This routine prints out a message saying "You can't aim your magic!"
  * returns 0 if not confused, non-zero (time remaining confused) if confused
  */
  * This routine prints out a message saying "You can't aim your magic!"
  * returns 0 if not confused, non-zero (time remaining confused) if confused
  */

-int
-isconfuse()
+static int
+isconfuse(void)

 {
        if (c[CONFUSE]) {
                lprcat(" You can't aim your magic!");
 {
        if (c[CONFUSE]) {
                lprcat(" You can't aim your magic!");


@@ -665,9 +681,8 @@ isconfuse()
  *   otherwise returns 0
  * Enter with the spell number in x, and the monster number in monst.
  */
  *   otherwise returns 0
  * Enter with the spell number in x, and the monster number in monst.
  */

-int
-nospell(x, monst)
-       int             x, monst;
+static int
+nospell(int x, int monst)

 {
        int    tmp;
        if (x >= SPNUM || monst >= MAXMONST + 8 || monst < 0 || x < 0)
 {
        int    tmp;
        if (x >= SPNUM || monst >= MAXMONST + 8 || monst < 0 || x < 0)


@@ -687,9 +702,8 @@ nospell(x, monst)
  * Function to return hp damage to monster due to a number of full hits
  * Enter with the number of full hits being done
  */
  * Function to return hp damage to monster due to a number of full hits
  * Enter with the number of full hits being done
  */

-int
-fullhit(xx)
-       int             xx;
+static int
+fullhit(int xx)

 {
        int    i;
        if (xx < 0 || xx > 20)
 {
        int    i;
        if (xx < 0 || xx > 20)


@@ -710,10 +724,8 @@ fullhit(xx)
  *   lprintf format string in str, and lprintf's argument in arg.
  * Returns no value.
  */
  *   lprintf format string in str, and lprintf's argument in arg.
  * Returns no value.
  */

-void
-direct(spnum, dam, str, arg)
-       int             spnum, dam, arg;
-       char           *str;
+static void
+direct(int spnum, int dam, const char *str, int arg)

 {
        int             x, y;
        int    m;
 {
        int             x, y;
        int    m;


@@ -740,7 +752,7 @@ direct(spnum, dam, str, arg)
                        goto fool;
                } else {
                        lastnum = 278;
                        goto fool;
                } else {
                        lastnum = 278;

-                       lprintf(str, "spell caster (thats you)", (long) arg);
+                       lprintf(str, "spell caster (that's you)", (long) arg);

                        beep();
                        losehp(dam);
                        return;
                        beep();
                        losehp(dam);
                        return;


@@ -773,13 +785,16 @@ direct(spnum, dam, str, arg)
  * Returns no value.
  */
 void
  * Returns no value.
  */
 void

-godirect(spnum, dam, str, delay, cshow)
-       int             spnum, dam, delay;
-       char           *str, cshow;
+godirect(int spnum, int dam, const char *str, int delay, int cshow_i)

 {
 {

-       char  *p;
+       u_char  *p;

        int    x, y, m;
        int             dx, dy;
        int    x, y, m;
        int             dx, dy;

+       char cshow;
+
+       /* truncate to char width in case it matters */
+       cshow = (char)cshow_i;
+

        if (spnum < 0 || spnum >= SPNUM || str == 0 || delay < 0)
                return;         /* bad args */
        if (isconfuse())
        if (spnum < 0 || spnum >= SPNUM || str == 0 || delay < 0)
                return;         /* bad args */
        if (isconfuse())


@@ -800,7 +815,7 @@ godirect(spnum, dam, str, delay, cshow)
                }
                if ((x == playerx) && (y == playery)) { /* if energy hits player */
                        cursors();
                }
                if ((x == playerx) && (y == playery)) { /* if energy hits player */
                        cursors();

-                       lprcat("\nYou are hit my your own magic!");
+                       lprcat("\nYou are hit by your own magic!");

                        beep();
                        lastnum = 278;
                        losehp(dam);
                        beep();
                        lastnum = 278;
                        losehp(dam);


@@ -896,11 +911,11 @@ godirect(spnum, dam, str, delay, cshow)
  * Enter with the coordinates (x,y) of the monster
  * Returns no value.
  */
  * Enter with the coordinates (x,y) of the monster
  * Returns no value.
  */

-void
-ifblind(x, y)
-       int             x, y;
+static void
+ifblind(int x, int y)

 {
 {

-       char           *p;
+       const char *p;
+

        vxy(&x, &y);            /* verify correct x,y coordinates */
        if (c[BLINDCOUNT]) {
                lastnum = 279;
        vxy(&x, &y);            /* verify correct x,y coordinates */
        if (c[BLINDCOUNT]) {
                lastnum = 279;


@@ -920,9 +935,8 @@ ifblind(x, y)
  * Enter with the spell number that wants to teleport away
  * Returns no value.
  */
  * Enter with the spell number that wants to teleport away
  * Returns no value.
  */

-void
-tdirect(spnum)
-       int             spnum;
+static void
+tdirect(int spnum)

 {
        int             x, y;
        int    m;
 {
        int             x, y;
        int    m;


@@ -955,12 +969,11 @@ tdirect(spnum)
  *   and the lprintf string to identify the spell in str.
  * Returns no value.
  */
  *   and the lprintf string to identify the spell in str.
  * Returns no value.
  */

-void
-omnidirect(spnum, dam, str)
-       int             spnum, dam;
-       char           *str;
+static void
+omnidirect(int spnum, int dam, const char *str)

 {
        int    x, y, m;
 {
        int    x, y, m;

+

        if (spnum < 0 || spnum >= SPNUM || str == 0)
                return;         /* bad args */
        for (x = playerx - 1; x < playerx + 2; x++)
        if (spnum < 0 || spnum >= SPNUM || str == 0)
                return;         /* bad args */
        for (x = playerx - 1; x < playerx + 2; x++)


@@ -990,29 +1003,36 @@ omnidirect(spnum, dam, str)
  * Returns index into diroffx[] (0-8).
  */
 static int
  * Returns index into diroffx[] (0-8).
  */
 static int

-dirsub(x, y)
-       int            *x, *y;
+dirsub(int *x, int *y)

 {
        int    i;
        lprcat("\nIn What Direction? ");
        for (i = 0;;)
 {
        int    i;
        lprcat("\nIn What Direction? ");
        for (i = 0;;)

-               switch (lgetchar()) {
+               switch (ttgetch()) {

                case 'b':
                        i++;
                case 'b':
                        i++;

+                       /* FALLTHROUGH */

                case 'n':
                        i++;
                case 'n':
                        i++;

+                       /* FALLTHROUGH */

                case 'y':
                        i++;
                case 'y':
                        i++;

+                       /* FALLTHROUGH */

                case 'u':
                        i++;
                case 'u':
                        i++;

+                       /* FALLTHROUGH */

                case 'h':
                        i++;
                case 'h':
                        i++;

+                       /* FALLTHROUGH */

                case 'k':
                        i++;
                case 'k':
                        i++;

+                       /* FALLTHROUGH */

                case 'l':
                        i++;
                case 'l':
                        i++;

+                       /* FALLTHROUGH */

                case 'j':
                        i++;
                case 'j':
                        i++;

+                       /* FALLTHROUGH */

                        goto out;
                };
 out:
                        goto out;
                };
 out:


@@ -1033,8 +1053,7 @@ out:
  * routine are affected.
  */
 int
  * routine are affected.
  */
 int

-vxy(x, y)
-       int            *x, *y;
+vxy(int *x, int *y)

 {
        int             flag = 0;
        if (*x < 0) {
 {
        int             flag = 0;
        if (*x < 0) {


@@ -1064,9 +1083,8 @@ vxy(x, y)
  * Enter with the spell number in spmun.
  * Returns no value.
  */
  * Enter with the spell number in spmun.
  * Returns no value.
  */

-void
-dirpoly(spnum)
-       int             spnum;
+static void
+dirpoly(int spnum)

 {
        int             x, y, m;
        if (spnum < 0 || spnum >= SPNUM)
 {
        int             x, y, m;
        if (spnum < 0 || spnum >= SPNUM)


@@ -1098,8 +1116,7 @@ dirpoly(spnum)
  * Returns no value.
  */
 void
  * Returns no value.
  */
 void

-hitmonster(x, y)
-       int             x, y;
+hitmonster(int x, int y)

 {
        int    tmp, monst, damag = 0, flag;
        if (c[TIMESTOP])
 {
        int    tmp, monst, damag = 0, flag;
        if (c[TIMESTOP])


@@ -1150,10 +1167,8 @@ hitmonster(x, y)
  * This routine is used to specifically damage a monster at a location (x,y)
  * Called by hitmonster(x,y)
  */
  * This routine is used to specifically damage a monster at a location (x,y)
  * Called by hitmonster(x,y)
  */

-int
-hitm(x, y, amt)
-       int x, y;
-       int amt;
+static int
+hitm(int x, int y, int amt)

 {
        int    monst;
        int    hpoints, amt2;
 {
        int    monst;
        int    hpoints, amt2;


@@ -1208,14 +1223,13 @@ hitm(x, y, amt)
  * Returns nothing of value.
  */
 void
  * Returns nothing of value.
  */
 void

-hitplayer(x, y)
-       int             x, y;
+hitplayer(int x, int y)

 {
        int    dam, tmp, mster, bias;
        vxy(&x, &y);            /* verify coordinates are within range */
        lastnum = mster = mitem[x][y];
        /*
 {
        int    dam, tmp, mster, bias;
        vxy(&x, &y);            /* verify coordinates are within range */
        lastnum = mster = mitem[x][y];
        /*

-        * spirit naga's and poltergeist's do nothing if scarab of negate
+        * spirit nagas and poltergeists do nothing if scarab of negate

         * spirit
         */
        if (c[NEGATESPIRIT] || c[SPIRITPRO])
         * spirit
         */
        if (c[NEGATESPIRIT] || c[SPIRITPRO])


@@ -1284,9 +1298,8 @@ hitplayer(x, y)
  * Enter with the monster number
  * Returns nothing of value.
  */
  * Enter with the monster number
  * Returns nothing of value.
  */

-void
-dropsomething(monst)
-       int             monst;
+static void
+dropsomething(int monst)

 {
        switch (monst) {
        case ORC:
 {
        switch (monst) {
        case ORC:


@@ -1319,8 +1332,7 @@ dropsomething(monst)
  * Returns nothing of value.
  */
 void
  * Returns nothing of value.
  */
 void

-dropgold(amount)
-       int    amount;
+dropgold(int amount)

 {
        if (amount > 250)
                createitem(OMAXGOLD, amount / 100);
 {
        if (amount > 250)
                createitem(OMAXGOLD, amount / 100);


@@ -1337,16 +1349,15 @@ dropgold(amount)
  * Returns nothing of value.
  */
 void
  * Returns nothing of value.
  */
 void

-something(level)
-       int             level;
+something(int cavelevel)

 {
        int    j;
        int             i;
 {
        int    j;
        int             i;

-       if (level < 0 || level > MAXLEVEL + MAXVLEVEL)
+       if (cavelevel < 0 || cavelevel > MAXLEVEL + MAXVLEVEL)

                return;         /* correct level? */
        if (rnd(101) < 8)
                return;         /* correct level? */
        if (rnd(101) < 8)

-               something(level);       /* possibly more than one item */
-       j = newobject(level, &i);
+               something(cavelevel);   /* possibly more than one item */
+       j = newobject(cavelevel, &i);

        createitem(j, i);
 }
 
        createitem(j, i);
 }
 


@@ -1368,8 +1379,7 @@ static char     nobjtab[] = {
        OLONGSWORD};
 
 int
        OLONGSWORD};
 
 int

-newobject(lev, i)
-       int    lev, *i;
+newobject(int lev, int *i)

 {
        int    tmp = 32, j;
        if (level < 0 || level > MAXLEVEL + MAXVLEVEL)
 {
        int    tmp = 32, j;
        if (level < 0 || level > MAXLEVEL + MAXVLEVEL)


@@ -1501,12 +1511,12 @@ static char     rustarm[ARMORTYPES][2] = {
        { OPLATEARMOR, -9}
 };
 static char     spsel[] = {1, 2, 3, 5, 6, 8, 9, 11, 13, 14};
        { OPLATEARMOR, -9}
 };
 static char     spsel[] = {1, 2, 3, 5, 6, 8, 9, 11, 13, 14};

-int
-spattack(x, xx, yy)
-       int             x, xx, yy;
+static int
+spattack(int x, int xx, int yy)

 {
        int    i, j = 0, k, m;
 {
        int    i, j = 0, k, m;

-       char  *p = 0;
+       const char *p = NULL;
+

        if (c[CANCELLATION])
                return (0);
        vxy(&xx, &yy);          /* verify x & y coordinates */
        if (c[CANCELLATION])
                return (0);
        vxy(&xx, &yy);          /* verify x & y coordinates */


@@ -1534,10 +1544,10 @@ spattack(x, xx, yy)
                if (j == 0)     /* if rusting did not occur */
                        switch (m) {
                        case OLEATHER:
                if (j == 0)     /* if rusting did not occur */
                        switch (m) {
                        case OLEATHER:

-                               p = "\nThe %s hit you -- Your lucky you have leather on";
+                               p = "\nThe %s hit you -- You're lucky you have leather on";

                                break;
                        case OSSPLATE:
                                break;
                        case OSSPLATE:

-                               p = "\nThe %s hit you -- Your fortunate to have stainless steel armor!";
+                               p = "\nThe %s hit you -- You're fortunate to have stainless steel armor!";

                                break;
                        }
                else {
                                break;
                        }
                else {


@@ -1550,7 +1560,7 @@ spattack(x, xx, yy)
                i = rnd(15) + 8 - c[AC];
 spout:         p = "\nThe %s breathes fire at you!";
                if (c[FIRERESISTANCE])
                i = rnd(15) + 8 - c[AC];
 spout:         p = "\nThe %s breathes fire at you!";
                if (c[FIRERESISTANCE])

-                       p = "\nThe %s's flame doesn't phase you!";
+                       p = "\nThe %s's flame doesn't faze you!";

                else
 spout2:        if (p) {
                        lprintf(p, lastmonst);
                else
 spout2:        if (p) {
                        lprintf(p, lastmonst);


@@ -1689,8 +1699,7 @@ spout3:   p = "\nThe %s bit you!";
  * Note: if x > c[HP] this routine could kill the player!
  */
 void
  * Note: if x > c[HP] this routine could kill the player!
  */
 void

-checkloss(x)
-       int             x;
+checkloss(int x)

 {
        if (x > 0) {
                losehp(x);
 {
        if (x > 0) {
                losehp(x);


@@ -1705,7 +1714,7 @@ checkloss(x)
  * Returns the experience gained from all monsters killed
  */
 int
  * Returns the experience gained from all monsters killed
  */
 int

-annihilate()
+annihilate(void)

 {
        int             i, j;
        long   k;
 {
        int             i, j;
        long   k;


@@ -1740,8 +1749,7 @@ annihilate()
  * Returns the number of spheres currently in existence
  */
 int
  * Returns the number of spheres currently in existence
  */
 int

-newsphere(x, y, dir, life)
-       int             x, y, dir, life;
+newsphere(int x, int y, int dir, int life)

 {
        int             m;
        struct sphere  *sp;
 {
        int             m;
        struct sphere  *sp;


@@ -1768,6 +1776,7 @@ newsphere(x, y, dir, life)
                lprintf("\nThe %s dispels the sphere!", monster[m].name);
                beep();
                rmsphere(x, y); /* remove any spheres that are here */
                lprintf("\nThe %s dispels the sphere!", monster[m].name);
                beep();
                rmsphere(x, y); /* remove any spheres that are here */

+               free(sp);

                return (c[SPHCAST]);
        }
        if (m == DISENCHANTRESS) {      /* disenchantress cancels spheres */
                return (c[SPHCAST]);
        }
        if (m == DISENCHANTRESS) {      /* disenchantress cancels spheres */


@@ -1776,6 +1785,7 @@ newsphere(x, y, dir, life)
                beep();
 boom:          sphboom(x, y);  /* blow up stuff around sphere */
                rmsphere(x, y); /* remove any spheres that are here */
                beep();
 boom:          sphboom(x, y);  /* blow up stuff around sphere */
                rmsphere(x, y); /* remove any spheres that are here */

+               free(sp);

                return (c[SPHCAST]);
        }
        if (c[CANCELLATION]) {  /* cancellation cancels spheres */
                return (c[SPHCAST]);
        }
        if (c[CANCELLATION]) {  /* cancellation cancels spheres */


@@ -1828,8 +1838,7 @@ boom:             sphboom(x, y);  /* blow up stuff around sphere */
  * Returns the number of spheres currently in existence
  */
 int
  * Returns the number of spheres currently in existence
  */
 int

-rmsphere(x, y)
-       int             x, y;
+rmsphere(int x, int y)

 {
        struct sphere *sp, *sp2 = 0;
        for (sp = spheres; sp; sp2 = sp, sp = sp->p)
 {
        struct sphere *sp, *sp2 = 0;
        for (sp = spheres; sp; sp2 = sp, sp = sp->p)


@@ -1861,9 +1870,8 @@ rmsphere(x, y)
  *
  * Enter with the coordinates of the blast, Returns no value
  */
  *
  * Enter with the coordinates of the blast, Returns no value
  */

-void
-sphboom(x, y)
-       int             x, y;
+static void
+sphboom(int x, int y)

 {
        int    i, j;
        if (c[HOLDMONST])
 {
        int    i, j;
        if (c[HOLDMONST])


@@ -1889,13 +1897,13 @@ sphboom(x, y)
  *
  * This is done by setting a flag in the monster[] structure
  */
  *
  * This is done by setting a flag in the monster[] structure
  */

-void
-genmonst()
+static void
+genmonst(void)

 {
        int    i, j;
        cursors();
        lprcat("\nGenocide what monster? ");
 {
        int    i, j;
        cursors();
        lprcat("\nGenocide what monster? ");

-       for (i = 0; (!isalpha(i)) && (i != ' '); i = lgetchar());
+       for (i = 0; (!isalpha(i)) && (i != ' '); i = ttgetch());

        lprc(i);
        for (j = 0; j < MAXMONST; j++)  /* search for the monster type */
                if (monstnamelist[j] == i) {    /* have we found it? */
        lprc(i);
        for (j = 0; j < MAXMONST; j++)  /* search for the monster type */
                if (monstnamelist[j] == i) {    /* have we found it? */