fiddlerwoaroof/crawl - Change S6TKJBJDUDKXI6RQU65GBWLGXSEQ2R4EGEQCQVS5NC3OH72ILOFQC

* Fix Xom gifts not going Splash! in deep water.

Limit Xom tele rounds to a maximum of 12 (unlikely, but you know…)
Update player doll for Merfolk entering/leaving water.

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

Created by j-p-e-g on July 23, 2009

S6TKJBJDUDKXI6RQU65GBWLGXSEQ2R4EGEQCQVS5NC3OH72ILOFQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/xom.cc at line 577 [6.3]

[4.138]

[5.168]


    if (grid_destroys_items(grd(you.pos())))
    {
        if (!silenced(you.pos()))
            mprf(MSGCH_SOUND, grid_item_destruction_message(grd(you.pos())));
        simple_god_message(" snickers.", GOD_XOM);
        destroy_item(thing_created, true);
        thing_created = NON_ITEM;
    }

Replacement in crawl-ref/source/xom.cc at line 1702 [6.3]

B:BD[7.653] → [7.653:723]

        while (x_chance_in_y(3, 4) || player_in_a_dangerous_place());

[7.653]

[2.549]

        while (x_chance_in_y(3, 4) || count > 7 + random2(5)
               || player_in_a_dangerous_place());

Replacement in crawl-ref/source/xom.cc at line 2722 [6.3]

B:BD[7.973] → [7.973:1048]

            while (x_chance_in_y(3, 4) && !player_in_a_dangerous_place());

[7.973]

[8.4691]

            while (count > 7 + random2(5)
                   || x_chance_in_y(3, 4) && !player_in_a_dangerous_place());

Insertion in crawl-ref/source/spells3.cc at line 1311 [9.531613]

[3.681]

[9.549603]

#ifdef USE_TILE
    const dungeon_feature_type old_grid = grd(you.pos());
#endif

Insertion in crawl-ref/source/spells3.cc at line 1463 [9.531613]

[10.540]

[6.28307]

#ifdef USE_TILE
    if (you.species == SP_MERFOLK)
    {
        const dungeon_feature_type new_grid = grd(you.pos());
        if (grid_is_water(old_grid) && !grid_is_water(new_grid)
            || !grid_is_water(old_grid) && grid_is_water(new_grid))
        {
            init_player_doll();
        }
    }
#endif

Insertion in crawl-ref/source/player.cc at line 229 [9.962854]
[11.339132]
[12.3301]
```
#ifdef USE_TILE
    bool need_doll_update = false;
#endif
```

Insertion in crawl-ref/source/player.cc at line 259 [9.962854]

[13.4143]

#ifdef USE_TILE
                need_doll_update = true;
#endif

Insertion in crawl-ref/source/player.cc at line 267 [9.962854]

[13.4332]

#ifdef USE_TILE
                need_doll_update = true;
#endif

Insertion in crawl-ref/source/player.cc at line 321 [9.962854]

[14.18655]

[15.5747361]

#ifdef USE_TILE
    if (need_doll_update)
        init_player_doll();
#endif