fiddlerwoaroof/crawl - Change 6AOBHPEVZFUDSTZ6FR6PRQ6H2V766R2PJRXS4UMYI6SAELGAV5EAC

Convert some ints to monster_type.

There's a whole lot of places that pass monster_type as int, often with varying meanings for the value -1. This moves some of these to monster_type, introducing MONS_NO_MONSTER and MONS_PLAYER as new invalid special values.

Also improve on the autoexclude descriptions.

Created by Robert Vollmert on October 26, 2009

6AOBHPEVZFUDSTZ6FR6PRQ6H2V766R2PJRXS4UMYI6SAELGAV5EAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/travel.h at line 367 [16.29464]

B:BD[14.476] → [15.119:193]

                   bool autoex = false, monster_type mons = NUM_MONSTERS,

[14.476]

[17.232]

                   bool autoex = false, monster_type mons = MONS_NO_MONSTER,

Replacement in crawl-ref/source/travel.cc at line 536 [16.39949]
B:BD[16.48091] → [15.195:240]
```
        monster_type montype = NUM_MONSTERS;
```
[16.48091]
[18.1516]
```
        monster_type montype = MONS_NO_MONSTER;
```

Replacement in crawl-ref/source/travel.cc at line 538 [16.39949]

B:BD[18.1559] → [18.1559:1608]

B:BD[18.1608] → [13.122:180]

        if (m && mons_near(m) && you.can_see(m))
            montype = static_cast<monster_type>(m->type);

[18.1559]

[18.1639]

        if (m && you.can_see(m))
            montype = m->type;

Replacement in crawl-ref/source/travel.cc at line 567 [16.39949]

B:BD[18.2706] → [18.2706:2755]

B:BD[18.2755] → [13.181:294]

        if (curr_excludes[i].mon != NON_MONSTER)
            monsters.push_back("unknown monster");
               // FIXME: mondata[curr_excludes[i].mon].name);

[18.2706]

[18.2833]

        if (!invalid_monster_type(curr_excludes[i].mon))
            monsters.push_back(mons_type_name(curr_excludes[i].mon, DESC_PLAIN));

Replacement in crawl-ref/source/travel.cc at line 3661 [16.39949]

B:BD[18.3707] → [15.448:493]

            monster_type mon = NUM_MONSTERS;

[18.3707]

[18.3751]

            monster_type mon = MONS_NO_MONSTER;

Replacement in crawl-ref/source/traps.cc at line 445 [20.5308]

∅:D[3.298] → [19.6480:6543]

B:BD[19.6480] → [19.6480:6543]

                bleed_onto_floor(you.pos(), -1, damage, true);

[3.298]

[21.350]

                bleed_onto_floor(you.pos(), MONS_PLAYER, damage, true);

Replacement in crawl-ref/source/tags.cc at line 2177 [24.164589]

B:BD[22.6518] → [23.7380:7424]

    m.type           = unmarshallShort(th);

[22.6518]

[23.7424]

    m.type           = static_cast<monster_type>(unmarshallShort(th));

Replacement in crawl-ref/source/tags.cc at line 2220 [24.164589]
B:BD[24.213946] → [25.1848:1874]
```
        if (m.type != -1)
```
[24.213946]
[4.317]
```
        if (m.type != MONS_NO_MONSTER)
```

Replacement in crawl-ref/source/religion.cc at line 7157 [24.804403]

B:BD[26.2959] → [26.2959:3005]

    const int mons_class = mitm[corpse].plus;

[26.2959]

[27.3925]

    const monster_type mons_class = static_cast<monster_type>(mitm[corpse].plus);

Replacement in crawl-ref/source/player.h at line 329 [24.945993]
B:BD[12.12146] → [12.12146:12166]
```
    int id() const;
```
[12.12146]
[12.12166]
```
    monster_type id() const;
```
Replacement in crawl-ref/source/player.cc at line 6428 [24.962854]
∅:D[28.3153] → [29.6194:6217]
∅:D[30.71419] → [29.6194:6217]
B:BD[29.6194] → [29.6194:6217]
```
int player::id() const
```
[28.3153]
[29.6217]
```
monster_type player::id() const
```
Replacement in crawl-ref/source/player.cc at line 6430 [24.962854]
B:BD[29.6219] → [29.6219:6236]
```
    return (-1);
```
[29.6219]
[29.6236]
```
    return (MONS_PLAYER);
```
Replacement in crawl-ref/source/mstuff2.cc at line 1322 [24.1340842]
∅:D[31.2719] → [24.1363882:1363922]
B:BD[24.1363882] → [24.1363882:1363922]
```
    if (mons_is_mimic( monster->type ))
```
[31.2719]
[24.1363922]
```
    if (mons_is_mimic(monster->type))
```

