From: Jason S. Ninneman <jsn@mbar.us>
Date: Mon, 19 Jun 2017 02:54:48 +0000 (-0700)
Subject: Remove  message pointer math in croak().
X-Git-Tag: 1.1~232
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=fecc48e6e5244c3c4fde59fdc54a48ca84b2cc27;p=open-adventure.git

Remove  message pointer math in croak().
---

diff --git a/main.c b/main.c
index dd9d5c1..7e30f4e 100644
--- a/main.c
+++ b/main.c
@@ -490,6 +490,8 @@ static bool dwarfmove(void)
 static void croak(void)
 /*  Okay, he's dead.  Let's get on with it. */
 {
+    const char* query = obituaries[game.numdie].query;
+    const char* yes_response = obituaries[game.numdie].yes_response;
     ++game.numdie;
     if (game.closng) {
         /*  He died during closing time.  No resurrection.  Tally up a
@@ -497,8 +499,7 @@ static void croak(void)
         RSPEAK(DEATH_CLOSING);
         terminate(endgame);
     }
-    /* FIXME: Arithmetic on message numbers */
-    else if (game.numdie == MAXDIE || !YES(arbitrary_messages[WATCH_IT + game.numdie * 2], arbitrary_messages[WHICH_WAY + game.numdie * 2], arbitrary_messages[OK_MAN]))
+    else if (game.numdie == maximum_deaths || !YES(query, yes_response, arbitrary_messages[OK_MAN]))
         terminate(endgame);
     else {
         game.place[WATER] = game.place[OIL] = NOWHERE;