fiddlerwoaroof/crawl - Change 7UIFNKK5IU2VUAGKWDB6KOETOVQOCOVDHZHB4OPAM2CQRCWV4AGQC

Pull out some code from print_wounds() into new function mons_get_damage_level.

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

Created by pauldubois on March 30, 2008

7UIFNKK5IU2VUAGKWDB6KOETOVQOCOVDHZHB4OPAM2CQRCWV4AGQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/monstuff.h at line 140 [6.1390580]

∅:D[5.752] → [6.1394500:1394716]

∅:D[3.4632] → [6.1394500:1394716]

B:BD[6.1394500] → [6.1394500:1394716]


/* ***********************************************************************
 * called from: fight
 * *********************************************************************** */
bool wounded_damaged(int wound_class);

Deletion in crawl-ref/source/monstuff.h at line 158 [6.1390580]
B:BD[6.1395729] → [6.1395729:1395730]

Deletion in crawl-ref/source/monstuff.h at line 159 [6.1390580]

B:BD[6.1395731] → [6.1395731:1395904]

/* ***********************************************************************
 * called from: xxx
 * *********************************************************************** */

Insertion in crawl-ref/source/monstuff.h at line 161 [6.1390580]

[6.1395959]

void mons_get_damage_level(const monsters*, std::string& desc, mon_dam_level_type&);

Deletion in crawl-ref/source/monstuff.h at line 163 [6.1390580]

B:BD[6.1395960] → [6.1395960:1396258]

// last updated 08jun2000 {dlb}
/* ***********************************************************************
 * called from: bang - beam - effects - fight - monstuff - mstuff2 -
 *              spells2 - spells3 - spells4
 * *********************************************************************** */

Deletion in crawl-ref/source/monstuff.h at line 165 [6.1390580]

B:BD[6.1396321] → [6.1396321:1396533]


/* ***********************************************************************
 * called from: beam - fight - files - monstuff - spells1
 * *********************************************************************** */

Deletion in crawl-ref/source/monstuff.h at line 167 [6.1390580]

B:BD[6.1396617] → [7.410817:411012]

/* ***********************************************************************
 * called from: monplace - spells2 - view
 * *********************************************************************** */

Insertion in crawl-ref/source/monstuff.cc at line 73 [6.1396662]
[6.1397982]
[4.2687]
```
static bool _wounded_damaged(int wound_class);
```

Replacement in crawl-ref/source/monstuff.cc at line 797 [6.1396662]

B:BD[8.18025] → [8.18025:18099]

                     wounded_damaged(monster->type) ? "destroy" : "kill",

[8.18025]

[9.1674]

                     _wounded_damaged(monster->type) ? "destroy" : "kill",

Replacement in crawl-ref/source/monstuff.cc at line 926 [6.1396662]

B:BD[2.239] → [2.239:311]

                                       wounded_damaged(monster->type) ?

[2.239]

[2.311]

                                       _wounded_damaged(monster->type) ?

Replacement in crawl-ref/source/monstuff.cc at line 1057 [6.1396662]

B:BD[2.563] → [2.563:635]

                                       wounded_damaged(monster->type) ?

[2.563]

[2.635]

                                       _wounded_damaged(monster->type) ?

Replacement in crawl-ref/source/monstuff.cc at line 1821 [6.1396662]

B:BD[6.1433667] → [6.1433667:1433804]

        // Might not be ideal, but it's better that insta-killing
        // the monster... maybe try for a short blinki instead? -- bwr

[6.1433667]

[6.1433804]

        // Might not be ideal, but it's better than insta-killing
        // the monster... maybe try for a short blink instead? -- bwr

Replacement in crawl-ref/source/monstuff.cc at line 1831 [6.1396662]

B:BD[6.1433940] → [5.754:797]

void print_wounds(const monsters *monster)

[6.1433940]

[6.1433984]

void mons_get_damage_level(
    const monsters* monster,
    std::string& desc, mon_dam_level_type& dam_level)

Replacement in crawl-ref/source/monstuff.cc at line 1835 [6.1396662]

B:BD[6.1433986] → [6.1433986:1434094]

    // prevents segfault -- cannot use info[] here {dlb}
    char str_wound[INFO_SIZE];
    int  dam_level;

