merge NetHack-3.6.2 part 2

This commit is contained in:
nhmall
2019-02-22 08:53:18 -05:00
parent b92df3f2cb
commit 453a2a041d
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -383,7 +383,7 @@ dofire()
fill quiver with it if it's not wielded */ fill quiver with it if it's not wielded */
if (!obj) { if (!obj) {
/* direction of previous throw is not suitable answer here */ /* direction of previous throw is not suitable answer here */
in_doagain = FALSE; g.in_doagain = FALSE;
obj = getobj(uslinging() ? bullets : toss_objs, "throw"); obj = getobj(uslinging() ? bullets : toss_objs, "throw");
/* Q command doesn't allow gold in quiver */ /* Q command doesn't allow gold in quiver */
if (obj && !obj->owornmask && obj->oclass != COIN_CLASS) if (obj && !obj->owornmask && obj->oclass != COIN_CLASS)
+1 -1
View File
@@ -101,7 +101,7 @@ sort_rooms()
#else #else
#define CAST_nroom g.nroom /*as-is*/ #define CAST_nroom g.nroom /*as-is*/
#endif #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 #undef CAST_nroom
} }