Revert structurization changes, they broke database compilation...
...bug showing only if adventure.data was absent. We'll need to sneak up on this more carefully.
This commit is contained in:
Eric S. Raymond
parent
7e5448e974
commit
484ca4e9fd
11 changed files with 485 additions and 533 deletions
150
actions2.c
150
actions2.c
|
|
@ -9,17 +9,17 @@
|
|||
|
||||
int carry(void) {
|
||||
if(TOTING(OBJ)) return(2011);
|
||||
game.spk=25;
|
||||
if(OBJ == PLANT && PROP[PLANT] <= 0)game.spk=115;
|
||||
if(OBJ == BEAR && PROP[BEAR] == 1)game.spk=169;
|
||||
if(OBJ == CHAIN && PROP[BEAR] != 0)game.spk=170;
|
||||
if(OBJ == URN)game.spk=215;
|
||||
if(OBJ == CAVITY)game.spk=217;
|
||||
if(OBJ == BLOOD)game.spk=239;
|
||||
if(OBJ == RUG && PROP[RUG] == 2)game.spk=222;
|
||||
if(OBJ == SIGN)game.spk=196;
|
||||
SPK=25;
|
||||
if(OBJ == PLANT && PROP[PLANT] <= 0)SPK=115;
|
||||
if(OBJ == BEAR && PROP[BEAR] == 1)SPK=169;
|
||||
if(OBJ == CHAIN && PROP[BEAR] != 0)SPK=170;
|
||||
if(OBJ == URN)SPK=215;
|
||||
if(OBJ == CAVITY)SPK=217;
|
||||
if(OBJ == BLOOD)SPK=239;
|
||||
if(OBJ == RUG && PROP[RUG] == 2)SPK=222;
|
||||
if(OBJ == SIGN)SPK=196;
|
||||
if(OBJ != MESSAG) goto L9011;
|
||||
game.spk=190;
|
||||
SPK=190;
|
||||
DSTROY(MESSAG);
|
||||
L9011: if(FIXED[OBJ] != 0) return(2011);
|
||||
if(OBJ != WATER && OBJ != OIL) goto L9017;
|
||||
|
|
@ -27,16 +27,16 @@ L9011: if(FIXED[OBJ] != 0) return(2011);
|
|||
OBJ=BOTTLE;
|
||||
if(HERE(BOTTLE) && LIQ(0) == K) goto L9017;
|
||||
if(TOTING(BOTTLE) && PROP[BOTTLE] == 1) return(fill());
|
||||
if(PROP[BOTTLE] != 1)game.spk=105;
|
||||
if(!TOTING(BOTTLE))game.spk=104;
|
||||
if(PROP[BOTTLE] != 1)SPK=105;
|
||||
if(!TOTING(BOTTLE))SPK=104;
|
||||
return(2011);
|
||||
L9017: game.spk=92;
|
||||
if(game.holdng >= 7) return(2011);
|
||||
L9017: SPK=92;
|
||||
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))game.spk=27;
|
||||
if(TOTING(ROD))game.spk=26;
|
||||
if(game.spk/2 == 13) return(2011);
|
||||
if(!TOTING(CAGE))SPK=27;
|
||||
if(TOTING(ROD))SPK=26;
|
||||
if(SPK/2 == 13) return(2011);
|
||||
PROP[BIRD]=1;
|
||||
L9014: if((OBJ == BIRD || OBJ == CAGE) && (PROP[BIRD] == 1 || -1-PROP[BIRD] ==
|
||||
1))CARRY(BIRD+CAGE-OBJ,LOC);
|
||||
|
|
@ -48,7 +48,7 @@ L9014: if((OBJ == BIRD || OBJ == CAGE) && (PROP[BIRD] == 1 || -1-PROP[BIRD] ==
|
|||
PROP[CAVITY]=1;
|
||||
return(2009);
|
||||
|
||||
L9015: game.spk=238;
|
||||
L9015: SPK=238;
|
||||
DSTROY(BIRD);
|
||||
return(2011);
|
||||
}
|
||||
|
|
@ -63,7 +63,7 @@ int discard(bool just_do_it) {
|
|||
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;
|
||||
|
|
@ -83,11 +83,11 @@ L9023: if(!(GSTONE(OBJ) && AT(CAVITY) && PROP[CAVITY] != 0)) goto L9024;
|
|||
PROP[CAVITY]=0;
|
||||
if(!HERE(RUG) || !((OBJ == EMRALD && PROP[RUG] != 2) || (OBJ == RUBY &&
|
||||
PROP[RUG] == 2))) goto L9021;
|
||||
game.spk=219;
|
||||
if(TOTING(RUG))game.spk=220;
|
||||
if(OBJ == RUBY)game.spk=221;
|
||||
RSPEAK(game.spk);
|
||||
if(game.spk == 220) goto L9021;
|
||||
SPK=219;
|
||||
if(TOTING(RUG))SPK=220;
|
||||
if(OBJ == RUBY)SPK=221;
|
||||
RSPEAK(SPK);
|
||||
if(SPK == 220) goto L9021;
|
||||
K=2-PROP[RUG];
|
||||
PROP[RUG]=K;
|
||||
if(K == 2)K=PLAC[SAPPH];
|
||||
|
|
@ -149,26 +149,26 @@ int attack(FILE *input) {
|
|||
if(HERE(CLAM) || HERE(OYSTER))OBJ=100*OBJ+CLAM;
|
||||
if(OBJ > 100) return(8000);
|
||||
L9124: if(OBJ != BIRD) goto L9125;
|
||||
game.spk=137;
|
||||
if(game.closed) return(2011);
|
||||
SPK=137;
|
||||
if(CLOSED) return(2011);
|
||||
DSTROY(BIRD);
|
||||
PROP[BIRD]=0;
|
||||
game.spk=45;
|
||||
SPK=45;
|
||||
L9125: if(OBJ != VEND) goto L9126;
|
||||
PSPEAK(VEND,PROP[VEND]+2);
|
||||
PROP[VEND]=3-PROP[VEND];
|
||||
return(2012);
|
||||
|
||||
L9126: if(OBJ == 0)game.spk=44;
|
||||
if(OBJ == CLAM || OBJ == OYSTER)game.spk=150;
|
||||
if(OBJ == SNAKE)game.spk=46;
|
||||
if(OBJ == DWARF)game.spk=49;
|
||||
if(OBJ == DWARF && game.closed) return(19000);
|
||||
if(OBJ == DRAGON)game.spk=167;
|
||||
if(OBJ == TROLL)game.spk=157;
|
||||
if(OBJ == OGRE)game.spk=203;
|
||||
L9126: if(OBJ == 0)SPK=44;
|
||||
if(OBJ == CLAM || OBJ == OYSTER)SPK=150;
|
||||
if(OBJ == SNAKE)SPK=46;
|
||||
if(OBJ == DWARF)SPK=49;
|
||||
if(OBJ == DWARF && CLOSED) return(19000);
|
||||
if(OBJ == DRAGON)SPK=167;
|
||||
if(OBJ == TROLL)SPK=157;
|
||||
if(OBJ == OGRE)SPK=203;
|
||||
if(OBJ == OGRE && I > 0) goto L9128;
|
||||
if(OBJ == BEAR)game.spk=165+(PROP[BEAR]+1)/2;
|
||||
if(OBJ == BEAR)SPK=165+(PROP[BEAR]+1)/2;
|
||||
if(OBJ != DRAGON || PROP[DRAGON] != 0) return(2011);
|
||||
/* Fun stuff for dragon. If he insists on attacking it, win! Set PROP to dead,
|
||||
* move dragon to central loc (still fixed), move rug there (not fixed), and
|
||||
|
|
@ -195,7 +195,7 @@ L9126: if(OBJ == 0)game.spk=44;
|
|||
K=NUL;
|
||||
return(8);
|
||||
|
||||
L9128: RSPEAK(game.spk);
|
||||
L9128: RSPEAK(SPK);
|
||||
RSPEAK(6);
|
||||
DSTROY(OGRE);
|
||||
K=0;
|
||||
|
|
@ -203,10 +203,10 @@ L9128: RSPEAK(game.spk);
|
|||
if(DLOC[I] != LOC) goto L9129;
|
||||
K=K+1;
|
||||
DLOC[I]=61;
|
||||
game.dseen[I]=false;
|
||||
DSEEN[I]=false;
|
||||
L9129: /*etc*/ ;
|
||||
} /* end loop */
|
||||
game.spk=game.spk+1+1/K;
|
||||
SPK=SPK+1+1/K;
|
||||
return(2011);
|
||||
}
|
||||
|
||||
|
|
@ -222,30 +222,30 @@ int throw(FILE *cmdin) {
|
|||
if(OBJ != AXE) return(discard(false));
|
||||
I=ATDWRF(LOC);
|
||||
if(I > 0) goto L9172;
|
||||
game.spk=152;
|
||||
SPK=152;
|
||||
if(AT(DRAGON) && PROP[DRAGON] == 0) goto L9175;
|
||||
game.spk=158;
|
||||
SPK=158;
|
||||
if(AT(TROLL)) goto L9175;
|
||||
game.spk=203;
|
||||
SPK=203;
|
||||
if(AT(OGRE)) goto L9175;
|
||||
if(HERE(BEAR) && PROP[BEAR] == 0) goto L9176;
|
||||
OBJ=0;
|
||||
return(attack(cmdin));
|
||||
|
||||
L9172: game.spk=48;
|
||||
if(RAN(7) < game.dflag) goto L9175;
|
||||
game.dseen[I]=false;
|
||||
L9172: SPK=48;
|
||||
if(RAN(7) < DFLAG) goto L9175;
|
||||
DSEEN[I]=false;
|
||||
DLOC[I]=0;
|
||||
game.spk=47;
|
||||
game.dkill=game.dkill+1;
|
||||
if(game.dkill == 1)game.spk=149;
|
||||
L9175: RSPEAK(game.spk);
|
||||
SPK=47;
|
||||
DKILL=DKILL+1;
|
||||
if(DKILL == 1)SPK=149;
|
||||
L9175: RSPEAK(SPK);
|
||||
DROP(AXE,LOC);
|
||||
K=NUL;
|
||||
return(8);
|
||||
|
||||
/* This'll teach him to throw the axe at the bear! */
|
||||
L9176: game.spk=164;
|
||||
L9176: SPK=164;
|
||||
DROP(AXE,LOC);
|
||||
FIXED[AXE]= -1;
|
||||
PROP[AXE]=1;
|
||||
|
|
@ -256,7 +256,7 @@ L9176: game.spk=164;
|
|||
L9177: OBJ=BEAR;
|
||||
return(feed());
|
||||
|
||||
L9178: game.spk=159;
|
||||
L9178: SPK=159;
|
||||
/* Snarf a treasure for the troll. */
|
||||
DROP(OBJ,0);
|
||||
MOVE(TROLL,0);
|
||||
|
|
@ -272,41 +272,41 @@ L9178: game.spk=159;
|
|||
|
||||
int feed() {
|
||||
if(OBJ != BIRD) goto L9212;
|
||||
game.spk=100;
|
||||
SPK=100;
|
||||
return(2011);
|
||||
|
||||
L9212: if(OBJ != SNAKE && OBJ != DRAGON && OBJ != TROLL) goto L9213;
|
||||
game.spk=102;
|
||||
if(OBJ == DRAGON && PROP[DRAGON] != 0)game.spk=110;
|
||||
if(OBJ == TROLL)game.spk=182;
|
||||
if(OBJ != SNAKE || game.closed || !HERE(BIRD)) return(2011);
|
||||
game.spk=101;
|
||||
SPK=102;
|
||||
if(OBJ == DRAGON && PROP[DRAGON] != 0)SPK=110;
|
||||
if(OBJ == TROLL)SPK=182;
|
||||
if(OBJ != SNAKE || CLOSED || !HERE(BIRD)) return(2011);
|
||||
SPK=101;
|
||||
DSTROY(BIRD);
|
||||
PROP[BIRD]=0;
|
||||
return(2011);
|
||||
|
||||
L9213: if(OBJ != DWARF) goto L9214;
|
||||
if(!HERE(FOOD)) return(2011);
|
||||
game.spk=103;
|
||||
game.dflag=game.dflag+2;
|
||||
SPK=103;
|
||||
DFLAG=DFLAG+2;
|
||||
return(2011);
|
||||
|
||||
L9214: if(OBJ != BEAR) goto L9215;
|
||||
if(PROP[BEAR] == 0)game.spk=102;
|
||||
if(PROP[BEAR] == 3)game.spk=110;
|
||||
if(PROP[BEAR] == 0)SPK=102;
|
||||
if(PROP[BEAR] == 3)SPK=110;
|
||||
if(!HERE(FOOD)) return(2011);
|
||||
DSTROY(FOOD);
|
||||
PROP[BEAR]=1;
|
||||
FIXED[AXE]=0;
|
||||
PROP[AXE]=0;
|
||||
game.spk=168;
|
||||
SPK=168;
|
||||
return(2011);
|
||||
|
||||
L9215: if(OBJ != OGRE) goto L9216;
|
||||
if(HERE(FOOD))game.spk=202;
|
||||
if(HERE(FOOD))SPK=202;
|
||||
return(2011);
|
||||
|
||||
L9216: game.spk=14;
|
||||
L9216: SPK=14;
|
||||
return(2011);
|
||||
}
|
||||
|
||||
|
|
@ -317,33 +317,33 @@ int fill() {
|
|||
if(OBJ == URN) goto L9224;
|
||||
if(OBJ != 0 && OBJ != BOTTLE) return(2011);
|
||||
if(OBJ == 0 && !HERE(BOTTLE)) return(8000);
|
||||
game.spk=107;
|
||||
if(LIQLOC(LOC) == 0)game.spk=106;
|
||||
if(HERE(URN) && PROP[URN] != 0)game.spk=214;
|
||||
if(LIQ(0) != 0)game.spk=105;
|
||||
if(game.spk != 107) return(2011);
|
||||
SPK=107;
|
||||
if(LIQLOC(LOC) == 0)SPK=106;
|
||||
if(HERE(URN) && PROP[URN] != 0)SPK=214;
|
||||
if(LIQ(0) != 0)SPK=105;
|
||||
if(SPK != 107) return(2011);
|
||||
PROP[BOTTLE]=MOD(COND[LOC],4)/2*2;
|
||||
K=LIQ(0);
|
||||
if(TOTING(BOTTLE))PLACE[K]= -1;
|
||||
if(K == OIL)game.spk=108;
|
||||
if(K == OIL)SPK=108;
|
||||
return(2011);
|
||||
|
||||
L9222: game.spk=29;
|
||||
if(LIQLOC(LOC) == 0)game.spk=144;
|
||||
L9222: SPK=29;
|
||||
if(LIQLOC(LOC) == 0)SPK=144;
|
||||
if(LIQLOC(LOC) == 0 || !TOTING(VASE)) return(2011);
|
||||
RSPEAK(145);
|
||||
PROP[VASE]=2;
|
||||
FIXED[VASE]= -1;
|
||||
return(discard(true));
|
||||
|
||||
L9224: game.spk=213;
|
||||
L9224: SPK=213;
|
||||
if(PROP[URN] != 0) return(2011);
|
||||
game.spk=144;
|
||||
SPK=144;
|
||||
K=LIQ(0);
|
||||
if(K == 0 || !HERE(BOTTLE)) return(2011);
|
||||
PLACE[K]=0;
|
||||
PROP[BOTTLE]=1;
|
||||
if(K == OIL)PROP[URN]=1;
|
||||
game.spk=211+PROP[URN];
|
||||
SPK=211+PROP[URN];
|
||||
return(2011);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue