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

Still more gotoicides.

Browse source
This commit is contained in:
Eric S. Raymond 2017-06-09 13:49:19 -04:00
parent 3c053367a5
commit c8ebabdf3b
1 changed files with 56 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

70
main.c
View file

@ -561,43 +561,36 @@ L13: if(game.newloc <= 100)
L14: if(game.newloc != 0 && !PCT(game.newloc)) goto L12; L14: if(game.newloc != 0 && !PCT(game.newloc)) goto L12;
L16: game.newloc=MOD(LL,1000); L16: game.newloc=MOD(LL,1000);
if(game.newloc <= 300) return true; if(game.newloc <= 300) return true;
if(game.newloc <= 500) goto L30000; if(game.newloc <= 500) {
RSPEAK(game.newloc-500); game.newloc=game.newloc-300;
game.newloc=game.loc; switch (game.newloc)
return true; {
case 1:
/* Special motions come here. Labelling convention: statement numbers NNNXX /* Travel 301. Plover-alcove passage. Can carry only
* (XX=00-99) are used for special case number NNN (NNN=301-500). */ * emerald. Note: travel table must include "useless"
* entries going through passage, which can never be used for
L30000: game.newloc=game.newloc-300; * actual motion, but can be spotted by "go back". */
switch (game.newloc) { case 1: goto L30100; case 2: goto L30200; case 3: goto game.newloc=99+100-game.loc; /* ESR: an instance of NOBJECTS? */
L30300; }
BUG(20);
/* Travel 301. Plover-alcove passage. Can carry only emerald. Note: travel
* table must include "useless" entries going through passage, which can never
* be used for actual motion, but can be spotted by "go back". */
L30100: game.newloc=99+100-game.loc; /* ESR: an instance of NOBJECTS? */
if(game.holdng == 0 || (game.holdng == 1 && TOTING(EMRALD))) return true; if(game.holdng == 0 || (game.holdng == 1 && TOTING(EMRALD))) return true;
game.newloc=game.loc; game.newloc=game.loc;
RSPEAK(117); RSPEAK(117);
return true; return true;
case 2:
/* Travel 302. Plover transport. Drop the emerald (only use special travel if /* Travel 302. Plover transport. Drop the emerald (only use
* toting it), so he's forced to use the plover-passage to get it out. Having * special travel if toting it), so he's forced to use the
* dropped it, go back and pretend he wasn't carrying it after all. */ * plover-passage to get it out. Having dropped it, go back and
* pretend he wasn't carrying it after all. */
L30200: DROP(EMRALD,game.loc); DROP(EMRALD,game.loc);
goto L12; goto L12;
case 3:
/* Travel 303. Troll bridge. Must be done only as special motion so that /* Travel 303. Troll bridge. Must be done only as special
* dwarves won't wander across and encounter the bear. (They won't follow the * motion so that dwarves won't wander across and encounter
* player there because that region is forbidden to the pirate.) If * the bear. (They won't follow the player there because
* game.prop(TROLL)=1, he's crossed since paying, so step out and block him. * that region is forbidden to the pirate.) If
* (standard travel entries check for game.prop(TROLL)=0.) Special stuff for bear. */ * game.prop(TROLL)=1, he's crossed since paying, so step out
* and block him. (standard travel entries check for
L30300: if(game.prop[TROLL] != 1) goto L30310; * game.prop(TROLL)=0.) Special stuff for bear. */
if(game.prop[TROLL] == 1) {
PSPEAK(TROLL,1); PSPEAK(TROLL,1);
game.prop[TROLL]=0; game.prop[TROLL]=0;
MOVE(TROLL2,0); MOVE(TROLL2,0);
@ -607,8 +600,8 @@ L30300: if(game.prop[TROLL] != 1) goto L30310;
JUGGLE(CHASM); JUGGLE(CHASM);
game.newloc=game.loc; game.newloc=game.loc;
return true; return true;
} else {
L30310: game.newloc=PLAC[TROLL]+FIXD[TROLL]-game.loc; game.newloc=PLAC[TROLL]+FIXD[TROLL]-game.loc;
if(game.prop[TROLL] == 0)game.prop[TROLL]=1; if(game.prop[TROLL] == 0)game.prop[TROLL]=1;
if(!TOTING(BEAR)) return true; if(!TOTING(BEAR)) return true;
RSPEAK(162); RSPEAK(162);
@ -620,8 +613,13 @@ L30310: game.newloc=PLAC[TROLL]+FIXD[TROLL]-game.loc;
game.oldlc2=game.newloc; game.oldlc2=game.newloc;
croak(cmdin); croak(cmdin);
return false; return false;
}
/* End of specials. */ }
BUG(20);
}
RSPEAK(game.newloc-500);
game.newloc=game.loc;
return true;
L21: LL=MOD((labs(TRAVEL[KK])/1000),1000); L21: LL=MOD((labs(TRAVEL[KK])/1000),1000);
if(LL != K) { if(LL != K) {