Merge remote-tracking branch 'origin/NetHack-3.6.0'

doc/fixes36.1

@@ -355,6 +355,7 @@ wielding Trollsbane prevents trolls from reviving
 wielding Demonbane prevents demons summoning friends
 Elbereth must now be on a square by itself to function
 Elbereth now erodes based on attacks by the player, not monsters scared
+novels are made of paper, not gold
 
 
 Fixes to Post-3.6.0 Problems that Were Exposed Via git Repository

src/dothrow.c

@@ -985,11 +985,11 @@ sho_obj_return_to_u(obj)
 struct obj *obj;
 {
     /* might already be our location (bounced off a wall) */
-    if (bhitpos.x != u.ux || bhitpos.y != u.uy) {
+    if ((u.dx || u.dy) && (bhitpos.x != u.ux || bhitpos.y != u.uy)) {
         int x = bhitpos.x - u.dx, y = bhitpos.y - u.dy;
 
         tmp_at(DISP_FLASH, obj_to_glyph(obj));
-        while (x != u.ux || y != u.uy) {
+        while (isok(x,y) && (x != u.ux || y != u.uy)) {
             tmp_at(x, y);
             delay_output();
             x -= u.dx;

src/objects.c

@@ -984,7 +984,7 @@ SPELL("freeze sphere",   "hardcover",
 SPELL("blank paper", "plain", P_NONE, 18, 0, 0, 0, 0, HI_PAPER),
 /* tribute book for 3.6 */
 OBJECT(OBJ("novel", "paperback"),
-       BITS(0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, P_NONE, HI_PAPER),
+       BITS(0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, P_NONE, PAPER),
        0, SPBOOK_CLASS, 0, 0, 0, 20, 0, 0, 0, 1, 20, CLR_BRIGHT_BLUE),
 /* a special, one of a kind, spellbook */
 OBJECT(OBJ("Book of the Dead", "papyrus"),