Magic-number elimination.

[open-adventure.git] / actions.c

diff --git a/actions.c b/actions.c
index 4c2716e68114b241de9848d5e2e4bd48cf4ee3d1..b1c1ce5c76603f8ead7f188770a5cf8cd912d0fc 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -112,19 +112,22 @@ static int attack(struct command_t *command)
         }
         state_change(DRAGON, DRAGON_DEAD);
         game.prop[RUG] = RUG_FLOOR;
-        /* FIXME: Arithmetic on location values */
-        int k = (objects[DRAGON].plac + objects[DRAGON].fixd) / 2;
+        /* Hardcoding LOC_SECRET5 as the dragon's death location is ugly.
+        * The way it was computed before was wirse; it depended on the
+        * two dragon locations being LOC_SECRET4 and LOC_SECRET6 and 
+        * LOC_SECRET5 being right between them.
+        */
         move(DRAGON + NOBJECTS, -1);
         move(RUG + NOBJECTS, 0);
-        move(DRAGON, k);
-        move(RUG, k);
-        drop(BLOOD, k);
+        move(DRAGON, LOC_SECRET5);
+        move(RUG, LOC_SECRET5);
+        drop(BLOOD, LOC_SECRET5);
         for (obj = 1; obj <= NOBJECTS; obj++) {
             if (game.place[obj] == objects[DRAGON].plac ||
                 game.place[obj] == objects[DRAGON].fixd)
-                move(obj, k);
+                move(obj, LOC_SECRET5);
         }
-        game.loc = k;
+        game.loc = LOC_SECRET5;
         return GO_MOVE;
     }
 
@@ -475,7 +478,6 @@ static int discard(token_t verb, token_t obj, bool just_do_it)
                     spk = RUG_SETTLES;
                 rspeak(spk);
                 if (spk != RUG_WIGGLES) {
-                    /* FIXME: Arithmetic on state numbers */
                     int k = (game.prop[RUG] == RUG_HOVER) ? RUG_FLOOR : RUG_HOVER;
                     game.prop[RUG] = k;
                     if (k == RUG_HOVER)
@@ -813,12 +815,12 @@ static int fly(token_t verb, token_t obj)
     }
     game.oldlc2 = game.oldloc;
     game.oldloc = game.loc;
-    /* FIXME: Arithmetic on location values */
-    game.newloc = game.place[RUG] + game.fixed[RUG] - game.loc;
 
     if (game.prop[SAPPH] == STATE_NOTFOUND) {
+       game.newloc = game.place[SAPPH];
         rspeak(RUG_GOES);
     } else {
+       game.newloc = LOC_CLIFF;
         rspeak(RUG_RETURNS);
     }
     return GO_TERMINATE;
@@ -1073,8 +1075,7 @@ static int read(struct command_t command)
 static int reservoir(void)
 /*  Z'ZZZ (word gets recomputed at startup; different each game). */
 {
-    /* FIXME: Arithmetic on state numbers */
-    if (!AT(RESER) && game.loc != game.fixed[RESER] - 1) {
+    if (!AT(RESER) && game.loc != LOC_RESBOTTOM) {
         rspeak(NOTHING_HAPPENS);
         return GO_CLEAROBJ;
     } else {