X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=main.c;h=8a58c5770035dfa8815d1c28ccb41c26a198f260;hb=dda636bbc1c15fc28e5d52ad08ef3bcc30a3e682;hp=0ccfccefa3dbc2dbf31e09748902972c0bbb443e;hpb=c3add5c2066face7535108706bb86dc41971ad9f;p=open-adventure.git diff --git a/main.c b/main.c index 0ccfcce..8a58c57 100644 --- a/main.c +++ b/main.c @@ -7,51 +7,55 @@ #include #include #include -#include "main.h" - -#include "misc.h" - -long ABB[186], ATAB[331], ATLOC[186], - DLOC[7], FIXED[101], - KTAB[331], *LINES, LINK[201], LNLENG, LNPOSN, - PARMS[26], PLACE[101], PTEXT[101], RTEXT[278], - TABSIZ = 330; -signed char INLINE[LINESIZE+1], MAP1[129], MAP2[129]; - -long ACTVERB[36], AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD, - BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST, CHLOC, CHLOC2, - CLAM, CLSHNT, CLSMAX = 12, CLSSES, - COINS, COND[186], CONDS, CTEXT[13], CVAL[13], DALTLC, - DOOR, DPRSSN, DRAGON, DSEEN[7], DWARF, EGGS, - EMRALD, ENTER, ENTRNC, FIND, FISSUR, FIXD[101], FOOD, - GRATE, HINT, HINTED[21], HINTLC[21], HINTS[21][5], HNTMAX, - HNTSIZ = 20, I, INVENT, IGO, J, JADE, K, K2, KEY[186], KEYS, KK, - KNIFE, KQ, L, LAMP, LINSIZ = 12500, LINUSE, LL, - LOC, LOCK, LOCSIZ = 185, LOCSND[186], LOOK, LTEXT[186], - MAGZIN, MAXDIE, MAXTRS, MESH = 123456789, - MESSAG, MIRROR, MXSCOR, NUGGET, NUL, OBJ, OBJSND[101], - OBJTXT[101], ODLOC[7], OGRE, OIL, OYSTER, - PEARL, PILLOW, PLAC[101], PLANT, PLANT2, PROP[101], PYRAM, - RESER, ROD, ROD2, RTXSIZ = 277, RUBY, RUG, SAPPH, SAY, - SCORE, SECT, SIGN, SNAKE, STEPS, STEXT[186], STICK, - STREAM, TABNDX, THROW, TK[21], TRAVEL[886], TRIDNT, - TRNSIZ = 5, TRNVAL[6], TRNVLS, TROLL, TROLL2, TRVS, - TRVSIZ = 885, TTEXT[6], URN, V1, V2, VASE, VEND, VERB, - VOLCAN, VRBSIZ = 35, VRSION = 25, WATER, WD1, WD1X, WD2, WD2X, - ZZWORD; -struct game_t game = {.blklin = true}; +#include +#include +#include "advent.h" +#include "database.h" + +struct game_t game; + +long ATLOC[186], FIXED[NOBJECTS+1], + LINK[NOBJECTS*2 + 1], LNLENG, LNPOSN, + PARMS[26], PLACE[NOBJECTS+1], + SETUP = 0; +char rawbuf[LINESIZE], INLINE[LINESIZE+1], MAP1[129], MAP2[129]; + +long AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD, + BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST, + CLAM, COINS, DALTLC, DOOR, DPRSSN, DRAGON, DWARF, EGGS, + EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOD, + GRATE, HINT, HINTED[21], HINTLC[21], + I, INVENT, IGO, J, JADE, K, K2, KEYS, KK, + KNIFE, KQ, L, LAMP, LL, LOC, LOCK, LOOK, + MAGZIN, MAXDIE, MAXTRS, MESSAG, MIRROR, MXSCOR, + NUGGET, NUL, OBJ, OGRE, OIL, OYSTER, PEARL, PILLOW, + PLANT, PLANT2, PROP[NOBJECTS+1], PYRAM, + RESER, ROD, ROD2, RUBY, RUG, SAPPH, SAY, + SCORE, SECT, SIGN, SNAKE, SPK, STEPS, STICK, + STREAM, THROW, TK[21], TRIDNT, TROLL, TROLL2, + URN, V1, V2, VASE, VEND, VERB, + VOLCAN, VRSION = 25, WATER, WD1, WD1X, WD2, WD2X; FILE *logfp; bool oldstyle = false; +lcg_state lcgstate; extern void initialise(); extern void score(long); extern int action(FILE *, long); +void sig_handler(int signo) +{ + if (signo == SIGINT) + if (logfp != NULL) + fflush(logfp); + exit(0); +} + /* * MAIN PROGRAM */ -static void do_command(FILE *); +static bool do_command(FILE *); int main(int argc, char *argv[]) { int ch; @@ -69,11 +73,12 @@ int main(int argc, char *argv[]) { while ((ch = getopt(argc, argv, "l:o")) != EOF) { switch (ch) { case 'l': - logfp = fopen(optarg, "w+"); + logfp = fopen(optarg, "w"); if (logfp == NULL) fprintf(stderr, "advent: can't open logfile %s for write\n", optarg); + signal(SIGINT, sig_handler); break; case 'o': oldstyle = true; @@ -85,7 +90,7 @@ int main(int argc, char *argv[]) { * * game.closed says whether we're all the way closed * game.closng says whether it's closing time yet - * CLSHNT says whether he's read the clue in the endgame + * game.clshnt says whether he's read the clue in the endgame * game.lmwarn says whether he's been warned about lamp going dim * game.novice says whether he asked for instructions at start-up * game.panic says whether he's found out he's trapped in the cave @@ -93,17 +98,20 @@ int main(int argc, char *argv[]) { #include "funcs.h" -/* Read the database if we have not yet done so */ +/* Initialize our LCG PRNG with parameters tested against Knuth vol. 2. by the original authors */ - LINES = (long *)calloc(LINSIZ+1,sizeof(long)); - if(!LINES){ - printf("Not enough memory!\n"); - exit(1); - } + lcgstate.a = 1093; + lcgstate.c = 221587; + lcgstate.m = 1048576; + srand(time(NULL)); + long seedval = (long)rand(); + set_seed(seedval); + +/* Read the database if we have not yet done so */ MAP2[1] = 0; - if(!game.setup)initialise(); - if(game.setup > 0) goto L1; + if(!SETUP)initialise(); + if(SETUP > 0) goto L1; /* Unlike earlier versions, adventure is no longer restartable. (This * lets us get away with modifying things such as OBJSND(BIRD) without @@ -115,25 +123,46 @@ int main(int argc, char *argv[]) { /* Start-up, dwarf stuff */ -L1: game.setup= -1; - I=RAN(-1); - ZZWORD=RNDVOC(3,0)+MESH*2; +L1: SETUP= -1; + I=0; + game.zzword=RNDVOC(3,0); game.novice=YES(stdin, 65,1,0); game.newloc=1; LOC=1; game.limit=330; if(game.novice)game.limit=1000; + if (logfp) + fprintf(logfp, "seed %ld\n", seedval); + for (;;) { - do_command(stdin); + if (!do_command(stdin)) + break; } + score(1); } -static void do_command(FILE *cmdin) { +static bool fallback_handler(char *buf) +/* fallback handler for commands not handled by FORTRANish parser */ +{ + long sv; + if (sscanf(buf, "seed %ld", &sv) == 1) { + set_seed(sv); + printf("Seed set to %ld\n", sv); + // autogenerated, so don't charge user time for it. + --game.turns; + // here we reconfigure any global game state that uses random numbers + game.zzword=RNDVOC(3,0); + return true; + } + return false; +} + +static bool do_command(FILE *cmdin) { /* Can't leave cave once it's closing (except by main office). */ -L2: if(!OUTSID(game.newloc) || game.newloc == 0 || !game.closng) goto L71; + if(!OUTSID(game.newloc) || game.newloc == 0 || !game.closng) goto L71; RSPEAK(130); game.newloc=LOC; if(!game.panic)game.clock2=15; @@ -144,8 +173,8 @@ L2: if(!OUTSID(game.newloc) || game.newloc == 0 || !game.closng) goto L71; * (dwarves rooted in place) let him get out (and attacked). */ L71: if(game.newloc == LOC || FORCED(LOC) || CNDBIT(LOC,3)) goto L74; - /* 73 */ for (I=1; I<=5; I++) { - if(ODLOC[I] != game.newloc || !DSEEN[I]) goto L73; + /* 73 */ for (I=1; I<=NDWARVES-1; I++) { + if(game.odloc[I] != game.newloc || !game.dseen[I]) goto L73; game.newloc=LOC; RSPEAK(2); goto L74; @@ -175,12 +204,12 @@ L6000: if(game.dflag != 1) goto L6010; if(!INDEEP(LOC) || (PCT(95) && (!CNDBIT(LOC,4) || PCT(85)))) goto L2000; game.dflag=2; for (I=1; I<=2; I++) { - J=1+RAN(5); - if(PCT(50))DLOC[J]=0; + J=1+randrange(NDWARVES-1); + if(PCT(50))game.dloc[J]=0; } /* end loop */ - for (I=1; I<=5; I++) { - if(DLOC[I] == LOC)DLOC[I]=DALTLC; - ODLOC[I]=DLOC[I]; + for (I=1; I<=NDWARVES-1; I++) { + if(game.dloc[I] == LOC)game.dloc[I]=DALTLC; + game.odloc[I]=game.dloc[I]; } /* end loop */ RSPEAK(3); DROP(AXE,LOC); @@ -194,31 +223,31 @@ L6000: if(game.dflag != 1) goto L6010; L6010: game.dtotal=0; ATTACK=0; STICK=0; - /* 6030 */ for (I=1; I<=6; I++) { - if(DLOC[I] == 0) goto L6030; + /* 6030 */ for (I=1; I<=NDWARVES; I++) { + if(game.dloc[I] == 0) goto L6030; /* Fill TK array with all the places this dwarf might go. */ J=1; - KK=DLOC[I]; + KK=game.dloc[I]; KK=KEY[KK]; if(KK == 0) goto L6016; -L6012: game.newloc=MOD(IABS(TRAVEL[KK])/1000,1000); +L6012: game.newloc=MOD(labs(TRAVEL[KK])/1000,1000); {long x = J-1; - if(game.newloc > 300 || !INDEEP(game.newloc) || game.newloc == ODLOC[I] || (J > 1 && - game.newloc == TK[x]) || J >= 20 || game.newloc == DLOC[I] || + if(game.newloc > 300 || !INDEEP(game.newloc) || game.newloc == game.odloc[I] || (J > 1 && + game.newloc == TK[x]) || J >= 20 || game.newloc == game.dloc[I] || FORCED(game.newloc) || (I == 6 && CNDBIT(game.newloc,3)) || - IABS(TRAVEL[KK])/1000000 == 100) goto L6014;} + labs(TRAVEL[KK])/1000000 == 100) goto L6014;} TK[J]=game.newloc; J=J+1; L6014: KK=KK+1; {long x = KK-1; if(TRAVEL[x] >= 0) goto L6012;} -L6016: TK[J]=ODLOC[I]; +L6016: TK[J]=game.odloc[I]; if(J >= 2)J=J-1; - J=1+RAN(J); - ODLOC[I]=DLOC[I]; - DLOC[I]=TK[J]; - DSEEN[I]=(DSEEN[I] && INDEEP(LOC)) || (DLOC[I] == LOC || ODLOC[I] == LOC); - if(!DSEEN[I]) goto L6030; - DLOC[I]=LOC; + J=1+randrange(J); + game.odloc[I]=game.dloc[I]; + game.dloc[I]=TK[J]; + game.dseen[I]=(game.dseen[I] && INDEEP(LOC)) || (game.dloc[I] == LOC || game.odloc[I] == LOC); + if(!game.dseen[I]) goto L6030; + game.dloc[I]=LOC; if(I != 6) goto L6027; /* The pirate's spotted him. He leaves him alone once we've found chest. K @@ -226,7 +255,7 @@ L6016: TK[J]=ODLOC[I]; * the pirate be spotted. Note that PLACE(CHEST)=0 might mean that he's * thrown it to the troll, but in that case he's seen the chest (PROP=0). */ - if(LOC == CHLOC || PROP[CHEST] >= 0) goto L6030; + if(LOC == game.chloc || PROP[CHEST] >= 0) goto L6030; K=0; /* 6020 */ for (J=50; J<=MAXTRS; J++) { /* Pirate won't take pyramid from plover room or dark room (too easy!). */ @@ -236,37 +265,37 @@ L6020: if(HERE(J))K=1; } /* end loop */ if(game.tally == 1 && K == 0 && PLACE[CHEST] == 0 && HERE(LAMP) && PROP[LAMP] == 1) goto L6025; - if(ODLOC[6] != DLOC[6] && PCT(20))RSPEAK(127); + if(game.odloc[6] != game.dloc[6] && PCT(20))RSPEAK(127); goto L6030; L6021: if(PLACE[CHEST] != 0) goto L6022; /* Install chest only once, to insure it is the last treasure in the list. */ - MOVE(CHEST,CHLOC); - MOVE(MESSAG,CHLOC2); + MOVE(CHEST,game.chloc); + MOVE(MESSAG,game.chloc2); L6022: RSPEAK(128); /* 6023 */ for (J=50; J<=MAXTRS; J++) { if(J == PYRAM && (LOC == PLAC[PYRAM] || LOC == PLAC[EMRALD])) goto L6023; if(AT(J) && FIXED[J] == 0)CARRY(J,LOC); - if(TOTING(J))DROP(J,CHLOC); + if(TOTING(J))DROP(J,game.chloc); L6023: /*etc*/ ; } /* end loop */ -L6024: DLOC[6]=CHLOC; - ODLOC[6]=CHLOC; - DSEEN[6]=false; +L6024: game.dloc[6]=game.chloc; + game.odloc[6]=game.chloc; + game.dseen[6]=false; goto L6030; L6025: RSPEAK(186); - MOVE(CHEST,CHLOC); - MOVE(MESSAG,CHLOC2); + MOVE(CHEST,game.chloc); + MOVE(MESSAG,game.chloc2); goto L6024; /* This threatening little dwarf is in the room with him! */ L6027: game.dtotal=game.dtotal+1; - if(ODLOC[I] != DLOC[I]) goto L6030; + if(game.odloc[I] != game.dloc[I]) goto L6030; ATTACK=ATTACK+1; if(game.knfloc >= 0)game.knfloc=LOC; - if(RAN(1000) < 95*(game.dflag-2))STICK=STICK+1; + if(randrange(1000) < 95*(game.dflag-2))STICK=STICK+1; L6030: /*etc*/ ; } /* end loop */ @@ -300,7 +329,7 @@ L6030: /*etc*/ ; L2000: if(LOC == 0) goto L99; KK=STEXT[LOC]; - if(MOD(ABB[LOC],game.abbnum) == 0 || KK == 0)KK=LTEXT[LOC]; + if(MOD(game.abbrev[LOC],game.abbnum) == 0 || KK == 0)KK=LTEXT[LOC]; if(FORCED(LOC) || !DARK(0)) goto L2001; if(game.wzdark && PCT(35)) goto L90; KK=RTEXT[16]; @@ -317,11 +346,11 @@ L2001: if(TOTING(BEAR))RSPEAK(141); * are because PROP=0 is needed to get full score. */ if(DARK(0)) goto L2012; - ABB[LOC]=ABB[LOC]+1; + game.abbrev[LOC]=game.abbrev[LOC]+1; I=ATLOC[LOC]; L2004: if(I == 0) goto L2012; OBJ=I; - if(OBJ > 100)OBJ=OBJ-100; + if(OBJ > NOBJECTS)OBJ=OBJ-NOBJECTS; if(OBJ == STEPS && TOTING(NUGGET)) goto L2008; if(PROP[OBJ] >= 0) goto L2006; if(game.closed) goto L2008; @@ -346,8 +375,8 @@ L2008: I=LINK[I]; goto L2004; L2009: K=54; -L2010: game.spk=K; -L2011: RSPEAK(game.spk); +L2010: SPK=K; +L2011: RSPEAK(SPK); L2012: VERB=0; game.oldobj=OBJ; @@ -358,7 +387,7 @@ L2012: VERB=0; * to finish the loop. Ignore "HINTS" < 4 (special stuff, see database notes). */ -L2600: if(COND[LOC] < CONDS) goto L2603; +L2600: if(COND[LOC] < game.conds) goto L2603; /* 2602 */ for (HINT=1; HINT<=HNTMAX; HINT++) { if(HINTED[HINT]) goto L2602; if(!CNDBIT(LOC,HINT+10))HINTLC[HINT]= -1; @@ -367,34 +396,36 @@ L2600: if(COND[LOC] < CONDS) goto L2603; L2602: /*etc*/ ; } /* end loop */ -/* Kick the random number generator just to add variety to the chase. Also, - * if closing time, check for any objects being toted with PROP < 0 and set +/* If closing time, check for any objects being toted with PROP < 0 and set * the prop to -1-PROP. This way objects won't be described until they've * been picked up and put down separate from their respective piles. Don't * tick game.clock1 unless well into cave (and not at Y2). */ L2603: if(!game.closed) goto L2605; if(PROP[OYSTER] < 0 && TOTING(OYSTER))PSPEAK(OYSTER,1); - for (I=1; I<=100; I++) { + for (I=1; I<=NOBJECTS; I++) { if(TOTING(I) && PROP[I] < 0)PROP[I]= -1-PROP[I]; } /* end loop */ L2605: game.wzdark=DARK(0); if(game.knfloc > 0 && game.knfloc != LOC)game.knfloc=0; - I=RAN(1); - GETIN(cmdin, WD1,WD1X,WD2,WD2X); + I=0; + if (!GETIN(cmdin, WD1,WD1X,WD2,WD2X)) + return false; /* Every input, check "game.foobar" flag. If zero, nothing's going on. If pos, * make neg. If neg, he skipped a word, so make it zero. */ L2607: game.foobar=(game.foobar>0 ? -game.foobar : 0); game.turns=game.turns+1; - if(game.turns != game.thresh) goto L2608; + if(game.turns == game.thresh) { SPEAK(TTEXT[game.trndex]); game.trnluz=game.trnluz+TRNVAL[game.trndex]/100000; game.trndex=game.trndex+1; game.thresh= -1; - if(game.trndex <= TRNVLS)game.thresh=MOD(TRNVAL[game.trndex],100000)+1; -L2608: if(VERB == SAY && WD2 > 0)VERB=0; + if(game.trndex <= TRNVLS) + game.thresh=MOD(TRNVAL[game.trndex],100000)+1; + } + if(VERB == SAY && WD2 > 0)VERB=0; if(VERB == SAY) goto L4090; if(game.tally == 0 && INDEEP(LOC) && LOC != 33)game.clock1=game.clock1-1; if(game.clock1 == 0) goto L10000; @@ -414,12 +445,13 @@ L19999: K=43; if((V1 != 1000+WATER && V1 != 1000+OIL) || (V2 != 1000+PLANT && V2 != 1000+DOOR)) goto L2610; {long x = V2-1000; if(AT(x))WD2=MAKEWD(16152118);} -L2610: if(V1 == 1000+CAGE && V2 == 1000+BIRD && HERE(CAGE) && - HERE(BIRD))WD1=MAKEWD(301200308); -L2620: if(WD1 != MAKEWD(23051920)) goto L2625; - game.iwest=game.iwest+1; - if(game.iwest == 10)RSPEAK(17); -L2625: if(WD1 != MAKEWD( 715) || WD2 == 0) goto L2630; +L2610: if(V1 == 1000+CAGE && V2 == 1000+BIRD && HERE(CAGE) && HERE(BIRD)) + WD1=MAKEWD(301200308); +L2620: if(WD1 == MAKEWD(23051920)) { + game.iwest=game.iwest+1; + if(game.iwest == 10)RSPEAK(17); + } + if(WD1 != MAKEWD( 715) || WD2 == 0) goto L2630; IGO=IGO+1; if(IGO == 10)RSPEAK(276); L2630: I=VOCAB(WD1,-1); @@ -440,6 +472,8 @@ L2800: WD1=WD2; /* Gee, I don't understand. */ L3000: SETPRM(1,WD1,WD1X); + if (fallback_handler(rawbuf)) + return true; RSPEAK(254); goto L2600; @@ -450,7 +484,7 @@ L4090: I=4090; goto Laction; L5000: I=5000; Laction: switch (action(cmdin, I)) { - case 2: return; + case 2: return true; case 8: goto L8; case 2000: goto L2000; case 2009: goto L2009; @@ -478,24 +512,24 @@ L8000: SETPRM(1,WD1,WD1X); /* Figure out the new location * * Given the current location in "LOC", and a motion verb number in - * "K", put the new location in "game.newloc". The current loc is - * saved in "game.oldloc" in case he wants to retreat. The current + * "K", put the new location in "game.newloc". The current loc is saved + * in "game.olddloc" in case he wants to retreat. The current * game.oldloc is saved in game.oldlc2, in case he dies. (if he - * does, game.newloc will be limbo, and game.oldloc will be what - * killed him, so we need game.oldlc2, which is the last place he was + * does, game.newloc will be limbo, and OLgame.dloc will be what killed + * him, so we need game.oldlc2, which is the last place he was * safe.) */ L8: KK=KEY[LOC]; game.newloc=LOC; if(KK == 0)BUG(26); - if(K == NUL) return; + if(K == NUL) return true; if(K == BACK) goto L20; if(K == LOOK) goto L30; if(K == CAVE) goto L40; game.oldlc2=game.oldloc; game.oldloc=LOC; -L9: LL=IABS(TRAVEL[KK]); +L9: LL=labs(TRAVEL[KK]); if(MOD(LL,1000) == 1 || MOD(LL,1000) == K) goto L10; if(TRAVEL[KK] < 0) goto L50; KK=KK+1; @@ -503,27 +537,27 @@ L9: LL=IABS(TRAVEL[KK]); L10: LL=LL/1000; L11: game.newloc=LL/1000; - K=MOD(game.newloc,100); + K=MOD(game.newloc,100); /* ESR: an instance of NOBJECTS? */ if(game.newloc <= 300) goto L13; if(PROP[K] != game.newloc/100-3) goto L16; L12: if(TRAVEL[KK] < 0)BUG(25); KK=KK+1; - game.newloc=IABS(TRAVEL[KK])/1000; + game.newloc=labs(TRAVEL[KK])/1000; if(game.newloc == LL) goto L12; LL=game.newloc; goto L11; -L13: if(game.newloc <= 100) goto L14; +L13: if(game.newloc <= 100) goto L14; /* ESR: an instance of NOBJECTS? */ if(TOTING(K) || (game.newloc > 200 && AT(K))) goto L16; goto L12; L14: if(game.newloc != 0 && !PCT(game.newloc)) goto L12; L16: game.newloc=MOD(LL,1000); - if(game.newloc <= 300) return; + if(game.newloc <= 300) return true; if(game.newloc <= 500) goto L30000; RSPEAK(game.newloc-500); game.newloc=LOC; - return; + return true; /* Special motions come here. Labelling convention: statement numbers NNNXX * (XX=00-99) are used for special case number NNN (NNN=301-500). */ @@ -537,11 +571,11 @@ L30000: game.newloc=game.newloc-300; * table must include "useless" entries going through passage, which can never * be used for actual motion, but can be spotted by "go back". */ -L30100: game.newloc=99+100-LOC; - if(game.holdng == 0 || (game.holdng == 1 && TOTING(EMRALD))) return; +L30100: game.newloc=99+100-LOC; /* ESR: an instance of NOBJECTS? */ + if(game.holdng == 0 || (game.holdng == 1 && TOTING(EMRALD))) return true; game.newloc=LOC; RSPEAK(117); - return; + return true; /* Travel 302. Plover transport. Drop the emerald (only use special travel if * toting it), so he's forced to use the plover-passage to get it out. Having @@ -560,16 +594,16 @@ L30300: if(PROP[TROLL] != 1) goto L30310; PSPEAK(TROLL,1); PROP[TROLL]=0; MOVE(TROLL2,0); - MOVE(TROLL2+100,0); + MOVE(TROLL2+NOBJECTS,0); MOVE(TROLL,PLAC[TROLL]); - MOVE(TROLL+100,FIXD[TROLL]); + MOVE(TROLL+NOBJECTS,FIXD[TROLL]); JUGGLE(CHASM); game.newloc=LOC; - return; + return true; L30310: game.newloc=PLAC[TROLL]+FIXD[TROLL]-LOC; if(PROP[TROLL] == 0)PROP[TROLL]=1; - if(!TOTING(BEAR)) return; + if(!TOTING(BEAR)) return true; RSPEAK(162); PROP[CHASM]=1; PROP[TROLL]=2; @@ -581,9 +615,8 @@ L30310: game.newloc=PLAC[TROLL]+FIXD[TROLL]-LOC; /* End of specials. */ -/* Handle "go back". Look for verb which goes from LOC to - * game.oldloc, or to game.oldlc2 If game.oldloc has forced-motion. - * K2 saves entry -> forced loc -> previous loc. */ +/* Handle "go back". Look for verb which goes from LOC to game.oldloc, or to game.oldlc2 + * If game.oldloc has forced-motion. K2 saves entry -> forced loc -> previous loc. */ L20: K=game.oldloc; if(FORCED(K))K=game.oldlc2; @@ -594,23 +627,27 @@ L20: K=game.oldloc; if(CNDBIT(LOC,4))K2=274; if(K2 == 0) goto L21; RSPEAK(K2); - return; - -L21: LL=MOD((IABS(TRAVEL[KK])/1000),1000); - if(LL == K) goto L25; - if(LL > 300) goto L22; - J=KEY[LL]; - if(FORCED(LL) && MOD((IABS(TRAVEL[J])/1000),1000) == K)K2=KK; -L22: if(TRAVEL[KK] < 0) goto L23; - KK=KK+1; - goto L21; - -L23: KK=K2; - if(KK != 0) goto L25; - RSPEAK(140); - return; + return true; + +L21: LL=MOD((labs(TRAVEL[KK])/1000),1000); + if(LL != K) { + if(LL <= 300) { + J=KEY[LL]; + if(FORCED(LL) && MOD((labs(TRAVEL[J])/1000),1000) == K) + K2=KK; + } + if(TRAVEL[KK] < 0) goto L23; + KK=KK+1; + goto L21; + +L23: KK=K2; + if(KK == 0) { + RSPEAK(140); + return true; + } + } -L25: K=MOD(IABS(TRAVEL[KK]),1000); + K=MOD(labs(TRAVEL[KK]),1000); KK=KEY[LOC]; goto L9; @@ -620,32 +657,28 @@ L25: K=MOD(IABS(TRAVEL[KK]),1000); L30: if(game.detail < 3)RSPEAK(15); game.detail=game.detail+1; game.wzdark=false; - ABB[LOC]=0; - return; + game.abbrev[LOC]=0; + return true; /* Cave. Different messages depending on whether above ground. */ L40: K=58; if(OUTSID(LOC) && LOC != 8)K=57; RSPEAK(K); - return; + return true; /* Non-applicable motion. Various messages depending on word given. */ -L50: game.spk=12; - if(K >= 43 && K <= 50)game.spk=52; - if(K == 29 || K == 30)game.spk=52; - if(K == 7 || K == 36 || K == 37)game.spk=10; - if(K == 11 || K == 19)game.spk=11; - if(VERB == FIND || VERB == INVENT)game.spk=59; - if(K == 62 || K == 65)game.spk=42; - if(K == 17)game.spk=80; - RSPEAK(game.spk); - return; - - - - +L50: SPK=12; + if(K >= 43 && K <= 50)SPK=52; + if(K == 29 || K == 30)SPK=52; + if(K == 7 || K == 36 || K == 37)SPK=10; + if(K == 11 || K == 19)SPK=11; + if(VERB == FIND || VERB == INVENT)SPK=59; + if(K == 62 || K == 65)SPK=42; + if(K == 17)SPK=80; + RSPEAK(SPK); + return true; /* "You're dead, Jim." * @@ -678,8 +711,8 @@ L99: if(game.closng) goto L95; PLACE[WATER]=0; PLACE[OIL]=0; if(TOTING(LAMP))PROP[LAMP]=0; - /* 98 */ for (J=1; J<=100; J++) { - I=101-J; + /* 98 */ for (J=1; J<=NOBJECTS; J++) { + I=NOBJECTS + 1 - J; if(!TOTING(I)) goto L98; K=game.oldlc2; if(I == LAMP)K=1; @@ -797,14 +830,14 @@ L41000: if(game.tally == 1 && PROP[JADE] < 0) goto L40010; L10000: PROP[GRATE]=0; PROP[FISSUR]=0; - for (I=1; I<=6; I++) { - DSEEN[I]=false; - DLOC[I]=0; + for (I=1; I<=NDWARVES; I++) { + game.dseen[I]=false; + game.dloc[I]=0; } /* end loop */ MOVE(TROLL,0); - MOVE(TROLL+100,0); + MOVE(TROLL+NOBJECTS,0); MOVE(TROLL2,PLAC[TROLL]); - MOVE(TROLL2+100,FIXD[TROLL]); + MOVE(TROLL2+NOBJECTS,FIXD[TROLL]); JUGGLE(CHASM); if(PROP[BEAR] != 3)DSTROY(BEAR); PROP[CHAIN]=0; @@ -853,13 +886,14 @@ L11000: PROP[BOTTLE]=PUT(BOTTLE,115,1); PROP[MIRROR]=PUT(MIRROR,115,0); FIXED[MIRROR]=116; - for (I=1; I<=100; I++) { - if(TOTING(I))DSTROY(I); + for (I=1; I<=NOBJECTS; I++) { + if(TOTING(I)) + DSTROY(I); } /* end loop */ RSPEAK(132); game.closed=true; - return; + return true; /* Another way we can force an end to things is by having the lamp give out. * When it gets close, we come here to warn him. We go to 12000 if the lamp @@ -876,10 +910,10 @@ L12000: RSPEAK(188); L12200: if(game.lmwarn || !HERE(LAMP)) goto L19999; game.lmwarn=true; - game.spk=187; - if(PLACE[BATTER] == 0)game.spk=183; - if(PROP[BATTER] == 1)game.spk=189; - RSPEAK(game.spk); + SPK=187; + if(PLACE[BATTER] == 0)SPK=183; + if(PROP[BATTER] == 1)SPK=189; + RSPEAK(SPK); goto L19999; L12400: game.limit= -1; @@ -889,7 +923,8 @@ L12400: game.limit= -1; /* Oh dear, he's disturbed the dwarves. */ -L18999: RSPEAK(game.spk); +L18999: RSPEAK(SPK); L19000: RSPEAK(136); score(0); + return true; }