Localize OBJ in throw().

diff --git a/actions1.c b/actions1.c
index ef523eae0649016909a21f429224d04963074206..81bb49ad25fe5d5c38de9388c279a4843dc1dae3 100644 (file)
--- a/actions1.c
+++ b/actions1.c
@@ -388,7 +388,7 @@ L9160:      if(OBJ != LAMP)SPK=76;
 
 /*  Throw moved into separate module. */
 
-L9170: return(throw(input));
+L9170: return(throw(input, OBJ));
 
 /*  Quit.  Intransitive only.  Verify intent and exit if that's what he wants. */
 

diff --git a/actions2.c b/actions2.c
index dea103098d431ee82b2ac332f223f1ea2d2a359b..ec6365b30e41050d6066b846741c4eb0eac5b406 100644 (file)
--- a/actions2.c
+++ b/actions2.c
@@ -213,12 +213,12 @@ L9128:    RSPEAK(SPK);
  *  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) {
+       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));
        I=ATDWRF(game.loc);
        if(I > 0) goto L9172;
        SPK=152;
@@ -228,8 +228,8 @@ int throw(FILE *cmdin) {
        SPK=203;
        if(AT(OGRE)) goto L9175;
        if(HERE(BEAR) && game.prop[BEAR] == 0) goto L9176;
-       OBJ=0;
-       return(attack(cmdin, OBJ));
+       obj=0;
+       return(attack(cmdin, obj));
 
 L9172: SPK=48;
        if(randrange(NDWARVES+1) < game.dflag) goto L9175;
@@ -252,12 +252,12 @@ L9176:    SPK=164;
         return(2011);
 
 /*  But throwing food is another story. */
-L9177: OBJ=BEAR;
+L9177: obj=BEAR;
        return(feed());
 
 L9178: SPK=159;
 /*  Snarf a treasure for the troll. */
-       DROP(OBJ,0);
+       DROP(obj,0);
        MOVE(TROLL,0);
        MOVE(TROLL+NOBJECTS,0);
        DROP(TROLL2,PLAC[TROLL]);

diff --git a/funcs.h b/funcs.h
index 3edd545b225c7dc45e65d42297b8f1d481556a6a..6f99b11d2c6750c47abd97180233768f7705aaed 100644 (file)
--- a/funcs.h
+++ b/funcs.h
@@ -38,7 +38,7 @@
 #define OUTSID(LOC)    ((LOC) <= 8 || FOREST(LOC) || (LOC) == PLAC[SAPPH] || (LOC) == 180 || (LOC) == 182)
 #define INDEEP(LOC)    ((LOC) >= 15 && !OUTSID(LOC) && (LOC) != 179)
 
-extern int carry(void), discard(bool), attack(FILE *, long), throw(FILE *), feed(void), fill(void);
+extern int carry(void), discard(bool), attack(FILE *, long), throw(FILE *, long obj), feed(void), fill(void);
 void score(long);