X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=main.c;h=faa353b514be4001c04d0506170d0e660fbc47ef;hp=f24c5bc4162cb6480b3f232d69f338b86d663204;hb=a3c159660bb03f220b7de52ba0ac4977098f389e;hpb=3a722da650b8f5a758f9b661c26271e714989d08 diff --git a/main.c b/main.c index f24c5bc..faa353b 100644 --- a/main.c +++ b/main.c @@ -137,7 +137,8 @@ static bool fallback_handler(struct command_t command) /* fallback handler for commands not handled by FORTRANish parser */ { long sv; - char buf[LINESIZE]; + turn_t turnlimit; + char buf[DIM(command.raw1) + DIM(command.raw2) + 1]; sprintf(buf, "%s %s", command.raw1, command.raw2); if (sscanf(buf, "seed %ld", &sv) == 1) { @@ -146,6 +147,10 @@ static bool fallback_handler(struct command_t command) // autogenerated, so don't charge user time for it. --game.turns; return true; + } else if (sscanf(buf, "waste %ld", &turnlimit) == 1) { + game.limit -= turnlimit; + printf("Game limit is now %ld\n", game.limit); + return true; } return false; } @@ -223,9 +228,8 @@ static void checkhints(void) break; game.hintlc[hint] = 0; return; - default: + default: // LCOV_EXCL_LINE BUG(HINT_NUMBER_EXCEEDS_GOTO_LIST); // LCOV_EXCL_LINE - break; } /* Fall through to hint display */ @@ -315,7 +319,7 @@ static bool dwarfmove(void) /* Dwarves move. Return true if player survives, false if he dies. */ { int kk, stick, attack; - long tk[21]; + loc_t tk[21]; /* Dwarf stuff. See earlier comments for description of * variables. Remember sixth dwarf is pirate and is thus @@ -397,7 +401,7 @@ static bool dwarfmove(void) else if (j > 1 && game.newloc == tk[j - 1]) continue; else if (j >= DIM(tk) - 1) - /* This can't actually happen. */ + /* This can't actually happen. */ continue; // LCOV_EXCL_LINE else if (game.newloc == game.dloc[i]) continue; @@ -448,7 +452,7 @@ static bool dwarfmove(void) rspeak(stick > 1 ? MULTIPLE_HITS : (stick == 1 ? ONE_HIT : NONE_HIT), stick); } else { rspeak(KNIFE_THROWN); - rspeak(MISSES_YOU); + rspeak(stick ? GETS_YOU : MISSES_YOU); } if (stick == 0) return true; @@ -487,8 +491,8 @@ static void croak(void) * death and exit. */ rspeak(DEATH_CLOSING); terminate(endgame); - } else if (game.numdie == NDEATHS || - !yes(query, yes_response, arbitrary_messages[OK_MAN])) + } else if ( !yes(query, yes_response, arbitrary_messages[OK_MAN]) + || game.numdie == NDEATHS) terminate(endgame); else { game.place[WATER] = game.place[OIL] = LOC_NOWHERE; @@ -505,7 +509,7 @@ static void croak(void) } } -static bool traveleq(long a, long b) +static bool traveleq(int a, int b) /* Are two travel entries equal for purposes of skip after failed condition? */ { return (travel[a].condtype == travel[b].condtype) @@ -540,40 +544,39 @@ static void playermove( int motion) motion = game.oldlc2; game.oldlc2 = game.oldloc; game.oldloc = game.loc; - int spk = 0; - if (motion == game.loc) - spk = FORGOT_PATH; - if (CNDBIT(game.loc, COND_NOBACK)) - spk = TWIST_TURN; - if (spk == 0) { - int te_tmp = 0; - for (;;) { - enum desttype_t desttype = travel[travel_entry].desttype; - scratchloc = travel[travel_entry].destval; - if (desttype != dest_goto || scratchloc != motion) { - if (desttype == dest_goto) { - if (FORCED(scratchloc) && travel[tkey[scratchloc]].destval == motion) - te_tmp = travel_entry; - } - if (!travel[travel_entry].stop) { - ++travel_entry; /* go to next travel entry for this location */ - continue; - } - /* we've reached the end of travel entries for game.loc */ - travel_entry = te_tmp; - if (travel_entry == 0) { - rspeak(NOT_CONNECTED); - return; - } - } + if (CNDBIT(game.loc, COND_NOBACK)) { + rspeak(TWIST_TURN); + return; + } + if (motion == game.loc) { + rspeak(FORGOT_PATH); + return; + } - motion = travel[travel_entry].motion; - travel_entry = tkey[game.loc]; - break; /* fall through to ordinary travel */ + int te_tmp = 0; + for (;;) { + enum desttype_t desttype = travel[travel_entry].desttype; + scratchloc = travel[travel_entry].destval; + if (desttype != dest_goto || scratchloc != motion) { + if (desttype == dest_goto) { + if (FORCED(scratchloc) && travel[tkey[scratchloc]].destval == motion) + te_tmp = travel_entry; + } + if (!travel[travel_entry].stop) { + ++travel_entry; /* go to next travel entry for this location */ + continue; + } + /* we've reached the end of travel entries for game.loc */ + travel_entry = te_tmp; + if (travel_entry == 0) { + rspeak(NOT_CONNECTED); + return; + } } - } else { - rspeak(spk); - return; + + motion = travel[travel_entry].motion; + travel_entry = tkey[game.loc]; + break; /* fall through to ordinary travel */ } } else if (motion == LOOK) { /* Look. Can't give more detail. Pretend it wasn't dark @@ -668,7 +671,7 @@ static void playermove( int motion) /* We arrive here on conditional failure. * Skip to next non-matching destination */ - long te_tmp = travel_entry; + int te_tmp = travel_entry; do { if (travel[te_tmp].stop) BUG(CONDITIONAL_TRAVEL_ENTRY_WITH_NO_ALTERATION); // LCOV_EXCL_LINE @@ -757,7 +760,7 @@ static void playermove( int motion) croak(); return; } - default: + default: // LCOV_EXCL_LINE BUG(SPECIAL_TRAVEL_500_GT_L_GT_300_EXCEEDS_GOTO_LIST); // LCOV_EXCL_LINE } } @@ -899,14 +902,20 @@ static void lampcheck(void) * lamp give out. When it gets close, we come here to warn him. * First following arm checks if the lamp and fresh batteries are * here, in which case we replace the batteries and continue. - * Second is for other cases of lamp dying. Eve after it goes + * Second is for other cases of lamp dying. Even after it goes * out, he can explore outside for a while if desired. */ if (game.limit <= WARNTIME) { if (HERE(BATTERY) && game.prop[BATTERY] == FRESH_BATTERIES && HERE(LAMP)) { rspeak(REPLACE_BATTERIES); game.prop[BATTERY] = DEAD_BATTERIES; +#ifdef __unused__ + /* This code from the original game seems to have been faulty. + * No tests ever passed the guard, and with the guard removed + * the game hangs when the lamp limit is reached. + */ if (TOTING(BATTERY)) drop(BATTERY, game.loc); +#endif game.limit += BATTERYLIFE; game.lmwarn = false; } else if (!game.lmwarn && HERE(LAMP)) { @@ -939,7 +948,7 @@ static void listobjects(void) if (!DARK(game.loc)) { ++game.abbrev[game.loc]; for (int i = game.atloc[game.loc]; i != 0; i = game.link[i]) { - long obj = i; + obj_t obj = i; if (obj > NOBJECTS) obj = obj - NOBJECTS; if (obj == STEPS && TOTING(NUGGET)) @@ -978,46 +987,10 @@ static void listobjects(void) } } -static bool get_command_input(struct command_t *command) -{ - char inputbuf[LINESIZE]; - char word1[TOKLEN + 1]; - char word2[TOKLEN + 1]; - char* input; - - for (;;) { - input = get_input(); - if (input == NULL) - return false; - if (word_count(input) > 2) { - rspeak(TWO_WORDS); - free(input); - continue; - } - if (strcmp(input, "") != 0) - break; - free(input); - } - - strncpy(inputbuf, input, LINESIZE - 1); - free(input); - - tokenize(inputbuf, command); - - packed_to_token(command->wd1, word1); - packed_to_token(command->wd2, word2); - command->id1 = get_vocab_id(word1); - command->id2 = get_vocab_id(word2); - - return true; -} - static bool do_command() /* Get and execute a command */ { - long kmod, defn; static struct command_t command; - char word1[TOKLEN + 1]; command.verb = 0; @@ -1105,7 +1078,6 @@ Lclearobj: if (!get_command_input(&command)) return false; -Lclosecheck: ++game.turns; if (closecheck()) { @@ -1114,8 +1086,8 @@ Lclosecheck: } else lampcheck(); - if (command.id1 == ENTER && (command.id2 == STREAM || - command.id2 == PROMOTE_WORD(WATER))) { + if (command.type1 == MOTION && command.id1 == ENTER + && (command.id2 == STREAM || command.id2 == WATER)) { if (LIQLOC(game.loc) == WATER) rspeak(FEET_WET); else @@ -1123,55 +1095,70 @@ Lclosecheck: goto Lclearobj; } - if (command.id1 == ENTER && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY) { - command.id1 = command.id2; - command.id2 = WORD_EMPTY; - } else { - /* FIXME: Magic numbers related to vocabulary */ - if (!((command.id1 != PROMOTE_WORD(WATER) && command.id1 != PROMOTE_WORD(OIL)) || - (command.id2 != PROMOTE_WORD(PLANT) && command.id2 != PROMOTE_WORD(DOOR)))) { - if (AT(DEMOTE_WORD(command.id2))) - command.wd2 = token_to_packed("POUR"); + + if (command.type1 == OBJECT) { + if (command.id1 == GRATE) { + command.type1 = MOTION; + if (game.loc == LOC_START || + game.loc == LOC_VALLEY || + game.loc == LOC_SLIT) { + command.id1 = DEPRESSION; + } + if (game.loc == LOC_COBBLE || + game.loc == LOC_DEBRIS || + game.loc == LOC_AWKWARD || + game.loc == LOC_BIRD || + game.loc == LOC_PITTOP) { + command.id1 = ENTRANCE; + } + } + if (!((command.id1 != WATER && command.id1 != OIL) || (command.id2 != PLANT && command.id2 != DOOR))) { + if (AT(command.id2)) { + command.id2 = POUR; + command.type2 = ACTION; + strncpy(command.raw2, "POUR", LINESIZE - 1); + } + } + if (command.id1 == CAGE && command.id2 == BIRD && HERE(CAGE) && HERE(BIRD)) { + command.id1 = CARRY; + command.type1 = ACTION; + strncpy(command.raw2, "CATCH", LINESIZE - 1); } - if (command.id1 == PROMOTE_WORD(CAGE) && command.id2 == PROMOTE_WORD(BIRD) && HERE(CAGE) && HERE(BIRD)) - command.wd1 = token_to_packed("CATCH"); } + Lookup: - if (wordeq(command.wd1, token_to_packed("WEST"))) { + if (strncasecmp(command.raw1, "west", sizeof("west")) == 0) { if (++game.iwest == 10) rspeak(W_IS_WEST); } - if (wordeq(command.wd1, token_to_packed("GO")) && !wordempty(command.wd2)) { + if (strncasecmp(command.raw1, "go", sizeof("go")) == 0 && command.id2 != WORD_EMPTY) { if (++game.igo == 10) rspeak(GO_UNNEEDED); } - packed_to_token(command.wd1, word1); - defn = get_vocab_id(word1); - if (defn == WORD_NOT_FOUND) { + if (command.id1 == WORD_NOT_FOUND) { if (fallback_handler(command)) continue; /* Gee, I don't understand. */ sspeak(DONT_KNOW, command.raw1); goto Lclearobj; } - /* FIXME: magic numbers related to vocabulary */ - kmod = MOD(defn, 1000); - switch (defn / 1000) { - case 0: - playermove(kmod); + switch (command.type1) { + case NO_WORD_TYPE: // FIXME: treating NO_WORD_TYPE as a motion word is confusing + case MOTION: + playermove(command.id1); return true; - case 1: + case OBJECT: command.part = unknown; - command.obj = kmod; + command.obj = command.id1; break; - case 2: + case ACTION: command.part = intransitive; - command.verb = kmod; + command.verb = command.id1; break; - case 3: - speak(specials[kmod].message); + case SPECIAL: + speak(specials[command.id1].message); goto Lclearobj; - default: + default: // LCOV_EXCL_LINE BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE } @@ -1183,15 +1170,13 @@ Lookup: return true; case GO_TOP: continue; /* back to top of main interpreter loop */ - case GO_CHECKFOO: - goto Lclosecheck; - case GO_LOOKUP: - goto Lookup; case GO_WORD2: /* Get second word for analysis. */ - command.wd1 = command.wd2; + command.id1 = command.id2; + command.type1 = command.type2; strncpy(command.raw1, command.raw2, LINESIZE - 1); - wordclear(&command.wd2); + command.id2 = WORD_EMPTY; + command.type2 = NO_WORD_TYPE; command.raw2[0] = '\0'; goto Lookup; case GO_UNKNOWN: @@ -1208,7 +1193,7 @@ Lookup: /* Oh dear, he's disturbed the dwarves. */ rspeak(DWARVES_AWAKEN); terminate(endgame); - default: + default: // LCOV_EXCL_LINE BUG(ACTION_RETURNED_PHASE_CODE_BEYOND_END_OF_SWITCH); // LCOV_EXCL_LINE } }