X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=main.c;h=84eca5758177d5d262d015186fb02bb5e3aeb80b;hb=45820bc8cd6e01279d94703fd18b73f6848f09aa;hp=95acac2fb47adcec557ecce53bf2df089704e45c;hpb=d9d089bdcc31698970747fc829edb057c0a0da5b;p=open-adventure.git diff --git a/main.c b/main.c index 95acac2..84eca57 100644 --- a/main.c +++ b/main.c @@ -13,13 +13,12 @@ * and for the offensive globals. Applying the Structured Program * Theorem can be hard. */ -#define DEFINE_GLOBALS_FROM_INCLUDES + #include #include #include #include #include -#include #include #include "advent.h" #include "linenoise/linenoise.h" @@ -27,8 +26,6 @@ #define DIM(a) (sizeof(a)/sizeof(a[0])) -struct game_t game; - FILE *logfp = NULL, *rfp = NULL; bool oldstyle = false; bool editline = true; @@ -42,7 +39,7 @@ static void sig_handler(int signo) if (logfp != NULL) fflush(logfp); } - exit(0); + exit(EXIT_FAILURE); } // LCOV_EXCL_STOP @@ -113,30 +110,20 @@ int main(int argc, char *argv[]) #endif fprintf(stderr, " -s suppress command editing\n"); - exit(-1); + exit(EXIT_FAILURE); break; } } linenoiseHistorySetMaxLen(350); - /* Initialize our LCG PRNG with parameters tested against - * Knuth vol. 2. by the original authors */ - game.lcg_a = 1093; - game.lcg_c = 221587; - game.lcg_m = 1048576; - srand(time(NULL)); - long seedval = (long)rand(); - set_seed(seedval); - /* Initialize game variables */ - initialise(); + long seedval = initialise(); /* Start-up, dwarf stuff */ make_zzword(game.zzword); - game.newloc = LOC_START; - game.loc = LOC_START; - game.limit = GAMELIMIT; + +#ifndef ADVENT_NOSAVE if (!rfp) { game.novice = yes(arbitrary_messages[WELCOME_YOU], arbitrary_messages[CAVE_NEARBY], arbitrary_messages[NO_MESSAGE]); if (game.novice) @@ -144,6 +131,7 @@ int main(int argc, char *argv[]) } else { restore(rfp); } +#endif if (logfp) fprintf(logfp, "seed %ld\n", seedval); @@ -371,9 +359,12 @@ static bool dwarfmove(void) if (PCT(50)) game.dloc[j] = 0; } + + /* Alternate initial loc for dwarf, in case one of them + * starts out on top of the adventurer. */ for (int i = 1; i <= NDWARVES - 1; i++) { if (game.dloc[i] == game.loc) - game.dloc[i] = DALTLC; + game.dloc[i] = DALTLC; // game.odloc[i] = game.dloc[i]; } rspeak(DWARF_RAN); @@ -619,6 +610,7 @@ static bool playermove( int motion) /* (ESR) We've found a destination that goes with the motion verb. * Next we need to check any conditional(s) on this destination, and * possibly on following entries. */ + /* FIXME: Magic numbers related to move opcodes */ do { for (;;) { /* L12 loop */ for (;;) { @@ -701,8 +693,8 @@ static bool playermove( int motion) * so step out and block him. (standard travel * entries check for game.prop(TROLL)=0.) Special * stuff for bear. */ - if (game.prop[TROLL] == 1) { - pspeak(TROLL, look, 1); + if (game.prop[TROLL] == TROLL_PAIDONCE) { + pspeak(TROLL, look, TROLL_PAIDONCE); game.prop[TROLL] = 0; move(TROLL2, 0); move(TROLL2 + NOBJECTS, 0); @@ -713,13 +705,13 @@ static bool playermove( int motion) return true; } else { game.newloc = objects[TROLL].plac + objects[TROLL].fixd - game.loc; - if (game.prop[TROLL] == 0) - game.prop[TROLL] = 1; + if (game.prop[TROLL] == TROLL_UNPAID) + game.prop[TROLL] = TROLL_PAIDONCE; if (!TOTING(BEAR)) return true; rspeak(BRIDGE_COLLAPSE); - game.prop[CHASM] = 1; - game.prop[TROLL] = 2; + game.prop[CHASM] = BRIDGE_WRECKED; + game.prop[TROLL] = TROLL_GONE; drop(BEAR, game.newloc); game.fixed[BEAR] = -1; game.prop[BEAR] = BEAR_DEAD; @@ -775,7 +767,7 @@ static bool closecheck(void) * have been activated, since we've found chest. */ if (game.clock1 == 0) { game.prop[GRATE] = GRATE_CLOSED; - game.prop[FISSURE] = 0; + game.prop[FISSURE] = UNBRIDGED; for (int i = 1; i <= NDWARVES; i++) { game.dseen[i] = false; game.dloc[i] = 0; @@ -1029,6 +1021,8 @@ L2600: /* This is where we get a new command from the user */ char* input; + char inputbuf[LINESIZE]; + for (;;) { input = get_input(); if (input == NULL) @@ -1040,8 +1034,12 @@ L2600: if (strcmp(input, "") != 0) break; } + + strncpy(inputbuf, input, LINESIZE - 1); + linenoiseFree(input); + long tokens[4]; - tokenize(input, tokens); + tokenize(inputbuf, tokens); command.wd1 = tokens[0]; command.wd1x = tokens[1]; command.wd2 = tokens[2]; @@ -1094,13 +1092,13 @@ L2607: command.wd1x = command.wd2x; wordclear(&command.wd2); } else { - /* FIXME: Magic numbers */ - if (!((V1 != 1000 + WATER && V1 != 1000 + OIL) || - (V2 != 1000 + PLANT && V2 != 1000 + DOOR))) { - if (AT(V2 - 1000)) + /* FIXME: Magic numbers related to vocabulary */ + if (!((V1 != PROMOTE_WORD(WATER) && V1 != PROMOTE_WORD(OIL)) || + (V2 != PROMOTE_WORD(PLANT) && V2 != PROMOTE_WORD(DOOR)))) { + if (AT(DEMOTE_WORD(V2))) command.wd2 = token_to_packed("POUR"); } - if (V1 == 1000 + CAGE && V2 == 1000 + BIRD && HERE(CAGE) && HERE(BIRD)) + if (V1 == PROMOTE_WORD(CAGE) && V2 == PROMOTE_WORD(BIRD) && HERE(CAGE) && HERE(BIRD)) command.wd1 = token_to_packed("CATCH"); } L2620: @@ -1118,11 +1116,12 @@ Lookup: defn = get_vocab_id(word1); if (defn == -1) { /* Gee, I don't understand. */ - if (fallback_handler(input)) + if (fallback_handler(inputbuf)) continue; rspeak(DONT_KNOW, command.wd1, command.wd1x); goto L2600; } + /* FIXME: magic numbers related to vocabulary */ kmod = MOD(defn, 1000); switch (defn / 1000) { case 0: @@ -1181,7 +1180,6 @@ Laction: default: BUG(ACTION_RETURNED_PHASE_CODE_BEYOND_END_OF_SWITCH); // LCOV_EXCL_LINE } - linenoiseFree(input); } }