projects / open-adventure.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Yet more OBJ localization.
[open-adventure.git] / actions2.c
diff --git a/actions2.c b/actions2.c
index 3de30be2374832e54612cc7fd4a9aed4ef42ed19..64695e07c74c01bc27fb0c7ab8f6acec1356c89a 100644 (file)
--- a/actions2.c
+++ b/actions2.c
@@ -37,8 +37,8 @@ L9017:        SPK=92;
        if(SPK/2 == 13) return(2011);
        game.prop[BIRD]=1;
 L9014: if((OBJ == BIRD || OBJ == CAGE) && (game.prop[BIRD] == 1 || -1-game.prop[BIRD] ==
-               1))CARRY(BIRD+CAGE-OBJ,LOC);
-       CARRY(OBJ,LOC);
+               1))CARRY(BIRD+CAGE-OBJ,game.loc);
+       CARRY(OBJ,game.loc);
        K=LIQ(0);
        if(OBJ == BOTTLE && K != 0)game.place[K]= -1;
        if(!GSTONE(OBJ) || game.prop[OBJ] == 0) return(2009);
@@ -68,11 +68,11 @@ int discard(bool just_do_it) {
 L9021: K=LIQ(0);
        if(K == OBJ)OBJ=BOTTLE;
        if(OBJ == BOTTLE && K != 0)game.place[K]=0;
-       if(OBJ == CAGE && game.prop[BIRD] == 1)DROP(BIRD,LOC);
-       DROP(OBJ,LOC);
+       if(OBJ == CAGE && game.prop[BIRD] == 1)DROP(BIRD,game.loc);
+       DROP(OBJ,game.loc);
        if(OBJ != BIRD) return(2012);
        game.prop[BIRD]=0;
-       if(FOREST(LOC))game.prop[BIRD]=2;
+       if(FOREST(game.loc))game.prop[BIRD]=2;
         return(2012);
 
 L9023: if(!(GSTONE(OBJ) && AT(CAVITY) && game.prop[CAVITY] != 0)) goto L9024;
@@ -94,7 +94,7 @@ L9023:        if(!(GSTONE(OBJ) && AT(CAVITY) && game.prop[CAVITY] != 0)) goto L9024;
 
 L9024: if(OBJ != COINS || !HERE(VEND)) goto L9025;
        DSTROY(COINS);
-       DROP(BATTER,LOC);
+       DROP(BATTER,game.loc);
        PSPEAK(BATTER,0);
         return(2012);
 
@@ -114,7 +114,7 @@ L9026:      if(OBJ != BEAR || !AT(TROLL)) goto L9027;
        game.prop[TROLL]=2;
         goto L9021;
 
-L9027: if(OBJ == VASE && LOC != PLAC[PILLOW]) goto L9028;
+L9027: if(OBJ == VASE && game.loc != PLAC[PILLOW]) goto L9028;
        RSPEAK(54);
         goto L9021;
 
@@ -129,52 +129,52 @@ L9028:    game.prop[VASE]=2;
  *  objects fall into two categories: enemies (snake, dwarf, etc.)  and others
  *  (bird, clam, machine).  Ambiguous if 2 enemies, or no enemies but 2 others. */
 
-int attack(FILE *input) {
-       I=ATDWRF(LOC);
-       if(OBJ != 0) goto L9124;
-       if(I > 0)OBJ=DWARF;
-       if(HERE(SNAKE))OBJ=OBJ*NOBJECTS+SNAKE;
-       if(AT(DRAGON) && game.prop[DRAGON] == 0)OBJ=OBJ*NOBJECTS+DRAGON;
-       if(AT(TROLL))OBJ=OBJ*NOBJECTS+TROLL;
-       if(AT(OGRE))OBJ=OBJ*NOBJECTS+OGRE;
-       if(HERE(BEAR) && game.prop[BEAR] == 0)OBJ=OBJ*NOBJECTS+BEAR;
-       if(OBJ > NOBJECTS) return(8000);
-       if(OBJ != 0) goto L9124;
+int attack(FILE *input, long obj) {
+       I=ATDWRF(game.loc);
+       if(obj != 0) goto L9124;
+       if(I > 0)obj=DWARF;
+       if(HERE(SNAKE))obj=obj*NOBJECTS+SNAKE;
+       if(AT(DRAGON) && game.prop[DRAGON] == 0)obj=obj*NOBJECTS+DRAGON;
+       if(AT(TROLL))obj=obj*NOBJECTS+TROLL;
+       if(AT(OGRE))obj=obj*NOBJECTS+OGRE;
+       if(HERE(BEAR) && game.prop[BEAR] == 0)obj=obj*NOBJECTS+BEAR;
+       if(obj > NOBJECTS) return(8000);
+       if(obj != 0) goto L9124;
 /*  CAN'T ATTACK BIRD OR MACHINE BY THROWING AXE. */
-       if(HERE(BIRD) && VERB != THROW)OBJ=BIRD;
-       if(HERE(VEND) && VERB != THROW)OBJ=OBJ*NOBJECTS+VEND;
+       if(HERE(BIRD) && VERB != THROW)obj=BIRD;
+       if(HERE(VEND) && VERB != THROW)obj=obj*NOBJECTS+VEND;
 /*  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);
-L9124: if(OBJ == BIRD) {
+       if(HERE(CLAM) || HERE(OYSTER))obj=NOBJECTS*obj+CLAM;
+       if(obj > NOBJECTS) return(8000);
+L9124: if(obj == BIRD) {
                SPK=137;
                if(game.closed) return(2011);
                DSTROY(BIRD);
                game.prop[BIRD]=0;
                SPK=45;
        }
-L9125: if(OBJ != VEND) goto L9126;
+L9125: if(obj != VEND) goto L9126;
        PSPEAK(VEND,game.prop[VEND]+2);
        game.prop[VEND]=3-game.prop[VEND];
         return(2012);
 
-L9126: if(OBJ == 0)SPK=44;
-       if(OBJ == CLAM || OBJ == OYSTER)SPK=150;
-       if(OBJ == SNAKE)SPK=46;
-       if(OBJ == DWARF)SPK=49;
-       if(OBJ == DWARF && game.closed) return(19000);
-       if(OBJ == DRAGON)SPK=167;
-       if(OBJ == TROLL)SPK=157;
-       if(OBJ == OGRE)SPK=203;
-       if(OBJ == OGRE && I > 0) goto L9128;
-       if(OBJ == BEAR)SPK=165+(game.prop[BEAR]+1)/2;
-       if(OBJ != DRAGON || game.prop[DRAGON] != 0) return(2011);
+L9126: if(obj == 0)SPK=44;
+       if(obj == CLAM || obj == OYSTER)SPK=150;
+       if(obj == SNAKE)SPK=46;
+       if(obj == DWARF)SPK=49;
+       if(obj == DWARF && game.closed) return(19000);
+       if(obj == DRAGON)SPK=167;
+       if(obj == TROLL)SPK=157;
+       if(obj == OGRE)SPK=203;
+       if(obj == OGRE && I > 0) goto L9128;
+       if(obj == BEAR)SPK=165+(game.prop[BEAR]+1)/2;
+       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,
  *  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);
        VERB=0;
-       OBJ=0;
+       obj=0;
        GETIN(input,WD1,WD1X,WD2,WD2X);
        if(WD1 != MAKEWD(25) && WD1 != MAKEWD(250519)) return(2607);
        PSPEAK(DRAGON,3);
@@ -186,11 +186,11 @@ L9126:    if(OBJ == 0)SPK=44;
        MOVE(DRAGON,K);
        MOVE(RUG,K);
        DROP(BLOOD,K);
-       for (OBJ=1; OBJ<=NOBJECTS; OBJ++) {
-       if(game.place[OBJ] == PLAC[DRAGON] || game.place[OBJ] == FIXD[DRAGON])MOVE(OBJ,K);
+       for (obj=1; obj<=NOBJECTS; obj++) {
+       if(game.place[obj] == PLAC[DRAGON] || game.place[obj] == FIXD[DRAGON])MOVE(obj,K);
        /*etc*/ ;
        } /* end loop */
-       LOC=K;
+       game.loc=K;
        K=NUL;
         return(8);
 
@@ -199,7 +199,7 @@ L9128:      RSPEAK(SPK);
        DSTROY(OGRE);
        K=0;
        for (I=1; I < PIRATE; I++) {
-               if(game.dloc[I] == LOC) {
+               if(game.dloc[I] == game.loc) {
                        K=K+1;
                        game.dloc[I]=61;
                        game.dseen[I]=false;
@@ -213,13 +213,13 @@ 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));
-       I=ATDWRF(LOC);
+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;
        if(AT(DRAGON) && game.prop[DRAGON] == 0) goto L9175;
@@ -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=0;
+       return(attack(cmdin, obj));
 
 L9172: SPK=48;
        if(randrange(NDWARVES+1) < game.dflag) goto L9175;
@@ -239,25 +239,25 @@ L9172:    SPK=48;
        game.dkill=game.dkill+1;
        if(game.dkill == 1)SPK=149;
 L9175: RSPEAK(SPK);
-       DROP(AXE,LOC);
+       DROP(AXE,game.loc);
        K=NUL;
         return(8);
 
 /*  This'll teach him to throw the axe at the bear! */
 L9176: SPK=164;
-       DROP(AXE,LOC);
+       DROP(AXE,game.loc);
        game.fixed[AXE]= -1;
        game.prop[AXE]=1;
        JUGGLE(BEAR);
         return(2011);
 
 /*  But throwing food is another story. */
-L9177: OBJ=BEAR;
-       return(feed());
+L9177: obj=BEAR;
+       return(feed(obj));
 
 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]);
@@ -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);
 
