X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=main.c;h=d7ecd7797785b1d324d267af1d70fddfc23f2c57;hb=a73620cca5d0ea0f9cfc10af1a9d2015bf462b22;hp=2d9a20701a2513bbcd1196edb344e6e12963036e;hpb=59a558b7622f1d12e4b52c4852f5577c55be26f6;p=open-adventure.git diff --git a/main.c b/main.c index 2d9a207..d7ecd77 100644 --- a/main.c +++ b/main.c @@ -475,14 +475,13 @@ static void croak(FILE *cmdin) * death and exit. */ RSPEAK(DEATH_CLOSING); score(endgame); - } else { - /* FIXME: Arithmetic on message numbers */ - if (!YES(cmdin,WATCH_IT+game.numdie*2,WHICH_WAY+game.numdie*2,OK_MAN)) - score(endgame); - if (game.numdie == MAXDIE) + + } + /* FIXME: Arithmetic on message numbers */ + else if (game.numdie == MAXDIE || !YES(cmdin,WATCH_IT+game.numdie*2,WHICH_WAY+game.numdie*2,OK_MAN)) score(endgame); - game.place[WATER] = NOWHERE; - game.place[OIL] = NOWHERE; + else { + game.place[WATER] = game.place[OIL] = NOWHERE; if (TOTING(LAMP)) game.prop[LAMP]=0; for (int j=1; j<=NOBJECTS; j++) {