X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=main.c;h=dbdaef9c9d081d900c7f579bab267e38056fee08;hp=b788c618e65428352c0a5f9be4a619ecb194baaa;hb=21c36003cdd1bae2291311d5e2bc6d98383f72fa;hpb=ef97d579ea8974bfd42b9c5b0d5c9d1983e99448 diff --git a/main.c b/main.c index b788c61..dbdaef9 100644 --- a/main.c +++ b/main.c @@ -116,6 +116,10 @@ int main(int argc, char *argv[]) } else { restore(rfp); } +#else + game.novice = yes(arbitrary_messages[WELCOME_YOU], arbitrary_messages[CAVE_NEARBY], arbitrary_messages[NO_MESSAGE]); + if (game.novice) + game.limit = NOVICELIMIT; #endif if (settings.logfp) @@ -380,9 +384,10 @@ static bool dwarfmove(void) kk = tkey[game.dloc[i]]; if (kk != 0) do { - game.newloc = travel[kk].dest; + enum desttype_t desttype = travel[kk].desttype; + game.newloc = travel[kk].destval; /* Have we avoided a dwarf encounter? */ - if (SPECIAL(game.newloc)) + if (desttype != dest_goto) continue; else if (!INDEEP(game.newloc)) continue; @@ -428,9 +433,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); @@ -496,16 +499,18 @@ 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; } } static bool traveleq(long a, long b) /* Are two travel entries equal for purposes of skip after failed condition? */ { - return (travel[a].cond == travel[b].cond) - && (travel[a].dest == travel[b].dest); + return (travel[a].condtype == travel[b].condtype) + && (travel[a].condarg1 == travel[b].condarg1) + && (travel[a].condarg2 == travel[b].condarg2) + && (travel[a].desttype == travel[b].desttype) + && (travel[a].destval == travel[b].destval); } /* Given the current location in "game.loc", and a motion verb number in @@ -541,10 +546,11 @@ static void playermove( int motion) if (spk == 0) { int te_tmp = 0; for (;;) { - scratchloc = travel[travel_entry].dest; - if (scratchloc != motion) { - if (!SPECIAL(scratchloc)) { - if (FORCED(scratchloc) && travel[tkey[scratchloc]].dest == motion) + 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) { @@ -596,25 +602,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; @@ -627,22 +646,23 @@ static void playermove( int motion) do { for (;;) { /* L12 loop */ for (;;) { - long cond = travel[travel_entry].cond; - long arg = MOD(cond, 100); - if (!SPECIAL(cond)) { + enum condtype_t condtype = travel[travel_entry].condtype; + long condarg1 = travel[travel_entry].condarg1; + long condarg2 = travel[travel_entry].condarg2; + if (condtype < cond_not) { /* YAML N and [pct N] conditionals */ - if (cond <= 100) { - if (cond == 0 || - PCT(cond)) + if (condtype == cond_goto || condtype == cond_pct) { + if (condarg1 == 0 || + PCT(condarg1)) break; /* else fall through */ } /* YAML [with OBJ] clause */ - if (TOTING(arg) || - (cond > 200 && AT(arg))) + else if (TOTING(condarg1) || + (condtype == cond_with && AT(condarg1))) break; /* else fall through to check [not OBJ STATE] */ - } else if (game.prop[arg] != cond / 100 - 3) + } else if (game.prop[condarg1] != condarg2) break; /* We arrive here on conditional failure. @@ -658,17 +678,17 @@ static void playermove( int motion) } /* Found an eligible rule, now execute it */ - game.newloc = travel[travel_entry].dest; - if (!SPECIAL(game.newloc)) + enum desttype_t desttype = travel[travel_entry].desttype; + game.newloc = travel[travel_entry].destval; + if (desttype == dest_goto) return; - if (game.newloc > 500) { + if (desttype == dest_speak) { /* Execute a speak rule */ - rspeak(L_SPEAK(game.newloc)); + rspeak(game.newloc); game.newloc = game.loc; return; } else { - game.newloc -= SPECIALBASE; switch (game.newloc) { case 1: /* Special travel 1. Plover-alcove passage. Can carry only @@ -870,28 +890,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); - } } } @@ -1050,6 +1071,7 @@ L2600: } if (strcmp(input, "") != 0) break; + free(input); } strncpy(inputbuf, input, LINESIZE - 1); @@ -1173,7 +1195,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;