[6.1433986]

[6.1434094]

    if (monster->hit_points <= monster->max_hit_points / 6)
    {
        desc += "almost ";
        desc += _wounded_damaged(monster->type) ? "destroyed" : "dead";
        dam_level = MDAM_ALMOST_DEAD;
        return;
    }

Insertion in crawl-ref/source/monstuff.cc at line 1843 [6.1396662]

[6.1434095]

    if (monster->hit_points <= monster->max_hit_points / 6)
    {
        desc += "horribly ";
        dam_level = MDAM_HORRIBLY_DAMAGED;
    }
    else if (monster->hit_points <= monster->max_hit_points / 3)
    {
        desc += "heavily ";
        dam_level = MDAM_HEAVILY_DAMAGED;
    }
    else if (monster->hit_points <= 3 * (monster-> max_hit_points / 4))
    {
        desc += "moderately ";
        dam_level = MDAM_MODERATELY_DAMAGED;
    }
    else
    {
        desc += "lightly ";
        dam_level = MDAM_LIGHTLY_DAMAGED;
    }
    desc += _wounded_damaged(monster->type) ? "damaged" : "wounded";
}
void print_wounds(const monsters *monster)
{

Deletion in crawl-ref/source/monstuff.cc at line 1880 [6.1396662]

B:BD[6.1434339] → [6.1434339:1435341]


    strcpy(str_wound, " is ");
    if (monster->hit_points <= monster->max_hit_points / 6)
    {
        strcat(str_wound, "almost ");
        strcat(str_wound, wounded_damaged(monster->type) ? "destroyed"
                                                         : "dead");
        dam_level = MDAM_ALMOST_DEAD;
    }
    else
    {
        if (monster->hit_points <= monster->max_hit_points / 6)
        {
            strcat(str_wound, "horribly ");
            dam_level = MDAM_HORRIBLY_DAMAGED;
        }
        else if (monster->hit_points <= monster->max_hit_points / 3)
        {
            strcat(str_wound, "heavily " );
            dam_level = MDAM_HEAVILY_DAMAGED;
        }
        else if (monster->hit_points <= 3 * (monster-> max_hit_points / 4))
        {
            strcat(str_wound, "moderately ");
            dam_level = MDAM_MODERATELY_DAMAGED;
        }
        else
        {
            strcat(str_wound, "lightly ");
            dam_level = MDAM_LIGHTLY_DAMAGED;
        }

Replacement in crawl-ref/source/monstuff.cc at line 1881 [6.1396662]

B:BD[6.1435342] → [6.1435342:1435488]

        strcat(str_wound, wounded_damaged(monster->type) ? "damaged"
                                                         : "wounded");
    }

[6.1435342]

[6.1435488]

    std::string desc;
    mon_dam_level_type dam_level;
    mons_get_damage_level(monster, desc, dam_level);

Replacement in crawl-ref/source/monstuff.cc at line 1885 [6.1396662]

B:BD[6.1435489] → [6.1435489:1435598]

    strcat(str_wound, ".");
    simple_monster_message(monster, str_wound, MSGCH_MONSTER_DAMAGE, dam_level);

[6.1435489]

[6.1435598]

    desc.insert(0, " is ");
    desc += ".";
    simple_monster_message(monster, desc.c_str(), MSGCH_MONSTER_DAMAGE, dam_level);

Replacement in crawl-ref/source/monstuff.cc at line 1892 [6.1396662]
B:BD[6.1435762] → [6.1435762:1435800]
```
bool wounded_damaged(int wound_class)
```
[6.1435762]
[6.1435800]
```
static bool _wounded_damaged(int monster_type)
```

Replacement in crawl-ref/source/monstuff.cc at line 1895 [6.1396662]

B:BD[6.1435872] → [2.765:830]

    const mon_holy_type holy = mons_class_holiness(wound_class);

[6.1435872]

[6.1435921]

    const mon_holy_type holy = mons_class_holiness(monster_type);

Replacement in crawl-ref/source/monstuff.cc at line 1900 [6.1396662]
B:BD[6.1436036] → [6.1436036:1436093]
```
}                               // end wounded_damaged()
```
[6.1436036]
[6.1436093]
```
}                               // end _wounded_damaged()
```