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

Eliminate objectionable use of global.

Browse source
This commit is contained in:
Eric S. Raymond 2017-06-09 10:17:13 -04:00
parent 9ecbfa2ca8
commit 37117f20e0
2 changed files with 32 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

47
actions.c
View file

@ -1079,40 +1079,55 @@ L4090: switch (verb-1) {
* they are never actually dropped at any location, but might be here inside * they are never actually dropped at any location, but might be here inside
* the bottle or urn or as a feature of the location. */ * the bottle or urn or as a feature of the location. */
L5000: obj=K; L5000:
if (!HERE(K)) goto L5100; if (!HERE(obj))
L5010: if (WD2 > 0) return(2800); goto L5100;
if (verb != 0) goto L4090; L5010:
if (WD2 > 0)
return(2800);
if (verb != 0)
goto L4090;
SETPRM(1,WD1,WD1X); SETPRM(1,WD1,WD1X);
RSPEAK(255); RSPEAK(255);
return(2600); return(2600);
L5100: L5100:
if (K != GRATE) goto L5110; if (obj == GRATE) {
if (game.loc == 1 || game.loc == 4 || game.loc == 7)K=DPRSSN; if (game.loc == 1 || game.loc == 4 || game.loc == 7)
if (game.loc > 9 && game.loc < 15)K=ENTRNC; obj=DPRSSN;
if (K != GRATE) return(8); if (game.loc > 9 && game.loc < 15)
L5110: obj=ENTRNC;
if (K == DWARF && ATDWRF(game.loc) > 0) goto L5010; if (obj != GRATE)
if ((LIQ(0) == K && HERE(BOTTLE)) || K == LIQLOC(game.loc)) goto L5010; return(8);
if (obj != OIL || !HERE(URN) || game.prop[URN] == 0) goto L5120; }
if (obj == DWARF && ATDWRF(game.loc) > 0)
goto L5010;
if ((LIQ(0) == obj && HERE(BOTTLE)) || obj == LIQLOC(game.loc))
goto L5010;
if (obj != OIL || !HERE(URN) || game.prop[URN] == 0)
goto L5120;
obj=URN; obj=URN;
goto L5010; goto L5010;
L5120: L5120:
if (obj != PLANT || !AT(PLANT2) || game.prop[PLANT2] == 0) goto L5130; if (obj != PLANT || !AT(PLANT2) || game.prop[PLANT2] == 0)
goto L5130;
obj=PLANT2; obj=PLANT2;
goto L5010; goto L5010;
L5130: L5130:
if (obj != KNIFE || game.knfloc != game.loc) goto L5140; if (obj != KNIFE || game.knfloc != game.loc)
goto L5140;
game.knfloc= -1; game.knfloc= -1;
SPK=116; SPK=116;
return(2011); return(2011);
L5140: L5140:
if (obj != ROD || !HERE(ROD2)) goto L5190; if (obj != ROD || !HERE(ROD2))
goto L5190;
obj=ROD2; obj=ROD2;
goto L5010; goto L5010;
L5190: L5190:
if ((verb == FIND || verb == INVENT) && WD2 <= 0) goto L5010; if ((verb == FIND || verb == INVENT) && WD2 <= 0)
goto L5010;
SETPRM(1,WD1,WD1X); SETPRM(1,WD1,WD1X);
RSPEAK(256); RSPEAK(256);
return(2012); return(2012);

2
main.c
View file

@ -648,7 +648,7 @@ L3000: SETPRM(1,WD1,WD1X);
L4000: I=4000; VERB=K; goto Laction; L4000: I=4000; VERB=K; goto Laction;
L4090: I=4090; goto Laction; L4090: I=4090; goto Laction;
L5000: I=5000; L5000: I=5000; obj = K;
Laction: Laction:
switch (action(cmdin, I, VERB, obj)) { switch (action(cmdin, I, VERB, obj)) {
case 2: return true; case 2: return true;