fiddlerwoaroof/crawl - Change ZNFSMIN4JRFH5UCXUXFF7RYDPBRMH5JG2FK45AWL2GENAXAG7FVAC

Limit the number of tries used to find a random space on the level in

monster_random_space(), as is done with random_near_space().

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

Created by dolorous on November 25, 2008

ZNFSMIN4JRFH5UCXUXFF7RYDPBRMH5JG2FK45AWL2GENAXAG7FVAC

Dependencies

In channels

main

Change contents

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

B:BD[3.2466] → [2.2431:2483]

                monster_random_space(mon, mon_pos);

[3.2466]

[5.3095]

                if (!monster_random_space(mon, mon_pos))
                    continue;

Replacement in crawl-ref/source/mstuff2.h at line 28 [4.1336995]

B:BD[6.4312] → [3.2561:2631]

void monster_random_space(const monsters *monster, coord_def& target,

[6.4312]

[3.2631]

bool monster_random_space(const monsters *monster, coord_def& target,

Replacement in crawl-ref/source/mstuff2.h at line 30 [4.1336995]

B:BD[3.2689] → [3.2689:2752]

void monster_random_space(monster_type mon, coord_def& target,

[3.2689]

[3.2752]

bool monster_random_space(monster_type mon, coord_def& target,

Replacement in crawl-ref/source/mstuff2.cc at line 602 [4.1340842]

B:BD[5.3634] → [3.2812:2882]

void monster_random_space(const monsters *monster, coord_def& target,

[5.3634]

[3.2882]

bool monster_random_space(const monsters *monster, coord_def& target,

Replacement in crawl-ref/source/mstuff2.cc at line 605 [4.1340842]
B:BD[5.3829] → [7.2671:2688]
```
    while (true)
```
[5.3829]
[5.3874]
```
    int tries = 0;
    while (tries++ < 1000)
```
Replacement in crawl-ref/source/mstuff2.cc at line 619 [4.1340842]
B:BD[5.4321] → [7.2689:2708]
```
            break;
```
[5.4321]
[8.399823]
```
            return (true);
```
Insertion in crawl-ref/source/mstuff2.cc at line 621 [4.1340842]
[8.399829]
[3.2987]
```
    return (false);
```

Replacement in crawl-ref/source/mstuff2.cc at line 625 [4.1340842]

B:BD[3.2990] → [3.2990:3053]

void monster_random_space(monster_type mon, coord_def& target,

[3.2990]

[3.3053]

bool monster_random_space(monster_type mon, coord_def& target,

Replacement in crawl-ref/source/mstuff2.cc at line 669 [4.1340842]

B:BD[9.20241] → [3.3215:3286]

∅:D[3.3286] → [7.2754:2783]

B:BD[7.2754] → [7.2754:2783]

    monster_random_space(monster, newpos, !mons_wont_attack(monster));
    monster->moveto(newpos);

[9.20241]

[4.1363333]

    if (monster_random_space(monster, newpos, !mons_wont_attack(monster)))
        monster->moveto(newpos);