fiddlerwoaroof/crawl - Change UA5DAEP7KCACHMACVVL2KGE6XNUCWLOUWT6MS2HOZ4P4LQAAV6OAC

Really fix monster speed handling, so that enslaved intact souls can

have their speed properly overridden.

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

Created by dolorous on March 13, 2009

UA5DAEP7KCACHMACVVL2KGE6XNUCWLOUWT6MS2HOZ4P4LQAAV6OAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monplace.cc at line 766 [5.1641732]

B:BD[3.6191] → [4.2645:2695]

                && (mons_class_speed(mg.cls) == 0

[3.6191]

[6.4717]

                && (mons_class_base_speed(mg.cls) == 0

Replacement in crawl-ref/source/monplace.cc at line 833 [5.1641732]

B:BD[7.27480] → [7.27480:27557]

B:BD[7.27557] → [4.2696:2751]

                    // 0 speed monsters can't shove player out of their way.
                    if (mons_class_speed(mg.cls) == 0)

[7.27480]

[5.1648874]

                    if (mons_class_base_speed(mg.cls) == 0)

Replacement in crawl-ref/source/monplace.cc at line 1389 [5.1641732]

B:BD[7.36191] → [8.2647:2718]

    menv[mid].speed = mons_class_zombie_speed(menv[mid].base_monster);

[7.36191]

[7.36270]

    menv[mid].speed = mons_class_zombie_base_speed(menv[mid].base_monster);

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

B:BD[5.1694652] → [4.2779:2809]

B:BD[4.2809] → [8.2720:2757]

int mons_class_speed(int mc);
int mons_class_zombie_speed(int mc);

[5.1694652]

[5.1694680]

int mons_class_base_speed(int mc);
int mons_class_zombie_base_speed(int zombie_base_mc);
int mons_base_speed(const monsters *mon);

Deletion in crawl-ref/source/mon-util.cc at line 1587 [5.1699344]
B:BD[5.1717468] → [8.2806:2858]
```
    const int  zclass      = monster->base_monster;
```

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

B:BD[9.6258] → [8.2859:3013]

    const int speed =
        mons_is_zombified(monster) ? mons_class_zombie_speed(zclass)
                                   : mons_class_speed(mclass);

[9.6258]

[10.3409]

    const int  speed       = mons_base_speed(monster);

Replacement in crawl-ref/source/mon-util.cc at line 2302 [5.1699344]
B:BD[5.1732251] → [4.2899:2928]
```
int mons_class_speed(int mc)
```
[5.1732251]
[5.1732274]
```
int mons_class_base_speed(int mc)
```
Replacement in crawl-ref/source/mon-util.cc at line 2308 [5.1699344]
B:BD[5.1732828] → [8.3014:3050]
```
int mons_class_zombie_speed(int mc)
```
[5.1732828]
[4.2965]
```
int mons_class_zombie_base_speed(int zombie_base_mc)
```

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

B:BD[4.2967] → [8.3051:3098]

    return (std::max(3, _base_speed(mc) - 2));

[4.2967]

[4.2992]

    return (std::max(3, _base_speed(zombie_base_mc) - 2));
}
int mons_base_speed(const monsters *mon)
{
    if (mons_enslaved_intact_soul(mon))
        return (mons_class_base_speed(mons_zombie_base(mon)));
    return (mons_is_zombified(mon) ? mons_class_zombie_base_speed(mons_zombie_base(mon))
                                   : mons_class_base_speed(mon->type));

Replacement in crawl-ref/source/describe.cc at line 2686 [5.3736416]

B:BD[11.8309] → [2.2745:2883]

    const int speed = mons_class_is_zombified(mon.type) ?
        mons_class_zombie_speed(mon.base_monster) : mons_class_speed(mon.type);

[11.8309]

[12.5023]

    const int speed = mons_base_speed(&mon);