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

De-gotoified actions2.c functions.

Browse source
This commit is contained in:
Peje Nilsson 2017-06-08 09:13:34 -04:00 • committed by Eric S. Raymond
parent da76563f40
commit 2ae280befb
1 changed files with 82 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

166
actions2.c
View file

@ -65,73 +65,69 @@ int carry(long obj)
* Drop coins at vending machine for extra batteries. */ * Drop coins at vending machine for extra batteries. */
int discard(long obj, bool just_do_it) { int discard(long obj, bool just_do_it) {
if (just_do_it) goto L9021; if (!just_do_it) {
if (TOTING(ROD2) && obj == ROD && !TOTING(ROD))obj=ROD2; if (TOTING(ROD2) && obj == ROD && !TOTING(ROD))obj=ROD2;
if (!TOTING(obj)) return(2011); if (!TOTING(obj)) return(2011);
if (obj != BIRD || !HERE(SNAKE)) goto L9023; if (obj == BIRD && HERE(SNAKE)) {
RSPEAK(30); RSPEAK(30);
if (game.closed) return(19000); if (game.closed) return(19000);
DSTROY(SNAKE); DSTROY(SNAKE);
/* Set game.prop for use by travel options */ /* Set game.prop for use by travel options */
game.prop[SNAKE]=1; game.prop[SNAKE]=1;
L9021: K=LIQ(0);
if (K == obj)obj=BOTTLE;
if (obj == BOTTLE && K != 0)game.place[K]=0;
if (obj == CAGE && game.prop[BIRD] == 1)DROP(BIRD,game.loc);
DROP(obj,game.loc);
if (obj != BIRD) return(2012);
game.prop[BIRD]=0;
if (FOREST(game.loc))game.prop[BIRD]=2;
return(2012);
L9023: if (!(GSTONE(obj) && AT(CAVITY) && game.prop[CAVITY] != 0)) goto L9024; } else if ((GSTONE(obj) && AT(CAVITY) && game.prop[CAVITY] != 0)) {
RSPEAK(218); RSPEAK(218);
game.prop[obj]=1; game.prop[obj]=1;
game.prop[CAVITY]=0; game.prop[CAVITY]=0;
if (!HERE(RUG) || !((obj == EMRALD && game.prop[RUG] != 2) || (obj == RUBY && if (HERE(RUG) && ((obj == EMRALD && game.prop[RUG] != 2) || (obj == RUBY &&
game.prop[RUG] == 2))) goto L9021; game.prop[RUG] == 2))) {
SPK=219; SPK=219;
if (TOTING(RUG))SPK=220; if (TOTING(RUG))SPK=220;
if (obj == RUBY)SPK=221; if (obj == RUBY)SPK=221;
RSPEAK(SPK); RSPEAK(SPK);
if (SPK == 220) goto L9021; if (SPK != 220) {
K=2-game.prop[RUG]; K=2-game.prop[RUG];
game.prop[RUG]=K; game.prop[RUG]=K;
if (K == 2)K=PLAC[SAPPH]; if (K == 2)K=PLAC[SAPPH];
MOVE(RUG+NOBJECTS,K); MOVE(RUG+NOBJECTS,K);
goto L9021; }
}
L9024: if (obj != COINS || !HERE(VEND)) goto L9025; } else if (obj == COINS && HERE(VEND)) {
DSTROY(COINS); DSTROY(COINS);
DROP(BATTER,game.loc); DROP(BATTER,game.loc);
PSPEAK(BATTER,0); PSPEAK(BATTER,0);
return(2012); return(2012);
} else if (obj == BIRD && AT(DRAGON) && game.prop[DRAGON] == 0) {
L9025: if (obj != BIRD || !AT(DRAGON) || game.prop[DRAGON] != 0) goto L9026; RSPEAK(154);
RSPEAK(154); DSTROY(BIRD);
DSTROY(BIRD); game.prop[BIRD]=0;
game.prop[BIRD]=0; return(2012);
return(2012); } else if (obj == BEAR && AT(TROLL)) {
RSPEAK(163);
L9026: if (obj != BEAR || !AT(TROLL)) goto L9027; MOVE(TROLL,0);
RSPEAK(163); MOVE(TROLL+NOBJECTS,0);
MOVE(TROLL,0); MOVE(TROLL2,PLAC[TROLL]);
MOVE(TROLL+NOBJECTS,0); MOVE(TROLL2+NOBJECTS,FIXD[TROLL]);
MOVE(TROLL2,PLAC[TROLL]); JUGGLE(CHASM);
MOVE(TROLL2+NOBJECTS,FIXD[TROLL]); game.prop[TROLL]=2;
JUGGLE(CHASM); } else if (obj != VASE || game.loc == PLAC[PILLOW]) {
game.prop[TROLL]=2; RSPEAK(54);
goto L9021; } else {
game.prop[VASE]=2;
L9027: if (obj == VASE && game.loc != PLAC[PILLOW]) goto L9028; if (AT(PILLOW))game.prop[VASE]=0;
RSPEAK(54); PSPEAK(VASE,game.prop[VASE]+1);
goto L9021; if (game.prop[VASE] != 0)game.fixed[VASE]= -1;
}
L9028: game.prop[VASE]=2; }
if (AT(PILLOW))game.prop[VASE]=0; K=LIQ(0);
PSPEAK(VASE,game.prop[VASE]+1); if (K == obj)obj=BOTTLE;
if (game.prop[VASE] != 0)game.fixed[VASE]= -1; if (obj == BOTTLE && K != 0)game.place[K]=0;
goto L9021; if (obj == CAGE && game.prop[BIRD] == 1)DROP(BIRD,game.loc);
DROP(obj,game.loc);
if (obj != BIRD) return(2012);
game.prop[BIRD]=0;
if (FOREST(game.loc))game.prop[BIRD]=2;
return(2012);
} }
/* Attack. Assume target if unambiguous. "Throw" also links here. Attackable /* Attack. Assume target if unambiguous. "Throw" also links here. Attackable
@ -140,30 +136,32 @@ L9028: game.prop[VASE]=2;
int attack(FILE *input, long obj, long verb) { int attack(FILE *input, long obj, long verb) {
I=ATDWRF(game.loc); I=ATDWRF(game.loc);
if (obj != 0) goto L9124; if (obj == 0) {
if (I > 0)obj=DWARF; if (I > 0)obj=DWARF;
if (HERE(SNAKE))obj=obj*NOBJECTS+SNAKE; if (HERE(SNAKE))obj=obj*NOBJECTS+SNAKE;
if (AT(DRAGON) && game.prop[DRAGON] == 0)obj=obj*NOBJECTS+DRAGON; if (AT(DRAGON) && game.prop[DRAGON] == 0)obj=obj*NOBJECTS+DRAGON;
if (AT(TROLL))obj=obj*NOBJECTS+TROLL; if (AT(TROLL))obj=obj*NOBJECTS+TROLL;
if (AT(OGRE))obj=obj*NOBJECTS+OGRE; if (AT(OGRE))obj=obj*NOBJECTS+OGRE;
if (HERE(BEAR) && game.prop[BEAR] == 0)obj=obj*NOBJECTS+BEAR; if (HERE(BEAR) && game.prop[BEAR] == 0)obj=obj*NOBJECTS+BEAR;
if (obj > NOBJECTS) return(8000); if (obj > NOBJECTS) return(8000);
if (obj != 0) goto L9124; if (obj == 0) {
/* Can't attack bird or machine by throwing axe. */ /* Can't attack bird or machine by throwing axe. */
if (HERE(BIRD) && verb != THROW)obj=BIRD; if (HERE(BIRD) && verb != THROW)obj=BIRD;
if (HERE(VEND) && verb != THROW)obj=obj*NOBJECTS+VEND; if (HERE(VEND) && verb != THROW)obj=obj*NOBJECTS+VEND;
/* Clam and oyster both treated as clam for intransitive case; /* Clam and oyster both treated as clam for intransitive case;
* no harm done. */ * no harm done. */
if (HERE(CLAM) || HERE(OYSTER))obj=NOBJECTS*obj+CLAM; if (HERE(CLAM) || HERE(OYSTER))obj=NOBJECTS*obj+CLAM;
if (obj > NOBJECTS) return(8000); if (obj > NOBJECTS) return(8000);
L9124: if (obj == BIRD) { }
}
if (obj == BIRD) {
SPK=137; SPK=137;
if (game.closed) return(2011); if (game.closed) return(2011);
DSTROY(BIRD); DSTROY(BIRD);
game.prop[BIRD]=0; game.prop[BIRD]=0;
SPK=45; SPK=45;
} }
L9125: if (obj == VEND) { if (obj == VEND) {
PSPEAK(VEND,game.prop[VEND]+2); PSPEAK(VEND,game.prop[VEND]+2);
game.prop[VEND]=3-game.prop[VEND]; game.prop[VEND]=3-game.prop[VEND];
return(2012); return(2012);