X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=main.c;h=7a065b2fd91ca3dc4f955be85b93f893f99ca558;hp=249fdee3d06324186e13b6c10c963eb31710ff0c;hb=28583348450b28bd4811d37fa5fe50bcbcfcfb12;hpb=ba1369310d6f98808fec143e00e0d9f800833bd7 diff --git a/main.c b/main.c index 249fdee..7a065b2 100644 --- a/main.c +++ b/main.c @@ -7,38 +7,40 @@ #include #include #include +#include +#include #include "main.h" - +#include "database.h" #include "misc.h" -long ABB[186], ATAB[331], ATLOC[186], BLKLIN = true, DFLAG, +long ABB[186], 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]; + LINK[201], LNLENG, LNPOSN, + PARMS[26], PLACE[101], + SETUP = 0; +signed 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, + CLAM, CLOCK1, CLOCK2, CLOSED, CLOSNG, CLSHNT, + COINS, CONDS, 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, + 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[7], OGRE, OIL, OLDLC2, OLDLOC, OLDOBJ, OYSTER, + PANIC, PEARL, PILLOW, PLANT, PLANT2, PROP[101], 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 +50,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 +80,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 +110,11 @@ int main(int argc, char *argv[]) { lcgstate.a = 1093; lcgstate.c = 221587; lcgstate.m = 1048576; - set_seed_from_time(); + long seedval = (long)time(NULL); + 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,19 +131,38 @@ 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 void do_command(FILE *cmdin) { +static bool fallback_handler(signed 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); + // 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). */ @@ -389,7 +414,8 @@ L2603: if(!CLOSED) goto L2605; 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 +474,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 +486,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,7 +522,7 @@ 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; @@ -525,11 +553,11 @@ L13: if(NEWLOC <= 100) goto L14; 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). */ @@ -544,10 +572,10 @@ L30000: NEWLOC=NEWLOC-300; * 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; + 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 @@ -571,11 +599,11 @@ L30300: if(PROP[TROLL] != 1) goto L30310; MOVE(TROLL+100,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,7 +627,7 @@ 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); if(LL == K) goto L25; @@ -613,7 +641,7 @@ 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); KK=KEY[LOC]; @@ -626,14 +654,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 +674,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." * @@ -864,7 +888,7 @@ L11000: PROP[BOTTLE]=PUT(BOTTLE,115,1); 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 +921,5 @@ L12400: LIMIT= -1; L18999: RSPEAK(SPK); L19000: RSPEAK(136); score(0); + return true; }