new prayer prompt (yes, renew, cancel) for 0.3

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.3@2558 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 11 insertions, 1 deletions

diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index fa9de1bd8b..7dbf06baa1 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -803,12 +803,22 @@ void pray()
     const bool was_praying = you.duration[DUR_PRAYER];
     if (you.duration[DUR_PRAYER])
     {
-        if ( yesno("Do you want to stop praying?", true, 'y') )
+        mpr("Stop praying? ('y' ends prayer, 'r' will renew prayer)", MSGCH_PROMPT);
+
+        int tmp = get_ch();
+
+        if ( tmp == 'y' || tmp == 'Y')
         {
              mpr( "Your prayer is over.", MSGCH_PRAY, you.religion );
              you.duration[DUR_PRAYER] = 0;
              return;
         }
+
+        if ( tmp != 'r' && tmp != 'R')
+        {
+            mesclr();
+            return;
+        }
     }
 
     const god_type altar_god = grid_altar_god(grd[you.x_pos][you.y_pos]);