From: Eric S. Raymond Date: Thu, 8 Jun 2017 09:21:20 +0000 (-0400) Subject: Gotoectomy. X-Git-Tag: 1.1~512 X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=86e75219e39125fb3bb71d8f312f38b6fa2a3f8f;p=open-adventure.git Gotoectomy. --- diff --git a/main.c b/main.c index b75cac1..80d1649 100644 --- a/main.c +++ b/main.c @@ -712,33 +712,35 @@ L90: RSPEAK(23); /* Okay, he's dead. Let's get on with it. */ -L99: if(game.closng) goto L95; - game.numdie=game.numdie+1; - if(!YES(cmdin,79+game.numdie*2,80+game.numdie*2,54)) score(0); - if(game.numdie == MAXDIE) score(0); - game.place[WATER]=0; - game.place[OIL]=0; - if(TOTING(LAMP))game.prop[LAMP]=0; - /* 98 */ for (J=1; J<=NOBJECTS; J++) { - I=NOBJECTS + 1 - J; - if(!TOTING(I)) goto L98; - K=game.oldlc2; - if(I == LAMP)K=1; - DROP(I,K); -L98: /*etc*/ ; - } /* end loop */ - game.loc=3; - game.oldloc=game.loc; - goto L2000; - -/* He died during closing time. No resurrection. Tally up a death and exit. */ - -L95: RSPEAK(131); - game.numdie=game.numdie+1; - score(0); - - - +L99: if(game.closng) { + /* He died during closing time. No resurrection. Tally up a + * death and exit. */ + RSPEAK(131); + ++game.numdie; + score(0); + } else { + ++game.numdie; + if(!YES(cmdin,79+game.numdie*2,80+game.numdie*2,54)) + score(0); + if(game.numdie == MAXDIE) + score(0); + game.place[WATER]=0; + game.place[OIL]=0; + if(TOTING(LAMP)) + game.prop[LAMP]=0; + for (J=1; J<=NOBJECTS; J++) { + I=NOBJECTS + 1 - J; + if(TOTING(I)) { + K=game.oldlc2; + if(I == LAMP) + K=1; + DROP(I,K); + } + } + game.loc=3; + game.oldloc=game.loc; + goto L2000; + } /* Hints */