Replacement in crawl-ref/source/mstuff2.cc at line 1324 [24.1340842]

B:BD[24.1363928] → [31.2720:2761]

∅:D[31.2761] → [32.2542:2598]

B:BD[24.1363928] → [32.2542:2598]

∅:D[32.2598] → [33.400473:400528]

B:BD[24.1363982] → [33.400473:400528]

        int old_type    = monster->type;
        monster->type   = MONS_GOLD_MIMIC + random2(5);
        monster->colour = get_mimic_colour( monster );

[24.1363928]

[31.2762]

        monster_type old_type = monster->type;
        monster->type   = static_cast<monster_type>(
                                         MONS_GOLD_MIMIC + random2(5));
        monster->colour = get_mimic_colour(monster);

Replacement in crawl-ref/source/monstuff.cc at line 1670 [24.1396662]

B:BD[34.2897] → [34.2897:2945]

                    if (killer_mon->type == -1)

[34.2897]

[34.2945]

                    if (killer_mon->type == MONS_NO_MONSTER)

Insertion in crawl-ref/source/monstuff.cc at line 1994 [24.1396662]
[24.1418984]
[33.417960]
```
// Clean up after a dead monster.
```

Replacement in crawl-ref/source/monstuff.cc at line 2097 [24.1396662]

B:BD[24.1423399] → [35.3085:3145]

static bool _valid_morph(monsters *monster, int new_mclass)

[24.1423399]

[24.1423467]

static bool _valid_morph(monsters *monster, monster_type new_mclass)

Insertion in crawl-ref/source/monstuff.cc at line 8221 [24.1396662]
[36.7277]
[10.3027]
```
    monster_type mt = static_cast<monster_type>(item.plus);
```

Replacement in crawl-ref/source/monstuff.cc at line 8224 [24.1396662]

B:BD[36.7357] → [10.3045:3119]

        monster->hit_points += 1 + random2(mons_weight(item.plus)) / 100;

[36.7357]

[37.3218]

        monster->hit_points += 1 + random2(mons_weight(mt)) / 100;

Replacement in crawl-ref/source/monstuff.cc at line 8242 [24.1396662]
B:BD[10.3452] → [10.3452:3509]
```
    const int max_chunks = mons_weight(item.plus) / 150;
```
[10.3452]
[10.3509]
```
    const int max_chunks = mons_weight(mt) / 150;
```

Replacement in crawl-ref/source/monstuff.cc at line 8246 [24.1396662]

B:BD[10.3602] → [10.3602:3673]

        bleed_onto_floor(monster->pos(), item.plus, max_chunks, true);

[10.3602]

[10.3673]

        bleed_onto_floor(monster->pos(), mt, max_chunks, true);

Replacement in crawl-ref/source/monstuff.cc at line 8248 [24.1396662]
B:BD[10.3674] → [10.3674:3728]
```
    if (mons_skeleton(item.plus) && one_chance_in(3))
```
[10.3674]
[10.3728]
```
    if (mons_skeleton(mt) && one_chance_in(3))
```
Replacement in crawl-ref/source/monster.h at line 65 [12.17727]
B:BD[12.19222] → [12.19222:19236]
```
    int type;
```
[12.19222]
[12.19236]
```
    monster_type type;
```
Replacement in crawl-ref/source/monster.h at line 190 [12.17727]
B:BD[12.23562] → [12.23562:23582]
```
    int id() const;
```
[12.23562]
[12.23582]
```
    monster_type id() const;
```
Replacement in crawl-ref/source/monspeak.cc at line 361 [24.1558496]
B:BD[24.1559228] → [38.3675:3726]
```
    ASSERT(!invalid_monster_class(monster->type));
```
[24.1559228]
[38.3726]
```
    ASSERT(!invalid_monster_type(monster->type));
```
Replacement in crawl-ref/source/monplace.h at line 322 [24.1638277]
B:BD[39.978] → [40.369:416]
```
bool monster_habitable_grid(int monster_class,
```
[39.978]
[40.416]
```
bool monster_habitable_grid(monster_type montype,
```

