fiddlerwoaroof/crawl - Change WQLOHSNCA3VOMDJF6IINJYKSYVYZEBPJJWBB33QSNE4RP5HEXPMAC

[1956565] Fix issues with monster names.

Monster names are now stored in the monster struct and saved.

Changed some monster-finding functions to return monsters* instead of monster index for type-safety.

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

Created by dshaligram on May 4, 2008

WQLOHSNCA3VOMDJF6IINJYKSYVYZEBPJJWBB33QSNE4RP5HEXPMAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 625 [11.3]

B:BD[9.1834] → [10.139:246]

        int monster = choose_random_nearby_monster(0,
                          choose_mutatable_monster);

[9.1834]

[10.320]

        monsters *mon =
            choose_random_nearby_monster(0, choose_mutatable_monster);

Replacement in crawl-ref/source/xom.cc at line 628 [11.3]
B:BD[10.321] → [3.5:41]
```
        if (monster != NON_MONSTER)
```
[10.321]
[11.15854]
```
        if (mon)
```
Deletion in crawl-ref/source/xom.cc at line 631 [11.3]
B:BD[12.81] → [3.42:87]
```
            monsters* mon = &menv[monster];
```

Replacement in crawl-ref/source/xom.cc at line 808 [11.3]

B:BD[9.4841] → [10.339:454]

            int monster = choose_random_nearby_monster(0,
                              choose_mutatable_monster);

[9.4841]

[10.532]

            monsters *mon =
                choose_random_nearby_monster(0, choose_mutatable_monster);

Replacement in crawl-ref/source/xom.cc at line 811 [11.3]
B:BD[10.533] → [3.88:128]
```
            if (monster != NON_MONSTER)
```
[10.533]
[13.148]
```
            if (mon)
```
Deletion in crawl-ref/source/xom.cc at line 814 [11.3]
∅:D[12.161] → [13.548:549]
∅:D[14.2120] → [13.548:549]
∅:D[9.5172] → [13.548:549]
B:BD[13.548] → [13.548:549]
B:BD[13.549] → [3.129:177]
```
                monsters* mon = &menv[monster];
```
Insertion in crawl-ref/source/tags.h at line 50 [16.161012]
[15.42679]
[4.249]
```
// Minor version will be reset to zero when major version changes.
```

Replacement in crawl-ref/source/tags.h at line 56 [16.161012]

B:BD[4.442] → [4.442:493]

    TAG_MINOR_VERSION = 4       // Current version

[4.442]

[4.493]

    TAG_MINOR_MONNAM = 5,       // Monsters get individual names
    TAG_MINOR_VERSION = 5       // Current version

Insertion in crawl-ref/source/tags.cc at line 101 [16.164589]

[17.2294]

[16.168192]


// The minor version for the tag currently being read.
static int _tag_minor_version = -1;

Insertion in crawl-ref/source/tags.cc at line 712 [16.164589]
[16.176493]
[16.176710]
```
    unwind_var<int> tag_minor_version(_tag_minor_version, minorVersion);
```

Replacement in crawl-ref/source/tags.cc at line 797 [16.164589]

