fiddlerwoaroof/crawl - Change DELYWRJYVTRDE5XWQ2L2IRJPO4N2F3JVLPLCTGOU7QS5JO75NOPAC

Removed option to cancel prayer when already praying. With some gods

praying is a tactical decision; it shouldn't be cancelable at will.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2937 c06c8d41-db1a-0410-9941-cceddc491573

Created by haranp on November 29, 2007

DELYWRJYVTRDE5XWQ2L2IRJPO4N2F3JVLPLCTGOU7QS5JO75NOPAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/religion.cc at line 976 [4.804403]

B:BD[3.229] → [3.229:250]

∅:D[3.250] → [5.239:245]

B:BD[5.239] → [5.239:245]

B:BD[5.245] → [3.251:348]

∅:D[3.348] → [6.257:258]

B:BD[6.257] → [6.257:258]

B:BD[6.258] → [2.172:216]

∅:D[2.216] → [6.286:326]

∅:D[7.245] → [6.286:326]

∅:D[3.382] → [6.286:326]

B:BD[6.286] → [6.286:326]

∅:D[6.326] → [5.309:453]

B:BD[5.309] → [5.309:453]

B:BD[5.453] → [6.327:387]

B:BD[6.387] → [3.383:421]

∅:D[3.421] → [6.387:429]

B:BD[6.387] → [6.387:429]

∅:D[6.429] → [5.453:469]

B:BD[5.453] → [5.453:469]

    if (was_praying)
    {
        mpr("Stop praying? ('y' ends prayer, 'r' will renew prayer)",
            MSGCH_PROMPT);
        const int tmp = getchm(KC_CONFIRM);
        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')
        {
            you.turn_is_over = false;
            mesclr();
            return;
        }
    }

Replacement in crawl-ref/source/religion.cc at line 1029 [4.804403]

∅:D[8.1054] → [9.465:540]

B:BD[10.1973] → [9.465:540]

    mprf(MSGCH_PRAY, "You offer a prayer to %s.", god_name(you.religion));

[8.1054]

[10.2117]

    mprf(MSGCH_PRAY, "You %s prayer to %s.",
         was_praying ? "renew your" : "offer a", god_name(you.religion));