X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=actions2.c;h=f208a4978520ef6c44fa76b92685c2ef56ef27d0;hp=7d931cc054fa6e413d78d1851a9fc3c81233a708;hb=43aef9ceb16d0e2821c5ee81ea9d7c2f7ace84bb;hpb=c9e9b6457540d1feb7ccd7186ccffa57698dec57 diff --git a/actions2.c b/actions2.c index 7d931cc..f208a49 100644 --- a/actions2.c +++ b/actions2.c @@ -1,16 +1,11 @@ -#include "misc.h" -#include "main.h" -#include "share.h" +#include "advent.h" #include "funcs.h" -#define TRUE (0==0) -#define FALSE (0!=0) +/* Carry an object. Special cases for bird and cage (if bird in cage, can't + * take one without the other). Liquids also special, since they depend on + * status of bottle. Also various side effects, etc. */ -/* CARRY AN OBJECT. SPECIAL CASES FOR BIRD AND CAGE (IF BIRD IN CAGE, CAN'T - * TAKE ONE WITHOUT THE OTHER). LIQUIDS ALSO SPECIAL, SINCE THEY DEPEND ON - * STATUS OF BOTTLE. ALSO VARIOUS SIDE EFFECTS, ETC. */ - -int carry() { +int carry(void) { if(TOTING(OBJ)) return(2011); SPK=25; if(OBJ == PLANT && PROP[PLANT] <= 0)SPK=115; @@ -56,11 +51,11 @@ L9015: SPK=238; return(2011); } -/* DISCARD OBJECT. "THROW" ALSO COMES HERE FOR MOST OBJECTS. SPECIAL CASES FOR - * BIRD (MIGHT ATTACK SNAKE OR DRAGON) AND CAGE (MIGHT CONTAIN BIRD) AND VASE. - * DROP COINS AT VENDING MACHINE FOR EXTRA BATTERIES. */ +/* Discard object. "Throw" also comes here for most objects. Special cases for + * bird (might attack snake or dragon) and cage (might contain bird) and vase. + * Drop coins at vending machine for extra batteries. */ -int discard(just_do_it)long just_do_it; { +int discard(bool just_do_it) { if(just_do_it) goto L9021; if(TOTING(ROD2) && OBJ == ROD && !TOTING(ROD))OBJ=ROD2; if(!TOTING(OBJ)) return(2011); @@ -130,11 +125,11 @@ L9028: PROP[VASE]=2; goto L9021; } -/* ATTACK. ASSUME TARGET IF UNAMBIGUOUS. "THROW" ALSO LINKS HERE. ATTACKABLE - * OBJECTS FALL INTO TWO CATEGORIES: ENEMIES (SNAKE, DWARF, ETC.) AND OTHERS - * (BIRD, CLAM, MACHINE). AMBIGUOUS IF 2 ENEMIES, OR NO ENEMIES BUT 2 OTHERS. */ +/* Attack. Assume target if unambiguous. "Throw" also links here. Attackable + * objects fall into two categories: enemies (snake, dwarf, etc.) and others + * (bird, clam, machine). Ambiguous if 2 enemies, or no enemies but 2 others. */ -int attack() { +int attack(FILE *input) { I=ATDWRF(LOC); if(OBJ != 0) goto L9124; if(I > 0)OBJ=DWARF; @@ -173,13 +168,13 @@ L9126: if(OBJ == 0)SPK=44; if(OBJ == OGRE && I > 0) goto L9128; 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 - * MOVE HIM THERE, TOO. THEN DO A NULL MOTION TO GET NEW DESCRIPTION. */ +/* 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 + * move him there, too. Then do a null motion to get new description. */ RSPEAK(49); VERB=0; OBJ=0; - GETIN(WD1,WD1X,WD2,WD2X); + GETIN(input,WD1,WD1X,WD2,WD2X); if(WD1 != MAKEWD(25) && WD1 != MAKEWD(250519)) return(2607); PSPEAK(DRAGON,3); PROP[DRAGON]=1; @@ -190,9 +185,9 @@ L9126: if(OBJ == 0)SPK=44; MOVE(DRAGON,K); MOVE(RUG,K); DROP(BLOOD,K); - /* 9127 */ for (OBJ=1; OBJ<=100; OBJ++) { + for (OBJ=1; OBJ<=100; OBJ++) { if(PLACE[OBJ] == PLAC[DRAGON] || PLACE[OBJ] == FIXD[DRAGON])MOVE(OBJ,K); -L9127: /*etc*/ ; + /*etc*/ ; } /* end loop */ LOC=K; K=NUL; @@ -206,23 +201,23 @@ L9128: RSPEAK(SPK); if(DLOC[I] != LOC) goto L9129; K=K+1; DLOC[I]=61; - DSEEN[I]=FALSE; + DSEEN[I]=false; L9129: /*etc*/ ; } /* end loop */ SPK=SPK+1+1/K; return(2011); } -/* THROW. SAME AS DISCARD UNLESS AXE. THEN SAME AS ATTACK EXCEPT IGNORE BIRD, - * AND IF DWARF IS PRESENT THEN ONE MIGHT BE KILLED. (ONLY WAY TO DO SO!) - * AXE ALSO SPECIAL FOR DRAGON, BEAR, AND TROLL. TREASURES SPECIAL FOR TROLL. */ +/* Throw. Same as discard unless axe. Then same as attack except ignore bird, + * and if dwarf is present then one might be killed. (Only way to do so!) + * Axe also special for dragon, bear, and troll. Treasures special for troll. */ -int throw() { +int throw(FILE *cmdin) { if(TOTING(ROD2) && OBJ == ROD && !TOTING(ROD))OBJ=ROD2; if(!TOTING(OBJ)) return(2011); if(OBJ >= 50 && OBJ <= MAXTRS && AT(TROLL)) goto L9178; if(OBJ == FOOD && HERE(BEAR)) goto L9177; - if(OBJ != AXE) return(discard(FALSE)); + if(OBJ != AXE) return(discard(false)); I=ATDWRF(LOC); if(I > 0) goto L9172; SPK=152; @@ -233,11 +228,11 @@ int throw() { if(AT(OGRE)) goto L9175; if(HERE(BEAR) && PROP[BEAR] == 0) goto L9176; OBJ=0; - return(attack()); + return(attack(cmdin)); L9172: SPK=48; - if(RAN(7) < DFLAG) goto L9175; - DSEEN[I]=FALSE; + if(randrange(7) < DFLAG) goto L9175; + DSEEN[I]=false; DLOC[I]=0; SPK=47; DKILL=DKILL+1; @@ -247,7 +242,7 @@ L9175: RSPEAK(SPK); K=NUL; return(8); -/* THIS'LL TEACH HIM TO THROW THE AXE AT THE BEAR! */ +/* This'll teach him to throw the axe at the bear! */ L9176: SPK=164; DROP(AXE,LOC); FIXED[AXE]= -1; @@ -255,12 +250,12 @@ L9176: SPK=164; JUGGLE(BEAR); return(2011); -/* BUT THROWING FOOD IS ANOTHER STORY. */ +/* But throwing food is another story. */ L9177: OBJ=BEAR; return(feed()); L9178: SPK=159; -/* SNARF A TREASURE FOR THE TROLL. */ +/* Snarf a treasure for the troll. */ DROP(OBJ,0); MOVE(TROLL,0); MOVE(TROLL+100,0); @@ -270,8 +265,8 @@ L9178: SPK=159; return(2011); } -/* FEED. IF BIRD, NO SEED. SNAKE, DRAGON, TROLL: QUIP. IF DWARF, MAKE HIM - * MAD. BEAR, SPECIAL. */ +/* Feed. If bird, no seed. Snake, dragon, troll: quip. If dwarf, make him + * mad. Bear, special. */ int feed() { if(OBJ != BIRD) goto L9212; @@ -313,7 +308,7 @@ L9216: SPK=14; return(2011); } -/* FILL. BOTTLE OR URN MUST BE EMPTY, AND LIQUID AVAILABLE. (VASE IS NASTY.) */ +/* Fill. Bottle or urn must be empty, and liquid available. (Vase is nasty.) */ int fill() { if(OBJ == VASE) goto L9222; @@ -337,7 +332,7 @@ L9222: SPK=29; RSPEAK(145); PROP[VASE]=2; FIXED[VASE]= -1; - return(discard(TRUE)); + return(discard(true)); L9224: SPK=213; if(PROP[URN] != 0) return(2011);