B:BD[16.178524] → [18.4596:4653]

                if (i >= TAG_YOU && i <= TAG_YOU_DUNGEON

[16.178524]

[19.1319]

                if ((i >= TAG_YOU && i <= TAG_YOU_DUNGEON)

Deletion in crawl-ref/source/tags.cc at line 1587 [16.164589]
B:BD[19.2704] → [20.2536:2537]
Insertion in crawl-ref/source/tags.cc at line 1761 [16.164589]
[19.4719]
[19.4719]
```
    marshallString(th, m.mname);
```

Insertion in crawl-ref/source/tags.cc at line 2018 [16.164589]

[19.5956]

    m.reset();
    
    if (_tag_minor_version >= TAG_MINOR_MONNAM)
        m.mname = unmarshallString(th, 100);

Replacement in crawl-ref/source/stuff.h at line 165 [16.217090]

B:BD[21.169] → [21.169:264]

    rng_save_excursion()  { push_rng_state(); }
    ~rng_save_excursion() { pop_rng_state(); }

[21.169]

[21.264]

    rng_save_excursion(long seed) { push_rng_state(); seed_rng(seed); }
    rng_save_excursion()          { push_rng_state(); }
    ~rng_save_excursion()         { pop_rng_state(); }

Replacement in crawl-ref/source/religion.h at line 81 [16.800304]
B:BD[22.2550] → [23.2527:2566]
```
bool bless_follower(int follower = -1,
```
[22.2550]
[22.2597]
```
bool bless_follower(monsters *follower = NULL,
```
Replacement in crawl-ref/source/religion.cc at line 1095 [16.804403]
∅:D[24.2711] → [23.2869:2903]
B:BD[25.2580] → [23.2869:2903]
```
bool bless_follower(int follower,
```
[24.2711]
[22.3548]
```
bool bless_follower(monsters *follower,
```
Deletion in crawl-ref/source/religion.cc at line 1101 [16.804403]
B:BD[26.2581] → [8.2528:2554]
```
    monsters *mon = NULL;
```

Replacement in crawl-ref/source/religion.cc at line 1105 [16.804403]

B:BD[27.2578] → [28.3005:3071]

    if (follower == -1 || (!force && !suitable(&menv[follower])))

[27.2578]

[29.3040]

    if (!follower || (!force && !suitable(follower)))

Replacement in crawl-ref/source/religion.cc at line 1116 [16.804403]
B:BD[29.3112] → [28.3209:3246]
```
        if (follower == NON_MONSTER)
```
[29.3112]
[30.3079]
```
        if (!follower)
```
Replacement in crawl-ref/source/religion.cc at line 1124 [16.804403]
B:BD[31.10854] → [24.3125:3166]
```
            if (follower == NON_MONSTER)
```
[31.10854]
[30.3118]
```
            if (!follower)
```
Replacement in crawl-ref/source/religion.cc at line 1133 [16.804403]
B:BD[24.3452] → [24.3452:3497]
```
                if (follower == NON_MONSTER)
```
[24.3452]
[32.2639]
```
                if (!follower)
```
Replacement in crawl-ref/source/religion.cc at line 1155 [16.804403]
B:BD[29.3205] → [24.4087:4142]
```
    ASSERT(follower != -1 && follower != NON_MONSTER);
```
[29.3205]
[33.2636]
```
    ASSERT(follower);
```
Deletion in crawl-ref/source/religion.cc at line 1157 [16.804403]
B:BD[33.2637] → [24.4143:4191]
B:BD[24.4191] → [8.2555:2582]
∅:D[8.2582] → [34.2565:2566]
B:BD[34.2565] → [34.2565:2566]
```
    // Else, apply blessing to chosen follower.
    mon = &menv[follower];
```

Replacement in crawl-ref/source/religion.cc at line 1166 [16.804403]

B:BD[35.2658] → [35.2658:2711]

                    if (_tso_blessing_holy_wpn(mon))

[35.2658]

[35.2711]

                    if (_tso_blessing_holy_wpn(follower))

Replacement in crawl-ref/source/religion.cc at line 1178 [16.804403]

B:BD[35.2982] → [35.2982:3035]

                    if (_tso_blessing_holy_arm(mon))

[35.2982]

[35.3035]

                    if (_tso_blessing_holy_arm(follower))

Replacement in crawl-ref/source/religion.cc at line 1190 [16.804403]

B:BD[36.3442] → [37.5307:5360]

                if (_beogh_blessing_priesthood(mon))

[36.3442]

[36.3494]

                if (_beogh_blessing_priesthood(follower))

Replacement in crawl-ref/source/religion.cc at line 1213 [16.804403]
B:BD[38.3624] → [37.5361:5404]
```
            affected = _blessing_wpn(mon);
```
[38.3624]
[39.3329]
```
            affected = _blessing_wpn(follower);
```
Replacement in crawl-ref/source/religion.cc at line 1217 [16.804403]
B:BD[39.3385] → [37.5405:5445]
```
                if (_blessing_wpn(mon))
```
[39.3385]
[39.3424]
```
                if (_blessing_wpn(follower))
```

Replacement in crawl-ref/source/religion.cc at line 1224 [16.804403]

B:BD[39.3563] → [40.3269:3316]

                give_unique_monster_name(mon);

[39.3563]

                give_unique_monster_name(follower);

Replacement in crawl-ref/source/religion.cc at line 1232 [16.804403]
B:BD[38.3736] → [37.5446:5488]
```
            affected = _blessing_AC(mon);
```
[38.3736]
[39.3678]
```
            affected = _blessing_AC(follower);
```
Replacement in crawl-ref/source/religion.cc at line 1236 [16.804403]
B:BD[39.3734] → [37.5489:5528]
```
                if (_blessing_AC(mon))
```
[39.3734]
[39.3772]
```
                if (_blessing_AC(follower))
```

Replacement in crawl-ref/source/religion.cc at line 1243 [16.804403]

B:BD[39.3906] → [40.3405:3452]

                give_unique_monster_name(mon);

[39.3906]

                give_unique_monster_name(follower);

Replacement in crawl-ref/source/religion.cc at line 1260 [16.804403]
∅:D[41.2576] → [42.2660:2721]
∅:D[43.2594] → [42.2660:2721]
∅:D[44.2594] → [42.2660:2721]
∅:D[5.2803] → [42.2660:2721]
B:BD[45.2759] → [42.2660:2721]
```
            bool more_time = _tso_blessing_extend_stay(mon);
```
[5.2803]
[42.2721]
```
            bool more_time = _tso_blessing_extend_stay(follower);
```

Replacement in crawl-ref/source/religion.cc at line 1264 [16.804403]

B:BD[42.2803] → [42.2803:2867]

                friendliness = _tso_blessing_friendliness(mon);

[42.2803]

[46.3164]

                friendliness = _tso_blessing_friendliness(follower);

Replacement in crawl-ref/source/religion.cc at line 1287 [16.804403]

B:BD[47.4035] → [24.4601:4643]

                if (_blessing_balms(mon))

[47.4035]

[24.4643]

                if (_blessing_balms(follower))

Replacement in crawl-ref/source/religion.cc at line 1296 [16.804403]

B:BD[48.3436] → [37.5709:5767]

            bool healing = _blessing_healing(mon, false);

[48.3436]

[45.3715]

            bool healing = _blessing_healing(follower, false);

Replacement in crawl-ref/source/religion.cc at line 1301 [16.804403]

B:BD[45.3789] → [37.5768:5823]

                vigour = _blessing_healing(mon, true);

[45.3789]

[49.2695]

                vigour = _blessing_healing(follower, true);

Replacement in crawl-ref/source/religion.cc at line 1328 [16.804403]
B:BD[24.4954] → [24.4954:4987]
```
    if (follower == NON_MONSTER)
```
[24.4954]
[24.4987]
```
    if (!follower)
```

Replacement in crawl-ref/source/religion.cc at line 1332 [16.804403]

B:BD[31.11613] → [24.5019:5078]

        if (mons_near(mon) && player_monster_visible(mon))

[31.11613]

[24.5078]

        if (mons_near(follower) && player_monster_visible(follower))

Replacement in crawl-ref/source/religion.cc at line 1337 [16.804403]

∅:D[24.5148] → [31.11720:11769]

B:BD[31.11720] → [31.11720:11769]

B:BD[31.11769] → [24.5149:5235]

            whom = get_unique_monster_name(mon);
            if (whom.empty())
                whom = "your " + mon->name(DESC_PLAIN);

[24.5148]

[24.5235]

            if (follower->is_named())
                whom = follower->name(DESC_PLAIN);
            else
                whom = "your " + follower->name(DESC_PLAIN);

Replacement in crawl-ref/source/religion.cc at line 1355 [16.804403]
∅:D[50.2685] → [33.2979:3016]
B:BD[33.2979] → [33.2979:3016]
```
        coord_def c(mon->x, mon->y);
```
[50.2685]
[33.3016]
```
        coord_def c(follower->pos());
```
Insertion in crawl-ref/source/religion.cc at line 1365 [16.804403]
[33.3207]
[33.3207]
```
        update_screen();
```

Replacement in crawl-ref/source/monstuff.h at line 126 [16.1390580]

B:BD[10.3137] → [10.3137:3255]

B:BD[10.3255] → [28.4278:4335]

B:BD[28.4335] → [31.12183:12238]

∅:D[31.12238] → [28.4335:4396]

B:BD[28.4335] → [28.4335:4396]

int choose_random_nearby_monster(int weight,
                                 bool (*suitable)(const monsters* mon) =
                                     choose_any_monster,
                                 bool in_sight = true,
                                 bool prefer_named = false);

[10.3137]

[24.5384]

monsters *choose_random_nearby_monster(
    int weight,
    bool (*suitable)(const monsters* mon) =
    choose_any_monster,
    bool in_sight = true,
    bool prefer_named = false);

Replacement in crawl-ref/source/monstuff.h at line 133 [16.1390580]

B:BD[24.5385] → [24.5385:5708]

int choose_random_monster_on_level(int weight,
                                   bool (*suitable)(const monsters* mon) =
                                       choose_any_monster,
                                   bool in_sight = true, bool near_by = false,
                                   bool prefer_named = false);

[24.5385]

[10.3313]

monsters *choose_random_monster_on_level(
    int weight,
    bool (*suitable)(const monsters* mon) =
    choose_any_monster,
    bool in_sight = true, bool near_by = false,
    bool prefer_named = false);

Replacement in crawl-ref/source/monstuff.cc at line 421 [16.1396662]
B:BD[51.2749] → [23.3898:3944]
```
                bless_follower(killer_index);
```
[51.2749]
[51.2821]
```
                bless_follower(mon);
```

Replacement in crawl-ref/source/monstuff.cc at line 1124 [16.1396662]

B:BD[52.2657] → [23.4809:4873]

                    if (!one_chance_in(3) && bless_follower(i))

[52.2657]

[52.2723]

                    if (!one_chance_in(3) && mon->alive()
                        && bless_follower(mon))
                    {

Insertion in crawl-ref/source/monstuff.cc at line 1128 [16.1396662]
[52.2754]
[53.3170]
```
                    }
```

Replacement in crawl-ref/source/monstuff.cc at line 1146 [16.1396662]

B:BD[54.3682] → [23.5034:5073]

                    bless_follower(i);

[54.3682]

[55.5525]

                    bless_follower(&menv[i]);

Replacement in crawl-ref/source/monstuff.cc at line 2610 [16.1396662]

∅:D[28.4756] → [10.3629:3674]

B:BD[10.3629] → [10.3629:3674]

B:BD[10.3674] → [28.4757:4829]

B:BD[28.4829] → [31.12240:12307]

int choose_random_nearby_monster(int weight,
                                 bool (*suitable)(const monsters* mon),
                                 bool in_sight, bool prefer_named)

[28.4756]

[10.3746]

monsters *choose_random_nearby_monster(int weight,
                                       bool (*suitable)(const monsters* mon),
                                       bool in_sight, bool prefer_named)

Replacement in crawl-ref/source/monstuff.cc at line 2618 [16.1396662]

B:BD[24.5846] → [24.5846:6085]

int choose_random_monster_on_level(int weight,
                                   bool (*suitable)(const monsters* mon),
                                   bool in_sight, bool near_by,
                                   bool prefer_named)

[24.5846]

[24.6085]

monsters *choose_random_monster_on_level(int weight,
                                         bool (*suitable)(const monsters* mon),
                                         bool in_sight, bool near_by,
                                         bool prefer_named)

Insertion in crawl-ref/source/monstuff.cc at line 2623 [16.1396662]
[24.6087]
[10.3748]
```
    monsters *chosen = NULL;
```
Deletion in crawl-ref/source/monstuff.cc at line 2625 [16.1396662]
B:BD[10.3777] → [10.3777:3807]
B:BD[10.3807] → [28.4882:4895]
```
    int result = NON_MONSTER;
    int mon;
```

Replacement in crawl-ref/source/monstuff.cc at line 2647 [16.1396662]

B:BD[10.4240] → [28.4896:4972]

                mon = mgrd[x][y];
                if (suitable(&menv[mon]))

[10.4240]

[28.4972]

                monsters *mon = &menv[mgrd[x][y]];
                if (suitable(mon))

Replacement in crawl-ref/source/monstuff.cc at line 2650 [16.1396662]

B:BD[28.4990] → [28.4990:5027]

B:BD[28.5027] → [31.12516:12591]

                    if (prefer_named
                        && !(get_unique_monster_name(&menv[mon]).empty()))

[28.4990]

[28.5100]

                    // FIXME: if the intent is to favour monsters
                    // named by $DEITY, we should set a flag on the
                    // monster (something like MF_DEITY_PREFERRED) and
                    // use that instead of checking the name, given
                    // that other monsters can also have names.
                    if (prefer_named && mon->is_named())

Replacement in crawl-ref/source/monstuff.cc at line 2660 [16.1396662]

B:BD[28.5279] → [28.5279:5321]

                            result = mon;

[28.5279]

[28.5321]

                            chosen = mon;

Replacement in crawl-ref/source/monstuff.cc at line 2663 [16.1396662]

B:BD[28.5401] → [28.5401:5439]

                        result = mon;

[28.5401]

[28.5439]

                        chosen = mon;

Replacement in crawl-ref/source/monstuff.cc at line 2666 [16.1396662]
B:BD[10.4436] → [10.4436:4456]
```
    return result;
```
[10.4436]
[56.2313]
```
    
    return chosen;
```
Replacement in crawl-ref/source/monplace.cc at line 719 [16.1641732]
B:BD[16.1652661] → [57.10935:10968]
∅:D[57.10968] → [16.1652773:1652807]
B:BD[16.1652773] → [16.1652773:1652807]
B:BD[16.1652807] → [57.10969:11004]
B:BD[57.11004] → [58.8369:8402]
∅:D[58.8402] → [16.1652895:1652896]
∅:D[57.11004] → [16.1652895:1652896]
B:BD[16.1652895] → [16.1652895:1652896]
```
    menv[id].inv.init(NON_ITEM);
    // scrap monster enchantments
    menv[id].enchantments.clear();
    menv[id].ench_countdown = 0;
```
[16.1652661]
[16.1652896]
```
    menv[id].reset();
    
```
Deletion in crawl-ref/source/mon-util.h at line 390 [16.1682293]
∅:D[59.2893] → [40.5051:5109]
B:BD[40.5051] → [40.5051:5109]
```
std::string get_unique_monster_name(const monsters *mon);
```
Replacement in crawl-ref/source/mon-util.cc at line 475 [16.1699344]
B:BD[60.2909] → [2.2548:2601]
```
    return (i < 0
            || i >= MAX_MONSTERS);
```
[60.2909]
[60.3004]
```
    return (i < 0 || i >= MAX_MONSTERS);
```
Insertion in crawl-ref/source/mon-util.cc at line 1375 [16.1699344]
[16.1723126]
[61.475597]
```
    mons.mname.clear();
```

Insertion in crawl-ref/source/mon-util.cc at line 1632 [16.1699344]

[16.1727941]

[62.6827]

    // If the monster has an explicit name, return that, handling it like
    // a unique's name.
    if (!mon.mname.empty())
        return mon.mname;

Insertion in crawl-ref/source/mon-util.cc at line 1756 [16.1699344]

[62.9675]

[40.5289]

}
// XXX: unique as in "proper name", not unique as in "name not used elsewhere"?
static std::string _get_unique_monster_name(const monsters *mon)
{
    const monsterentry *me = mon->find_monsterentry();
    if (!me)
        return ("");
    
    std::string name = getRandNameString(me->name, " name");
    if (!name.empty())
        return name;
    name = getRandNameString(get_monster_data(mons_genus(mon->type))->name,
                             " name");
    if (!name.empty())
        return name;
    name = getRandNameString("generic_monster_name");
    return name;

Replacement in crawl-ref/source/mon-util.cc at line 1784 [16.1699344]

B:BD[59.2990] → [59.2990:3072]

    if (mon->number > 0 && mon->number != MONS_PROGRAM_BUG)
        return false;

[59.2990]

[59.3072]

    if (mon->is_named())
        return (false);

Deletion in crawl-ref/source/mon-util.cc at line 1787 [16.1699344]

∅:D[59.3073] → [40.5475:5653]

B:BD[40.5475] → [40.5475:5653]

    // already have a name
    if (mons_is_unique(mon->type) || mon->type == MONS_PLAYER_GHOST
        || mon->type == MONS_PANDEMONIUM_DEMON)
    {
        return false;
    }

Deletion in crawl-ref/source/mon-util.cc at line 1793 [16.1699344]

B:BD[59.3346] → [59.3346:3392]

∅:D[59.3392] → [40.6071:6077]

B:BD[40.6071] → [40.6071:6077]

B:BD[40.6077] → [59.3393:3402]

∅:D[59.3402] → [40.6314:6320]

B:BD[40.6314] → [40.6314:6320]

B:BD[40.6320] → [59.3403:3821]

        {
            return false;
        }
    }
    else
    {
        // need their number parameter for other information
        if (mon->type == MONS_HYDRA // #heads
            || mon->type == MONS_ABOMINATION_SMALL // colour
            || mon->type == MONS_ABOMINATION_LARGE // colour
            || mon->type == MONS_MANTICORE // #spikes
            || mons_genus(mon->type) == MONS_DRACONIAN // subspecies
            || mons_class_is_zombified(mon->type)) // zombie type

Deletion in crawl-ref/source/mon-util.cc at line 1796 [16.1699344]

∅:D[59.3867] → [40.6342:6349]

B:BD[40.6342] → [40.6342:6349]

B:BD[40.6465] → [40.6465:6761]

∅:D[40.6761] → [62.9675:9677]

B:BD[62.9675] → [62.9675:9677]

∅:D[62.9677] → [63.11347:11348]

B:BD[63.11347] → [63.11347:11348]

B:BD[63.11348] → [40.6762:6821]

B:BD[40.6907] → [40.6907:7073]

B:BD[40.7073] → [6.2574:2660]

∅:D[6.2660] → [40.7073:7571]

B:BD[40.7073] → [40.7073:7571]

    }
    // randomly pick a number
    // XXX: Why does unsigned int (number's type) get munged on save & reload?
    mon->number = (unsigned char) random_int();
//    mprf(MSGCH_DIAGNOSTICS, "new monster number is %d", mon->number);
    return (mon->number != 0 && mon->number != MONS_PROGRAM_BUG);
}
std::string get_unique_monster_name(const monsters *mon)
{
    if (mon->type == MONS_PLAYER_GHOST)
        return mon->ghost->name + "'s ghost";
    if (mon->type == MONS_PANDEMONIUM_DEMON)
        return mon->ghost->name;
    if (mons_is_unique(mon->type))
        return get_monster_data(mon->type)->name;
    // Since the seed for the monster name is stored in mon->number
    // any monster that uses number for something else cannot be named.
    if (mon->type == MONS_HYDRA // #heads
        || mon->type == MONS_ABOMINATION_SMALL // colour
        || mon->type == MONS_ABOMINATION_LARGE // colour
        || mon->type == MONS_MANTICORE // #spikes
        || mons_genus(mon->type) == MONS_DRACONIAN // subspecies
        || mons_class_is_zombified(mon->type)) // zombie type
    {
        return "";

Deletion in crawl-ref/source/mon-util.cc at line 1797 [16.1699344]

B:BD[40.7577] → [40.7577:7956]


    // unnamed, sorry
    if (mon->number <= 0 || mon->number == MONS_PROGRAM_BUG)
        return "";
//    mprf(MSGCH_DIAGNOSTICS, "get name from number %d", mon->number);
    rng_save_excursion rng_state;
    seed_rng( mon->number );
    std::string name
        = getRandNameString(get_monster_data(mon->type)->name, " name");
    if (!name.empty())
        return name;

Replacement in crawl-ref/source/mon-util.cc at line 1798 [16.1699344]

B:BD[40.7957] → [40.7957:8190]

    name = getRandNameString(get_monster_data(mons_genus(mon->type))->name,
                             " name");
    if (!name.empty())
        return name;
    name = getRandNameString("generic_monster_name");
    return name;

[40.7957]

[40.8190]

    mon->mname = _get_unique_monster_name(mon);
    return (mon->is_named());

Deletion in crawl-ref/source/mon-util.cc at line 1802 [16.1699344]
∅:D[40.8193] → [16.1731690:1731762]
B:BD[16.1731690] → [16.1731690:1731762]
```
/* ********************* END PUBLIC FUNCTIONS ********************* */
```

Insertion in crawl-ref/source/mon-util.cc at line 2564 [16.1699344]

[64.5813]

}
void monsters::reset()
{
    destroy_inventory();
    mname.clear();
    enchantments.clear();
    ench_countdown = 0;
    inv.init(NON_ITEM);
    flags           = 0;
    experience      = 0L;
    type            = -1;
    hit_points      = 0;
    max_hit_points  = 0;
    hit_dice        = 0;
    ac              = 0;
    ev              = 0;
    speed_increment = 0;
    attitude        = ATT_HOSTILE;
    behaviour       = BEH_SLEEP;
    foe             = MHITNOT;
    number          = 0;
    if (in_bounds(x, y))
        mgrd[x][y] = NON_MONSTER;
    x = y = 0;
    ghost.reset(NULL);

Insertion in crawl-ref/source/mon-util.cc at line 2598 [16.1699344]
[64.5864]
[64.5864]
```
    mname             = mon.mname;
```
Replacement in crawl-ref/source/mon-util.cc at line 3899 [16.1699344]
B:BD[65.9804] → [65.9804:9866]
```
std::string monsters::name(description_level_type desc) const
```
[65.9804]
[66.2391]
```
bool monsters::is_named() const
```

Replacement in crawl-ref/source/mon-util.cc at line 3901 [16.1699344]

B:BD[66.2393] → [7.10613:10728]

∅:D[7.10728] → [40.8306:8354]

B:BD[40.8306] → [40.8306:8354]

    std::string monnam = "";
    if (player_monster_visible(this))
        monnam = get_unique_monster_name(this);
    if (!monnam.empty())
        return monnam;

[66.2393]

[40.8354]

    return (!mname.empty() || mons_is_unique(type));
}

Insertion in crawl-ref/source/mon-util.cc at line 3904 [16.1699344]
[40.8355]
[66.2393]
```
std::string monsters::name(description_level_type desc) const
{
```
Replacement in crawl-ref/source/mon-util.cc at line 3917 [16.1699344]
B:BD[66.2512] → [67.4405:4465]
∅:D[66.2571] → [68.1668:1722]
∅:D[67.4465] → [68.1668:1722]
∅:D[62.9794] → [68.1668:1722]
B:BD[68.1668] → [68.1668:1722]
```
    std::string mname = _str_monam(*this, desc, force_vis);
    return (possessive? apostrophise(mname) : mname);
```
[66.2512]
[69.3016]
```
    std::string monnam = _str_monam(*this, desc, force_vis);
    return (possessive? apostrophise(monnam) : monnam);
```
Insertion in crawl-ref/source/mon-util.cc at line 4289 [16.1699344]
[64.6881]
[63.16939]
```
    mname = ghost->name;
```

Deletion in crawl-ref/source/mon-util.cc at line 4429 [16.1699344]

∅:D[19.14058] → [64.8131:8159]

B:BD[64.8131] → [64.8131:8159]

B:BD[64.8159] → [19.14059:14084]

B:BD[19.14084] → [20.11751:11752]

∅:D[20.11752] → [57.12590:12616]

B:BD[19.14089] → [57.12590:12616]

B:BD[57.12616] → [58.9433:9457]

∅:D[58.9457] → [64.8192:8217]

∅:D[57.12616] → [64.8192:8217]

B:BD[64.8192] → [64.8192:8217]

B:BD[64.8217] → [40.9105:9307]

∅:D[40.9307] → [64.8333:8358]

B:BD[64.8333] → [64.8333:8358]

B:BD[64.8358] → [40.9308:9432]

∅:D[40.9432] → [64.8432:8531]

∅:D[57.12633] → [64.8432:8531]

B:BD[64.8432] → [64.8432:8531]

}
void monsters::reset()
{
    destroy_inventory();
    enchantments.clear();
    ench_countdown = 0;
    inv.init(NON_ITEM);
    flags           = 0;
    experience      = 0L;
    type            = -1;
    hit_points      = 0;
    max_hit_points  = 0;
    hit_dice        = 0;
    ac              = 0;
    ev              = 0;
    speed_increment = 0;
    attitude        = ATT_HOSTILE;
    behaviour       = BEH_SLEEP;
    foe             = MHITNOT;
    number          = 0;
    if (in_bounds(x, y))
        mgrd[x][y] = NON_MONSTER;
    x = y = 0;
    ghost.reset(NULL);

Replacement in crawl-ref/source/mon-util.cc at line 5765 [16.1699344]

B:BD[70.7869] → [70.7869:7977]

            const std::string mname = name(DESC_CAP_THE);
            mprf("%s shudders%s.", mname.c_str(),

[70.7869]

[70.7977]

            const std::string monnam = name(DESC_CAP_THE);
            mprf("%s shudders%s.", monnam.c_str(),

Replacement in crawl-ref/source/mon-util.cc at line 5771 [16.1699344]

B:BD[70.8154] → [70.8154:8222]

                mprf("%s spits out another jelly.", mname.c_str());

[70.8154]

[70.8222]

                mprf("%s spits out another jelly.", monnam.c_str());

Replacement in crawl-ref/source/mon-util.cc at line 5775 [16.1699344]
B:BD[70.8293] → [70.8293:8329]
```
                     mname.c_str(),
```
[70.8293]
[70.8329]
```
                     monnam.c_str(),
```

Replacement in crawl-ref/source/mon-util.cc at line 6036 [16.1699344]

B:BD[71.19177] → [40.9532:9589]

    std::string name = get_unique_monster_name(monster);

[71.19177]

[40.9589]

    std::string name =
        monster->is_named()? monster->name(DESC_CAP_THE) : "";

Insertion in crawl-ref/source/externs.h at line 1013 [16.3270163]
[64.31762]
[64.31762]
```
    void reset();
```
Insertion in crawl-ref/source/externs.h at line 1016 [16.3270163]
[64.31771]
[16.3280366]
```
    std::string mname;
    
```

Insertion in crawl-ref/source/externs.h at line 1056 [16.3270163]

[65.83588]

[72.8774]

    // Returns true if the monster is named with a proper name, or is
    // a player ghost.
    bool is_named() const;
    const monsterentry *find_monsterentry() const;

Deletion in crawl-ref/source/externs.h at line 1064 [16.3270163]
B:BD[73.2233] → [74.3087:3088]
Deletion in crawl-ref/source/externs.h at line 1108 [16.3270163]
∅:D[19.15804] → [64.31930:31948]
B:BD[64.31930] → [64.31930:31948]
```
    void reset();
```
Deletion in crawl-ref/source/externs.h at line 1271 [16.3270163]
B:BD[75.3037] → [75.3037:3088]
```
    const monsterentry *find_monsterentry() const;
```

Replacement in crawl-ref/source/decks.cc at line 1349 [16.3987460]

B:BD[76.1186] → [76.1186:1285]

    const int mon_to_swap = choose_random_nearby_monster(0);
    if ( mon_to_swap == NON_MONSTER )

[76.1186]

[76.1285]

    monsters *mon_to_swap = choose_random_nearby_monster(0);
    if ( !mon_to_swap )

Replacement in crawl-ref/source/decks.cc at line 1356 [16.3987460]

B:BD[76.1345] → [76.1345:1446]

        monsters& mon = menv[mon_to_swap];
        const coord_def newpos = menv[mon_to_swap].pos();

[76.1345]

[76.1446]

        monsters& mon(*mon_to_swap);
        const coord_def newpos = mon.pos();

Replacement in crawl-ref/source/decks.cc at line 1360 [16.3987460]
B:BD[76.1478] → [76.1478:1520]
```
        mgrd[mon.x][mon.y] = NON_MONSTER;
```
[76.1478]
[76.1520]
```
        mgrd(newpos) = NON_MONSTER;
```
Replacement in crawl-ref/source/decks.cc at line 1366 [16.3987460]
B:BD[76.1601] → [76.1601:1643]
```
        mgrd[mon.x][mon.y] = mon_to_swap;
```
[76.1601]
[76.1643]
```
        mgrd(mon.pos()) = monster_index(mon_to_swap);
```

Replacement in crawl-ref/source/decks.cc at line 1406 [16.3987460]

B:BD[77.2543] → [77.2543:2610]

        const int mon_to_banish = choose_random_nearby_monster(1);

[77.2543]

[16.3997718]

        monsters *mon_to_banish = choose_random_nearby_monster(1);

Replacement in crawl-ref/source/decks.cc at line 1409 [16.3987460]
B:BD[77.2661] → [77.2661:2715]
```
        if ( i != 0 && mon_to_banish == NON_MONSTER )
```
[77.2661]
[77.2715]
```
        if ( i != 0 && !mon_to_banish )
```

Replacement in crawl-ref/source/decks.cc at line 1412 [16.3987460]

B:BD[77.2738] → [77.2738:2802]

        if ( mon_to_banish == NON_MONSTER ) // banish yourself!

[77.2738]

[77.2802]

        if ( !mon_to_banish ) // banish yourself!

Replacement in crawl-ref/source/decks.cc at line 1418 [16.3987460]
B:BD[77.2937] → [77.2937:2979]
```
            menv[mon_to_banish].banish();
```
[77.2937]
[77.2979]
```
            mon_to_banish->banish();
```

Replacement in crawl-ref/source/debug.cc at line 3566 [16.4016436]

B:BD[40.12278] → [23.5963:6036]

    if (!bless_follower(monster_index(mon), god, _force_suitable, true))

[40.12278]

[40.12336]

    if (!bless_follower(mon, god, _force_suitable, true))

[1956565] Fix issues with monster names.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/xom.cc at line 625 [11.3]

Replacement in crawl-ref/source/xom.cc at line 628 [11.3]

Deletion in crawl-ref/source/xom.cc at line 631 [11.3]

Replacement in crawl-ref/source/xom.cc at line 808 [11.3]

Replacement in crawl-ref/source/xom.cc at line 811 [11.3]

Deletion in crawl-ref/source/xom.cc at line 814 [11.3]

Insertion in crawl-ref/source/tags.h at line 50 [16.161012]

Replacement in crawl-ref/source/tags.h at line 56 [16.161012]

Insertion in crawl-ref/source/tags.cc at line 101 [16.164589]

Insertion in crawl-ref/source/tags.cc at line 712 [16.164589]

Replacement in crawl-ref/source/tags.cc at line 797 [16.164589]

Deletion in crawl-ref/source/tags.cc at line 1587 [16.164589]

Insertion in crawl-ref/source/tags.cc at line 1761 [16.164589]

Insertion in crawl-ref/source/tags.cc at line 2018 [16.164589]

Replacement in crawl-ref/source/stuff.h at line 165 [16.217090]

Replacement in crawl-ref/source/religion.h at line 81 [16.800304]

Replacement in crawl-ref/source/religion.cc at line 1095 [16.804403]

Deletion in crawl-ref/source/religion.cc at line 1101 [16.804403]

Replacement in crawl-ref/source/religion.cc at line 1105 [16.804403]

Replacement in crawl-ref/source/religion.cc at line 1116 [16.804403]

Replacement in crawl-ref/source/religion.cc at line 1124 [16.804403]

Replacement in crawl-ref/source/religion.cc at line 1133 [16.804403]

Replacement in crawl-ref/source/religion.cc at line 1155 [16.804403]

Deletion in crawl-ref/source/religion.cc at line 1157 [16.804403]

Replacement in crawl-ref/source/religion.cc at line 1166 [16.804403]

Replacement in crawl-ref/source/religion.cc at line 1178 [16.804403]

Replacement in crawl-ref/source/religion.cc at line 1190 [16.804403]

Replacement in crawl-ref/source/religion.cc at line 1213 [16.804403]

Replacement in crawl-ref/source/religion.cc at line 1217 [16.804403]

Replacement in crawl-ref/source/religion.cc at line 1224 [16.804403]

Replacement in crawl-ref/source/religion.cc at line 1232 [16.804403]

Replacement in crawl-ref/source/religion.cc at line 1236 [16.804403]

Replacement in crawl-ref/source/religion.cc at line 1243 [16.804403]

Replacement in crawl-ref/source/religion.cc at line 1260 [16.804403]

Replacement in crawl-ref/source/religion.cc at line 1264 [16.804403]

Replacement in crawl-ref/source/religion.cc at line 1287 [16.804403]

Replacement in crawl-ref/source/religion.cc at line 1296 [16.804403]

Replacement in crawl-ref/source/religion.cc at line 1301 [16.804403]

Replacement in crawl-ref/source/religion.cc at line 1328 [16.804403]

Replacement in crawl-ref/source/religion.cc at line 1332 [16.804403]

Replacement in crawl-ref/source/religion.cc at line 1337 [16.804403]

Replacement in crawl-ref/source/religion.cc at line 1355 [16.804403]

Insertion in crawl-ref/source/religion.cc at line 1365 [16.804403]

Replacement in crawl-ref/source/monstuff.h at line 126 [16.1390580]

Replacement in crawl-ref/source/monstuff.h at line 133 [16.1390580]

Replacement in crawl-ref/source/monstuff.cc at line 421 [16.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1124 [16.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 1128 [16.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1146 [16.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2610 [16.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2618 [16.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 2623 [16.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 2625 [16.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2647 [16.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2650 [16.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2660 [16.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2663 [16.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2666 [16.1396662]

Replacement in crawl-ref/source/monplace.cc at line 719 [16.1641732]

Deletion in crawl-ref/source/mon-util.h at line 390 [16.1682293]

Replacement in crawl-ref/source/mon-util.cc at line 475 [16.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 1375 [16.1699344]