X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=actions.c;h=b1c1ce5c76603f8ead7f188770a5cf8cd912d0fc;hp=aea451eb7ac9d882304b15600ce59926b5332f88;hb=146abeae1768de83f90c2cbe15e1d9166de10432;hpb=c8cac18f42ab4e5e060d632fcde29c8c74354b53

diff --git a/actions.c b/actions.c
index aea451e..b1c1ce5 100644
--- 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;
     }
 
@@ -173,7 +176,7 @@ static int attack(struct command_t *command)
         rspeak(ROCKY_TROLL);
         break;
     default:
-        rspeak(actions[verb].message);
+        speak(actions[verb].message);
     }
     return GO_CLEAROBJ;
 }
@@ -264,7 +267,7 @@ static int vbreak(token_t verb, token_t obj)
         game.fixed[VASE] = IS_FIXED;
         return GO_CLEAROBJ;
     }
-    rspeak(actions[verb].message);
+    speak(actions[verb].message);
     return (GO_CLEAROBJ);
 }
 
@@ -451,7 +454,7 @@ static int discard(token_t verb, token_t obj, bool just_do_it)
         if (TOTING(ROD2) && obj == ROD && !TOTING(ROD))
             obj = ROD2;
         if (!TOTING(obj)) {
-            rspeak(actions[verb].message);
+            speak(actions[verb].message);
             return GO_CLEAROBJ;
         }
         if (obj == BIRD && HERE(SNAKE)) {
@@ -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)
@@ -552,7 +554,7 @@ static int drink(token_t verb, token_t obj)
         return GO_CLEAROBJ;
     }
 
-    rspeak(actions[verb].message);
+    speak(actions[verb].message);
     return GO_CLEAROBJ;
 }
 
@@ -584,7 +586,7 @@ static int eat(token_t verb, token_t obj)
         rspeak(LOST_APPETITE);
         return GO_CLEAROBJ;
     }
-    rspeak(actions[verb].message);
+    speak(actions[verb].message);
     return GO_CLEAROBJ;
 }
 
@@ -623,7 +625,7 @@ static int extinguish(token_t verb, int obj)
         return GO_CLEAROBJ;
     }
 
-    rspeak(actions[verb].message);
+    speak(actions[verb].message);
     return GO_CLEAROBJ;
 }
 
@@ -656,7 +658,7 @@ static int feed(token_t verb, token_t obj)
             game.dflag += 2;
             rspeak(REALLY_MAD);
         } else
-            rspeak(actions[verb].message);
+            speak(actions[verb].message);
         break;
     case BEAR:
         if (game.prop[BEAR] == BEAR_DEAD) {
@@ -673,13 +675,13 @@ static int feed(token_t verb, token_t obj)
                 rspeak(NOTHING_EDIBLE);
             break;
         }
-        rspeak(actions[verb].message);
+        speak(actions[verb].message);
         break;
     case OGRE:
         if (HERE(FOOD))
             rspeak(OGRE_FULL);
         else
-            rspeak(actions[verb].message);
+            speak(actions[verb].message);
         break;
     default:
         rspeak(AM_GAME);
@@ -735,7 +737,7 @@ int fill(token_t verb, token_t obj)
         return GO_CLEAROBJ;
     }
     if (obj != NO_OBJECT && obj != BOTTLE) {
-        rspeak(actions[verb].message);
+        speak(actions[verb].message);
         return GO_CLEAROBJ;
     }
     if (obj == NO_OBJECT && !HERE(BOTTLE))
@@ -784,7 +786,7 @@ static int find(token_t verb, token_t obj)
     }
 
 
-    rspeak(actions[verb].message);
+    speak(actions[verb].message);
     return GO_CLEAROBJ;
 }
 
@@ -804,7 +806,7 @@ static int fly(token_t verb, token_t obj)
     }
 
     if (obj != RUG) {
-        rspeak(actions[verb].message);
+        speak(actions[verb].message);
         return GO_CLEAROBJ;
     }
     if (game.prop[RUG] != 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;
@@ -866,7 +868,7 @@ static int light(token_t verb, token_t obj)
         return GO_CLEAROBJ;
     } else {
         if (obj != LAMP) {
-            rspeak(actions[verb].message);
+            speak(actions[verb].message);
             return GO_CLEAROBJ;
         }
         if (game.limit < 0) {
@@ -984,7 +986,7 @@ static int lock(token_t verb, token_t obj)
         rspeak(CANNOT_UNLOCK);
         break;
     default:
-        rspeak(actions[verb].message);
+        speak(actions[verb].message);
     }
 
     return GO_CLEAROBJ;
@@ -1000,7 +1002,7 @@ static int pour(token_t verb, token_t obj)
     if (obj == NO_OBJECT)
         return GO_UNKNOWN;
     if (!TOTING(obj)) {
-        rspeak(actions[verb].message);
+        speak(actions[verb].message);
         return GO_CLEAROBJ;
     }
 
@@ -1064,7 +1066,7 @@ static int read(struct command_t command)
         game.clshnt = yes(arbitrary_messages[CLUE_QUERY], arbitrary_messages[WAYOUT_CLUE], arbitrary_messages[OK_MAN]);
     } else if (objects[command.obj].texts[0] == NULL ||
                game.prop[command.obj] < 0) {
-        rspeak(actions[command.verb].message);
+        speak(actions[command.verb].message);
     } else
         pspeak(command.obj, study, game.prop[command.obj], true);
     return GO_CLEAROBJ;
