archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Six more gotoectomies.

Browse source
This commit is contained in:
Eric S. Raymond 2017-06-10 21:50:43 -04:00
parent 3ed8b91eb7
commit 9fbf52ff7e
1 changed files with 27 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

57
main.c
View file

@ -836,10 +836,33 @@ L2607: game.foobar=(game.foobar>0 ? -game.foobar : 0);
if (game.clock2 == 0) goto L11000; if (game.clock2 == 0) goto L11000;
if (game.prop[LAMP] == 1) if (game.prop[LAMP] == 1)
--game.limit; --game.limit;
if (game.limit <= 30 && HERE(BATTER) && game.prop[BATTER] == 0 && HERE(LAMP))
goto L12000; /* Another way we can force an end to things is by having the
if (game.limit == 0) goto L12400; * lamp give out. When it gets close, we come here to warn
if (game.limit <= 30) goto L12200; * him. First following ar, if the lamp and fresh batteries are
* here, in which case we replace the batteries and continue.
* Second is for other cases of lamp dying. 12400 is when it
* goes out. Even then, he can explore outside for a while
* if desired. */
if (game.limit<=30 && HERE(BATTER) && game.prop[BATTER]==0 && HERE(LAMP))
{
RSPEAK(188);
game.prop[BATTER]=1;
if (TOTING(BATTER))DROP(BATTER,game.loc);
game.limit=game.limit+2500;
game.lmwarn=false;
} else if (game.limit == 0) {
game.limit= -1;
game.prop[LAMP]=0;
if (HERE(LAMP))RSPEAK(184);
} else if (game.limit <= 30) {
if (game.lmwarn || !HERE(LAMP)) goto L19999;
game.lmwarn=true;
SPK=187;
if (game.place[BATTER] == 0)SPK=183;
if (game.prop[BATTER] == 1)SPK=189;
RSPEAK(SPK);
}
L19999: K=43; L19999: K=43;
if (LIQLOC(game.loc) == WATER)K=70; if (LIQLOC(game.loc) == WATER)K=70;
V1=VOCAB(WD1,-1); V1=VOCAB(WD1,-1);
@ -1023,32 +1046,6 @@ L11000: game.prop[BOTTLE]=PUT(BOTTLE,115,1);
game.closed=true; game.closed=true;
return true; return true;
/* Another way we can force an end to things is by having the lamp give out.
* When it gets close, we come here to warn him. We go to 12000 if the lamp
* and fresh batteries are here, in which case we replace the batteries and
* continue. 12200 is for other cases of lamp dying. 12400 is when it goes
* out. Even then, he can explore outside for a while if desired. */
L12000: RSPEAK(188);
game.prop[BATTER]=1;
if (TOTING(BATTER))DROP(BATTER,game.loc);
game.limit=game.limit+2500;
game.lmwarn=false;
goto L19999;
L12200: if (game.lmwarn || !HERE(LAMP)) goto L19999;
game.lmwarn=true;
SPK=187;
if (game.place[BATTER] == 0)SPK=183;
if (game.prop[BATTER] == 1)SPK=189;
RSPEAK(SPK);
goto L19999;
L12400: game.limit= -1;
game.prop[LAMP]=0;
if (HERE(LAMP))RSPEAK(184);
goto L19999;
/* Oh dear, he's disturbed the dwarves. */ /* Oh dear, he's disturbed the dwarves. */
L18999: RSPEAK(SPK); L18999: RSPEAK(SPK);