From: Eric S. Raymond <esr@thyrsus.com>
Date: Wed, 7 Jun 2017 12:34:42 +0000 (-0400)
Subject: Yet more OBJ localization.
X-Git-Tag: 1.1~574
X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=commitdiff_plain;h=3079ebda9551d8b62ff6f3d4b5c924e499eae5ce

Yet more OBJ localization.
---

diff --git a/actions1.c b/actions1.c
index 81bb49a..1e142c1 100644
--- a/actions1.c
+++ b/actions1.c
@@ -420,7 +420,7 @@ L8201:	/*etc*/ ;
 
 /* Feed/fill are in the other module. */
 
-L9210:	return(feed());
+L9210:	return(feed(OBJ));
 L9220:	return(fill());
 
 /*  Blast.  No effect unless you've got dynamite, which is a neat trick! */
diff --git a/actions2.c b/actions2.c
index ec6365b..64695e0 100644
--- a/actions2.c
+++ b/actions2.c
@@ -253,7 +253,7 @@ L9176:	SPK=164;
 
 /*  But throwing food is another story. */
 L9177:	obj=BEAR;
-	return(feed());
+	return(feed(obj));
 
 L9178:	SPK=159;
 /*  Snarf a treasure for the troll. */
@@ -269,28 +269,28 @@ L9178:	SPK=159;
 /*  Feed.  If bird, no seed.  Snake, dragon, troll: quip.  If dwarf, make him
  *  mad.  Bear, special. */
 
-int feed() {
-	if(OBJ != BIRD) goto L9212;
+int feed(long obj) {
+	if(obj != BIRD) goto L9212;
 	SPK=100;
 	 return(2011);
 
-L9212:	if(OBJ != SNAKE && OBJ != DRAGON && OBJ != TROLL) goto L9213;
+L9212:	if(obj != SNAKE && obj != DRAGON && obj != TROLL) goto L9213;
 	SPK=102;
-	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);
 	SPK=101;
 	DSTROY(BIRD);
 	game.prop[BIRD]=0;
 	 return(2011);
 
-L9213:	if(OBJ != DWARF) goto L9214;
+L9213:	if(obj != DWARF) goto L9214;
 	if(!HERE(FOOD)) return(2011);
 	SPK=103;
 	game.dflag=game.dflag+2;
 	 return(2011);
 
-L9214:	if(OBJ != BEAR) goto L9215;
+L9214:	if(obj != BEAR) goto L9215;
 	if(game.prop[BEAR] == 0)SPK=102;
 	if(game.prop[BEAR] == 3)SPK=110;
 	if(!HERE(FOOD)) return(2011);
@@ -301,7 +301,7 @@ L9214:	if(OBJ != BEAR) goto L9215;
 	SPK=168;
 	 return(2011);
 
-L9215:	if(OBJ != OGRE) goto L9216;
+L9215:	if(obj != OGRE) goto L9216;
 	if(HERE(FOOD))SPK=202;
 	 return(2011);
 
diff --git a/funcs.h b/funcs.h
index 6f99b11..ceb1021 100644
--- 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 *, long obj), feed(void), fill(void);
+extern int carry(void), discard(bool), attack(FILE *, long), throw(FILE *, long obj), feed(long), fill(void);
 void score(long);