From 453a2a041d4be3d1dc82c41020657e8d7f90d91a Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Fri, 22 Feb 2019 08:53:18 -0500
Subject: [PATCH] merge NetHack-3.6.2 part 2

---
 src/dothrow.c | 2 +-
 src/mklev.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/dothrow.c b/src/dothrow.c
index f069dfcc4..43c1fc8a3 100644
--- a/src/dothrow.c
+++ b/src/dothrow.c
@@ -383,7 +383,7 @@ dofire()
            fill quiver with it if it's not wielded */
         if (!obj) {
             /* direction of previous throw is not suitable answer here */
-            in_doagain = FALSE;
+            g.in_doagain = FALSE;
             obj = getobj(uslinging() ? bullets : toss_objs, "throw");
             /* Q command doesn't allow gold in quiver */
             if (obj && !obj->owornmask && obj->oclass != COIN_CLASS)
diff --git a/src/mklev.c b/src/mklev.c
index 646380820..60b6b4e06 100644
--- a/src/mklev.c
+++ b/src/mklev.c
@@ -101,7 +101,7 @@ sort_rooms()
 #else
 #define CAST_nroom g.nroom /*as-is*/
 #endif
-    qsort((genericptr_t) rooms, CAST_nroom, sizeof (struct mkroom), do_comp);
+    qsort((genericptr_t) g.rooms, CAST_nroom, sizeof (struct mkroom), do_comp);
 #undef CAST_nroom
 }