Replacement in crawl-ref/source/monplace.cc at line 114 [24.1641732]

B:BD[41.9364] → [42.2473:2596]

    const int montype = mons_is_zombified(m) ? mons_zombie_base(m)
                                             : m->type;

[41.9364]

[43.15192]

    const monster_type montype = mons_is_zombified(m) ? mons_zombie_base(m)
                                                      : m->type;

Replacement in crawl-ref/source/monplace.cc at line 136 [24.1641732]
B:BD[33.452394] → [39.1190:1237]
```
bool monster_habitable_grid(int monster_class,
```
[33.452394]
[39.1237]
```
bool monster_habitable_grid(monster_type montype,
```
Replacement in crawl-ref/source/monplace.cc at line 145 [24.1641732]
∅:D[44.2521] → [45.2914:2979]
∅:D[46.19063] → [45.2914:2979]
B:BD[39.1390] → [45.2914:2979]
```
        habitat2grid(mons_class_primary_habitat(monster_class));
```
[46.19063]
[46.19064]
```
        habitat2grid(mons_class_primary_habitat(montype));
```
Replacement in crawl-ref/source/monplace.cc at line 147 [24.1641732]
∅:D[44.2573] → [45.3033:3100]
∅:D[46.19115] → [45.3033:3100]
B:BD[45.3033] → [45.3033:3100]
```
        habitat2grid(mons_class_secondary_habitat(monster_class));
```
[46.19115]
[43.15194]
```
        habitat2grid(mons_class_secondary_habitat(montype));
```

Replacement in crawl-ref/source/monplace.cc at line 151 [24.1641732]

B:BD[47.4108] → [46.19116:19193]

    if (monster_class == MONS_FIRE_ELEMENTAL && feat_is_watery(actual_grid))

[47.4108]

[48.9536]

    if (montype == MONS_FIRE_ELEMENTAL && feat_is_watery(actual_grid))

Replacement in crawl-ref/source/monplace.cc at line 155 [24.1641732]

B:BD[48.9609] → [48.9609:9684]

    if (monster_class == MONS_KRAKEN && actual_grid == DNGN_SHALLOW_WATER)

[48.9609]

[47.4185]

    if (montype == MONS_KRAKEN && actual_grid == DNGN_SHALLOW_WATER)

Replacement in crawl-ref/source/monplace.cc at line 168 [24.1641732]
B:BD[49.3214] → [50.5543:5599]
```
    if (_mons_airborne(monster_class, flies, paralysed)
```
[49.3214]
[49.3269]
```
    if (_mons_airborne(montype, flies, paralysed)
```

Replacement in crawl-ref/source/monplace.cc at line 698 [24.1641732]

B:BD[51.3084] → [11.2948:3088]

    const int montype = (mons_class_is_zombified(mg.cls) ? mg.base_type
                                                         : mg.cls);

[51.3084]

[11.3088]

    const monster_type montype = (mons_class_is_zombified(mg.cls) ? mg.base_type
                                                                  : mg.cls);

Replacement in crawl-ref/source/monplace.cc at line 1006 [24.1641732]
B:BD[24.1652554] → [24.1652554:1652587]
```
        if (menv[id].type == -1)
```
[24.1652548]
[24.1652587]
```
        if (menv[id].type == MONS_NO_MONSTER)
```

Replacement in crawl-ref/source/monplace.cc at line 1015 [24.1641732]

B:BD[52.4122] → [42.2865:3005]

    const int montype = (mons_class_is_zombified(mg.cls) ? mg.base_type
                                                         : mg.cls);

[52.4122]

[49.4285]

    const monster_type montype = (mons_class_is_zombified(mg.cls) ? mg.base_type
                                                                  : mg.cls);

Replacement in crawl-ref/source/monplace.cc at line 3218 [24.1641732]

B:BD[53.8782] → [53.8782:8917]

    const int montype = mons_is_zombified(mons) ? mons_zombie_base(mons)
                                                : mons->type;

