fiddlerwoaroof/crawl - Change VX2D7IVDD7OFX55ZVY5NKPITC3XWNJX4WSEBBTYASMXKJY5E7VBAC

Abolish M_HUMANOID flag as it wasn't used anywhere. Comments claimed

it was necessary for Glamour but even that appears to have used another function, mons_is_humanoid(), that made checks against monster glyph instead. Strange.

So in case anyone is badly in need of a monster flag, no. 15 is free! :)

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

Created by j-p-e-g on March 13, 2008

VX2D7IVDD7OFX55ZVY5NKPITC3XWNJX4WSEBBTYASMXKJY5E7VBAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mon-util.h at line 107 [5.1682293]

B:BD[4.67930] → [4.67930:67988]

    M_HUMANOID          = (1<<15),        // for Glamour

[4.67930]

[4.67988]

    M_RESERVED          = (1<<15),        // currently UNUSED

Deletion in crawl-ref/source/mon-util.h at line 480 [5.1682293]
∅:D[6.463785] → [5.1692137:1692170]
B:BD[5.1692137] → [5.1692137:1692170]
```
bool mons_is_humanoid( int mc );
```

Deletion in crawl-ref/source/mon-util.cc at line 469 [5.1699344]

B:BD[5.1704486] → [5.1704486:1704872]


// Used for elven Glamour ability. -- bwr
bool mons_is_humanoid( int mc )
{
    switch (mons_char( mc))
    {
    case 'o':   // orcs
    case 'e':   // elvens (deep)
    case 'c':   // centaurs
    case 'C':   // giants
    case 'O':   // ogres
    case 'K':   // kobolds
    case 'N':   // nagas
    case '@':   // adventuring humans
    case 'T':   // trolls
        return (true);

Deletion in crawl-ref/source/mon-util.cc at line 470 [5.1699344]

B:BD[7.7372] → [7.7372:7504]

∅:D[7.7504] → [5.1704872:1705174]

B:BD[5.1704872] → [5.1704872:1705174]

    case 'm':   // merfolk
        if (mc == MONS_MERFOLK || mc == MONS_MERMAID)
            return (true);
        return (false);
    case 'g':   // goblines, hobgoblins, gnolls, boggarts -- but not gargoyles
        if (mc != MONS_GARGOYLE
            && mc != MONS_METAL_GARGOYLE
            && mc != MONS_MOLTEN_GARGOYLE)
        {
            return (true);
        }
    default:
        break;
    }
    return (false);
}

Replacement in crawl-ref/source/mon-util.cc at line 5609 [5.1699344]

B:BD[8.24931] → [3.10468:10565]

        if (mons_genus(type) == MONS_DRACONIAN
            || mons_class_flag(type, M_HUMANOID))

[8.24931]

[8.25028]

        if (mons_genus(type) == MONS_DRACONIAN)

Replacement in crawl-ref/source/mon-data.h at line 259 [5.1826214]
B:BD[9.5128] → [2.2759:2801]
```
    M_HUMANOID | M_COLD_BLOOD | M_SPEAKS,
```
[9.5128]
[9.5159]
```
    M_COLD_BLOOD | M_SPEAKS,
```
Replacement in crawl-ref/source/mon-data.h at line 270 [5.1826214]
B:BD[9.5531] → [2.2802:2844]
```
    M_HUMANOID | M_COLD_BLOOD | M_SPEAKS,
```
[9.5531]
[9.5562]
```
    M_COLD_BLOOD | M_SPEAKS,
```

Replacement in crawl-ref/source/mon-data.h at line 281 [5.1826214]

B:BD[9.5951] → [2.2845:2907]

    M_HUMANOID | M_COLD_BLOOD | M_SPECIAL_ABILITY | M_SPEAKS,

[9.5951]

[9.6002]

    M_COLD_BLOOD | M_SPECIAL_ABILITY | M_SPEAKS,

Replacement in crawl-ref/source/mon-data.h at line 292 [5.1826214]
B:BD[9.6391] → [2.2908:2950]
```
    M_HUMANOID | M_COLD_BLOOD | M_SPEAKS,
```
[9.6391]
[9.6422]
```
    M_COLD_BLOOD | M_SPEAKS,
```
Replacement in crawl-ref/source/mon-data.h at line 303 [5.1826214]
B:BD[9.6808] → [2.2951:2993]
```
    M_HUMANOID | M_COLD_BLOOD | M_SPEAKS,
```
[9.6808]
[9.6839]
```
    M_COLD_BLOOD | M_SPEAKS,
```
Replacement in crawl-ref/source/mon-data.h at line 314 [5.1826214]
B:BD[9.7228] → [2.2994:3036]
```
    M_HUMANOID | M_COLD_BLOOD | M_SPEAKS,
```
[9.7228]
[9.7259]
```
    M_COLD_BLOOD | M_SPEAKS,
```

Replacement in crawl-ref/source/mon-data.h at line 325 [5.1826214]

B:BD[9.7640] → [2.3037:3099]

    M_HUMANOID | M_COLD_BLOOD | M_SPECIAL_ABILITY | M_SPEAKS,

[9.7640]

[9.7691]

    M_COLD_BLOOD | M_SPECIAL_ABILITY | M_SPEAKS,

Replacement in crawl-ref/source/mon-data.h at line 336 [5.1826214]

