fiddlerwoaroof/crawl - Change YWSN3SJEZRDX223KTSDBR7IU5Y7Y7SSKQWTOULWRHQV47UK5M5RQC

Make name(), base_name() and full_name() return a more informative string (and

be less likely to crash) if given an invalid monster.

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

Created by zelgadis on January 24, 2009

YWSN3SJEZRDX223KTSDBR7IU5Y7Y7SSKQWTOULWRHQV47UK5M5RQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mon-util.cc at line 1971 [7.1699344]

B:BD[5.2151] → [6.569:617]

    if (desc == DESC_NONE)
        return ("");

[5.2151]

[3.2819]

    if (mon.type == -1)
        return ("DEAD MONSTER");
    else if (invalid_monster_class(mon.type) && mon.type != MONS_PROGRAM_BUG)
        return make_stringf("INVALID MONSTER (#%d)", mon.type);

Insertion in crawl-ref/source/mon-util.cc at line 2146 [7.1699344]
[4.4359]
[4.4365]
```
    {
```

Replacement in crawl-ref/source/mon-util.cc at line 2148 [7.1699344]

B:BD[4.4395] → [4.4395:4447]

        result += get_monster_data(nametype)->name;

[4.4395]

[7.1730138]

        if (invalid_monster_class(nametype) && nametype != MONS_PROGRAM_BUG)
            result += make_stringf("INVALID MONSTER (#%d)", nametype);
        else
            result += get_monster_data(nametype)->name;
    }

Replacement in crawl-ref/source/mon-util.cc at line 5195 [7.1699344]

B:BD[8.9868] → [2.4175:4231]

    if (type == -1)
        return ("INVALID MONSTER");

[8.9868]

[2.4231]

    if (desc == DESC_NONE)
        return ("");

Insertion in crawl-ref/source/mon-util.cc at line 5219 [7.1699344]
[9.2903]
[9.2903]
```
    if (desc == DESC_NONE)
        return ("");
```
Insertion in crawl-ref/source/mon-util.cc at line 5235 [7.1699344]
[10.6830]
[10.6830]
```
    if (desc == DESC_NONE)
        return ("");
```