* take one without the other). Liquids also special, since they depend on
* status of bottle. Also various side effects, etc. */
* take one without the other). Liquids also special, since they depend on
* status of bottle. Also various side effects, etc. */
- if(OBJ == PLANT && game.prop[PLANT] <= 0)SPK=115;
- if(OBJ == BEAR && game.prop[BEAR] == 1)SPK=169;
- if(OBJ == CHAIN && game.prop[BEAR] != 0)SPK=170;
- if(OBJ == URN)SPK=215;
- if(OBJ == CAVITY)SPK=217;
- if(OBJ == BLOOD)SPK=239;
- if(OBJ == RUG && game.prop[RUG] == 2)SPK=222;
- if(OBJ == SIGN)SPK=196;
- if(OBJ != MESSAG) goto L9011;
+ if(obj == PLANT && game.prop[PLANT] <= 0)SPK=115;
+ if(obj == BEAR && game.prop[BEAR] == 1)SPK=169;
+ if(obj == CHAIN && game.prop[BEAR] != 0)SPK=170;
+ if(obj == URN)SPK=215;
+ if(obj == CAVITY)SPK=217;
+ if(obj == BLOOD)SPK=239;
+ if(obj == RUG && game.prop[RUG] == 2)SPK=222;
+ if(obj == SIGN)SPK=196;
+ if(obj != MESSAG) goto L9011;
if(game.prop[BOTTLE] != 1)SPK=105;
if(!TOTING(BOTTLE))SPK=104;
return(2011);
L9017: SPK=92;
if(game.holdng >= 7) return(2011);
if(game.prop[BOTTLE] != 1)SPK=105;
if(!TOTING(BOTTLE))SPK=104;
return(2011);
L9017: SPK=92;
if(game.holdng >= 7) return(2011);
-L9014: if((OBJ == BIRD || OBJ == CAGE) && (game.prop[BIRD] == 1 || -1-game.prop[BIRD] ==
- 1))CARRY(BIRD+CAGE-OBJ,game.loc);
- CARRY(OBJ,game.loc);
+L9014: if((obj == BIRD || obj == CAGE) && (game.prop[BIRD] == 1 || -1-game.prop[BIRD] ==
+ 1))CARRY(BIRD+CAGE-obj,game.loc);
+ CARRY(obj,game.loc);
- if(OBJ == BOTTLE && K != 0)game.place[K]= -1;
- if(!GSTONE(OBJ) || game.prop[OBJ] == 0) return(2009);
- game.prop[OBJ]=0;
+ if(obj == BOTTLE && K != 0)game.place[K]= -1;
+ if(!GSTONE(obj) || game.prop[obj] == 0) return(2009);
+ game.prop[obj]=0;
* bird (might attack snake or dragon) and cage (might contain bird) and vase.
* Drop coins at vending machine for extra batteries. */
* bird (might attack snake or dragon) and cage (might contain bird) and vase.
* Drop coins at vending machine for extra batteries. */
- if(TOTING(ROD2) && OBJ == ROD && !TOTING(ROD))OBJ=ROD2;
- if(!TOTING(OBJ)) return(2011);
- if(OBJ != BIRD || !HERE(SNAKE)) goto L9023;
+ if(TOTING(ROD2) && obj == ROD && !TOTING(ROD))obj=ROD2;
+ if(!TOTING(obj)) return(2011);
+ if(obj != BIRD || !HERE(SNAKE)) goto L9023;
- 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);
+ 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);
* objects fall into two categories: enemies (snake, dwarf, etc.) and others
* (bird, clam, machine). Ambiguous if 2 enemies, or no enemies but 2 others. */
* objects fall into two categories: enemies (snake, dwarf, etc.) and others
* (bird, clam, machine). Ambiguous if 2 enemies, or no enemies but 2 others. */
/* CLAM AND OYSTER BOTH TREATED AS CLAM FOR INTRANSITIVE CASE; NO HARM DONE. */
if(HERE(CLAM) || HERE(OYSTER))obj=NOBJECTS*obj+CLAM;
if(obj > NOBJECTS) return(8000);
/* CLAM AND OYSTER BOTH TREATED AS CLAM FOR INTRANSITIVE CASE; NO HARM DONE. */
if(HERE(CLAM) || HERE(OYSTER))obj=NOBJECTS*obj+CLAM;
if(obj > NOBJECTS) return(8000);
* 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);
* 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);
GETIN(input,WD1,WD1X,WD2,WD2X);
if(WD1 != MAKEWD(25) && WD1 != MAKEWD(250519)) return(2607);
PSPEAK(DRAGON,3);
GETIN(input,WD1,WD1X,WD2,WD2X);
if(WD1 != MAKEWD(25) && WD1 != MAKEWD(250519)) return(2607);
PSPEAK(DRAGON,3);
* 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. */
* 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(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));
+int throw(FILE *cmdin, long obj, long verb) {
+ 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(obj, false));
/* 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. */
- if(OBJ == DRAGON && game.prop[DRAGON] != 0)SPK=110;
- if(OBJ == TROLL)SPK=182;
- if(OBJ != SNAKE || game.closed || !HERE(BIRD)) return(2011);
+ if(obj == DRAGON && game.prop[DRAGON] != 0)SPK=110;
+ if(obj == TROLL)SPK=182;
+ if(obj != SNAKE || game.closed || !HERE(BIRD)) return(2011);
if(game.prop[BEAR] == 0)SPK=102;
if(game.prop[BEAR] == 3)SPK=110;
if(!HERE(FOOD)) return(2011);
if(game.prop[BEAR] == 0)SPK=102;
if(game.prop[BEAR] == 3)SPK=110;
if(!HERE(FOOD)) return(2011);
-int fill() {
- if(OBJ == VASE) goto L9222;
- if(OBJ == URN) goto L9224;
- if(OBJ != 0 && OBJ != BOTTLE) return(2011);
- if(OBJ == 0 && !HERE(BOTTLE)) return(8000);
+int fill(long obj) {
+ if(obj == VASE) goto L9222;
+ if(obj == URN) goto L9224;
+ if(obj != 0 && obj != BOTTLE) return(2011);
+ if(obj == 0 && !HERE(BOTTLE)) return(8000);