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

Abolish 18999 return from actions().

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

13
actions.c
View file

@ -180,8 +180,8 @@ static int vbreak(token_t obj)
game.fixed[VASE]= -1; game.fixed[VASE]= -1;
} else { } else {
if (obj == MIRROR && game.closed) { if (obj == MIRROR && game.closed) {
SPK=197; RSPEAK(197);
return(18999); return(190000);
} }
} }
RSPEAK(SPK); RSPEAK(SPK);
@ -926,8 +926,8 @@ static int wake(token_t obj)
/* Wake. Only use is to disturb the dwarves. */ /* Wake. Only use is to disturb the dwarves. */
{ {
if (obj != DWARF || !game.closed) {RSPEAK(SPK); return 2012;} if (obj != DWARF || !game.closed) {RSPEAK(SPK); return 2012;}
SPK=199; RSPEAK(199);
return(18999); return(19000);
} }
static int wave(token_t obj) static int wave(token_t obj)
@ -949,7 +949,10 @@ static int wave(token_t obj)
RSPEAK(SPK); RSPEAK(SPK);
return 2012; return 2012;
} else { } else {
if (game.closed) return(18999); if (game.closed) {
RSPEAK(SPK); /* FIXME: How is SPK set here? */
return(19000);
}
if (game.closng || !AT(FISSUR)) {RSPEAK(SPK); return 2012;} if (game.closng || !AT(FISSUR)) {RSPEAK(SPK); return 2012;}
if (HERE(BIRD))RSPEAK(SPK); if (HERE(BIRD))RSPEAK(SPK);
game.prop[FISSUR]=1-game.prop[FISSUR]; game.prop[FISSUR]=1-game.prop[FISSUR];

11
main.c
View file

@ -1041,14 +1041,11 @@ Laction:
RSPEAK(257); RSPEAK(257);
obj=0; obj=0;
goto L2600; goto L2600;
case 18999:
/* Oh dear, he's disturbed the dwarves. */
RSPEAK(SPK);
/* fall through */
case 19000: case 19000:
RSPEAK(136); /* Oh dear, he's disturbed the dwarves. */
score(0); RSPEAK(136);
return true; score(0);
return true;
} }
BUG(99); BUG(99);