fiddlerwoaroof/crawl - Change QFHQNEJ7B5RNTY4QRCDWBD2GVHUVN2URKFSZ2VCL4HKYB62ECIBQC

Fix spell power caps not being respected (looks like a long-standing bug.)

Code quality improvements for Twist.

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

Created by haranp on January 9, 2009

QFHQNEJ7B5RNTY4QRCDWBD2GVHUVN2URKFSZ2VCL4HKYB62ECIBQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spl-cast.cc at line 499 [3.293070]

[3.304817]


    const int cap = spell_power_cap(spell);
    if (cap > 0)
        power = std::min(power, cap);

Replacement in crawl-ref/source/spl-cast.cc at line 505 [3.293070]
B:BD[3.304838] → [3.304838:304896]
```
}                               // end calc_spell_power()
```
[3.304838]
[3.304896]
```
}
```
Replacement in crawl-ref/source/spl-cast.cc at line 1451 [3.293070]
B:BD[4.6824] → [4.6824:6850]
```
        cast_twist(powc);
```
[4.6824]
[4.6850]
```
        cast_twist(powc, beam.target);
```
Replacement in crawl-ref/source/spells4.h at line 35 [3.434549]
∅:D[5.522] → [3.435346:435373]
B:BD[3.435346] → [3.435346:435373]
```
void cast_twist(int powc);
```
[5.522]
[3.435373]
```
bool cast_twist(int powc, const coord_def& where);
```
Replacement in crawl-ref/source/spells4.cc at line 75 [3.436250]
∅:D[4.16644] → [3.440374:440431]
B:BD[3.440374] → [3.440374:440431]
```
inline bool player_hurt_monster(int monster, int damage)
```
[4.16644]
[3.440431]
```
static bool _player_hurt_monster(monsters& m, int damage)
```
Deletion in crawl-ref/source/spells4.cc at line 77 [3.436250]
B:BD[3.440433] → [3.440433:440471]
B:BD[3.440471] → [6.615:648]
∅:D[6.648] → [3.440471:440472]
B:BD[3.440471] → [3.440471:440472]
```
    ASSERT( monster != NON_MONSTER );
    monsters& m = menv[monster];
```

Insertion in crawl-ref/source/spells4.cc at line 85 [3.436250]

[6.758]