[53.8782]

[53.8917]

    const monster_type montype = mons_is_zombified(mons) ? mons_zombie_base(mons)
                                                         : mons->type;

Replacement in crawl-ref/source/mon-util.h at line 845 [24.1682293]
∅:D[54.545] → [33.465175:465215]
B:BD[33.465175] → [33.465175:465215]
```
bool invalid_monster_class(int mclass);
```
[54.545]
[55.2836]
```
bool invalid_monster_type(monster_type mt);
```

Replacement in crawl-ref/source/mon-util.cc at line 135 [24.1699344]

B:BD[33.467237] → [33.467237:467279]

            if (invalid_monster_class(m))

[33.467237]

[33.467279]

            monster_type mt = static_cast<monster_type>(m);
            if (invalid_monster_type(mt))

Replacement in crawl-ref/source/mon-util.cc at line 139 [24.1699344]

∅:D[43.15199] → [33.467305:467354]

B:BD[33.467305] → [33.467305:467354]

B:BD[33.467354] → [56.1261:1341]

            if (monster_habitable_grid(m, grid))
                monsters_by_habitat[i].push_back(static_cast<monster_type>(m));

[43.15199]

[33.467407]

            if (monster_habitable_grid(mt, grid))
                monsters_by_habitat[i].push_back(mt);

Replacement in crawl-ref/source/mon-util.cc at line 698 [24.1699344]
B:BD[33.470264] → [33.470264:470303]
```
bool invalid_monster_class(int mclass)
```
[33.470264]
[33.470303]
```
bool invalid_monster_type(monster_type mt)
```

Replacement in crawl-ref/source/mon-util.cc at line 700 [24.1699344]

B:BD[33.470305] → [54.1945:2006]

∅:D[54.2006] → [33.470368:470407]

B:BD[33.470368] → [33.470368:470407]

B:BD[33.470407] → [5.2637:2703]

    return (mclass < 0
            || mclass >= NUM_MONSTERS
            || mon_entry[mclass] == -1
            || mon_entry[mclass] == mon_entry[MONS_PROGRAM_BUG]);

[33.470305]

[33.470462]

    return (mt < 0 || mt >= NUM_MONSTERS
            || mon_entry[mt] == -1
            || mon_entry[mt] == mon_entry[MONS_PROGRAM_BUG]);

Replacement in crawl-ref/source/mon-util.cc at line 2038 [24.1699344]
B:BD[57.2151] → [6.2643:2667]
```
    if (mon.type == -1)
```
[57.2151]
[6.2667]
```
    if (mon.type == MONS_NO_MONSTER)
```

Replacement in crawl-ref/source/mon-util.cc at line 2040 [24.1699344]

B:BD[6.2700] → [6.2700:2778]

    else if (invalid_monster_class(mon.type) && mon.type != MONS_PROGRAM_BUG)

[6.2700]

[6.2778]

    else if (invalid_monster_type(mon.type) && mon.type != MONS_PROGRAM_BUG)

Replacement in crawl-ref/source/mon-util.cc at line 2094 [24.1699344]
B:BD[58.3132] → [58.3132:3161]
```
    int nametype = mon.type;
```
[58.3132]
[58.3161]
```
    monster_type nametype = mon.type;
```

Replacement in crawl-ref/source/mon-util.cc at line 2210 [24.1699344]

B:BD[59.4395] → [6.2850:2927]

        if (invalid_monster_class(nametype) && nametype != MONS_PROGRAM_BUG)

[59.4395]

[6.2927]

        if (invalid_monster_type(nametype) && nametype != MONS_PROGRAM_BUG)

Replacement in crawl-ref/source/mon-util.cc at line 3563 [24.1699344]

B:BD[25.5304] → [25.5304:5367]

    : type(-1), hit_points(0), max_hit_points(0), hit_dice(0),

[25.5304]

[60.55646]

    : type(MONS_NO_MONSTER), hit_points(0), max_hit_points(0), hit_dice(0),