@@ -317,19 +317,19 @@ int fill() {
        if(OBJ != 0 && OBJ != BOTTLE) return(2011);
        if(OBJ == 0 && !HERE(BOTTLE)) return(8000);
        SPK=107;
-       if(LIQLOC(LOC) == 0)SPK=106;
+       if(LIQLOC(game.loc) == 0)SPK=106;
        if(HERE(URN) && game.prop[URN] != 0)SPK=214;
        if(LIQ(0) != 0)SPK=105;
        if(SPK != 107) return(2011);
-       game.prop[BOTTLE]=MOD(COND[LOC],4)/2*2;
+       game.prop[BOTTLE]=MOD(COND[game.loc],4)/2*2;
        K=LIQ(0);
        if(TOTING(BOTTLE))game.place[K]= -1;
        if(K == OIL)SPK=108;
         return(2011);
 
 L9222: SPK=29;
-       if(LIQLOC(LOC) == 0)SPK=144;
-       if(LIQLOC(LOC) == 0 || !TOTING(VASE)) return(2011);
+       if(LIQLOC(game.loc) == 0)SPK=144;
+       if(LIQLOC(game.loc) == 0 || !TOTING(VASE)) return(2011);
        RSPEAK(145);
        game.prop[VASE]=2;
        game.fixed[VASE]= -1;
This code is a forward-port of the Crowther/Woods Adventure 2.5 from 1995, last version in the main line of Colossal Cave Adventure development written by the original authors. The authors have given permission and encouragement to this release.