[4.16645]

}
static bool _player_hurt_monster(int monster, int damage)
{
    ASSERT( !invalid_monster_index(monster) );
    _player_hurt_monster(menv[monster], damage);

Replacement in crawl-ref/source/spells4.cc at line 182 [3.436250]
B:BD[3.443270] → [3.443270:443318]
```
        player_hurt_monster( monster, damage );
```
[3.443270]
[7.165]
```
        _player_hurt_monster( monster, damage );
```

Replacement in crawl-ref/source/spells4.cc at line 601 [3.436250]

B:BD[3.465362] → [3.465362:465417]

        if (!player_hurt_monster( mon_index, damage ))

[3.465362]

[3.465417]

        if (!_player_hurt_monster( mon_index, damage ))

Replacement in crawl-ref/source/spells4.cc at line 812 [3.436250]
∅:D[8.323] → [3.471795:471843]
∅:D[9.333] → [3.471795:471843]
∅:D[10.4525] → [3.471795:471843]
B:BD[3.471795] → [3.471795:471843]
```
            player_hurt_monster( mon, damage );
```
[8.323]
[3.471843]
```
            _player_hurt_monster( mon, damage );
```
Replacement in crawl-ref/source/spells4.cc at line 946 [3.436250]
B:BD[3.475812] → [3.475812:475864]
```
    player_hurt_monster(monster_attacked, specdam);
```
[3.475812]
[3.475864]
```
    _player_hurt_monster(monster_attacked, specdam);
```
Replacement in crawl-ref/source/spells4.cc at line 1646 [3.436250]
B:BD[3.500416] → [3.500416:500456]
```
    player_hurt_monster( mon, damage );
```
[3.500416]
[3.500456]
```
    _player_hurt_monster( mon, damage );
```

Replacement in crawl-ref/source/spells4.cc at line 1728 [3.436250]

B:BD[11.1756] → [6.991:1050]

            player_hurt_monster(midx, beam.damage.roll());

[11.1756]

[3.504600]

            _player_hurt_monster(midx, beam.damage.roll());

Replacement in crawl-ref/source/spells4.cc at line 1737 [3.436250]

B:BD[11.1982] → [6.1051:1114]

            if (player_hurt_monster(midx, beam.damage.roll()))

[11.1982]

[11.2048]

            if (_player_hurt_monster(midx, beam.damage.roll()))

Replacement in crawl-ref/source/spells4.cc at line 1750 [3.436250]

B:BD[11.2283] → [6.1115:1178]

            if (player_hurt_monster(midx, beam.damage.roll()))

[11.2283]

[11.2349]

            if (_player_hurt_monster(midx, beam.damage.roll()))

Replacement in crawl-ref/source/spells4.cc at line 1776 [3.436250]

B:BD[7.2172] → [12.1125:1187]

                if (player_hurt_monster(midx, statue_damage))

[7.2172]

[11.2812]

                if (_player_hurt_monster(midx, statue_damage))

Replacement in crawl-ref/source/spells4.cc at line 1787 [3.436250]

B:BD[11.3051] → [6.1240:1303]

            if (player_hurt_monster(midx, beam.damage.roll()))

[11.3051]

[11.3117]

            if (_player_hurt_monster(midx, beam.damage.roll()))

Replacement in crawl-ref/source/spells4.cc at line 1799 [3.436250]

B:BD[2.554] → [2.554:621]

                if (player_hurt_monster(midx, beam.damage.roll()))

[2.554]

[2.621]

                if (_player_hurt_monster(midx, beam.damage.roll()))

Replacement in crawl-ref/source/spells4.cc at line 1821 [3.436250]

B:BD[2.1402] → [2.1402:1475]

                      if (player_hurt_monster(midx, beam.damage.roll()))

[2.1402]

[2.1475]

                      if (_player_hurt_monster(midx, beam.damage.roll()))

Replacement in crawl-ref/source/spells4.cc at line 1839 [3.436250]

B:BD[12.1798] → [6.1304:1375]

                    if (player_hurt_monster(midx, beam.damage.roll()))

[12.1798]

[12.1873]

                    if (_player_hurt_monster(midx, beam.damage.roll()))

Replacement in crawl-ref/source/spells4.cc at line 1850 [3.436250]

B:BD[12.2151] → [12.2151:2218]

            player_hurt_monster(midx, roll_dice(1, 5 + pow / 25));

[12.2151]

[12.2218]

            _player_hurt_monster(midx, roll_dice(1, 5 + pow / 25));

Replacement in crawl-ref/source/spells4.cc at line 2032 [3.436250]
B:BD[3.511683] → [3.511683:511708]
```
void cast_twist(int pow)
```
[3.511683]
[3.511708]
```
bool cast_twist(int pow, const coord_def& where)
```
Deletion in crawl-ref/source/spells4.cc at line 2034 [3.436250]
B:BD[3.511710] → [3.511710:511849]
B:BD[3.511849] → [13.145488:145545]
∅:D[13.145545] → [3.511907:511961]
B:BD[3.511907] → [3.511907:511961]
B:BD[3.511961] → [14.2734:2783]
∅:D[14.2783] → [3.512015:512032]
∅:D[15.9608] → [3.512015:512032]
B:BD[3.512015] → [3.512015:512032]
B:BD[3.512032] → [16.22954:22994]
∅:D[16.22994] → [3.512081:512082]
B:BD[3.512081] → [3.512081:512082]
```
    struct dist targ;
    struct bolt tmp;    // used, but ignored
    // level one power cap -- bwr
    if (pow > 25)
        pow = 25;
    // Get target, using DIR_TARGET for targetting only,
    // since we don't use fire_beam() for this spell.
    if (!spell_direction(targ, tmp, DIR_TARGET))
        return;
    const int mons = mgrd(targ.target);
```
Replacement in crawl-ref/source/spells4.cc at line 2035 [3.436250]
∅:D[4.18067] → [3.512105:512147]
B:BD[3.512105] → [3.512105:512147]
```
    if (mons == NON_MONSTER || targ.isMe)
```
[4.18067]
[3.512147]
```
    if (invalid_monster_index(mgrd(where)))
```
Replacement in crawl-ref/source/spells4.cc at line 2038 [3.436250]
B:BD[3.512196] → [3.512196:512212]
```
        return;
```
[3.512196]
[3.512212]
```
        return (false);
```
Insertion in crawl-ref/source/spells4.cc at line 2041 [3.436250]
[3.512219]
[3.512219]
```
    monsters& m = menv[mgrd(where)];
```
Replacement in crawl-ref/source/spells4.cc at line 2044 [3.436250]
B:BD[3.512264] → [3.512264:512323]
```
    if (check_mons_resist_magic( &menv[ mons ], pow * 2 ))
```
[3.512264]
[3.512323]
```
    if (check_mons_resist_magic(&m, pow * 2))
```

Replacement in crawl-ref/source/spells4.cc at line 2046 [3.436250]

B:BD[3.512329] → [17.340:485]

∅:D[17.485] → [3.512391:512407]

B:BD[3.512391] → [3.512391:512407]

        simple_monster_message( &menv[mons], mons_immune_magic(&menv[mons]) ?
                                " is unaffected." : " resists." );
        return;

[3.512329]

[3.512407]

        simple_monster_message(&m, mons_resist_string(&m));
        return (true);

Replacement in crawl-ref/source/spells4.cc at line 2054 [3.436250]
B:BD[3.512662] → [3.512662:512707]
```
    int damage = 1 + random2( 3 + pow / 5 );
```
[3.512662]
[3.512707]
```
    const int damage = 1 + random2(3 + pow / 5);
```
Replacement in crawl-ref/source/spells4.cc at line 2057 [3.436250]
∅:D[18.413] → [3.512734:512775]
B:BD[3.512734] → [3.512734:512775]
```
    player_hurt_monster( mons, damage );
```
[18.413]
[18.414]
```
    _player_hurt_monster(m, damage);
    return (true);
```
Deletion in crawl-ref/source/spells4.cc at line 2064 [3.436250]
B:BD[19.660] → [14.2784:2802]
∅:D[14.2802] → [19.680:699]
B:BD[19.680] → [19.680:699]
```
    if (pow > 50)
        pow = 50;
```

Fix spell power caps not being respected (looks like a long-standing bug.)

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/spl-cast.cc at line 499 [3.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 505 [3.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1451 [3.293070]

Replacement in crawl-ref/source/spells4.h at line 35 [3.434549]

Replacement in crawl-ref/source/spells4.cc at line 75 [3.436250]

Deletion in crawl-ref/source/spells4.cc at line 77 [3.436250]

Insertion in crawl-ref/source/spells4.cc at line 85 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 182 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 601 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 812 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 946 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 1646 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 1728 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 1737 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 1750 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 1776 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 1787 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 1799 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 1821 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 1839 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 1850 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 2032 [3.436250]

Deletion in crawl-ref/source/spells4.cc at line 2034 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 2035 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 2038 [3.436250]

Insertion in crawl-ref/source/spells4.cc at line 2041 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 2044 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 2046 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 2054 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 2057 [3.436250]

Deletion in crawl-ref/source/spells4.cc at line 2064 [3.436250]