@@ -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 {
@@ -1104,7 +1105,7 @@ static int rub(token_t verb, token_t obj)
     } else if (obj != LAMP) {
         rspeak(PECULIAR_NOTHING);
     } else {
-        rspeak(actions[verb].message);
+        speak(actions[verb].message);
     }
     return GO_CLEAROBJ;
 }
@@ -1150,7 +1151,7 @@ static int throw (struct command_t *command)
  *  troll.  Treasures special for troll. */
 {
     if (!TOTING(command->obj)) {
-        rspeak(actions[command->verb].message);
+        speak(actions[command->verb].message);
         return GO_CLEAROBJ;
     }
     if (objects[command->obj].is_treasure && AT(TROLL)) {
@@ -1209,7 +1210,7 @@ static int wake(token_t verb, token_t obj)
 {
     if (obj != DWARF ||
         !game.closed) {
-        rspeak(actions[verb].message);
+        speak(actions[verb].message);
         return GO_CLEAROBJ;
     } else {
         rspeak(PROD_DWARF);
@@ -1225,9 +1226,9 @@ static int wave(token_t verb, token_t obj)
         (!HERE(BIRD) &&
          (game.closng ||
           !AT(FISSURE)))) {
-        rspeak(((!TOTING(obj)) && (obj != ROD ||
+        speak(((!TOTING(obj)) && (obj != ROD ||
                                    !TOTING(ROD2))) ?
-               ARENT_CARRYING :
+               arbitrary_messages[ARENT_CARRYING] :
                actions[verb].message);
         return GO_CLEAROBJ;
     }
@@ -1356,7 +1357,7 @@ int action(struct command_t *command)
             case  TAME:
                 return GO_UNKNOWN;
             case GO: {
-                rspeak(actions[command->verb].message);
+                speak(actions[command->verb].message);
                 return GO_CLEAROBJ;
             }
             case ATTACK:
@@ -1441,11 +1442,11 @@ int action(struct command_t *command)
         case WAVE:
             return wave(command->verb, command->obj);
         case TAME: {
-            rspeak(actions[command->verb].message);
+            speak(actions[command->verb].message);
             return GO_CLEAROBJ;
         }
         case GO: {
-            rspeak(actions[command->verb].message);
+            speak(actions[command->verb].message);
             return GO_CLEAROBJ;
         }
         case ATTACK:
@@ -1461,7 +1462,7 @@ int action(struct command_t *command)
         case THROW:
             return throw (command);
         case QUIT: {
-            rspeak(actions[command->verb].message);
+            speak(actions[command->verb].message);
             return GO_CLEAROBJ;
         }
         case FIND:
@@ -1476,7 +1477,7 @@ int action(struct command_t *command)
             blast();
             return GO_CLEAROBJ;
         case SCORE: {
-            rspeak(actions[command->verb].message);
+            speak(actions[command->verb].message);
             return GO_CLEAROBJ;
         }
 	case FEE:
@@ -1484,11 +1485,11 @@ int action(struct command_t *command)
 	case FOE:
 	case FOO:
         case FUM: {
-            rspeak(actions[command->verb].message);
+            speak(actions[command->verb].message);
             return GO_CLEAROBJ;
         }
         case BRIEF: {
-            rspeak(actions[command->verb].message);
+            speak(actions[command->verb].message);
             return GO_CLEAROBJ;
         }
         case READ:
@@ -1498,17 +1499,17 @@ int action(struct command_t *command)
         case WAKE:
             return wake(command->verb, command->obj);
         case SAVE: {
-            rspeak(actions[command->verb].message);
+            speak(actions[command->verb].message);
             return GO_CLEAROBJ;
         }
         case RESUME: {
-            rspeak(actions[command->verb].message);
+            speak(actions[command->verb].message);
             return GO_CLEAROBJ;
         }
         case FLY:
             return fly(command->verb, command->obj);
         case LISTEN: {
-            rspeak(actions[command->verb].message);
+            speak(actions[command->verb].message);
             return GO_CLEAROBJ;
         }
         case PART: