-#include "misc.h"
-#include "main.h"
-#include "share.h"
+#include "advent.h"
#include "funcs.h"
/* Carry an object. Special cases for bird and cage (if bird in cage, can't
if(!TOTING(BOTTLE))SPK=104;
return(2011);
L9017: SPK=92;
- if(game.holdng >= 7) return(2011);
+ if(HOLDNG >= 7) return(2011);
if(OBJ != BIRD || PROP[BIRD] == 1 || -1-PROP[BIRD] == 1) goto L9014;
if(PROP[BIRD] == 2) goto L9015;
if(!TOTING(CAGE))SPK=27;
if(!TOTING(OBJ)) return(2011);
if(OBJ != BIRD || !HERE(SNAKE)) goto L9023;
RSPEAK(30);
- if(game.closed) return(19000);
+ if(CLOSED) return(19000);
DSTROY(SNAKE);
/* SET PROP FOR USE BY TRAVEL OPTIONS */
PROP[SNAKE]=1;
/* CLAM AND OYSTER BOTH TREATED AS CLAM FOR INTRANSITIVE CASE; NO HARM DONE. */
if(HERE(CLAM) || HERE(OYSTER))OBJ=100*OBJ+CLAM;
if(OBJ > 100) return(8000);
-L9124: if(OBJ != BIRD) goto L9125;
- SPK=137;
- if(game.closed) return(2011);
- DSTROY(BIRD);
- PROP[BIRD]=0;
- SPK=45;
+L9124: if(OBJ == BIRD) {
+ SPK=137;
+ if(CLOSED) return(2011);
+ DSTROY(BIRD);
+ PROP[BIRD]=0;
+ SPK=45;
+ }
L9125: if(OBJ != VEND) goto L9126;
PSPEAK(VEND,PROP[VEND]+2);
PROP[VEND]=3-PROP[VEND];
if(OBJ == CLAM || OBJ == OYSTER)SPK=150;
if(OBJ == SNAKE)SPK=46;
if(OBJ == DWARF)SPK=49;
- if(OBJ == DWARF && game.closed) return(19000);
+ if(OBJ == DWARF && CLOSED) return(19000);
if(OBJ == DRAGON)SPK=167;
if(OBJ == TROLL)SPK=157;
if(OBJ == OGRE)SPK=203;
RSPEAK(6);
DSTROY(OGRE);
K=0;
- /* 9129 */ for (I=1; I<=5; I++) {
- if(DLOC[I] != LOC) goto L9129;
- K=K+1;
- DLOC[I]=61;
- DSEEN[I]=false;
-L9129: /*etc*/ ;
- } /* end loop */
+ for (I=1; I<=5; I++) {
+ if(DLOC[I] == LOC) {
+ K=K+1;
+ DLOC[I]=61;
+ DSEEN[I]=false;
+ }
+ }
SPK=SPK+1+1/K;
- return(2011);
+ return(2011);
}
/* Throw. Same as discard unless axe. Then same as attack except ignore bird,
return(attack(cmdin));
L9172: SPK=48;
- if(RAN(7) < game.dflag) goto L9175;
+ if(randrange(7) < DFLAG) goto L9175;
DSEEN[I]=false;
DLOC[I]=0;
SPK=47;
- game.dkill=game.dkill+1;
- if(game.dkill == 1)SPK=149;
+ DKILL=DKILL+1;
+ if(DKILL == 1)SPK=149;
L9175: RSPEAK(SPK);
DROP(AXE,LOC);
K=NUL;
SPK=102;
if(OBJ == DRAGON && PROP[DRAGON] != 0)SPK=110;
if(OBJ == TROLL)SPK=182;
- if(OBJ != SNAKE || game.closed || !HERE(BIRD)) return(2011);
+ if(OBJ != SNAKE || CLOSED || !HERE(BIRD)) return(2011);
SPK=101;
DSTROY(BIRD);
PROP[BIRD]=0;
L9213: if(OBJ != DWARF) goto L9214;
if(!HERE(FOOD)) return(2011);
SPK=103;
- game.dflag=game.dflag+2;
+ DFLAG=DFLAG+2;
return(2011);
L9214: if(OBJ != BEAR) goto L9215;