fiddlerwoaroof/crawl - Change XAFFD52IHN6FWFR2TT5F2KCUS7HAVCBI5CWTFMKPQG77GGTGAHLAC

Added support for "no_monster_gen" tag.

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

Created by dshaligram on December 7, 2006

XAFFD52IHN6FWFR2TT5F2KCUS7HAVCBI5CWTFMKPQG77GGTGAHLAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/monplace.h at line 18 [3.1638277]
[3.1638583]
[3.1638583]
```
#include "dungeon.h"
```

Replacement in crawl-ref/source/monplace.h at line 43 [3.1638277]

B:BD[4.245751] → [5.449980:450054]

                int dur = 0,
                bool permit_bands = false );

[4.245751]

[3.1639790]

                int dur = 0, bool permit_bands = false );

Replacement in crawl-ref/source/monplace.h at line 83 [3.1638277]

B:BD[4.245851] → [4.245851:245886]

                    int dur = 0 );

[4.245851]

[5.450207]

                    int dur = 0,
                    const dgn_region_list &proscribed = dgn_region_list() );

Replacement in crawl-ref/source/monplace.cc at line 137 [3.1641732]

B:BD[3.1642807] → [3.1642807:1642872]

B:BD[3.1642872] → [4.245973:246012]

    int target, bool summoned, int px, int py, bool allow_bands,
    int proximity, int extra, int dur)

[3.1642807]

[3.1642902]

                   int target, bool summoned, int px, int py, bool allow_bands,
                   int proximity, int extra, int dur,
                   const dgn_region_list &forbidden)

Replacement in crawl-ref/source/monplace.cc at line 290 [3.1641732]

B:BD[3.1647092] → [3.1647092:1647126]

            else if (tries > 60)

[3.1647092]

[3.1647126]

            // Dropped number of tries from 60.
            else if (tries > 45)

Insertion in crawl-ref/source/monplace.cc at line 306 [3.1641732]

[5.454672]

[3.1647527]

                continue;
            // Is the grid verboten?
            if (!unforbidden( coord_def(px, py), forbidden ))

Insertion in crawl-ref/source/dungeon.h at line 118 [3.3428186]
[2.148283]
[2.148283]
```
bool unforbidden(const coord_def &c, const dgn_region_list &forbidden);
```
Deletion in crawl-ref/source/dungeon.cc at line 31 [3.3429798]
B:BD[3.3430951] → [2.148286:148307]
```
#include <algorithm>
```

Insertion in crawl-ref/source/dungeon.cc at line 156 [3.3429798]

[3.3435801]


//////////////////////////////////////////////////////////////////////////
// Static data
// Places where monsters should not be randomly generated.
static dgn_region_list no_monster_zones;

Insertion in crawl-ref/source/dungeon.cc at line 241 [3.3429798]
[3.3436216]
[3.3436242]
```
    no_monster_zones.clear();
    
```
Replacement in crawl-ref/source/dungeon.cc at line 4562 [3.3429798]
B:BD[3.3577169] → [3.3577169:3577189]
```
    int not_used=0;
```
[3.3577169]
[3.3577189]
```
    int not_used = 0;
```

Replacement in crawl-ref/source/dungeon.cc at line 4575 [3.3429798]

B:BD[3.3577467] → [3.3577467:3577524]

                           MHITNOT, false, 1, 1, true ))

[3.3577467]

[3.3577524]

                           MHITNOT, false, 1, 1, true, PROX_ANYWHERE, 250, 0,
                           no_monster_zones ))

Replacement in crawl-ref/source/dungeon.cc at line 4623 [3.3429798]

B:BD[3.3579274] → [3.3579274:3579346]

                               BEH_SLEEP, MHITNOT, false, 1, 1, true ))

[3.3579274]

[3.3579346]

                               BEH_SLEEP, MHITNOT, false, 1, 1, true,
                               PROX_ANYWHERE, 250, 0, no_monster_zones ))

Replacement in crawl-ref/source/dungeon.cc at line 4675 [3.3429798]

B:BD[3.3580676] → [3.3580676:3580728]

                               false, 1, 1, true ))

[3.3580676]

[3.3580728]

                               false, 1, 1, true, PROX_ANYWHERE, 250, 0,
                               no_monster_zones ))

Replacement in crawl-ref/source/dungeon.cc at line 4713 [3.3429798]

B:BD[3.3581813] → [3.3581813:3581865]

                               false, 1, 1, true ))

[3.3581813]

[3.3581865]

                               false, 1, 1, true, PROX_ANYWHERE, 250, 0,
                               no_monster_zones ))

Insertion in crawl-ref/source/dungeon.cc at line 5536 [3.3429798]

[3.3599495]

[5.968762]

    if (place.map->has_tag("no_monster_gen"))
        no_monster_zones.push_back( dgn_region( place.x, place.y, place.width, place.height ) );

Replacement in crawl-ref/source/dungeon.cc at line 5835 [3.3429798]

B:BD[2.155625] → [2.155625:155703]

static bool unforbidden(const coord_def &c, const dgn_region_list &forbidden)

[2.155625]

[3.3612211]

bool unforbidden(const coord_def &c, const dgn_region_list &forbidden)