Replacement in crawl-ref/source/mon-util.cc at line 3600 [24.1699344]
B:BD[61.7791] → [61.7791:7817]
```
    type            = -1;
```
[61.7791]
[62.41967]
```
    type            = MONS_NO_MONSTER;
```
Replacement in crawl-ref/source/mon-util.cc at line 5805 [24.1699344]
∅:D[28.7677] → [29.10000:10025]
∅:D[30.81718] → [29.10000:10025]
B:BD[29.10000] → [29.10000:10025]
```
int monsters::id() const
```
[28.7677]
[29.10025]
```
monster_type monsters::id() const
```
Replacement in crawl-ref/source/mon-util.cc at line 6179 [24.1699344]
B:BD[63.15401] → [2.2575:2618]
```
    return (hit_points > 0 && type != -1);
```
[63.15401]
[63.15444]
```
    return (hit_points > 0 && type != MONS_NO_MONSTER);
```

Replacement in crawl-ref/source/misc.h at line 36 [24.1928926]

B:BD[64.5200] → [64.5200:5252]

B:BD[64.5252] → [65.2512:2586]

bool can_bottle_blood_from_corpse( int mons_type );
int num_blood_potions_from_corpse( int mons_class, int chunk_type = -1 );

[64.5200]

[66.2639]

bool can_bottle_blood_from_corpse(int mons_type);
int num_blood_potions_from_corpse(int mons_class, int chunk_type = -1);

Replacement in crawl-ref/source/misc.h at line 40 [24.1928926]

∅:D[66.2759] → [67.3503:3579]

B:BD[64.5308] → [67.3503:3579]

void split_potions_into_decay( int obj, int amount, bool need_msg = true );

[66.2759]

[24.1932234]

void split_potions_into_decay(int obj, int amount, bool need_msg = true);

Replacement in crawl-ref/source/misc.h at line 42 [24.1928926]

B:BD[68.3961] → [69.36530:36597]

