merge NetHack-3.6.2 part 2

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)

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
 }