From f596870bcb87150b7820ebec985c027aa2a7f6a7 Mon Sep 17 00:00:00 2001
From: Richard Soderberg <rsoderberg@gmail.com>
Date: Tue, 22 Apr 2014 19:37:34 -0700
Subject: [PATCH] god_prayer.cc: check result of move_item_to_grid and return
 correctly from Kiku/Necro path

---
 crawl-ref/source/godprayer.cc | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/crawl-ref/source/godprayer.cc b/crawl-ref/source/godprayer.cc
index 17828f4..898d9ed 100644
--- a/crawl-ref/source/godprayer.cc
+++ b/crawl-ref/source/godprayer.cc
@@ -262,9 +262,7 @@ static bool _altar_prayer()
         if (thing_created == NON_ITEM)
             return false;
 
-        move_item_to_grid(&thing_created, you.pos());
-
-        if (thing_created != NON_ITEM)
+        if (move_item_to_grid(&thing_created, you.pos()) && thing_created != NON_ITEM)
         {
             simple_god_message(" grants you a gift!");
             more();
@@ -273,9 +271,6 @@ static bool _altar_prayer()
             did_something = true;
             take_note(Note(NOTE_GOD_GIFT, you.religion));
         }
-
-        // Return early so we don't offer our Necronomicon to Kiku.
-        return true;
     }
 
     return did_something;
-- 
1.8.5.2 (Apple Git-48)