fiddlerwoaroof/crawl - Change KABMEHHPUS7RLDZ2A5ADC6GMYSBJ5OHD3WPUBDWBM22XWHB7X6WQC

Fix a bug in monster summoning that was causing crashes, for example

when attempting to cast Shadow Creatures in a bazaar (which is bound to fail, anyway). I guess it would have also caused crashes anywhere else where the level was devoid of monsters and creating one failed - for whatever reason. I don't actually know how likely that combination is.

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

Created by j-p-e-g on June 26, 2008

KABMEHHPUS7RLDZ2A5ADC6GMYSBJ5OHD3WPUBDWBM22XWHB7X6WQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/spells3.cc at line 566 [4.531613]
B:BD[3.456] → [3.456:482]
B:BD[3.482] → [5.209:210]
```
    bool success = false;
```

Replacement in crawl-ref/source/spells3.cc at line 572 [4.531613]

B:BD[6.2215] → [7.5397:5440]

                      MG_FORCE_BEH, god));

[6.2215]

[3.587]

                      MG_FORCE_BEH, god), false);

Replacement in crawl-ref/source/spells3.cc at line 574 [4.531613]
B:BD[3.588] → [6.2285:2308]
```
    if (monster != -1)
```
[3.588]
[3.855]
```
    if (monster == -1)
```
Replacement in crawl-ref/source/spells3.cc at line 576 [4.531613]
B:BD[3.861] → [3.861:885]
∅:D[6.2361] → [8.383:384]
B:BD[8.383] → [8.383:384]
B:BD[8.384] → [6.2362:2409]
```
        success = true;
        player_angers_monster(&menv[monster]);
```
[3.861]
[3.983]
```
        mpr("The shadows disperse without effect.");
        return (false);
```
Deletion in crawl-ref/source/spells3.cc at line 579 [4.531613]
B:BD[3.989] → [3.989:998]
∅:D[3.998] → [9.4175:4216]
B:BD[9.4175] → [9.4175:4216]
```
    else
        canned_msg(MSG_NOTHING_HAPPENS);
```
Replacement in crawl-ref/source/spells3.cc at line 580 [4.531613]
B:BD[9.4217] → [9.4217:4239]
```
    return (success);
```
[9.4217]
[9.4239]
```
    player_angers_monster(&menv[monster]);
    return (true);
```

Replacement in crawl-ref/source/spells3.cc at line 639 [4.531613]

