From: Eric S. Raymond <esr@thyrsus.com>
Date: Thu, 6 Jul 2017 00:29:50 +0000 (-0400)
Subject: Location arithmetic elimination.
X-Git-Tag: 2017-07-10~58
X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=commitdiff_plain;h=b2a686b07def29a898fee83ab1e3a4a4f2ebd3eb

Location arithmetic elimination.
---

diff --git a/actions.c b/actions.c
index 4c2716e..e7574be 100644
--- a/actions.c
+++ b/actions.c
@@ -813,12 +813,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;