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

Begin localizing OBJ.

Browse source
This commit is contained in:
Eric S. Raymond 2017-06-07 08:29:30 -04:00
parent 4fe6286cc6
commit a5cef5208f
3 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
actions1.c
View file

@ -308,7 +308,7 @@ L9094: DROP(JADE,game.loc);
/* Attack also moved into separate module. */ /* Attack also moved into separate module. */
L9120: return(attack(input)); L9120: return(attack(input, OBJ));
/* Pour. If no object, or object is bottle, assume contents of bottle. /* Pour. If no object, or object is bottle, assume contents of bottle.
* special tests for pouring water or oil on plant or rusty door. */ * special tests for pouring water or oil on plant or rusty door. */

62
actions2.c
View file

@ -129,52 +129,52 @@ L9028: game.prop[VASE]=2;
* objects fall into two categories: enemies (snake, dwarf, etc.) and 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. */ * (bird, clam, machine). Ambiguous if 2 enemies, or no enemies but 2 others. */
int attack(FILE *input) { int attack(FILE *input, long obj) {
I=ATDWRF(game.loc); I=ATDWRF(game.loc);
if(OBJ != 0) goto L9124; if(obj != 0) goto L9124;
if(I > 0)OBJ=DWARF; if(I > 0)obj=DWARF;
if(HERE(SNAKE))OBJ=OBJ*NOBJECTS+SNAKE; if(HERE(SNAKE))obj=obj*NOBJECTS+SNAKE;
if(AT(DRAGON) && game.prop[DRAGON] == 0)OBJ=OBJ*NOBJECTS+DRAGON; if(AT(DRAGON) && game.prop[DRAGON] == 0)obj=obj*NOBJECTS+DRAGON;
if(AT(TROLL))OBJ=OBJ*NOBJECTS+TROLL; if(AT(TROLL))obj=obj*NOBJECTS+TROLL;
if(AT(OGRE))OBJ=OBJ*NOBJECTS+OGRE; if(AT(OGRE))obj=obj*NOBJECTS+OGRE;
if(HERE(BEAR) && game.prop[BEAR] == 0)OBJ=OBJ*NOBJECTS+BEAR; if(HERE(BEAR) && game.prop[BEAR] == 0)obj=obj*NOBJECTS+BEAR;
if(OBJ > NOBJECTS) return(8000); if(obj > NOBJECTS) return(8000);
if(OBJ != 0) goto L9124; if(obj != 0) goto L9124;
/* CAN'T ATTACK BIRD OR MACHINE BY THROWING AXE. */ /* CAN'T ATTACK BIRD OR MACHINE BY THROWING AXE. */
if(HERE(BIRD) && VERB != THROW)OBJ=BIRD; if(HERE(BIRD) && VERB != THROW)obj=BIRD;
if(HERE(VEND) && VERB != THROW)OBJ=OBJ*NOBJECTS+VEND; if(HERE(VEND) && VERB != THROW)obj=obj*NOBJECTS+VEND;
/* CLAM AND OYSTER BOTH TREATED AS CLAM FOR INTRANSITIVE CASE; NO HARM DONE. */ /* CLAM AND OYSTER BOTH TREATED AS CLAM FOR INTRANSITIVE CASE; NO HARM DONE. */
if(HERE(CLAM) || HERE(OYSTER))OBJ=NOBJECTS*OBJ+CLAM; if(HERE(CLAM) || HERE(OYSTER))obj=NOBJECTS*obj+CLAM;
if(OBJ > NOBJECTS) return(8000); if(obj > NOBJECTS) return(8000);
L9124: if(OBJ == BIRD) { L9124: if(obj == BIRD) {
SPK=137; SPK=137;
if(game.closed) return(2011); if(game.closed) return(2011);
DSTROY(BIRD); DSTROY(BIRD);
game.prop[BIRD]=0; game.prop[BIRD]=0;
SPK=45; SPK=45;
} }
L9125: if(OBJ != VEND) goto L9126; L9125: if(obj != VEND) goto L9126;
PSPEAK(VEND,game.prop[VEND]+2); PSPEAK(VEND,game.prop[VEND]+2);
game.prop[VEND]=3-game.prop[VEND]; game.prop[VEND]=3-game.prop[VEND];
return(2012); return(2012);
L9126: if(OBJ == 0)SPK=44; L9126: if(obj == 0)SPK=44;
if(OBJ == CLAM || OBJ == OYSTER)SPK=150; if(obj == CLAM || obj == OYSTER)SPK=150;
if(OBJ == SNAKE)SPK=46; if(obj == SNAKE)SPK=46;
if(OBJ == DWARF)SPK=49; if(obj == DWARF)SPK=49;
if(OBJ == DWARF && game.closed) return(19000); if(obj == DWARF && game.closed) return(19000);
if(OBJ == DRAGON)SPK=167; if(obj == DRAGON)SPK=167;
if(OBJ == TROLL)SPK=157; if(obj == TROLL)SPK=157;
if(OBJ == OGRE)SPK=203; if(obj == OGRE)SPK=203;
if(OBJ == OGRE && I > 0) goto L9128; if(obj == OGRE && I > 0) goto L9128;
if(OBJ == BEAR)SPK=165+(game.prop[BEAR]+1)/2; if(obj == BEAR)SPK=165+(game.prop[BEAR]+1)/2;
if(OBJ != DRAGON || game.prop[DRAGON] != 0) return(2011); if(obj != DRAGON || game.prop[DRAGON] != 0) return(2011);
/* Fun stuff for dragon. If he insists on attacking it, win! Set game.prop to dead, /* Fun stuff for dragon. If he insists on attacking it, win! Set game.prop to dead,
* move dragon to central loc (still fixed), move rug there (not fixed), and * 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. */ * move him there, too. Then do a null motion to get new description. */
RSPEAK(49); RSPEAK(49);
VERB=0; VERB=0;
OBJ=0; obj=0;
GETIN(input,WD1,WD1X,WD2,WD2X); GETIN(input,WD1,WD1X,WD2,WD2X);
if(WD1 != MAKEWD(25) && WD1 != MAKEWD(250519)) return(2607); if(WD1 != MAKEWD(25) && WD1 != MAKEWD(250519)) return(2607);
PSPEAK(DRAGON,3); PSPEAK(DRAGON,3);
@ -186,8 +186,8 @@ L9126: if(OBJ == 0)SPK=44;
MOVE(DRAGON,K); MOVE(DRAGON,K);
MOVE(RUG,K); MOVE(RUG,K);
DROP(BLOOD,K); DROP(BLOOD,K);
for (OBJ=1; OBJ<=NOBJECTS; OBJ++) { for (obj=1; obj<=NOBJECTS; obj++) {
if(game.place[OBJ] == PLAC[DRAGON] || game.place[OBJ] == FIXD[DRAGON])MOVE(OBJ,K); if(game.place[obj] == PLAC[DRAGON] || game.place[obj] == FIXD[DRAGON])MOVE(obj,K);
/*etc*/ ; /*etc*/ ;
} /* end loop */ } /* end loop */
game.loc=K; game.loc=K;
@ -229,7 +229,7 @@ int throw(FILE *cmdin) {
if(AT(OGRE)) goto L9175; if(AT(OGRE)) goto L9175;
if(HERE(BEAR) && game.prop[BEAR] == 0) goto L9176; if(HERE(BEAR) && game.prop[BEAR] == 0) goto L9176;
OBJ=0; OBJ=0;
return(attack(cmdin)); return(attack(cmdin, OBJ));
L9172: SPK=48; L9172: SPK=48;
if(randrange(NDWARVES+1) < game.dflag) goto L9175; if(randrange(NDWARVES+1) < game.dflag) goto L9175;

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 *), throw(FILE *), feed(void), fill(void); extern int carry(void), discard(bool), attack(FILE *, long), throw(FILE *), feed(void), fill(void);
void score(long); void score(long);