archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Yet more OBJ localization.

Browse source
This commit is contained in:
Eric S. Raymond 2017-06-07 08:34:42 -04:00
parent f20b7f56fd
commit 3079ebda95
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
actions1.c
View file

@ -420,7 +420,7 @@ L8201: /*etc*/ ;
/* Feed/fill are in the other module. */ /* Feed/fill are in the other module. */
L9210: return(feed()); L9210: return(feed(OBJ));
L9220: return(fill()); L9220: return(fill());
/* Blast. No effect unless you've got dynamite, which is a neat trick! */ /* Blast. No effect unless you've got dynamite, which is a neat trick! */

20
actions2.c
View file

@ -253,7 +253,7 @@ L9176: SPK=164;
/* But throwing food is another story. */ /* But throwing food is another story. */
L9177: obj=BEAR; L9177: obj=BEAR;
return(feed()); return(feed(obj));
L9178: SPK=159; L9178: SPK=159;
/* Snarf a treasure for the troll. */ /* 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 /* Feed. If bird, no seed. Snake, dragon, troll: quip. If dwarf, make him
* mad. Bear, special. */ * mad. Bear, special. */
int feed() { int feed(long obj) {
if(OBJ != BIRD) goto L9212; if(obj != BIRD) goto L9212;
SPK=100; SPK=100;
return(2011); return(2011);
L9212: if(OBJ != SNAKE && OBJ != DRAGON && OBJ != TROLL) goto L9213; L9212: if(obj != SNAKE && obj != DRAGON && obj != TROLL) goto L9213;
SPK=102; SPK=102;
if(OBJ == DRAGON && game.prop[DRAGON] != 0)SPK=110; if(obj == DRAGON && game.prop[DRAGON] != 0)SPK=110;
if(OBJ == TROLL)SPK=182; if(obj == TROLL)SPK=182;
if(OBJ != SNAKE || game.closed || !HERE(BIRD)) return(2011); if(obj != SNAKE || game.closed || !HERE(BIRD)) return(2011);
SPK=101; SPK=101;
DSTROY(BIRD); DSTROY(BIRD);
game.prop[BIRD]=0; game.prop[BIRD]=0;
return(2011); return(2011);
L9213: if(OBJ != DWARF) goto L9214; L9213: if(obj != DWARF) goto L9214;
if(!HERE(FOOD)) return(2011); if(!HERE(FOOD)) return(2011);
SPK=103; SPK=103;
game.dflag=game.dflag+2; game.dflag=game.dflag+2;
return(2011); 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] == 0)SPK=102;
if(game.prop[BEAR] == 3)SPK=110; if(game.prop[BEAR] == 3)SPK=110;
if(!HERE(FOOD)) return(2011); if(!HERE(FOOD)) return(2011);
@ -301,7 +301,7 @@ L9214: if(OBJ != BEAR) goto L9215;
SPK=168; SPK=168;
return(2011); return(2011);
L9215: if(OBJ != OGRE) goto L9216; L9215: if(obj != OGRE) goto L9216;
if(HERE(FOOD))SPK=202; if(HERE(FOOD))SPK=202;
return(2011); return(2011);

2
funcs.h
View file

@ -38,7 +38,7 @@
#define OUTSID(LOC) ((LOC) <= 8 || FOREST(LOC) || (LOC) == PLAC[SAPPH] || (LOC) == 180 || (LOC) == 182) #define OUTSID(LOC) ((LOC) <= 8 || FOREST(LOC) || (LOC) == PLAC[SAPPH] || (LOC) == 180 || (LOC) == 182)
#define INDEEP(LOC) ((LOC) >= 15 && !OUTSID(LOC) && (LOC) != 179) #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); void score(long);