cgram: fix assertion when substituting at the end of the longest line

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

diff --git a/larn/moreobj.c b/larn/moreobj.c
index ab236281cdfc84e69b444403ede407796537899f..d36e6e172ef04ed49765b31811e6447c8693bd37 100644 (file)
--- a/larn/moreobj.c
+++ b/larn/moreobj.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: moreobj.c,v 1.6 2004/01/27 20:30:30 jsm Exp $  */
+/*     $NetBSD: moreobj.c,v 1.12 2012/06/19 05:30:43 dholland Exp $    */

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


@@ -9,88 +9,37 @@
  */
 #include <sys/cdefs.h>
 #ifndef lint
  */
 #include <sys/cdefs.h>
 #ifndef lint

-__RCSID("$NetBSD: moreobj.c,v 1.6 2004/01/27 20:30:30 jsm Exp $");
+__RCSID("$NetBSD: moreobj.c,v 1.12 2012/06/19 05:30:43 dholland Exp $");

 #endif                         /* not lint */
 #include <stdlib.h>
 #include <unistd.h>
 #include "header.h"
 #include "extern.h"
 
 #endif                         /* not lint */
 #include <stdlib.h>
 #include <unistd.h>
 #include "header.h"
 #include "extern.h"
 

-static void ohear(void);

 static void fch(int, long *);
 
 /*
 static void fch(int, long *);
 
 /*

- *     ******
- *     OALTAR
- *     ******
- *

  *     subroutine to process an altar object
  */
 void
  *     subroutine to process an altar object
  */
 void

