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

Abolish 2009 return.

Browse source
This commit is contained in:
Eric S. Raymond 2017-06-11 11:13:31 -04:00
parent c3222aef27
commit 093415efc8
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
actions.c
View file

@ -118,7 +118,10 @@ static int bigwords(long foo)
return 2012; return 2012;
} else { } else {
game.foobar=k; game.foobar=k;
if (k != 4) return(2009); if (k != 4) {
RSPEAK(54);
return 2012;
}
game.foobar=0; game.foobar=0;
if (game.place[EGGS]==PLAC[EGGS] || (TOTING(EGGS) && game.loc==PLAC[EGGS])) { if (game.place[EGGS]==PLAC[EGGS] || (TOTING(EGGS) && game.loc==PLAC[EGGS])) {
RSPEAK(SPK); RSPEAK(SPK);
@ -263,11 +266,12 @@ static int carry(long obj)
CARRY(obj,game.loc); CARRY(obj,game.loc);
if (obj == BOTTLE && LIQUID() != 0) if (obj == BOTTLE && LIQUID() != 0)
game.place[LIQUID()] = -1; game.place[LIQUID()] = -1;
if (!GSTONE(obj) || game.prop[obj] == 0) if (GSTONE(obj) && game.prop[obj] != 0) {
return(2009); game.prop[obj]=0;
game.prop[obj]=0; game.prop[CAVITY]=1;
game.prop[CAVITY]=1; }
return(2009); RSPEAK(54);
return(2012);
} }
static int chain(token_t verb) static int chain(token_t verb)
@ -1028,7 +1032,7 @@ int action(FILE *input, enum speechpart part, long verb, long obj)
case 1: /* DROP */ return(8000); case 1: /* DROP */ return(8000);
case 2: /* SAY */ return(8000); case 2: /* SAY */ return(8000);
case 3: /* UNLOC */ return lock(verb, INTRANSITIVE); case 3: /* UNLOC */ return lock(verb, INTRANSITIVE);
case 4: /* NOTHI */ return(2009); case 4: /* NOTHI */ {RSPEAK(54); return(20012);}
case 5: /* LOCK */ return lock(verb, INTRANSITIVE); case 5: /* LOCK */ return lock(verb, INTRANSITIVE);
case 6: /* LIGHT */ return light(INTRANSITIVE); case 6: /* LIGHT */ return light(INTRANSITIVE);
case 7: /* EXTIN */ return extinguish(INTRANSITIVE); case 7: /* EXTIN */ return extinguish(INTRANSITIVE);
@ -1069,7 +1073,7 @@ int action(FILE *input, enum speechpart part, long verb, long obj)
case 1: /* DROP */ return discard(obj, false); case 1: /* DROP */ return discard(obj, false);
case 2: /* SAY */ return say(); case 2: /* SAY */ return say();
case 3: /* UNLOC */ return lock(verb, obj); case 3: /* UNLOC */ return lock(verb, obj);
case 4: /* NOTHI */ return(2009); case 4: /* NOTHI */ {RSPEAK(54); return(20012);}
case 5: /* LOCK */ return lock(verb, obj); case 5: /* LOCK */ return lock(verb, obj);
case 6: /* LIGHT */ return light(obj); case 6: /* LIGHT */ return light(obj);
case 7: /* EXTI */ return extinguish(obj); case 7: /* EXTI */ return extinguish(obj);

2
main.c
View file

@ -768,7 +768,6 @@ L2006: KK=game.prop[obj];
L2008: i=game.link[i]; L2008: i=game.link[i];
goto L2004; goto L2004;
L2009: RSPEAK(54);
L2012: VERB=0; L2012: VERB=0;
game.oldobj=obj; game.oldobj=obj;
obj=0; obj=0;
@ -1030,7 +1029,6 @@ Laction:
case 2: return true; case 2: return true;
case 8: goto L8; case 8: goto L8;
case 2000: goto L2000; case 2000: goto L2000;
case 2009: goto L2009;
case 2012: goto L2012; case 2012: goto L2012;
case 2600: goto L2600; case 2600: goto L2600;
case 2607: goto L2607; case 2607: goto L2607;