fiddlerwoaroof/crawl - Change XKAJWK6MPHS3ZCZIPPLTIMOPF6AROGLRDDCS6EFE3IGE4AHT7MYQC

[1632207] Dropping items on an altar while praying will offer those items to

$DEITY. If it's a multidrop, only the last item will trigger the altar-offer to avoid spammy messages. Interrupted multidrop will not do the offer, nor will the offer happen if prayer ends before the last item is dropped.

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

Created by dshaligram on January 10, 2007

XKAJWK6MPHS3ZCZIPPLTIMOPF6AROGLRDDCS6EFE3IGE4AHT7MYQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.h at line 36 [4.800304]
[2.76]
[4.804358]
```
void offer_items();
```

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

B:BD[4.807864] → [4.807864:807928]

            && grd[you.x_pos][you.y_pos] == 179 + you.religion)

[4.807864]

[4.807928]

        && grid_altar_god(grd[you.x_pos][you.y_pos]) == you.religion)

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

B:BD[4.807964] → [4.807964:808063]

    else if (grd[you.x_pos][you.y_pos] >= 180
                && grd[you.x_pos][you.y_pos] <= 199)

[4.807964]

[4.808063]

    else if (grid_altar_god(grd[you.x_pos][you.y_pos]) != GOD_NO_GOD)

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

B:BD[4.808219] → [4.808219:808271]

        god_pitch(grd[you.x_pos][you.y_pos] - 179);

[4.808219]

[4.808271]

        god_pitch( grid_altar_god(grd[you.x_pos][you.y_pos]) );

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

B:BD[4.879504] → [4.879504:879716]

    int   i, j, next;
    char  subst_id[4][50];
    char str_pass[ ITEMNAME_SIZE ];
    for (i = 0; i < 4; i++)
    {
        for (j = 0; j < 50; j++)
        {
            subst_id[i][j] = 1;
        }
    }

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

∅:D[3.3747] → [4.879849:879885]

∅:D[5.195889] → [4.879849:879885]

B:BD[4.879849] → [4.879849:879885]

    i = igrd[you.x_pos][you.y_pos];

[3.3747]

[4.879885]

    offer_items();
}                               // end altar_prayer()
void offer_items()
{
    if (you.religion == GOD_NO_GOD)
        return;
    
    char subst_id[4][50];
    memset(subst_id, 1, sizeof subst_id);
    
    int i = igrd[you.x_pos][you.y_pos];

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

B:BD[4.879970] → [4.879970:880034]

        next = mitm[i].link;  // in case we can't get it later.

[4.879970]

[4.880034]

        const int next = mitm[i].link;  // in case we can't get it later.

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

B:BD[4.880247] → [4.880247:880409]

            it_name(i, DESC_CAP_THE, str_pass);
            strcpy(info, str_pass);
            strcat(info, sacrifice[you.religion - 1]);
            mpr(info);

[4.880247]

[4.880409]

            mprf("%s%s", it_name(i, DESC_CAP_THE), sacrifice[you.religion - 1]);

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

B:BD[4.880679] → [4.880679:880841]

            it_name(i, DESC_CAP_THE, str_pass);
            strcpy(info, str_pass);
            strcat(info, sacrifice[you.religion - 1]);
            mpr(info);

[4.880679]

[4.880841]

            mprf("%s%s", it_name(i, DESC_CAP_THE), sacrifice[you.religion - 1]);

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

B:BD[4.881095] → [4.881095:881257]

            it_name(i, DESC_CAP_THE, str_pass);
            strcpy(info, str_pass);
            strcat(info, sacrifice[you.religion - 1]);
            mpr(info);

[4.881095]

[4.881257]

            mprf("%s%s", it_name(i, DESC_CAP_THE), sacrifice[you.religion - 1]);

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

B:BD[4.881516] → [4.881516:881678]

            it_name(i, DESC_CAP_THE, str_pass);
            strcpy(info, str_pass);
            strcat(info, sacrifice[you.religion - 1]);
            mpr(info);

[4.881516]

[4.881678]

            mprf("%s%s", it_name(i, DESC_CAP_THE), sacrifice[you.religion - 1]);

Replacement in crawl-ref/source/religion.cc at line 2451 [4.804403]
B:BD[4.882028] → [4.882028:882082]
```
}                               // end altar_prayer()
```
[4.882028]
[4.882082]
```
}
```

Replacement in crawl-ref/source/items.h at line 129 [4.2580284]

B:BD[4.2584687] → [6.342088:342140]

bool drop_item( int item_dropped, int quant_drop );

[4.2584687]

[6.342140]

bool drop_item( int item_dropped, int quant_drop, bool try_offer = false );

Replacement in crawl-ref/source/items.cc at line 1711 [4.2584728]
B:BD[4.2622389] → [6.355811:355864]
```
bool drop_item( int item_dropped, int quant_drop ) {
```
[4.2621437]
[4.2622948]
```
bool drop_item( int item_dropped, int quant_drop, bool try_offer )
{
```

Replacement in crawl-ref/source/items.cc at line 1778 [4.2584728]

B:BD[5.636666] → [5.636666:636806]

    if ( !grid_destroys_items(my_grid) &&
	 !copy_item_to_grid( you.inv[item_dropped], 
			     you.x_pos, you.y_pos, quant_drop, true )) {

[5.636666]

[4.2624755]

    if ( !grid_destroys_items(my_grid)
         && !copy_item_to_grid( you.inv[item_dropped], 
                                you.x_pos, you.y_pos, quant_drop, true ))
    {

Replacement in crawl-ref/source/items.cc at line 1790 [4.2584728]
B:BD[5.636812] → [5.636812:636854]
```
    if ( grid_destroys_items(my_grid) ) {
```
[5.636812]
[5.636854]
```
    if ( grid_destroys_items(my_grid) )
```
Deletion in crawl-ref/source/items.cc at line 1792 [4.2584728]
B:BD[5.636921] → [5.636921:636927]
```
    }
```

Insertion in crawl-ref/source/items.cc at line 1795 [4.2584728]

[5.636957]

[6.356219]


    if (try_offer
        && you.religion != GOD_NO_GOD
        && you.duration[DUR_PRAYER]
        && grid_altar_god(grd[you.x_pos][you.y_pos]) == you.religion)
    {
        offer_items();
    }

Replacement in crawl-ref/source/items.cc at line 1960 [4.2584728]

B:BD[5.638891] → [5.638891:638945]

                   items_for_multidrop[0].quantity );

[5.638891]

[5.638945]

                   items_for_multidrop[0].quantity,
                   true );

Replacement in crawl-ref/source/describe.cc at line 257 [4.3736416]

B:BD[4.3744024] → [4.3744024:3744098]

        description += "$It renders you almost immune negative energy. ";

[4.3744024]

[4.3744098]

        description += "$It renders you almost immune to negative energy. ";

Replacement in crawl-ref/source/describe.cc at line 1047 [4.3736416]
B:BD[4.3767108] → [5.984375:984411]
```
	description += "$Damage rating: ";
```
[4.3767108]
[4.3767151]
```
        description += "$Damage rating: ";
```

Replacement in crawl-ref/source/delay.cc at line 394 [4.3963459]

B:BD[5.1000605] → [5.1000605:1000663]

                       items_for_multidrop[0].quantity );

[5.1000605]

[5.1000663]

                       items_for_multidrop[0].quantity,
                       items_for_multidrop.size() == 1 );