B:BD[9.8075] → [2.3100:3162]

    M_HUMANOID | M_COLD_BLOOD | M_SPECIAL_ABILITY | M_SPEAKS,

[9.8075]

[9.8126]

    M_COLD_BLOOD | M_SPECIAL_ABILITY | M_SPEAKS,

Replacement in crawl-ref/source/mon-data.h at line 347 [5.1826214]
B:BD[9.8523] → [2.3163:3205]
```
    M_HUMANOID | M_COLD_BLOOD | M_SPEAKS,
```
[9.8523]
[9.8554]
```
    M_COLD_BLOOD | M_SPEAKS,
```

Replacement in crawl-ref/source/mon-data.h at line 358 [5.1826214]

B:BD[9.8966] → [2.3206:3282]

    M_SPELLCASTER | M_ACTUAL_SPELLS | M_HUMANOID | M_COLD_BLOOD | M_SPEAKS,

[9.8966]

[9.9031]

    M_SPELLCASTER | M_ACTUAL_SPELLS | M_COLD_BLOOD | M_SPEAKS,

Replacement in crawl-ref/source/mon-data.h at line 369 [5.1826214]
B:BD[9.9410] → [2.3283:3337]
```
    M_FIGHTER | M_HUMANOID | M_COLD_BLOOD | M_SPEAKS,
```
[9.9410]
[9.9453]
```
    M_FIGHTER | M_COLD_BLOOD | M_SPEAKS,
```

Replacement in crawl-ref/source/mon-data.h at line 381 [5.1826214]

B:BD[9.9878] → [2.3338:3416]

    M_SPELLCASTER | M_HUMANOID | M_PRIEST | M_COLD_BLOOD | M_EVIL | M_SPEAKS,

[9.9878]

[9.9945]

    M_SPELLCASTER | M_PRIEST | M_COLD_BLOOD | M_EVIL | M_SPEAKS,

Replacement in crawl-ref/source/mon-data.h at line 392 [5.1826214]

B:BD[9.10345] → [2.3417:3493]

    M_SPELLCASTER | M_ACTUAL_SPELLS | M_HUMANOID | M_COLD_BLOOD | M_SPEAKS,

[9.10345]

[9.10410]

    M_SPELLCASTER | M_ACTUAL_SPELLS | M_COLD_BLOOD | M_SPEAKS,

Replacement in crawl-ref/source/mon-data.h at line 403 [5.1826214]

B:BD[9.10809] → [2.3494:3570]

    M_SPELLCASTER | M_ACTUAL_SPELLS | M_HUMANOID | M_COLD_BLOOD | M_SPEAKS,

[9.10809]

[9.10874]

    M_SPELLCASTER | M_ACTUAL_SPELLS | M_COLD_BLOOD | M_SPEAKS,

Replacement in crawl-ref/source/mon-data.h at line 414 [5.1826214]

B:BD[9.11266] → [2.3571:3641]

    M_SPELLCASTER | M_HUMANOID | M_FIGHTER | M_COLD_BLOOD | M_SPEAKS,

[9.11266]

[9.11325]

    M_SPELLCASTER | M_FIGHTER | M_COLD_BLOOD | M_SPEAKS,

Replacement in crawl-ref/source/mon-data.h at line 425 [5.1826214]

B:BD[9.11715] → [2.3642:3715]

    M_SPELLCASTER | M_ACTUAL_SPELLS | M_HUMANOID | M_COLD_BLOOD | M_EVIL

[9.11715]

[2.3715]

    M_SPELLCASTER | M_ACTUAL_SPELLS | M_COLD_BLOOD | M_EVIL

Replacement in crawl-ref/source/mon-data.h at line 942 [5.1826214]
B:BD[9.28721] → [2.4693:4750]
```
    M_HUMANOID | M_WARM_BLOOD | M_AMPHIBIOUS | M_SPEAKS,
```
[9.28721]
[9.28767]
```
    M_WARM_BLOOD | M_AMPHIBIOUS | M_SPEAKS,
```

Replacement in crawl-ref/source/mon-data.h at line 953 [5.1826214]

B:BD[9.29133] → [2.4751:4824]

    M_SPELLCASTER | M_HUMANOID | M_WARM_BLOOD | M_AMPHIBIOUS | M_SPEAKS,

[9.29133]

[9.29195]

    M_SPELLCASTER | M_WARM_BLOOD | M_AMPHIBIOUS | M_SPEAKS,

Replacement in crawl-ref/source/mon-data.h at line 3808 [5.1826214]

B:BD[9.120842] → [2.7925:8019]

    M_HUMANOID | M_SEE_INVIS | M_EVIL | M_UNIQUE | M_FLIES | M_COLD_BLOOD
        | M_SPEAKS,

[9.120842]

[9.120917]

    M_SEE_INVIS | M_EVIL | M_UNIQUE | M_FLIES | M_COLD_BLOOD | M_SPEAKS,

Abolish M_HUMANOID flag as it wasn't used anywhere. Comments claimed

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/mon-util.h at line 107 [5.1682293]

Deletion in crawl-ref/source/mon-util.h at line 480 [5.1682293]

Deletion in crawl-ref/source/mon-util.cc at line 469 [5.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 470 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 5609 [5.1699344]

Replacement in crawl-ref/source/mon-data.h at line 259 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 270 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 281 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 292 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 303 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 314 [5.1826214]