X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=main.c;h=e2fdadb60ba0a2219d51cd1030f3d686c18f4e80;hb=7c610a120d29d3b42642df53f2eef2d24752c2b8;hp=200c77ebc3d0bf4a541e3c206e6571a2a8d74f80;hpb=5af8fb18f01fde6d515e4ebbf15c40e1f9476afa;p=open-adventure.git diff --git a/main.c b/main.c index 200c77e..e2fdadb 100644 --- a/main.c +++ b/main.c @@ -134,10 +134,13 @@ int main(int argc, char *argv[]) terminate(quitgame); } -static bool fallback_handler(char *buf) +static bool fallback_handler(struct command_t command) /* fallback handler for commands not handled by FORTRANish parser */ { long sv; + char buf[LINESIZE]; + 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); @@ -384,7 +387,7 @@ static bool dwarfmove(void) kk = tkey[game.dloc[i]]; if (kk != 0) do { - enum desttype_t desttype = travel[kk].desttype; + enum desttype_t desttype = travel[kk].desttype; game.newloc = travel[kk].destval; /* Have we avoided a dwarf encounter? */ if (desttype != dest_goto) @@ -433,9 +436,7 @@ static bool dwarfmove(void) } } - /* Now we know what's happening. Let's tell the poor sucker about it. - * Note that various of the "knife" messages must have specific relative - * positions in the rspeak database. */ + /* Now we know what's happening. Let's tell the poor sucker about it. */ if (game.dtotal == 0) return true; rspeak(game.dtotal == 1 ? DWARF_SINGLE : DWARF_PACK, game.dtotal); @@ -501,8 +502,7 @@ static void croak(void) drop(i, (i == LAMP) ? LOC_START : game.oldlc2); } } - game.loc = LOC_BUILDING; - game.oldloc = game.loc; + game.oldloc = game.loc = game.newloc = LOC_BUILDING; } } @@ -510,8 +510,8 @@ static bool traveleq(long a, long b) /* Are two travel entries equal for purposes of skip after failed condition? */ { return (travel[a].condtype == travel[b].condtype) - && (travel[a].condarg1 == travel[b].condarg1) - && (travel[a].condarg2 == travel[b].condarg2) + && (travel[a].condarg1 == travel[b].condarg1) + && (travel[a].condarg2 == travel[b].condarg2) && (travel[a].desttype == travel[b].desttype) && (travel[a].destval == travel[b].destval); } @@ -549,7 +549,7 @@ static void playermove( int motion) if (spk == 0) { int te_tmp = 0; for (;;) { - enum desttype_t desttype = travel[travel_entry].desttype; + enum desttype_t desttype = travel[travel_entry].desttype; scratchloc = travel[travel_entry].destval; if (desttype != dest_goto || scratchloc != motion) { if (desttype == dest_goto) { @@ -605,25 +605,38 @@ static void playermove( int motion) if (travel[travel_entry].stop) { /* Couldn't find an entry matching the motion word passed * in. Various messages depending on word given. */ - int spk = CANT_APPLY; - if (motion >= EAST && motion <= NW) - spk = BAD_DIRECTION; - if (motion == UP || - motion == DOWN) - spk = BAD_DIRECTION; - if (motion == FORWARD || - motion == LEFT || - motion == RIGHT) - spk = UNSURE_FACING; - if (motion == OUTSIDE || - motion == INSIDE) - spk = NO_INOUT_HERE; - if (motion == XYZZY || - motion == PLUGH) - spk = NOTHING_HAPPENS; - if (motion == CRAWL) - spk = WHICH_WAY; - rspeak(spk); + switch (motion) { + case EAST: + case WEST: + case SOUTH: + case NORTH: + case NE: + case NW: + case SW: + case SE: + case UP: + case DOWN: + rspeak(BAD_DIRECTION); + break; + case FORWARD: + case LEFT: + case RIGHT: + rspeak(UNSURE_FACING); + break; + case OUTSIDE: + case INSIDE: + rspeak(NO_INOUT_HERE); + break; + case XYZZY: + case PLUGH: + rspeak(NOTHING_HAPPENS); + break; + case CRAWL: + rspeak(WHICH_WAY); + break; + default: + rspeak(CANT_APPLY); + } return; } ++travel_entry; @@ -636,7 +649,7 @@ static void playermove( int motion) do { for (;;) { /* L12 loop */ for (;;) { - enum condtype_t condtype = travel[travel_entry].condtype; + enum condtype_t condtype = travel[travel_entry].condtype; long condarg1 = travel[travel_entry].condarg1; long condarg2 = travel[travel_entry].condarg2; if (condtype < cond_not) { @@ -668,7 +681,7 @@ static void playermove( int motion) } /* Found an eligible rule, now execute it */ - enum desttype_t desttype = travel[travel_entry].desttype; + enum desttype_t desttype = travel[travel_entry].desttype; game.newloc = travel[travel_entry].destval; if (desttype == dest_goto) return; @@ -880,28 +893,29 @@ static void lampcheck(void) * here, in which case we replace the batteries and continue. * Second is for other cases of lamp dying. Eve after it goes * out, he can explore outside for a while if desired. */ - if (game.limit <= WARNTIME && HERE(BATTERY) && game.prop[BATTERY] == FRESH_BATTERIES && HERE(LAMP)) { - rspeak(REPLACE_BATTERIES); - game.prop[BATTERY] = DEAD_BATTERIES; - if (TOTING(BATTERY)) - drop(BATTERY, game.loc); - game.limit += BATTERYLIFE; - game.lmwarn = false; - } else if (game.limit == 0) { + if (game.limit <= WARNTIME) { + if (HERE(BATTERY) && game.prop[BATTERY] == FRESH_BATTERIES && HERE(LAMP)) { + rspeak(REPLACE_BATTERIES); + game.prop[BATTERY] = DEAD_BATTERIES; + if (TOTING(BATTERY)) + drop(BATTERY, game.loc); + game.limit += BATTERYLIFE; + game.lmwarn = false; + } else if (!game.lmwarn && HERE(LAMP)) { + game.lmwarn = true; + if (game.prop[BATTERY] == DEAD_BATTERIES) + rspeak(MISSING_BATTERIES); + else if (game.place[BATTERY] == LOC_NOWHERE) + rspeak(LAMP_DIM); + else + rspeak(GET_BATTERIES); + } + } + if (game.limit == 0) { game.limit = -1; game.prop[LAMP] = LAMP_DARK; if (HERE(LAMP)) rspeak(LAMP_OUT); - } else if (game.limit <= WARNTIME) { - if (!game.lmwarn && HERE(LAMP)) { - game.lmwarn = true; - int spk = GET_BATTERIES; - if (game.place[BATTERY] == LOC_NOWHERE) - spk = LAMP_DIM; - if (game.prop[BATTERY] == DEAD_BATTERIES) - spk = MISSING_BATTERIES; - rspeak(spk); - } } } @@ -962,6 +976,10 @@ static bool do_command() long kmod, defn; static long igo = 0; static struct command_t command; + char inputbuf[LINESIZE]; + char word1[TOKLEN + 1]; + char word2[TOKLEN + 1]; + command.verb = 0; /* Can't leave cave once it's closing (except by main office). */ @@ -1023,7 +1041,7 @@ static bool do_command() listobjects(); -L2012: +Lclearobj: game.oldobj = command.obj; L2600: @@ -1047,7 +1065,6 @@ L2600: /* This is where we get a new command from the user */ char* input; - char inputbuf[LINESIZE]; for (;;) { input = get_input(); @@ -1068,13 +1085,12 @@ L2600: tokenize(inputbuf, &command); - char word1[TOKLEN + 1]; - char word2[TOKLEN + 1]; packed_to_token(command.wd1, word1); packed_to_token(command.wd2, word2); command.id1 = get_vocab_id(word1); command.id2 = get_vocab_id(word2); - + + //command = get_command_input(); L2607: ++game.turns; @@ -1106,7 +1122,7 @@ L2607: } else { rspeak(WHERE_QUERY); } - goto L2012; + goto Lclearobj; } if (command.id1 == ENTER && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY) { /* command.wd1 = command.wd2; */ @@ -1138,7 +1154,7 @@ Lookup: defn = get_vocab_id(word1); if (defn == WORD_NOT_FOUND) { /* Gee, I don't understand. */ - if (fallback_handler(inputbuf)) + if (fallback_handler(command)) continue; sspeak(DONT_KNOW, command.raw1); goto L2600; @@ -1159,7 +1175,7 @@ Lookup: break; case 3: speak(specials[kmod].message); - goto L2012; + goto Lclearobj; default: BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE } @@ -1174,7 +1190,7 @@ Laction: case GO_TOP: continue; /* back to top of main interpreter loop */ case GO_CLEAROBJ: - goto L2012; + goto Lclearobj; case GO_CHECKHINT: goto L2600; case GO_CHECKFOO: @@ -1184,7 +1200,7 @@ Laction: case GO_WORD2: /* Get second word for analysis. */ command.wd1 = command.wd2; - strcpy(command.raw1, command.raw2); + strncpy(command.raw1, command.raw2, LINESIZE - 1); wordclear(&command.wd2); command.raw2[0] = '\0'; goto L2620;