void bleed_onto_floor(const coord_def& where, int mon, int damage,

[24.1932235]

[70.2540]

void bleed_onto_floor(const coord_def& where, monster_type mon, int damage,

Replacement in crawl-ref/source/misc.cc at line 127 [24.1933596]

B:BD[71.8552] → [71.8552:8656]

    int mtype = corpse.orig_monnum - 1;
    if (!invalid_monster_class(mtype) && mons_is_unique(mtype))

[71.8552]

[71.8656]

    monster_type mtype = static_cast<monster_type>(corpse.orig_monnum - 1);
    if (!invalid_monster_type(mtype) && mons_is_unique(mtype))

Replacement in crawl-ref/source/misc.cc at line 159 [24.1933596]
∅:D[72.2714] → [73.4324:4325]
∅:D[74.3904] → [73.4324:4325]
B:BD[73.4324] → [73.4324:4325]
B:BD[73.4325] → [74.3905:3962]
```
    const int max_chunks = mons_weight(item.plus) / 150;
```
[72.2714]
[24.1935097]
```
    const monster_type montype = static_cast<monster_type>(item.plus);
    const int max_chunks = mons_weight(montype) / 150;
```

Replacement in crawl-ref/source/misc.cc at line 164 [24.1933596]

B:BD[64.6807] → [74.3963:4029]

        bleed_onto_floor(you.pos(), item.plus, max_chunks, true);

[64.6807]

[75.10243]

        bleed_onto_floor(you.pos(), montype, max_chunks, true);

Replacement in crawl-ref/source/misc.cc at line 1129 [24.1933596]

B:BD[76.6656] → [69.38181:38240]

void bleed_onto_floor(const coord_def& where, int montype,

[76.6656]

[70.3229]

void bleed_onto_floor(const coord_def& where, monster_type montype,

Replacement in crawl-ref/source/misc.cc at line 1134 [24.1933596]
∅:D[7.2650] → [77.3308:3351]
B:BD[69.38319] → [77.3308:3351]
```
    if (montype == -1 && !you.can_bleed())
```
[7.2650]
[73.7227]
```
    if (montype == MONS_PLAYER && !you.can_bleed())
```
Replacement in crawl-ref/source/misc.cc at line 1137 [24.1933596]
∅:D[7.2652] → [77.3352:3375]
B:BD[73.7243] → [77.3352:3375]
```
    if (montype != -1)
```
[7.2652]
[77.3375]
```
    if (montype != NUM_MONSTERS)
```
Insertion in crawl-ref/source/makeitem.cc at line 4047 [79.927]
[78.19657]
[78.19657]
```
        default:
            break;
```
Deletion in crawl-ref/source/fight.cc at line 5116 [24.3140790]
∅:D[63.79711] → [24.3250306:3250307]
∅:D[33.892308] → [24.3250306:3250307]
B:BD[24.3250306] → [24.3250306:3250307]
B:BD[24.3250307] → [77.15484:15529]
```
            const int type = defender->id();
```

Replacement in crawl-ref/source/fight.cc at line 5127 [24.3140790]

B:BD[73.8487] → [69.43793:43851]

                bleed_onto_floor(pos, type, blood, true);

[73.8487]

[80.3898]

                bleed_onto_floor(pos, defender->id(), blood, true);

Insertion in crawl-ref/source/enum.h at line 2097 [24.3287960]
[81.19226]
[24.3340085]
```
    MONS_NO_MONSTER,
    MONS_PLAYER,
```
Replacement in crawl-ref/source/dungeon.cc at line 4688 [24.3429798]
B:BD[82.150567] → [83.11144:11180]
```
        const int  mid = mspec.mid;
```
[82.150567]
[84.17010]
```
        const monster_type mid = static_cast<monster_type>(mspec.mid);
```

Replacement in crawl-ref/source/dungeon.cc at line 4714 [24.3429798]

B:BD[85.24204] → [42.3422:3499]

            const int montype = mons_class_is_zombified(mid) ? mspec.monbase

[85.24204]

[42.3499]

            const monster_type montype = mons_class_is_zombified(mid)
                                                             ? mspec.monbase

Replacement in crawl-ref/source/dungeon.cc at line 4724 [24.3429798]
B:BD[86.687] → [62.50009:50063]
```
        mgen_data mg(static_cast<monster_type>(mid));
```
[86.687]
[87.4221]
```
        mgen_data mg(mid);
```

Insertion in crawl-ref/source/dungeon.cc at line 5120 [24.3429798]

[88.1360]

[89.2637]

            monster_type mt = static_cast<monster_type>(monster_type_thing.mid);

Replacement in crawl-ref/source/dungeon.cc at line 5124 [24.3429798]

B:BD[89.2800] → [89.2800:2989]

                && !invalid_monster_class(monster_type_thing.mid)
                && mons_is_unique(monster_type_thing.mid)
                && you.unique_creatures[monster_type_thing.mid])

[89.2800]

[89.2989]

                && !invalid_monster_type(mt)
                && mons_is_unique(mt)
                && you.unique_creatures[mt])

Replacement in crawl-ref/source/dungeon.cc at line 5130 [24.3429798]

B:BD[89.3134] → [89.3134:3254]

                     mons_type_name(monster_type_thing.mid,
                                    DESC_CAP_THE).c_str());

[89.3134]

[90.7044]

                     mons_type_name(mt, DESC_CAP_THE).c_str());

Replacement in crawl-ref/source/dungeon.cc at line 5132 [24.3429798]

∅:D[90.7096] → [89.3307:3377]

B:BD[89.3307] → [89.3307:3377]

                you.unique_creatures[monster_type_thing.mid] = false;

[90.7096]

[89.3377]

                you.unique_creatures[mt] = false;

Replacement in crawl-ref/source/delay.cc at line 471 [24.3963459]

∅:D[9.3132] → [91.2750:2751]

B:BD[92.14235] → [91.2750:2751]

B:BD[91.2751] → [9.3133:3201]


        const bool was_orc = (mons_species(item.plus) == MONS_ORC);

[9.3132]

[92.14235]

        monster_type montype = static_cast<monster_type>(item.plus);
        const bool was_orc = (mons_species(montype) == MONS_ORC);

Replacement in crawl-ref/source/delay.cc at line 476 [24.3963459]

B:BD[91.2823] → [9.3202:3273]

        bleed_onto_floor(you.pos(), item.plus, delay.duration, false);

[91.2823]

[91.2868]

        bleed_onto_floor(you.pos(), montype, delay.duration, false);

