X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=main.c;h=75982c651cab10000f7e3b868dd3eab0c512239b;hb=07c0020a7aaa0ab34ee0e4f6e3a9ae0e1fe06c25;hp=de25b32a388cf642e4c34af86cc5886df7dfecd3;hpb=dc9d9e467b4efe76c30f15ccd23ceede2326f5e8;p=open-adventure.git diff --git a/main.c b/main.c index de25b32..75982c6 100644 --- a/main.c +++ b/main.c @@ -7,51 +7,63 @@ #include #include #include -#include "main.h" +#include +#include +#include "advent.h" +#include "database.h" -#include "misc.h" +struct game_t game; -long ABB[186], ATAB[331], ATLOC[186], BLKLIN = true, DFLAG, - DLOC[7], FIXED[101], HOLDNG, - KTAB[331], *LINES, LINK[201], LNLENG, LNPOSN, - PARMS[26], PLACE[101], PTEXT[101], RTEXT[278], - SETUP = 0, TABSIZ = 330; -signed char INLINE[LINESIZE+1], MAP1[129], MAP2[129]; +long ABB[186], ATLOC[186], BLKLIN = true, DFLAG, + FIXED[NOBJECTS+1], HOLDNG, + LINK[NOBJECTS*2 + 1], LNLENG, LNPOSN, + PARMS[26], PLACE[NOBJECTS+1], + SETUP = 0; +char rawbuf[LINESIZE], INLINE[LINESIZE+1], MAP1[129], MAP2[129]; -long ABBNUM, ACTSPK[36], AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD, BONUS, +long ABBNUM, AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD, BONUS, BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST, CHLOC, CHLOC2, - CLAM, CLOCK1, CLOCK2, CLOSED, CLOSNG, CLSHNT, CLSMAX = 12, CLSSES, - COINS, COND[186], CONDS, CTEXT[13], CVAL[13], DALTLC, DETAIL, - DKILL, DOOR, DPRSSN, DRAGON, DSEEN[7], DTOTAL, DWARF, EGGS, - EMRALD, ENTER, ENTRNC, FIND, FISSUR, FIXD[101], FOOBAR, FOOD, - GRATE, HINT, HINTED[21], HINTLC[21], HINTS[21][5], HNTMAX, - HNTSIZ = 20, I, INVENT, IGO, IWEST, J, JADE, K, K2, KEY[186], KEYS, KK, - KNFLOC, KNIFE, KQ, L, LAMP, LIMIT, LINSIZ = 12500, LINUSE, LL, - LMWARN, LOC, LOCK, LOCSIZ = 185, LOCSND[186], LOOK, LTEXT[186], - MAGZIN, MAXDIE, MAXTRS, MESH = 123456789, + CLAM, CLOCK1, CLOCK2, CLOSED, CLOSNG, CLSHNT, + COINS, CONDS, DALTLC, DETAIL, + DKILL, DOOR, DPRSSN, DRAGON, DTOTAL, DWARF, EGGS, + EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOBAR, FOOD, + GRATE, HINT, HINTED[21], HINTLC[21], + I, INVENT, IGO, IWEST, J, JADE, K, K2, KEYS, KK, + KNFLOC, KNIFE, KQ, L, LAMP, LIMIT, LL, + LMWARN, LOC, LOCK, LOOK, + MAGZIN, MAXDIE, MAXTRS, MESSAG, MIRROR, MXSCOR, - NEWLOC, NOVICE, NUGGET, NUL, NUMDIE, OBJ, OBJSND[101], - OBJTXT[101], ODLOC[7], OGRE, OIL, OLDLC2, OLDLOC, OLDOBJ, OYSTER, - PANIC, PEARL, PILLOW, PLAC[101], PLANT, PLANT2, PROP[101], PYRAM, - RESER, ROD, ROD2, RTXSIZ = 277, RUBY, RUG, SAPPH, SAVED, SAY, - SCORE, SECT, SIGN, SNAKE, SPK, STEPS, STEXT[186], STICK, - STREAM, TABNDX, TALLY, THRESH, THROW, TK[21], TRAVEL[886], TRIDNT, - TRNDEX, TRNLUZ, TRNSIZ = 5, TRNVAL[6], TRNVLS, TROLL, TROLL2, TRVS, - TRVSIZ = 885, TTEXT[6], TURNS, URN, V1, V2, VASE, VEND, VERB, - VOLCAN, VRBSIZ = 35, VRSION = 25, WATER, WD1, WD1X, WD2, WD2X, + NEWLOC, NOVICE, NUGGET, NUL, NUMDIE, OBJ, + OGRE, OIL, OLDLC2, OLDLOC, OLDOBJ, OYSTER, + PANIC, PEARL, PILLOW, PLANT, PLANT2, PROP[NOBJECTS+1], PYRAM, + RESER, ROD, ROD2, RUBY, RUG, SAPPH, SAVED, SAY, + SCORE, SECT, SIGN, SNAKE, SPK, STEPS, STICK, + STREAM, TALLY, THRESH, THROW, TK[21], TRIDNT, + TRNDEX, TRNLUZ, TROLL, TROLL2, + TURNS, URN, V1, V2, VASE, VEND, VERB, + VOLCAN, VRSION = 25, WATER, WD1, WD1X, WD2, WD2X, WZDARK = false, ZZWORD; 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 +81,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; @@ -93,13 +106,16 @@ 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(!SETUP)initialise(); @@ -116,24 +132,45 @@ int main(int argc, char *argv[]) { /* Start-up, dwarf stuff */ L1: SETUP= -1; - I=RAN(-1); - ZZWORD=RNDVOC(3,0)+MESH*2; + I=0; + ZZWORD=RNDVOC(3,0); NOVICE=YES(stdin, 65,1,0); NEWLOC=1; LOC=1; LIMIT=330; if(NOVICE)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. + --TURNS; + // here we reconfigure any global game state that uses random numbers + 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(NEWLOC) || NEWLOC == 0 || !CLOSNG) goto L71; + if(!OUTSID(NEWLOC) || NEWLOC == 0 || !CLOSNG) goto L71; RSPEAK(130); NEWLOC=LOC; if(!PANIC)CLOCK2=15; @@ -144,8 +181,8 @@ L2: if(!OUTSID(NEWLOC) || NEWLOC == 0 || !CLOSNG) goto L71; * (dwarves rooted in place) let him get out (and attacked). */ L71: if(NEWLOC == LOC || FORCED(LOC) || CNDBIT(LOC,3)) goto L74; - /* 73 */ for (I=1; I<=5; I++) { - if(ODLOC[I] != NEWLOC || !DSEEN[I]) goto L73; + /* 73 */ for (I=1; I<=NDWARVES-1; I++) { + if(game.odloc[I] != NEWLOC || !game.dseen[I]) goto L73; NEWLOC=LOC; RSPEAK(2); goto L74; @@ -175,12 +212,12 @@ L6000: if(DFLAG != 1) goto L6010; if(!INDEEP(LOC) || (PCT(95) && (!CNDBIT(LOC,4) || PCT(85)))) goto L2000; 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 +231,31 @@ L6000: if(DFLAG != 1) goto L6010; L6010: 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: NEWLOC=MOD(IABS(TRAVEL[KK])/1000,1000); +L6012: NEWLOC=MOD(labs(TRAVEL[KK])/1000,1000); {long x = J-1; - if(NEWLOC > 300 || !INDEEP(NEWLOC) || NEWLOC == ODLOC[I] || (J > 1 && - NEWLOC == TK[x]) || J >= 20 || NEWLOC == DLOC[I] || + if(NEWLOC > 300 || !INDEEP(NEWLOC) || NEWLOC == game.odloc[I] || (J > 1 && + NEWLOC == TK[x]) || J >= 20 || NEWLOC == game.dloc[I] || FORCED(NEWLOC) || (I == 6 && CNDBIT(NEWLOC,3)) || - IABS(TRAVEL[KK])/1000000 == 100) goto L6014;} + labs(TRAVEL[KK])/1000000 == 100) goto L6014;} TK[J]=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 @@ -236,7 +273,7 @@ L6020: if(HERE(J))K=1; } /* end loop */ if(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; @@ -250,9 +287,9 @@ L6022: RSPEAK(128); if(TOTING(J))DROP(J,CHLOC); L6023: /*etc*/ ; } /* end loop */ -L6024: DLOC[6]=CHLOC; - ODLOC[6]=CHLOC; - DSEEN[6]=false; +L6024: game.dloc[6]=CHLOC; + game.odloc[6]=CHLOC; + game.dseen[6]=false; goto L6030; L6025: RSPEAK(186); @@ -263,10 +300,10 @@ L6025: RSPEAK(186); /* This threatening little dwarf is in the room with him! */ L6027: DTOTAL=DTOTAL+1; - if(ODLOC[I] != DLOC[I]) goto L6030; + if(game.odloc[I] != game.dloc[I]) goto L6030; ATTACK=ATTACK+1; if(KNFLOC >= 0)KNFLOC=LOC; - if(RAN(1000) < 95*(DFLAG-2))STICK=STICK+1; + if(randrange(1000) < 95*(DFLAG-2))STICK=STICK+1; L6030: /*etc*/ ; } /* end loop */ @@ -321,7 +358,7 @@ L2001: if(TOTING(BEAR))RSPEAK(141); 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(CLOSED) goto L2008; @@ -367,34 +404,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 CLOCK1 unless well into cave (and not at Y2). */ L2603: if(!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: WZDARK=DARK(0); if(KNFLOC > 0 && KNFLOC != LOC)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 "FOOBAR" flag. If zero, nothing's going on. If pos, * make neg. If neg, he skipped a word, so make it zero. */ L2607: FOOBAR=(FOOBAR>0 ? -FOOBAR : 0); TURNS=TURNS+1; - if(TURNS != THRESH) goto L2608; + if(TURNS == THRESH) { SPEAK(TTEXT[TRNDEX]); TRNLUZ=TRNLUZ+TRNVAL[TRNDEX]/100000; TRNDEX=TRNDEX+1; THRESH= -1; - if(TRNDEX <= TRNVLS)THRESH=MOD(TRNVAL[TRNDEX],100000)+1; -L2608: if(VERB == SAY && WD2 > 0)VERB=0; + if(TRNDEX <= TRNVLS) + THRESH=MOD(TRNVAL[TRNDEX],100000)+1; + } + if(VERB == SAY && WD2 > 0)VERB=0; if(VERB == SAY) goto L4090; if(TALLY == 0 && INDEEP(LOC) && LOC != 33)CLOCK1=CLOCK1-1; if(CLOCK1 == 0) goto L10000; @@ -414,12 +453,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; - IWEST=IWEST+1; - if(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)) { + IWEST=IWEST+1; + if(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 +480,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 +492,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,22 +520,22 @@ 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 "NEWLOC". The current loc is saved in "OLDLOC" in case - * he wants to retreat. The current OLDLOC is saved in OLDLC2, in case he - * dies. (if he does, NEWLOC will be limbo, and OLDLOC will be what killed + * the new location in "NEWLOC". The current loc is saved in "OLgame.dloc" in case + * he wants to retreat. The current OLgame.dloc is saved in OLDLC2, in case he + * dies. (if he does, NEWLOC will be limbo, and OLgame.dloc will be what killed * him, so we need OLDLC2, which is the last place he was safe.) */ L8: KK=KEY[LOC]; 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; OLDLC2=OLDLOC; 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; @@ -501,27 +543,27 @@ L9: LL=IABS(TRAVEL[KK]); L10: LL=LL/1000; L11: NEWLOC=LL/1000; - K=MOD(NEWLOC,100); + K=MOD(NEWLOC,100); /* ESR: an instance of NOBJECTS? */ if(NEWLOC <= 300) goto L13; if(PROP[K] != NEWLOC/100-3) goto L16; L12: if(TRAVEL[KK] < 0)BUG(25); KK=KK+1; - NEWLOC=IABS(TRAVEL[KK])/1000; + NEWLOC=labs(TRAVEL[KK])/1000; if(NEWLOC == LL) goto L12; LL=NEWLOC; goto L11; -L13: if(NEWLOC <= 100) goto L14; +L13: if(NEWLOC <= 100) goto L14; /* ESR: an instance of NOBJECTS? */ if(TOTING(K) || (NEWLOC > 200 && AT(K))) goto L16; goto L12; L14: if(NEWLOC != 0 && !PCT(NEWLOC)) goto L12; L16: NEWLOC=MOD(LL,1000); - if(NEWLOC <= 300) return; + if(NEWLOC <= 300) return true; if(NEWLOC <= 500) goto L30000; RSPEAK(NEWLOC-500); 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). */ @@ -535,11 +577,11 @@ L30000: NEWLOC=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: NEWLOC=99+100-LOC; - if(HOLDNG == 0 || (HOLDNG == 1 && TOTING(EMRALD))) return; +L30100: NEWLOC=99+100-LOC; /* ESR: an instance of NOBJECTS? */ + if(HOLDNG == 0 || (HOLDNG == 1 && TOTING(EMRALD))) return true; 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 @@ -558,16 +600,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); NEWLOC=LOC; - return; + return true; L30310: 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; @@ -591,23 +633,27 @@ L20: K=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; @@ -618,14 +664,14 @@ L30: if(DETAIL < 3)RSPEAK(15); DETAIL=DETAIL+1; WZDARK=false; ABB[LOC]=0; - return; + 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. */ @@ -638,11 +684,7 @@ L50: SPK=12; if(K == 62 || K == 65)SPK=42; if(K == 17)SPK=80; RSPEAK(SPK); - return; - - - - + return true; /* "You're dead, Jim." * @@ -675,8 +717,8 @@ L99: if(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=OLDLC2; if(I == LAMP)K=1; @@ -763,15 +805,15 @@ L41000: if(TALLY == 1 && PROP[JADE] < 0) goto L40010; /* Cave closing and scoring */ -/* These sections handle the closing of the cave. The cave closes "CLOCK1" +/* These sections handle the closing of the cave. The cave closes "clock1" * turns after the last treasure has been located (including the pirate's * chest, which may of course never show up). Note that the treasures need not - * have been taken yet, just located. Hence CLOCK1 must be large enough to get + * have been taken yet, just located. Hence clock1 must be large enough to get * out of the cave (it only ticks while inside the cave). When it hits zero, * we branch to 10000 to start closing the cave, and then sit back and wait for - * him to try to get out. If he doesn't within CLOCK2 turns, we close the + * him to try to get out. If he doesn't within clock2 turns, we close the * cave; if he does try, we assume he panics, and give him a few additional - * turns to get frantic before we close. When CLOCK2 hits zero, we branch to + * turns to get frantic before we close. When clock2 hits zero, we branch to * 11000 to transport him into the final puzzle. Note that the puzzle depends * upon all sorts of random things. For instance, there must be no water or * oil, since there are beanstalks which we don't want to be able to water, @@ -783,8 +825,8 @@ L41000: if(TALLY == 1 && PROP[JADE] < 0) goto L40010; /* When the first warning comes, we lock the grate, destroy the bridge, kill * all the dwarves (and the pirate), remove the troll and bear (unless dead), - * and set "CLOSNG" to true. Leave the dragon; too much trouble to move it. - * from now until CLOCK2 runs out, he cannot unlock the grate, move to any + * and set "closng" to true. Leave the dragon; too much trouble to move it. + * from now until clock2 runs out, he cannot unlock the grate, move to any * location outside the cave, or create the bridge. Nor can he be * resurrected if he dies. Note that the snake is already gone, since he got * to the treasure accessible only via the hall of the mountain king. Also, he's @@ -794,14 +836,14 @@ L41000: if(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; @@ -813,17 +855,17 @@ L10000: PROP[GRATE]=0; CLOSNG=true; goto L19999; -/* ONCE HE'S PANICKED, AND CLOCK2 HAS RUN OUT, WE COME HERE TO SET UP THE - * STORAGE ROOM. THE ROOM HAS TWO LOCS, HARDWIRED AS 115 (NE) AND 116 (SW). - * AT THE NE END, WE PLACE EMPTY BOTTLES, A NURSERY OF PLANTS, A BED OF - * OYSTERS, A PILE OF LAMPS, RODS WITH STARS, SLEEPING DWARVES, AND HIM. AT - * THE SW END WE PLACE GRATE OVER TREASURES, SNAKE PIT, COVEY OF CAGED BIRDS, - * MORE RODS, AND PILLOWS. A MIRROR STRETCHES ACROSS ONE WALL. MANY OF THE - * OBJECTS COME FROM KNOWN LOCATIONS AND/OR STATES (E.G. THE SNAKE IS KNOWN TO - * HAVE BEEN DESTROYED AND NEEDN'T BE CARRIED AWAY FROM ITS OLD "PLACE"), - * MAKING THE VARIOUS OBJECTS BE HANDLED DIFFERENTLY. WE ALSO DROP ALL OTHER - * OBJECTS HE MIGHT BE CARRYING (LEST HE HAVE SOME WHICH COULD CAUSE TROUBLE, - * SUCH AS THE KEYS). WE DESCRIBE THE FLASH OF LIGHT AND TRUNDLE BACK. */ +/* Once he's panicked, and clock2 has run out, we come here to set up the + * storage room. The room has two locs, hardwired as 115 (ne) and 116 (sw). + * At the ne end, we place empty bottles, a nursery of plants, a bed of + * oysters, a pile of lamps, rods with stars, sleeping dwarves, and him. At + * the sw end we place grate over treasures, snake pit, covey of caged birds, + * more rods, and pillows. A mirror stretches across one wall. Many of the + * objects come from known locations and/or states (e.g. the snake is known to + * have been destroyed and needn't be carried away from its old "place"), + * making the various objects be handled differently. We also drop all other + * objects he might be carrying (lest he have some which could cause trouble, + * such as the keys). We describe the flash of light and trundle back. */ L11000: PROP[BOTTLE]=PUT(BOTTLE,115,1); PROP[PLANT]=PUT(PLANT,115,0); @@ -850,13 +892,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); 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 @@ -889,4 +932,5 @@ L12400: LIMIT= -1; L18999: RSPEAK(SPK); L19000: RSPEAK(136); score(0); + return true; }