fiddlerwoaroof/crawl - Change G3CXFOBNYSTKZQPTYUJ5YXJUCSFZKNA4RR4KAT77AH6ATTG4TONQC

Put monster speed calculation back in _define_zombie(), and fix problem

where the speed was being downgraded for zombies twice.

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

Created by dolorous on March 6, 2009

G3CXFOBNYSTKZQPTYUJ5YXJUCSFZKNA4RR4KAT77AH6ATTG4TONQC

Dependencies

In channels

main

Change contents

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

B:BD[5.1642487] → [2.2777:2904]

static void _define_zombie(int mid, monster_type ztype,
                           monster_type cs, int power, coord_def pos);

[5.1642487]

[6.23153]

static void _define_zombie(int mid, monster_type ztype, monster_type cs,
                           int power, coord_def pos);

Insertion in crawl-ref/source/monplace.cc at line 1389 [5.1641732]
[6.36113]
[6.36113]
```
    menv[mid].ac  = std::min(0, menv[mid].ac);
```
Deletion in crawl-ref/source/monplace.cc at line 1391 [5.1641732]
B:BD[6.36114] → [6.36114:36167]
```
    if (menv[mid].ac < 0)
        menv[mid].ac = 0;
```
Insertion in crawl-ref/source/monplace.cc at line 1392 [5.1641732]
[6.36190]
[6.36190]
```
    menv[mid].ev  = std::min(0, menv[mid].ev);
```

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

B:BD[6.36191] → [6.36191:36243]

    if (menv[mid].ev < 0)
        menv[mid].ev = 0;

[6.36191]

[6.36270]

    menv[mid].speed -= 2;
    menv[mid].speed  = std::min(3, menv[mid].speed);

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

B:BD[6.36660] → [7.8836:8911]

        menv[mid].hit_points     = hit_points( menv[mid].hit_dice, 5, 4 );

[6.36660]

[6.36731]

        menv[mid].hit_points     = hit_points(menv[mid].hit_dice, 5, 4);

Insertion in crawl-ref/source/monplace.cc at line 1409 [5.1641732]
[6.36816]
[6.36816]
```
        menv[mid].ac  = std::min(0, menv[mid].ac);
```
Deletion in crawl-ref/source/monplace.cc at line 1411 [5.1641732]
B:BD[6.36817] → [6.36817:36878]
```
        if (menv[mid].ac < 0)
            menv[mid].ac = 0;
```
Insertion in crawl-ref/source/monplace.cc at line 1412 [5.1641732]
[6.36905]
[6.36905]
```
        menv[mid].ev  = std::min(0, menv[mid].ev);
```
Deletion in crawl-ref/source/monplace.cc at line 1414 [5.1641732]
B:BD[6.36906] → [6.36906:36967]
```
        if (menv[mid].ev < 0)
            menv[mid].ev = 0;
```
Insertion in crawl-ref/source/monplace.cc at line 1422 [5.1641732]
[6.37409]
[4.3314]
Insertion in crawl-ref/source/monplace.cc at line 1430 [5.1641732]
[6.37747]
[7.9064]
Insertion in crawl-ref/source/monplace.cc at line 1432 [5.1641732]
[7.9102]
[7.9102]

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

B:BD[8.2648] → [8.2648:2741]

static int _mons_class_base_speed(int mc);
static int _mons_base_speed(const monsters *mon);

[8.2648]

[5.1701797]

static int _base_speed(int mc);

Replacement in crawl-ref/source/mon-util.cc at line 1749 [5.1699344]
B:BD[5.1723204] → [8.2742:2779]
```
    speed = _mons_base_speed(&mons);
```
[5.1723204]
[5.1723242]
```
    speed = _base_speed(type);
```
Replacement in crawl-ref/source/mon-util.cc at line 7437 [5.1699344]
B:BD[9.27505] → [8.2780:2822]
```
static int _mons_class_base_speed(int mc)
```
[9.27505]
[10.214]
```
static int _base_speed(int mc)
```

Deletion in crawl-ref/source/mon-util.cc at line 7461 [5.1699344]

B:BD[8.2894] → [8.2894:2977]

B:BD[8.2977] → [3.2647:2728]

∅:D[3.2728] → [8.3045:3106]

B:BD[8.3045] → [8.3045:3106]

∅:D[8.3106] → [10.615:618]

B:BD[10.615] → [10.615:618]

static int _mons_base_speed(const monsters *mon)
{
    if (mons_is_zombified(mon))
        return (std::max(3, _mons_class_base_speed(mons_zombie_base(mon)) - 2));
    else
        return (_mons_class_base_speed(mon->type));
}

Replacement in crawl-ref/source/mon-util.cc at line 7464 [5.1699344]
B:BD[10.678] → [8.3107:3143]
```
    speed = _mons_base_speed(this);
```
[10.678]
[10.794]
```
    speed = _base_speed(type);
```

Put monster speed calculation back in _define_zombie(), and fix problem

Dependencies

In channels

Change contents

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

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

Deletion in crawl-ref/source/monplace.cc at line 1391 [5.1641732]

Insertion in crawl-ref/source/monplace.cc at line 1392 [5.1641732]

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

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

Insertion in crawl-ref/source/monplace.cc at line 1409 [5.1641732]

Deletion in crawl-ref/source/monplace.cc at line 1411 [5.1641732]

Insertion in crawl-ref/source/monplace.cc at line 1412 [5.1641732]

Deletion in crawl-ref/source/monplace.cc at line 1414 [5.1641732]

Insertion in crawl-ref/source/monplace.cc at line 1422 [5.1641732]

Insertion in crawl-ref/source/monplace.cc at line 1430 [5.1641732]

Insertion in crawl-ref/source/monplace.cc at line 1432 [5.1641732]

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

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

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

Deletion in crawl-ref/source/mon-util.cc at line 7461 [5.1699344]

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