X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=main.c;h=2ba9dda3d4a6a52ead0e6f833c6d358ded07b64f;hp=faa353b514be4001c04d0506170d0e660fbc47ef;hb=5fb6e2e1bcec3bfddd322d27bdd85037c3c814f7;hpb=a3c159660bb03f220b7de52ba0ac4977098f389e diff --git a/main.c b/main.c index faa353b..2ba9dda 100644 --- a/main.c +++ b/main.c @@ -11,6 +11,10 @@ * ESR apologizes for the remaing gotos (now confined to one function * in this file - there used to be over 350 of them, *everywhere*). * Applying the Structured Program Theorem can be hard. + * + * Copyright (c) 1977, 2005 by Will Crowther and Don Woods + * Copyright (c) 2017 by Eric S. Raymond + * SPDX-License-Identifier: BSD-2-clause */ #include @@ -85,7 +89,6 @@ int main(int argc, char *argv[]) fprintf(stderr, "advent: can't open save file %s for read\n", optarg); - signal(SIGINT, sig_handler); break; #endif default: @@ -133,28 +136,6 @@ int main(int argc, char *argv[]) terminate(quitgame); } -static bool fallback_handler(struct command_t command) -/* fallback handler for commands not handled by FORTRANish parser */ -{ - long sv; - 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) { - set_seed(sv); - printf("Seed set to %ld\n", sv); - // 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; -} - /* Check if this loc is eligible for any hints. If been here long * enough, display. Ignore "HINTS" < 4 (special stuff, see database * notes). */ @@ -483,6 +464,8 @@ static bool dwarfmove(void) static void croak(void) /* Okay, he's dead. Let's get on with it. */ { + if (game.numdie < 0) + game.numdie = 0; // LCOV_EXCL_LINE const char* query = obituaries[game.numdie].query; const char* yes_response = obituaries[game.numdie].yes_response; ++game.numdie; @@ -715,14 +698,16 @@ static void playermove( int motion) * to get it out. Having dropped it, go back and * pretend he wasn't carrying it after all. */ drop(EMERALD, game.loc); - int te_tmp = travel_entry; - do { - if (travel[te_tmp].stop) - BUG(CONDITIONAL_TRAVEL_ENTRY_WITH_NO_ALTERATION); // LCOV_EXCL_LINE - ++te_tmp; - } while - (traveleq(travel_entry, te_tmp)); - travel_entry = te_tmp; + { + int te_tmp = travel_entry; + do { + if (travel[te_tmp].stop) + BUG(CONDITIONAL_TRAVEL_ENTRY_WITH_NO_ALTERATION); // LCOV_EXCL_LINE + ++te_tmp; + } while + (traveleq(travel_entry, te_tmp)); + travel_entry = te_tmp; + } continue; /* goto L12 */ case 3: /* Special travel 3. Troll bridge. Must be done @@ -990,9 +975,7 @@ static void listobjects(void) static bool do_command() /* Get and execute a command */ { - static struct command_t command; - - command.verb = 0; + static command_t command; /* Can't leave cave once it's closing (except by main office). */ if (OUTSID(game.newloc) && game.newloc != 0 && game.closng) { @@ -1054,8 +1037,11 @@ static bool do_command() listobjects(); Lclearobj: + command.verb = ACT_NULL; game.oldobj = command.obj; + command.obj = NO_OBJECT; +Lcheckhint: checkhints(); /* If closing time, check for any objects being toted with @@ -1074,10 +1060,37 @@ Lclearobj: if (game.knfloc > 0 && game.knfloc != game.loc) game.knfloc = 0; + /* Preserve state from last command for reuse when required */ + command_t preserve = command; + // Get command input from user if (!get_command_input(&command)) return false; +Lclosecheck: +#ifdef GDEBUG + /* Needs to stay synced with enum word_type_t */ + const char *types[] = {"NO_WORD_TYPE", "MOTION", "OBJECT", "ACTION", "NUMERIC"}; + /* needs to stay synced with enum speechpart */ + const char *roles[] = {"unknown", "intransitive", "transitive"}; + printf("Preserve: role = %s type1 = %s, id1 = %ld, type2 = %s, id2 = %ld\n", + roles[preserve.part], + types[preserve.word[0].type], + preserve.word[0].id, + types[preserve.word[1].type], + preserve.word[1].id); + printf("Command: role = %s type1 = %s, id1 = %ld, type2 = %s, id2 = %ld\n", + roles[command.part], + types[command.word[0].type], + command.word[0].id, + types[command.word[1].type], + command.word[1].id); +#endif + + /* Handle of objectless action followed by actionless object */ + if (preserve.word[0].type == ACTION && preserve.word[1].type == NO_WORD_TYPE && command.word[1].id == 0) + command.verb = preserve.verb; + ++game.turns; if (closecheck()) { @@ -1086,8 +1099,8 @@ Lclearobj: } else lampcheck(); - if (command.type1 == MOTION && command.id1 == ENTER - && (command.id2 == STREAM || command.id2 == WATER)) { + if (command.word[0].type == MOTION && command.word[0].id == ENTER + && (command.word[1].id == STREAM || command.word[1].id == WATER)) { if (LIQLOC(game.loc) == WATER) rspeak(FEET_WET); else @@ -1096,73 +1109,83 @@ Lclearobj: goto Lclearobj; } - if (command.type1 == OBJECT) { - if (command.id1 == GRATE) { - command.type1 = MOTION; + if (command.word[0].type == OBJECT) { + if (command.word[0].id == GRATE) { + command.word[0].type = MOTION; if (game.loc == LOC_START || game.loc == LOC_VALLEY || game.loc == LOC_SLIT) { - command.id1 = DEPRESSION; + command.word[0].id = 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; + command.word[0].id = 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.word[0].id == WATER || command.word[0].id == OIL) && (command.word[1].id == PLANT || command.word[1].id == DOOR)) { + if (AT(command.word[1].id)) { + command.word[1] = command.word[0]; + command.word[0].id = POUR; + command.word[0].type = ACTION; + strncpy(command.word[0].raw, "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.word[0].id == CAGE && command.word[1].id == BIRD && HERE(CAGE) && HERE(BIRD)) { + command.word[0].id = CARRY; + command.word[0].type = ACTION; + } + + /* From OV to VO form */ + if (command.word[0].type == OBJECT && command.word[1].type == ACTION) { + command_word_t stage = command.word[0]; + command.word[0] = command.word[1]; + command.word[1] = stage; } } Lookup: - if (strncasecmp(command.raw1, "west", sizeof("west")) == 0) { + if (strncasecmp(command.word[0].raw, "west", sizeof("west")) == 0) { if (++game.iwest == 10) rspeak(W_IS_WEST); } - if (strncasecmp(command.raw1, "go", sizeof("go")) == 0 && command.id2 != WORD_EMPTY) { + if (strncasecmp(command.word[0].raw, "go", sizeof("go")) == 0 && command.word[1].id != WORD_EMPTY) { if (++game.igo == 10) rspeak(GO_UNNEEDED); } - if (command.id1 == WORD_NOT_FOUND) { - if (fallback_handler(command)) - continue; + if (command.word[0].id == WORD_NOT_FOUND) { /* Gee, I don't understand. */ - sspeak(DONT_KNOW, command.raw1); + sspeak(DONT_KNOW, command.word[0].raw); goto Lclearobj; } - switch (command.type1) { + switch (command.word[0].type) { case NO_WORD_TYPE: // FIXME: treating NO_WORD_TYPE as a motion word is confusing case MOTION: - playermove(command.id1); + playermove(command.word[0].id); return true; case OBJECT: command.part = unknown; - command.obj = command.id1; + command.obj = command.word[0].id; break; case ACTION: - command.part = intransitive; - command.verb = command.id1; + if (command.word[1].type == NUMERIC) + command.part = transitive; + else + command.part = intransitive; + command.verb = command.word[0].id; break; - case SPECIAL: - speak(specials[command.id1].message); - goto Lclearobj; + case NUMERIC: // LCOV_EXCL_LINE + if (!settings.oldstyle) { + sspeak(DONT_KNOW, command.word[0].raw); + goto Lclearobj; + } default: // LCOV_EXCL_LINE BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE } - - switch (action(&command)) { + switch (action(command)) { case GO_TERMINATE: return true; case GO_MOVE: @@ -1170,25 +1193,25 @@ Lookup: return true; case GO_TOP: continue; /* back to top of main interpreter loop */ + case GO_CLEAROBJ: + goto Lclearobj; + case GO_CHECKHINT: + goto Lcheckhint; case GO_WORD2: +#ifdef GDEBUG + printf("Word shift\n"); +#endif /* GDEBUG */ /* Get second word for analysis. */ - command.id1 = command.id2; - command.type1 = command.type2; - strncpy(command.raw1, command.raw2, LINESIZE - 1); - command.id2 = WORD_EMPTY; - command.type2 = NO_WORD_TYPE; - command.raw2[0] = '\0'; + command.word[0] = command.word[1]; + command.word[1] = empty_command_word; goto Lookup; case GO_UNKNOWN: /* Random intransitive verbs come here. Clear obj just in case * (see attack()). */ - command.raw1[0] = toupper(command.raw1[0]); - sspeak(DO_WHAT, command.raw1); + command.word[0].raw[0] = toupper(command.word[0].raw[0]); + sspeak(DO_WHAT, command.word[0].raw); command.obj = 0; - // Fallthrough - case GO_CHECKHINT: // Fallthrough - case GO_CLEAROBJ: - goto Lclearobj; + goto Lcheckhint; case GO_DWARFWAKE: /* Oh dear, he's disturbed the dwarves. */ rspeak(DWARVES_AWAKEN);