-oaltar()
+oaltar(void)

 {
 {

-       unsigned long   k;

 
        lprcat("\nDo you (p) pray  (d) desecrate");
        iopts();
        while (1) {
                while (1)
 
        lprcat("\nDo you (p) pray  (d) desecrate");
        iopts();
        while (1) {
                while (1)

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

                        case 'p':
                                lprcat(" pray\nDo you (m) give money or (j) just pray? ");
                                while (1)
                        case 'p':
                                lprcat(" pray\nDo you (m) give money or (j) just pray? ");
                                while (1)

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

                                        case 'j':
                                        case 'j':

-                                               if (rnd(100) < 75)
-                                                       lprcat("\nnothing happens");
-                                               else if (rnd(13) < 4)
-                                                       ohear();
-                                               else if (rnd(43) == 10) {
-                                                       if (c[WEAR])
-                                                               lprcat("\nYou feel your armor vibrate for a moment");
-                                                       enchantarmor();
-                                                       return;
-                                               } else if (rnd(43) == 10) {
-                                                       if (c[WIELD])
-                                                               lprcat("\nYou feel your weapon vibrate for a moment");
-                                                       enchweapon();
-                                                       return;
-                                               } else
-                                                       createmonster(makemonst(level + 1));
+                                               act_just_pray();

                                                return;
 
                                        case 'm':
                                                return;
 
                                        case 'm':

-                                               lprcat("\n\n");
-                                               cursor(1, 24);
-                                               cltoeoln();
-                                               cursor(1, 23);
-                                               cltoeoln();
-                                               lprcat("how much do you donate? ");
-                                               k = readnum((long) c[GOLD]);
-                                               if (c[GOLD] < k) {
-                                                       lprcat("\nYou don't have that much!");
-                                                       return;
-                                               }
-                                               c[GOLD] -= k;
-                                               if (k < c[GOLD] / 10 || k < rnd(50)) {
-                                                       createmonster(makemonst(level + 1));
-                                                       c[AGGRAVATE] += 200;
-                                               } else if (rnd(101) > 50) {
-                                                       ohear();
-                                                       return;
-                                               } else if (rnd(43) == 5) {
-                                                       if (c[WEAR])
-                                                               lprcat("\nYou feel your armor vibrate for a moment");
-                                                       enchantarmor();
-                                                       return;
-                                               } else if (rnd(43) == 8) {
-                                                       if (c[WIELD])
-                                                               lprcat("\nYou feel your weapon vibrate for a moment");
-                                                       enchweapon();
-                                                       return;
-                                               } else
-                                                       lprcat("\nThank You.");
-                                               bottomline();
+                                               act_donation_pray();

                                                return;
 
                                        case '\33':
                                                return;
 
                                        case '\33':


@@ -99,91 +48,38 @@ oaltar()
 
                        case 'd':
                                lprcat(" desecrate");
 
                        case 'd':
                                lprcat(" desecrate");

-                               if (rnd(100) < 60) {
-                                       createmonster(makemonst(level + 2) + 8);
-                                       c[AGGRAVATE] += 2500;
-                               } else if (rnd(101) < 30) {
-                                       lprcat("\nThe altar crumbles into a pile of dust before your eyes");
-                                       forget();       /* remember to destroy
-                                                        * the altar     */
-                               } else
-                                       lprcat("\nnothing happens");
+                               act_desecrate_altar();

                                return;
 
                        case 'i':
                        case '\33':
                                ignore();
                                return;
 
                        case 'i':
                        case '\33':
                                ignore();

-                               if (rnd(100) < 30) {
-                                       createmonster(makemonst(level + 1));
-                                       c[AGGRAVATE] += rnd(450);
-                               } else
-                                       lprcat("\nnothing happens");
+                               act_ignore_altar();

                                return;
                        };
        }
 }
 
 /*
                                return;
                        };
        }
 }
 
 /*

-       function to cast a +3 protection on the player
- */
-static void
-ohear()
-{
-       lprcat("\nYou have been heard!");
-       if (c[ALTPRO] == 0)
-               c[MOREDEFENSES] += 3;
-       c[ALTPRO] += 500;       /* protection field */
-       bottomline();
-}
-
-/*
-       *******
-       OTHRONE
-       *******
-

        subroutine to process a throne object
  */
 void
        subroutine to process a throne object
  */
 void

-othrone(arg)
-       int             arg;
+othrone(int arg)

 {
 {

-       int    i, k;

 
        lprcat("\nDo you (p) pry off jewels, (s) sit down");
        iopts();
        while (1) {
                while (1)
 
        lprcat("\nDo you (p) pry off jewels, (s) sit down");
        iopts();
        while (1) {
                while (1)

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

                        case 'p':
                                lprcat(" pry off");
                        case 'p':
                                lprcat(" pry off");

-                               k = rnd(101);
-                               if (k < 25) {
-                                       for (i = 0; i < rnd(4); i++)
-                                               creategem();    /* gems pop off the
-                                                                * throne */
-                                       item[playerx][playery] = ODEADTHRONE;
-                                       know[playerx][playery] = 0;
-                               } else if (k < 40 && arg == 0) {
-                                       createmonster(GNOMEKING);
-                                       item[playerx][playery] = OTHRONE2;
-                                       know[playerx][playery] = 0;
-                               } else
-                                       lprcat("\nnothing happens");
+                               act_remove_gems(arg);

                                return;
 
                        case 's':
                                lprcat(" sit down");
                                return;
 
                        case 's':
                                lprcat(" sit down");

-                               k = rnd(101);
-                               if (k < 30 && arg == 0) {
-                                       createmonster(GNOMEKING);
-                                       item[playerx][playery] = OTHRONE2;
-                                       know[playerx][playery] = 0;
-                               } else if (k < 35) {
-                                       lprcat("\nZaaaappp!  You've been teleported!\n");
-                                       beep();
-                                       oteleport(0);
-                               } else
-                                       lprcat("\nnothing happens");
+                               act_sit_throne(arg);

                                return;
 
                        case 'i':
                                return;
 
                        case 'i':


@@ -195,7 +91,7 @@ othrone(arg)
 }
 
 void
 }
 
 void

-odeadthrone()
+odeadthrone(void)

 {
        int    k;
 
 {
        int    k;
 


@@ -203,7 +99,7 @@ odeadthrone()
        iopts();
        while (1) {
                while (1)
        iopts();
        while (1) {
                while (1)

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

                        case 's':
                                lprcat(" sit down");
                                k = rnd(101);
                        case 's':
                                lprcat(" sit down");
                                k = rnd(101);


@@ -224,59 +120,20 @@ odeadthrone()
 }
 
 /*
 }
 
 /*

-       ******
-       OCHEST
-       ******
-

        subroutine to process a throne object
  */
 void
        subroutine to process a throne object
  */
 void

-ochest()
+ochest(void)

 {
 {

-       int    i, k;
+

        lprcat("\nDo you (t) take it, (o) try to open it");
        iopts();
        while (1) {
                while (1)
        lprcat("\nDo you (t) take it, (o) try to open it");
        iopts();
        while (1) {
                while (1)

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

                        case 'o':
                                lprcat(" open it");
                        case 'o':
                                lprcat(" open it");

-                               k = rnd(101);
-                               if (k < 40) {
-                                       lprcat("\nThe chest explodes as you open it");
-                                       beep();
-                                       i = rnd(10);
-                                       lastnum = 281;  /* in case he dies */
-                                       lprintf("\nYou suffer %d hit points damage!", (long) i);
-                                       checkloss(i);
-                                       switch (rnd(10)) {      /* see if he gets a
-                                                                * curse */
-                                       case 1:
-                                               c[ITCHING] += rnd(1000) + 100;
-                                               lprcat("\nYou feel an irritation spread over your skin!");
-                                               beep();
-                                               break;
-
-                                       case 2:
-                                               c[CLUMSINESS] += rnd(1600) + 200;
-                                               lprcat("\nYou begin to lose hand to eye coordination!");
-                                               beep();
-                                               break;
-
-                                       case 3:
-                                               c[HALFDAM] += rnd(1600) + 200;
-                                               beep();
-                                               lprcat("\nA sickness engulfs you!");
-                                               break;
-                                       };
-                                       item[playerx][playery] = know[playerx][playery] = 0;
-                                       if (rnd(100) < 69)
-                                               creategem();    /* gems from the chest */
-                                       dropgold(rnd(110 * iarg[playerx][playery] + 200));
-                                       for (i = 0; i < rnd(4); i++)
-                                               something(iarg[playerx][playery] + 2);
-                               } else
-                                       lprcat("\nnothing happens");
+                               act_open_chest(playerx, playery);

                                return;
 
                        case 't':
                                return;
 
                        case 't':


@@ -294,48 +151,20 @@ ochest()
 }
 
 /*
 }
 
 /*

-       *********
-       OFOUNTAIN
-       *********
+       process a fountain object

  */
  */

-

 void
 void

-ofountain()
+ofountain(void)

 {
 {

-       int    x;
+

        cursors();
        lprcat("\nDo you (d) drink, (w) wash yourself");
        iopts();
        while (1)
        cursors();
        lprcat("\nDo you (d) drink, (w) wash yourself");
        iopts();
        while (1)

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

                case 'd':
                        lprcat("drink");
                case 'd':
                        lprcat("drink");

-                       if (rnd(1501) < 2) {
-                               lprcat("\nOops!  You seem to have caught the dreadful sleep!");
-                               beep();
-                               lflush();
-                               sleep(3);
-                               died(280);
-                               return;
-                       }
-                       x = rnd(100);
-                       if (x < 7) {
-                               c[HALFDAM] += 200 + rnd(200);
-                               lprcat("\nYou feel a sickness coming on");
-                       } else if (x < 13)
-                               quaffpotion(23);        /* see invisible */
-                       else if (x < 45)
-                               lprcat("\nnothing seems to have happened");
-                       else if (rnd(3) != 2)
-                               fntchange(1);   /* change char levels upward     */
-                       else
-                               fntchange(-1);  /* change char levels
-                                                * downward      */
-                       if (rnd(12) < 3) {
-                               lprcat("\nThe fountains bubbling slowly quiets");
-                               item[playerx][playery] = ODEADFOUNTAIN; /* dead fountain */
-                               know[playerx][playery] = 0;
-                       }
+                       act_drink_fountain();

                        return;
 
                case '\33':
                        return;
 
                case '\33':


@@ -345,21 +174,7 @@ ofountain()
 
                case 'w':
                        lprcat("wash yourself");
 
                case 'w':
                        lprcat("wash yourself");

-                       if (rnd(100) < 11) {
-                               x = rnd((level << 2) + 2);
-                               lprintf("\nOh no!  The water was foul!  You suffer %d hit points!", (long) x);
-                               lastnum = 273;
-                               losehp(x);
-                               bottomline();
-                               cursors();
-                       } else if (rnd(100) < 29)
-                               lprcat("\nYou got the dirt off!");
-                       else if (rnd(100) < 31)
-                               lprcat("\nThis water seems to be hard water!  The dirt didn't come off!");
-                       else if (rnd(100) < 34)
-                               createmonster(WATERLORD);       /* make water lord               */
-                       else
-                               lprcat("\nnothing seems to have happened");
+                       act_wash_fountain();

                        return;
                }
 }
                        return;
                }
 }


@@ -372,9 +187,7 @@ ofountain()
        subroutine to process an up/down of a character attribute for ofountain
  */
 static void
        subroutine to process an up/down of a character attribute for ofountain
  */
 static void

-fch(how, x)
-       int             how;
-       long           *x;
+fch(int how, long *x)

 {
        if (how < 0) {
                lprcat(" went down by one!");
 {
        if (how < 0) {
                lprcat(" went down by one!");


@@ -391,8 +204,7 @@ fch(how, x)
        if x > 0 they are raised   if x < 0 they are lowered
  */
 void
        if x > 0 they are raised   if x < 0 they are lowered
  */
 void

-fntchange(how)
-       int             how;
+fntchange(int how)

 {
        long   j;
        lprc('\n');
 {
        long   j;
        lprc('\n');


@@ -424,14 +236,14 @@ fntchange(how)
        case 7:
                j = rnd(level + 1);
                if (how < 0) {
        case 7:
                j = rnd(level + 1);
                if (how < 0) {

-                       lprintf("You lose %d hit point", (long) j);
+                       lprintf("You lose %ld hit point", (long) j);

                        if (j > 1)
                                lprcat("s!");
                        else
                                lprc('!');
                        losemhp((int) j);
                } else {
                        if (j > 1)
                                lprcat("s!");
                        else
                                lprc('!');
                        losemhp((int) j);
                } else {

-                       lprintf("You gain %d hit point", (long) j);
+                       lprintf("You gain %ld hit point", (long) j);

                        if (j > 1)
                                lprcat("s!");
                        else
                        if (j > 1)
                                lprcat("s!");
                        else


@@ -444,14 +256,14 @@ fntchange(how)
        case 8:
                j = rnd(level + 1);
                if (how > 0) {
        case 8:
                j = rnd(level + 1);
                if (how > 0) {

-                       lprintf("You just gained %d spell", (long) j);
+                       lprintf("You just gained %ld spell", (long) j);

                        raisemspells((int) j);
                        if (j > 1)
                                lprcat("s!");
                        else
                                lprc('!');
                } else {
                        raisemspells((int) j);
                        if (j > 1)
                                lprcat("s!");
                        else
                                lprc('!');
                } else {

-                       lprintf("You just lost %d spell", (long) j);
+                       lprintf("You just lost %ld spell", (long) j);

                        losemspells((int) j);
                        if (j > 1)
                                lprcat("s!");
                        losemspells((int) j);
                        if (j > 1)
                                lprcat("s!");


@@ -464,14 +276,14 @@ fntchange(how)
        case 9:
                j = 5 * rnd((level + 1) * (level + 1));
                if (how < 0) {
        case 9:
                j = 5 * rnd((level + 1) * (level + 1));
                if (how < 0) {

-                       lprintf("You just lost %d experience point", (long) j);
+                       lprintf("You just lost %ld experience point", (long) j);

                        if (j > 1)
                                lprcat("s!");
                        else
                                lprc('!');
                        loseexperience((long) j);
                } else {
                        if (j > 1)
                                lprcat("s!");
                        else
                                lprc('!');
                        loseexperience((long) j);
                } else {

-                       lprintf("You just gained %d experience point", (long) j);
+                       lprintf("You just gained %ld experience point", (long) j);

                        if (j > 1)
                                lprcat("s!");
                        else
                        if (j > 1)
                                lprcat("s!");
                        else