X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=actions.c;h=e9e7b705e3a09a2de045cc90bfe640e3690b7f76;hb=3be0cb3596a537a39311107734ad04ad7adbe550;hp=efa52a6bf9adecafe5db8c2ea85de6fb03c297af;hpb=8d9c8e4d5c035213bb41abc64c59fb25672e8e50;p=open-adventure.git diff --git a/actions.c b/actions.c index efa52a6..e9e7b70 100644 --- a/actions.c +++ b/actions.c @@ -201,15 +201,14 @@ static int bigwords(long id) * crossing. */ if (game.place[EGGS] == LOC_NOWHERE && game.place[TROLL] == LOC_NOWHERE && game.prop[TROLL] == TROLL_UNPAID) game.prop[TROLL] = TROLL_PAIDONCE; - int k; if (HERE(EGGS)) - k = EGGS_VANISHED; + pspeak(EGGS, look, EGGS_VANISHED, true); else if (game.loc == objects[EGGS].plac) - k = EGGS_HERE; + pspeak(EGGS, look, EGGS_HERE, true); else - k = EGGS_DONE; + pspeak(EGGS, look, EGGS_DONE, true); move(EGGS, objects[EGGS].plac); - pspeak(EGGS, look, k, true); + return GO_CLEAROBJ; } } else { @@ -1316,14 +1315,14 @@ int action(struct command_t *command) if (game.loc == LOC_START || game.loc == LOC_VALLEY || game.loc == LOC_SLIT) { - command->obj = DPRSSN; + command->obj = DEPRESSION; } if (game.loc == LOC_COBBLE || game.loc == LOC_DEBRIS || game.loc == LOC_AWKWARD || game.loc == LOC_BIRD || game.loc == LOC_PITTOP) { - command->obj = ENTRNC; + command->obj = ENTRANCE; } } else if (command->obj == DWARF && atdwrf(game.loc) > 0) /* FALL THROUGH */;