Replacement in crawl-ref/source/debug.cc at line 170 [24.4016436]
B:BD[24.4025679] → [49.5696:5741]
```
static int _debug_prompt_for_monster( void )
```
[24.4025139]
[24.4025723]
```
static monster_type _debug_prompt_for_monster(void)
```
Replacement in crawl-ref/source/debug.cc at line 178 [24.4016436]
B:BD[93.1962] → [93.1962:1987]
```
            return (-1);
```
[93.1962]
[24.4026498]
```
            return (MONS_NO_MONSTER);
```
Replacement in crawl-ref/source/debug.cc at line 182 [24.4016436]
B:BD[93.2039] → [93.2039:2056]
```
    return (-1);
```
[93.2039]
[24.4026517]
```
    return (MONS_NO_MONSTER);
```
Replacement in crawl-ref/source/debug.cc at line 1205 [24.4016436]
B:BD[24.4033679] → [24.4033679:4033703]
```
    int            mon;
```
[24.4033623]
[24.4033725]
```
    monster_type   mon;
```
Replacement in crawl-ref/source/debug.cc at line 1292 [24.4016436]
B:BD[24.4036504] → [33.1024979:1025029]
```
        if (mon == -1 || mon == MONS_PROGRAM_BUG)
```
[24.4036504]
[24.4036527]
```
        if (mon == MONS_NO_MONSTER || mon == MONS_PROGRAM_BUG)
```

Replacement in crawl-ref/source/debug.cc at line 5658 [24.4016436]

B:BD[94.14217] → [94.14217:14296]

    int old_type =  mon->type;
    int type     = _debug_prompt_for_monster();

[94.14217]

[94.14296]

    monster_type old_type =  mon->type;
    monster_type type     = _debug_prompt_for_monster();

Replacement in crawl-ref/source/debug.cc at line 5661 [24.4016436]
B:BD[94.14297] → [94.14297:14317]
```
    if (type == -1)
```
[94.14297]
[94.14317]
```
    if (type == NUM_MONSTERS)
```
Replacement in crawl-ref/source/debug.cc at line 5667 [24.4016436]
B:BD[94.14376] → [94.14376:14441]
```
    if (invalid_monster_class(type) || type == MONS_PROGRAM_BUG)
```
[94.14376]
[94.14441]
```
    if (invalid_monster_type(type))
```

Replacement in crawl-ref/source/debug.cc at line 5685 [24.4016436]

B:BD[94.14801] → [94.14801:14866]

    monster_polymorph(mon, (monster_type) type, PPT_SAME, true);

[94.14801]

[94.14866]

    monster_polymorph(mon, type, PPT_SAME, true);

Replacement in crawl-ref/source/debug.cc at line 6612 [24.4016436]

B:BD[95.5477] → [95.5477:5550]

    if (invalid_monster_index(midx) || invalid_monster_class(mon->type))

[95.5477]

[95.5550]

    if (invalid_monster_index(midx) || invalid_monster_type(mon->type))

Replacement in crawl-ref/source/debug.cc at line 6784 [24.4016436]

B:BD[95.10646] → [95.10646:10702]

        && !invalid_monster_class(menv[mon->foe].type))

[95.10646]

[95.10702]

        && !invalid_monster_type(menv[mon->foe].type))

Replacement in crawl-ref/source/debug.cc at line 6792 [24.4016436]

B:BD[95.10887] → [95.10887:10941]

        && !invalid_monster_class(menv[target].type))

[95.10887]

[95.10941]

        && !invalid_monster_type(menv[target].type))

Replacement in crawl-ref/source/beam.cc at line 4014 [24.4128068]
∅:D[8.3810] → [69.62508:62562]
B:BD[96.15572] → [69.62508:62562]
```
        bleed_onto_floor(you.pos(), -1, blood, true);
```
[8.3810]
[97.8668]
```
        bleed_onto_floor(you.pos(), MONS_PLAYER, blood, true);
```
Replacement in crawl-ref/source/actor.h at line 9 [12.35200]
B:BD[12.35279] → [12.35279:35317]
```
    virtual int       id() const = 0;
```
[12.35279]
[12.35317]
```
    virtual monster_type  id() const = 0;
```

Convert some ints to monster_type.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/travel.h at line 367 [16.29464]

Replacement in crawl-ref/source/travel.cc at line 536 [16.39949]

Replacement in crawl-ref/source/travel.cc at line 538 [16.39949]

Replacement in crawl-ref/source/travel.cc at line 567 [16.39949]

Replacement in crawl-ref/source/travel.cc at line 3661 [16.39949]

