fiddlerwoaroof/crawl - Change KSPB4TR7USO3VMFQ3UQTHHIZVGOHRUFNRPT736ABI6SAMSQ7RPGAC

[2046134] Fixing segfault when random dracos are specified with 'nothing' as equipment.

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

Created by ennewalker on August 16, 2008

KSPB4TR7USO3VMFQ3UQTHHIZVGOHRUFNRPT736ABI6SAMSQ7RPGAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/mon-util.cc at line 390 [3.1699344]
[3.1704014]
[3.1704014]
```
    ASSERT(smc);
```
Insertion in crawl-ref/source/mon-util.cc at line 396 [3.1699344]
[4.11247]
[5.2663]
```
    ASSERT(smc);
```
Insertion in crawl-ref/source/mon-util.cc at line 404 [3.1699344]
[4.11373]
[4.11373]
```
    ASSERT(smc);
```
Insertion in crawl-ref/source/mon-util.cc at line 581 [3.1699344]
[3.1705205]
[3.1705205]
```
    ASSERT(smc);
```
Insertion in crawl-ref/source/mon-util.cc at line 587 [3.1699344]
[3.1705322]
[3.1705322]
```
    ASSERT(smc);
```
Insertion in crawl-ref/source/mon-util.cc at line 593 [3.1699344]
[3.1705436]
[3.1705436]
```
    ASSERT(smc);
```

Insertion in crawl-ref/source/mon-util.cc at line 605 [3.1699344]

[6.471001]

    if (mc == RANDOM_DRACONIAN || mc == RANDOM_BASE_DRACONIAN
        || mc == RANDOM_NONBASE_DRACONIAN)
    {
        return MONS_DRACONIAN;
    }
    ASSERT(smc);

Insertion in crawl-ref/source/mon-util.cc at line 702 [3.1699344]
[3.1705674]
[7.10775]
```
    ASSERT(smc);
```
Insertion in crawl-ref/source/mon-util.cc at line 791 [3.1699344]
[3.1707470]
[3.1707470]
```
    ASSERT(smc);
```
Insertion in crawl-ref/source/mon-util.cc at line 880 [3.1699344]
[8.10105]
[8.10105]
```
    ASSERT(smc);
```
Insertion in crawl-ref/source/mon-util.cc at line 902 [3.1699344]
[8.10697]
[8.10697]
```
    ASSERT(smc);
```
Insertion in crawl-ref/source/mon-util.cc at line 2001 [3.1699344]
[3.1732168]
[3.1732168]
```
    ASSERT(smc);
```
Insertion in crawl-ref/source/mon-util.cc at line 2008 [3.1699344]
[3.1732276]
[3.1732276]
```
    ASSERT(smc);
```
Insertion in crawl-ref/source/mon-util.cc at line 2015 [3.1699344]
[3.1732892]
[3.1732892]
```
    ASSERT(smc);
```
Insertion in crawl-ref/source/mon-util.cc at line 2040 [3.1699344]
[2.7940]
[3.1733047]
```
    ASSERT(smc);
```

Replacement in crawl-ref/source/mapdef.cc at line 1994 [6.594797]

B:BD[9.3537] → [9.3537:3582]

            if (mspec.mid == RANDOM_MONSTER)

[9.3537]

[9.3582]

            monster_type mid = (monster_type)mspec.mid;
            if (mid == RANDOM_DRACONIAN
                || mid == RANDOM_BASE_DRACONIAN
                || mid == RANDOM_NONBASE_DRACONIAN)
            {
                mid = MONS_DRACONIAN;
            }
            if (mid >= NUM_MONSTERS)

Replacement in crawl-ref/source/mapdef.cc at line 2006 [6.594797]

B:BD[9.3697] → [9.3697:3782]

            };
            if (mons_itemuse(mspec.mid) < MONUSE_STARTING_EQUIPMENT)

[9.3697]

[9.3782]

            }
            else if (mons_itemuse(mid) < MONUSE_STARTING_EQUIPMENT)

[2046134] Fixing segfault when random dracos are specified with 'nothing' as equipment.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/mon-util.cc at line 390 [3.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 396 [3.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 404 [3.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 581 [3.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 587 [3.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 593 [3.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 605 [3.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 702 [3.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 791 [3.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 880 [3.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 902 [3.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 2001 [3.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 2008 [3.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 2015 [3.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 2040 [3.1699344]

Replacement in crawl-ref/source/mapdef.cc at line 1994 [6.594797]

Replacement in crawl-ref/source/mapdef.cc at line 2006 [6.594797]