Use symbolic shortnames for locations.

[open-adventure.git] / actions.c

diff --git a/actions.c b/actions.c
index a69dbc5d1685fa6860f461021c8c6f18656af265..9cd6e0df4547afc21048ea9eac4a93d14ad712e4 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -21,9 +21,9 @@ static int attack(FILE *input, long verb, token_t obj)
  *  enemies, or no enemies but 2 others. */
 {
     int spk = ACTSPK[verb];
-    int i = ATDWRF(game.loc);
+    int d = ATDWRF(game.loc);
     if (obj == 0) {
-       if (i > 0)
+       if (d > 0)
            obj=DWARF;
        if (HERE(SNAKE))obj=obj*NOBJECTS+SNAKE;
        if (AT(DRAGON) && game.prop[DRAGON] == 0)obj=obj*NOBJECTS+DRAGON;
@@ -66,15 +66,15 @@ static int attack(FILE *input, long verb, token_t obj)
     if (obj == DRAGON)spk=ALREADY_DEAD;
     if (obj == TROLL)spk=ROCKY_TROLL;
     if (obj == OGRE)spk=OGRE_DOFGE;
-    if (obj == OGRE && i > 0) {
+    if (obj == OGRE && d > 0) {
        RSPEAK(spk);
        RSPEAK(KNIFE_THROWN);
        DSTROY(OGRE);
        int k=0;
-       for (i=1; i < PIRATE; i++) {
+       for (int i=1; i < PIRATE; i++) {
            if (game.dloc[i] == game.loc) {
                ++k;
-               game.dloc[i] = LOC_61;
+               game.dloc[i] = LOC_LONGWEST;
                game.dseen[i]=false;
            }
        }
@@ -158,7 +158,7 @@ static int bivalve(token_t verb, token_t obj)
     if (spk == PEARL_FALLS) {
        DSTROY(CLAM);
        DROP(OYSTER,game.loc);
-       DROP(PEARL,LOC_105);
+       DROP(PEARL,LOC_CULDESAC);
     }
     RSPEAK(spk);
     return GO_CLEAROBJ;
@@ -173,7 +173,7 @@ static int blast(void)
        return GO_CLEAROBJ;
     }
     game.bonus=133;
-    if (game.loc == LOC_115)
+    if (game.loc == LOC_NE)
        game.bonus=134;
     if (HERE(ROD2))
        game.bonus=135;
@@ -604,13 +604,12 @@ static int fly(token_t verb, token_t obj)
     RSPEAK(spk);
     return GO_TERMINATE;
 }
-    
+
 static int inven(token_t obj)
 /* Inventory. If object, treat same as find.  Else report on current burden. */
 {
-    int i;
     int spk=NO_CARRY;
-    for (i=1; i<=NOBJECTS; i++) {
+    for (int i=1; i<=NOBJECTS; i++) {
        if (i == BEAR || !TOTING(i))
            continue;
        if (spk == NO_CARRY)
@@ -661,13 +660,13 @@ int light(token_t verb, token_t obj)
            return GO_TOP;
        else
            return GO_CLEAROBJ;
-    }   
+    }
 }
 
 static int listen(void)
 /*  Listen.  Intransitive only.  Print stuff based on objsnd/locsnd. */
 {
-    int i, k;
+    int k;
     int spk=ALL_SILENT;
     k=LOCSND[game.loc];
     if (k != 0) {
@@ -676,7 +675,7 @@ static int listen(void)
        spk=ARB_0;
     }
     SETPRM(1,game.zzword,0);
-    for (i=1; i<=NOBJECTS; i++) {
+    for (int i=1; i<=NOBJECTS; i++) {
        if (!HERE(i) || OBJSND[i] == 0 || game.prop[i] < 0)
            continue;
        PSPEAK(i,OBJSND[i]+game.prop[i]);
@@ -1004,10 +1003,10 @@ int action(FILE *input, enum speechpart part, long verb, token_t obj)
        if (HERE(obj))
            /* FALL THROUGH */;
        else if (obj == GRATE) {
-           if (game.loc == LOC_1 || game.loc == LOC_4 || game.loc == LOC_7)
+           if (game.loc == LOC_START || game.loc == LOC_VALLEY || game.loc == LOC_SLIT)
                obj=DPRSSN;
            /* FIXME: Arithmetic on location numbers */
-           if (game.loc > LOC_9 && game.loc < LOC_15)
+           if (game.loc > LOC_BELOWGRATE && game.loc < LOC_MISTHALL)
                obj=ENTRNC;
            if (obj != GRATE)
                return GO_MOVE;