Replacement in crawl-ref/source/traps.cc at line 445 [20.5308]

Replacement in crawl-ref/source/tags.cc at line 2177 [24.164589]

Replacement in crawl-ref/source/tags.cc at line 2220 [24.164589]

Replacement in crawl-ref/source/religion.cc at line 7157 [24.804403]

Replacement in crawl-ref/source/player.h at line 329 [24.945993]

Replacement in crawl-ref/source/player.cc at line 6428 [24.962854]

Replacement in crawl-ref/source/player.cc at line 6430 [24.962854]

Replacement in crawl-ref/source/mstuff2.cc at line 1322 [24.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 1324 [24.1340842]

Replacement in crawl-ref/source/monstuff.cc at line 1670 [24.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 1994 [24.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2097 [24.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 8221 [24.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 8224 [24.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 8242 [24.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 8246 [24.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 8248 [24.1396662]

Replacement in crawl-ref/source/monster.h at line 65 [12.17727]

Replacement in crawl-ref/source/monster.h at line 190 [12.17727]

Replacement in crawl-ref/source/monspeak.cc at line 361 [24.1558496]

Replacement in crawl-ref/source/monplace.h at line 322 [24.1638277]

Replacement in crawl-ref/source/monplace.cc at line 114 [24.1641732]

Replacement in crawl-ref/source/monplace.cc at line 136 [24.1641732]

Replacement in crawl-ref/source/monplace.cc at line 145 [24.1641732]

Replacement in crawl-ref/source/monplace.cc at line 147 [24.1641732]

Replacement in crawl-ref/source/monplace.cc at line 151 [24.1641732]

Replacement in crawl-ref/source/monplace.cc at line 155 [24.1641732]

Replacement in crawl-ref/source/monplace.cc at line 168 [24.1641732]

Replacement in crawl-ref/source/monplace.cc at line 698 [24.1641732]

Replacement in crawl-ref/source/monplace.cc at line 1006 [24.1641732]

Replacement in crawl-ref/source/monplace.cc at line 1015 [24.1641732]

Replacement in crawl-ref/source/monplace.cc at line 3218 [24.1641732]

Replacement in crawl-ref/source/mon-util.h at line 845 [24.1682293]

Replacement in crawl-ref/source/mon-util.cc at line 135 [24.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 139 [24.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 698 [24.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 700 [24.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2038 [24.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2040 [24.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2094 [24.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2210 [24.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3563 [24.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3600 [24.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 5805 [24.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 6179 [24.1699344]

Replacement in crawl-ref/source/misc.h at line 36 [24.1928926]

Replacement in crawl-ref/source/misc.h at line 40 [24.1928926]

Replacement in crawl-ref/source/misc.h at line 42 [24.1928926]

Replacement in crawl-ref/source/misc.cc at line 127 [24.1933596]

Replacement in crawl-ref/source/misc.cc at line 159 [24.1933596]

Replacement in crawl-ref/source/misc.cc at line 164 [24.1933596]

Replacement in crawl-ref/source/misc.cc at line 1129 [24.1933596]

Replacement in crawl-ref/source/misc.cc at line 1134 [24.1933596]

Replacement in crawl-ref/source/misc.cc at line 1137 [24.1933596]

Insertion in crawl-ref/source/makeitem.cc at line 4047 [79.927]

Deletion in crawl-ref/source/fight.cc at line 5116 [24.3140790]

Replacement in crawl-ref/source/fight.cc at line 5127 [24.3140790]

Insertion in crawl-ref/source/enum.h at line 2097 [24.3287960]

Replacement in crawl-ref/source/dungeon.cc at line 4688 [24.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4714 [24.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4724 [24.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 5120 [24.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5124 [24.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5130 [24.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5132 [24.3429798]

Replacement in crawl-ref/source/delay.cc at line 471 [24.3963459]

Replacement in crawl-ref/source/delay.cc at line 476 [24.3963459]

Replacement in crawl-ref/source/debug.cc at line 170 [24.4016436]

Replacement in crawl-ref/source/debug.cc at line 178 [24.4016436]

Replacement in crawl-ref/source/debug.cc at line 182 [24.4016436]

Replacement in crawl-ref/source/debug.cc at line 1205 [24.4016436]