X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=actions.c;h=45dd8b66fe11ed0ac1bdec3a93690a9d727846d0;hp=caf20eee0e084a138907f260538581bb47f992f0;hb=3215930f646e7911d541bb1d29c73e9eb19db477;hpb=deb61e3dcd060dac685feb71aa21e52165fd8691 diff --git a/actions.c b/actions.c index caf20ee..45dd8b6 100644 --- a/actions.c +++ b/actions.c @@ -112,7 +112,7 @@ static int bigwords(token_t foo) int k = VOCAB(foo, 3); int spk = NOTHING_HAPPENS; if (game.foobar != 1 - k) { - if (game.foobar != 0)spk = START_OVER; + if (game.foobar != 0 && game.loc == LOC_GIANTROOM)spk = START_OVER; rspeak(spk); return GO_CLEAROBJ; } else { @@ -1011,8 +1011,6 @@ int action(FILE *input, struct command_t *command) if (game.loc == LOC_COBBLE || game.loc == LOC_DEBRIS || game.loc == LOC_AWKWARD || game.loc == LOC_BIRD || game.loc == LOC_PITTOP) command->obj = ENTRNC; - if (command->obj != GRATE) - return GO_MOVE; } else if (command->obj == DWARF && ATDWRF(game.loc) > 0) /* FALL THROUGH */; else if ((LIQUID() == command->obj && HERE(BOTTLE)) || command->obj == LIQLOC(game.loc))