fiddlerwoaroof/crawl - Change VGX2NJ7LQ6Q4AGAJMPZXFARQTQRLI4OYUXXPKWC6TDG4ADUEXLIQC

Make messages for animating single skeletons/corpses versus multiple

ones consistent. Also, display a proper warning message if a player tries to animate a single skeleton/corpse while not actually standing on one.

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

Created by dolorous on January 22, 2009

VGX2NJ7LQ6Q4AGAJMPZXFARQTQRLI4OYUXXPKWC6TDG4ADUEXLIQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 1600 [8.293070]

B:BD[6.1724] → [7.267:379]

        animate_remains(you.pos(), CORPSE_SKELETON, BEH_FRIENDLY,
                        you.pet_target, god);

[6.1724]

[6.1873]


        if (animate_remains(you.pos(), CORPSE_SKELETON, BEH_FRIENDLY,
                            you.pet_target, god) < 0)
        {
            mpr("There is no skeleton here to animate!");
        }

Replacement in crawl-ref/source/spl-cast.cc at line 1609 [8.293070]

B:BD[6.1918] → [6.1918:1972]

        mpr("You call on the dead to walk for you.");

[6.1918]

[9.1550]

        mpr("You call on the dead to walk for you...");

Replacement in crawl-ref/source/spells3.h at line 54 [8.526814]

∅:D[3.348] → [7.385:581]

B:BD[10.621] → [7.385:581]

B:BD[7.581] → [11.4868:4933]

bool animate_remains(const coord_def &a, corpse_type class_allowed,
                     beh_type beha, unsigned short hitting,
                     god_type god = GOD_NO_GOD, bool actual = true,
                     bool quiet = false, int* mon_index = NULL);

[3.348]

[10.854]

int animate_remains(const coord_def &a, corpse_type class_allowed,
                    beh_type beha, unsigned short hitting,
                    god_type god = GOD_NO_GOD, bool actual = true,
                    bool quiet = false, int* mon_index = NULL);

Replacement in crawl-ref/source/spells3.cc at line 875 [8.531613]

B:BD[10.8051] → [7.625:801]

B:BD[7.801] → [11.5169:5218]

bool animate_remains(const coord_def &a, corpse_type class_allowed,
                     beh_type beha, unsigned short hitting,
                     god_type god, bool actual,
                     bool quiet, int* mon_index)

[10.8051]

[10.8260]

int animate_remains(const coord_def &a, corpse_type class_allowed,
                    beh_type beha, unsigned short hitting,
                    god_type god, bool actual,
                    bool quiet, int* mon_index)

Replacement in crawl-ref/source/spells3.cc at line 881 [8.531613]
∅:D[12.9672] → [13.199:223]
B:BD[13.199] → [13.199:223]
```
        return (false);
```
[12.9672]
[13.223]
```
        return (0);
```
Insertion in crawl-ref/source/spells3.cc at line 883 [8.531613]
[13.224]
[10.8262]
```
    int number_found = 0;
```

Replacement in crawl-ref/source/spells3.cc at line 889 [8.531613]

B:BD[10.8417] → [2.365:402]

∅:D[14.313] → [10.8502:8547]

∅:D[2.402] → [10.8502:8547]

B:BD[10.8502] → [10.8502:8547]

B:BD[10.8547] → [14.314:367]

        if (_animatable_remains(*si)
            && (class_allowed == CORPSE_BODY
                || si->sub_type == CORPSE_SKELETON))

[10.8417]

[10.8601]

        if (class_allowed == CORPSE_BODY || si->sub_type == CORPSE_SKELETON)

Insertion in crawl-ref/source/spells3.cc at line 891 [8.531613]

[10.8611]

[14.368]

            number_found++;
            if (!_animatable_remains(*si))
                continue;

Insertion in crawl-ref/source/spells3.cc at line 919 [8.531613]
[10.9285]
[10.9285]
```
    if (number_found == 0)
        return (-1);
```
Replacement in crawl-ref/source/spells3.cc at line 923 [8.531613]
B:BD[10.9286] → [10.9286:9308]
```
    return (success);
```
[10.9286]
[10.9308]
```
    if (!success)
        return (0);
    return (1);
```

Replacement in crawl-ref/source/spells3.cc at line 982 [8.531613]

B:BD[7.907] → [5.275:326]

                                    actual, true))

[7.907]

[14.947]

                                    actual, true) > 0)

Replacement in crawl-ref/source/item_use.cc at line 1828 [8.2781507]

B:BD[4.8979] → [4.8979:9103]

    if (!animate_remains(victim->pos(), CORPSE_BODY, beh, hitting,
                         GOD_NO_GOD, true, true, &midx))

[4.8979]

[4.9103]

    if (animate_remains(victim->pos(), CORPSE_BODY, beh, hitting,
                        GOD_NO_GOD, true, true, &midx) <= 0)

Replacement in crawl-ref/source/abl-show.cc at line 1551 [8.4494389]

∅:D[15.3069] → [8.4522041:4522097]

B:BD[8.4522041] → [8.4522041:4522097]

B:BD[8.4522097] → [7.3314:3434]

        mpr("You call on the dead to walk for you...");
        animate_remains(you.pos(), CORPSE_BODY, BEH_FRIENDLY, you.pet_target,
                        GOD_YREDELEMNUL);

[15.3069]

[8.4522219]

        mpr("You attempt to give life to the dead...");
        if (animate_remains(you.pos(), CORPSE_BODY, BEH_FRIENDLY,
                            you.pet_target, GOD_YREDELEMNUL) < 0)
        {
            mpr("There are no remains here to animate!");
        }

Insertion in crawl-ref/source/abl-show.cc at line 1568 [8.4494389]
[8.4522493]
[10.14204]