X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=main.c;h=640a6fb3a9ff2b67c75cc16d6265bfb8539d4853;hb=978168523abcc3e4f06c23df57dc47541cd995ca;hp=4854b695f187bb55545f8b5adc0c40f49a5ba56e;hpb=8a8770375ebcf69b18749be85838dc46132cbe9f;p=open-adventure.git diff --git a/main.c b/main.c index 4854b69..640a6fb 100644 --- a/main.c +++ b/main.c @@ -7,38 +7,39 @@ #include #include #include -#include "main.h" - -#include "misc.h" - -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 ABBNUM, ACTSPK[36], AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD, BONUS, +#include +#include +#include "advent.h" +#include "database.h" + +long ABB[186], ATLOC[186], BLKLIN = true, DFLAG, + DLOC[7], 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, 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, DSEEN[NDWARVES+1], 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, + ODLOC[NDWARVES+1], 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; @@ -48,11 +49,19 @@ 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; @@ -70,11 +79,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; @@ -99,16 +109,12 @@ int main(int argc, char *argv[]) { lcgstate.a = 1093; lcgstate.c = 221587; lcgstate.m = 1048576; - set_seed_from_time(); + srand(time(NULL)); + long seedval = (long)rand(); + set_seed(seedval); /* Read the database if we have not yet done so */ - LINES = (long *)calloc(LINSIZ+1,sizeof(long)); - if(!LINES){ - printf("Not enough memory!\n"); - exit(1); - } - MAP2[1] = 0; if(!SETUP)initialise(); if(SETUP > 0) goto L1; @@ -125,23 +131,44 @@ int main(int argc, char *argv[]) { L1: SETUP= -1; I=0; - ZZWORD=RNDVOC(3,0)+MESH*2; + 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 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 void do_command(FILE *cmdin) { +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; @@ -152,7 +179,7 @@ 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++) { + /* 73 */ for (I=1; I<=NDWARVES-1; I++) { if(ODLOC[I] != NEWLOC || !DSEEN[I]) goto L73; NEWLOC=LOC; RSPEAK(2); @@ -183,10 +210,10 @@ 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+randrange(5); + J=1+randrange(NDWARVES-1); if(PCT(50))DLOC[J]=0; } /* end loop */ - for (I=1; I<=5; I++) { + for (I=1; I<=NDWARVES-1; I++) { if(DLOC[I] == LOC)DLOC[I]=DALTLC; ODLOC[I]=DLOC[I]; } /* end loop */ @@ -202,19 +229,19 @@ L6000: if(DFLAG != 1) goto L6010; L6010: DTOTAL=0; ATTACK=0; STICK=0; - /* 6030 */ for (I=1; I<=6; I++) { + /* 6030 */ for (I=1; I<=NDWARVES; I++) { if(DLOC[I] == 0) goto L6030; /* Fill TK array with all the places this dwarf might go. */ J=1; KK=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] || 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; @@ -329,7 +356,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; @@ -375,21 +402,21 @@ 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=0; - GETIN(cmdin, WD1,WD1X,WD2,WD2X); + 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. */ @@ -448,6 +475,8 @@ L2800: WD1=WD2; /* Gee, I don't understand. */ L3000: SETPRM(1,WD1,WD1X); + if (fallback_handler(rawbuf)) + return true; RSPEAK(254); goto L2600; @@ -458,7 +487,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; @@ -494,14 +523,14 @@ L8000: SETPRM(1,WD1,WD1X); 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; @@ -509,27 +538,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). */ @@ -543,11 +572,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 @@ -566,16 +595,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; @@ -599,13 +628,13 @@ L20: K=OLDLOC; if(CNDBIT(LOC,4))K2=274; if(K2 == 0) goto L21; RSPEAK(K2); - return; + return true; -L21: LL=MOD((IABS(TRAVEL[KK])/1000),1000); +L21: LL=MOD((labs(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; + if(FORCED(LL) && MOD((labs(TRAVEL[J])/1000),1000) == K)K2=KK; L22: if(TRAVEL[KK] < 0) goto L23; KK=KK+1; goto L21; @@ -613,9 +642,9 @@ L22: if(TRAVEL[KK] < 0) goto L23; L23: KK=K2; if(KK != 0) goto L25; RSPEAK(140); - return; + return true; -L25: K=MOD(IABS(TRAVEL[KK]),1000); +L25: K=MOD(labs(TRAVEL[KK]),1000); KK=KEY[LOC]; goto L9; @@ -626,14 +655,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. */ @@ -646,11 +675,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." * @@ -683,8 +708,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; @@ -802,14 +827,14 @@ L41000: if(TALLY == 1 && PROP[JADE] < 0) goto L40010; L10000: PROP[GRATE]=0; PROP[FISSUR]=0; - for (I=1; I<=6; I++) { + for (I=1; I<=NDWARVES; I++) { DSEEN[I]=false; 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; @@ -858,13 +883,13 @@ L11000: PROP[BOTTLE]=PUT(BOTTLE,115,1); PROP[MIRROR]=PUT(MIRROR,115,0); FIXED[MIRROR]=116; - for (I=1; I<=100; 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 @@ -897,4 +922,5 @@ L12400: LIMIT= -1; L18999: RSPEAK(SPK); L19000: RSPEAK(136); score(0); + return true; }