B:BD[10.2143] → [10.2143:2192]

        mprf("Some Thing%s answered your call!",

[10.2143]

[8.722]

        mprf("Some thing%s answered your call!",

Insertion in crawl-ref/source/newgame.cc at line 1920 [4.1132300]

[2.2575]

        // Ogres are, of course, really bad at Fire and Ice, so it's usually
        // restricted, but if the summoning book comes into play unrestrict
        // those two because ogres are even *worse* at Summonings.

Replacement in crawl-ref/source/monplace.h at line 24 [4.1638277]
B:BD[11.63668] → [11.63668:63705]
```
    BAND_KOBOLDS                = 1,
```
[11.63668]
[11.63705]
```
    BAND_KOBOLDS,
```
Insertion in crawl-ref/source/monplace.h at line 38 [4.1638277]
[12.2747]
[11.64010]
```
    // 15
```
Replacement in crawl-ref/source/monplace.h at line 67 [4.1638277]
B:BD[11.64703] → [11.64703:64741]
```
    BAND_SKELETAL_WARRIORS,     // 44
```
[11.64703]
[11.64741]
```
    BAND_SKELETAL_WARRIORS,
```
Replacement in crawl-ref/source/monplace.h at line 69 [4.1638277]
B:BD[11.64779] → [11.64779:64807]
```
    BAND_PANDEMONIUM_DEMON,
```
[11.64779]
[11.64807]
```
    BAND_PANDEMONIUM_DEMON,     // 46
```
Replacement in crawl-ref/source/monplace.h at line 238 [4.1638277]
B:BD[4.1639586] → [13.3060:3096]
```
int create_monster( mgen_data mg );
```
[4.1639586]
[14.21914]
```
int create_monster( mgen_data mg, bool fail_msg = true );
```

Replacement in crawl-ref/source/monplace.cc at line 264 [4.1641732]

B:BD[15.4911] → [15.4911:5011]

monster_type pick_random_monster(const level_id &place,
                                 int power,

[15.4911]

[15.5011]

monster_type pick_random_monster(const level_id &place, int power,

Replacement in crawl-ref/source/monplace.cc at line 267 [4.1641732]

B:BD[15.5061] → [16.5042:5087]

    if (place.level_type == LEVEL_LABYRINTH)

[15.5061]

[16.5087]

    if (place.level_type == LEVEL_LABYRINTH
        || place.level_type == LEVEL_PORTAL_VAULT)
    {

Insertion in crawl-ref/source/monplace.cc at line 271 [4.1641732]
[16.5122]
[17.10477]
```
    }
```
Replacement in crawl-ref/source/monplace.cc at line 430 [4.1641732]
∅:D[18.11536] → [19.1497:1549]
B:BD[4.1643396] → [19.1497:1549]
```
        // respect destination level for staircases
```
[18.11536]
[19.1549]
```
        // Respect destination level for staircases.
```
Replacement in crawl-ref/source/monplace.cc at line 435 [4.1641732]
B:BD[18.11564] → [18.11564:11590]
```
            int pval = 0;
```
[18.11564]
[20.3537]
```
            int pval  = 0;
```

Replacement in crawl-ref/source/monplace.cc at line 475 [4.1641732]

B:BD[19.3202] → [18.11655:11727]

                if ( *stair_type == DCHAR_STAIRS_DOWN ) // deeper level

[19.3202]

[18.11727]

                if (*stair_type == DCHAR_STAIRS_DOWN) // deeper level

Replacement in crawl-ref/source/monplace.cc at line 553 [4.1641732]
∅:D[14.25517] → [18.12983:13007]
B:BD[18.12983] → [18.12983:13007]
```
        return (false);
```
[14.25517]
[18.13007]
```
        return (-1);
```
Deletion in crawl-ref/source/monplace.cc at line 1867 [4.1641732]
∅:D[21.4801] → [4.1673453:1673472]
∅:D[14.39384] → [4.1673453:1673472]
B:BD[4.1673453] → [4.1673453:1673472]
```
    int mid = -1;
```
Replacement in crawl-ref/source/monplace.cc at line 1883 [4.1641732]
B:BD[4.1673839] → [14.39552:39581]
```
    mid = place_monster(mg);
```
[4.1673839]
[14.39581]
```
    int mid = place_monster(mg);
```
Replacement in crawl-ref/source/monplace.cc at line 2097 [4.1641732]
B:BD[22.459697] → [14.40646:40681]
```
int create_monster( mgen_data mg )
```
[22.459697]
[22.459828]
```
int create_monster( mgen_data mg, bool fail_msg )
```
Replacement in crawl-ref/source/monplace.cc at line 2117 [4.1641732]
∅:D[23.8046] → [14.40987:41030]
B:BD[4.1675766] → [14.40987:41030]
```
    if (summd == -1 && see_grid( mg.pos ))
```
[23.8046]
[14.41030]
```
    if (fail_msg && summd == -1 && see_grid( mg.pos ))
```

Fix a bug in monster summoning that was causing crashes, for example

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/spells3.cc at line 566 [4.531613]

Replacement in crawl-ref/source/spells3.cc at line 572 [4.531613]

Replacement in crawl-ref/source/spells3.cc at line 574 [4.531613]

Replacement in crawl-ref/source/spells3.cc at line 576 [4.531613]

Deletion in crawl-ref/source/spells3.cc at line 579 [4.531613]

Replacement in crawl-ref/source/spells3.cc at line 580 [4.531613]

Replacement in crawl-ref/source/spells3.cc at line 639 [4.531613]

Insertion in crawl-ref/source/newgame.cc at line 1920 [4.1132300]

Replacement in crawl-ref/source/monplace.h at line 24 [4.1638277]

Insertion in crawl-ref/source/monplace.h at line 38 [4.1638277]

Replacement in crawl-ref/source/monplace.h at line 67 [4.1638277]

Replacement in crawl-ref/source/monplace.h at line 69 [4.1638277]

Replacement in crawl-ref/source/monplace.h at line 238 [4.1638277]

Replacement in crawl-ref/source/monplace.cc at line 264 [4.1641732]

Replacement in crawl-ref/source/monplace.cc at line 267 [4.1641732]

Insertion in crawl-ref/source/monplace.cc at line 271 [4.1641732]

Replacement in crawl-ref/source/monplace.cc at line 430 [4.1641732]

Replacement in crawl-ref/source/monplace.cc at line 435 [4.1641732]

Replacement in crawl-ref/source/monplace.cc at line 475 [4.1641732]

Replacement in crawl-ref/source/monplace.cc at line 553 [4.1641732]

Deletion in crawl-ref/source/monplace.cc at line 1867 [4.1641732]

Replacement in crawl-ref/source/monplace.cc at line 1883 [4.1641732]

Replacement in crawl-ref/source/monplace.cc at line 2097 [4.1641732]

Replacement in crawl-ref/source/monplace.cc at line 2117 [4.1641732]