fiddlerwoaroof/crawl - Change LFIEDWOSNPS5D6EUWPUPOBBN5CEHVF2MLNOSPXEIVMRZ77A5BH4AC

Expand effect applicator functions to take an actor parameter, and use

it for holy word in order to generalize it. This way, monsters as well as players may be able to use it in the future.

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

Created by dolorous on January 19, 2009

LFIEDWOSNPS5D6EUWPUPOBBN5CEHVF2MLNOSPXEIVMRZ77A5BH4AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-util.h at line 82 [6.242902]

B:BD[6.244386] → [7.640:698]

typedef int cell_func(coord_def where, int pow, int aux);

[6.244386]

[8.17968]

typedef int cell_func(coord_def where, int pow, int aux, actor *agent);

Replacement in crawl-ref/source/spl-util.h at line 88 [6.242902]

∅:D[7.746] → [9.3785:3842]

B:BD[9.3785] → [9.3785:3842]

                       bool pass_through_trans = false);

[7.746]

[6.244521]

                       bool pass_through_trans = false, actor *agent = NULL);

Replacement in crawl-ref/source/spl-util.h at line 90 [6.242902]

B:BD[6.244522] → [7.747:819]

int apply_area_square(cell_func cf, const coord_def& where, int power);

[6.244522]

[6.244636]

int apply_area_square(cell_func cf, const coord_def& where, int power,
                      actor *agent = NULL);

Replacement in crawl-ref/source/spl-util.h at line 93 [6.242902]

B:BD[6.244637] → [7.820:900]

int apply_area_around_square(cell_func cf, const coord_def& where, int power );

[6.244637]

[6.244768]

int apply_area_around_square(cell_func cf, const coord_def& where, int power,
                             actor *agent = NULL);

Replacement in crawl-ref/source/spl-util.h at line 96 [6.242902]

B:BD[6.244769] → [7.901:1052]

int apply_random_around_square( cell_func cf, const coord_def& where,
                                bool hole_in_middle, int power, int max_targs );

[6.244769]

[6.244973]

int apply_random_around_square(cell_func cf, const coord_def& where,
                               bool hole_in_middle, int power, int max_targs,
                               actor *agent = NULL);

Replacement in crawl-ref/source/spl-util.h at line 100 [6.242902]

B:BD[6.244974] → [7.1053:1113]

int apply_one_neighbouring_square(cell_func cf, int power);

[6.244974]

[6.245096]

int apply_one_neighbouring_square(cell_func cf, int power, actor *agent = NULL);

Replacement in crawl-ref/source/spl-util.h at line 103 [6.242902]

B:BD[7.1182] → [7.1182:1244]

                             int pow, int radius, int ctype);

[7.1182]

[6.245237]

                             int pow, int radius, int ctype,
                             actor *agent = NULL);
void apply_area_cloud(cloud_func func, const coord_def& where,
                      int pow, int number, cloud_type ctype,
                      kill_category kc, killer_type killer,
                      int spread_rate = -1);

Deletion in crawl-ref/source/spl-util.h at line 119 [6.242902]
B:BD[6.245382] → [8.18140:18264]
∅:D[8.18264] → [10.1317:1422]
B:BD[11.825] → [10.1317:1422]
∅:D[12.329] → [6.245507:245508]
∅:D[13.465] → [6.245507:245508]
∅:D[10.1422] → [6.245507:245508]
B:BD[6.245507] → [6.245507:245508]
```
void apply_area_cloud(cloud_func func, const coord_def& where,
                      int pow, int number, cloud_type ctype,
                      kill_category kc, killer_type killer,
                      int spread_rate = -1);
```

Replacement in crawl-ref/source/spl-util.cc at line 470 [6.245665]

B:BD[6.251958] → [7.1246:1320]

int apply_area_visible( cell_func cf, int power, bool pass_through_trans)

[6.251958]

[6.252028]

int apply_area_visible(cell_func cf, int power,
                       bool pass_through_trans, actor *agent)

Replacement in crawl-ref/source/spl-util.cc at line 476 [6.245665]

B:BD[7.1383] → [7.1383:1480]

        if ( pass_through_trans || see_grid_no_trans(*ri) )
            rv += cf(*ri, power, 0);

[7.1383]

[6.252351]

        if (pass_through_trans || see_grid_no_trans(*ri))
            rv += cf(*ri, power, 0, agent);

Replacement in crawl-ref/source/spl-util.cc at line 484 [6.245665]

B:BD[6.252564] → [7.1481:1554]

int apply_area_square( cell_func cf, const coord_def& where, int power )

[6.252564]

[6.252674]

int apply_area_square(cell_func cf, const coord_def& where, int power,
                      actor *agent)

Replacement in crawl-ref/source/spl-util.cc at line 490 [6.245665]
B:BD[7.1610] → [7.1610:1643]
```
        rv += cf(*ai, power, 0);
```
[7.1610]
[6.252861]
```
        rv += cf(*ai, power, 0, agent);
```

Replacement in crawl-ref/source/spl-util.cc at line 498 [6.245665]

B:BD[6.253065] → [7.1644:1723]

int apply_area_around_square( cell_func cf, const coord_def& where, int power)

[6.253065]

[6.253195]

int apply_area_around_square(cell_func cf, const coord_def& where, int power,
                             actor *agent)

Replacement in crawl-ref/source/spl-util.cc at line 504 [6.245665]
B:BD[7.1778] → [7.1778:1811]
```
        rv += cf(*ai, power, 0);
```
[7.1778]
[14.1101]
```
        rv += cf(*ai, power, 0, agent);
```

Replacement in crawl-ref/source/spl-util.cc at line 509 [6.245665]

B:BD[6.253573] → [6.253573:253716]

B:BD[6.253716] → [7.1812:1962]

// Effect up to max_targs monsters around a point, chosen randomly
// Return varies with the function called;  return values will be added up.
int apply_random_around_square( cell_func cf, const coord_def& where,
                                bool exclude_center, int power, int max_targs )

[6.253573]

[6.253919]

// Affect up to max_targs monsters around a point, chosen randomly.
// Return varies with the function called; return values will be added up.
int apply_random_around_square(cell_func cf, const coord_def& where,
                               bool exclude_center, int power, int max_targs,
                               actor *agent)

Replacement in crawl-ref/source/spl-util.cc at line 521 [6.245665]

B:BD[7.2006] → [7.2006:2062]

        return (apply_area_square( cf, where, power ));

[7.2006]

[6.254103]

        return (apply_area_square(cf, where, power, agent));

Replacement in crawl-ref/source/spl-util.cc at line 524 [6.245665]

B:BD[7.2105] → [7.2105:2168]

        return (apply_area_around_square( cf, where, power ));

[7.2105]

[6.254232]

        return (apply_area_around_square(cf, where, power, agent));

Replacement in crawl-ref/source/spl-util.cc at line 607 [6.245665]
B:BD[7.5567] → [7.5567:5605]
```
            targs[ count - 1 ] = *ai;
```
[7.5567]
[7.5605]
```
            targs[count - 1] = *ai;
```

Replacement in crawl-ref/source/spl-util.cc at line 611 [6.245665]

B:BD[7.5675] → [7.5675:5726]

            const int pick = random2( max_targs );

[7.5675]

[7.5726]

            const int pick = random2(max_targs);

Replacement in crawl-ref/source/spl-util.cc at line 625 [6.245665]

B:BD[6.258842] → [7.5817:5903]

            ASSERT( !targs[i].origin() );
            rv += cf( targs[i], power, 0 );

[6.258842]

[6.258950]

            ASSERT(!targs[i].origin());
            rv += cf(targs[i], power, 0, agent);

Replacement in crawl-ref/source/spl-util.cc at line 634 [6.245665]

B:BD[15.334] → [7.5907:5966]

int apply_one_neighbouring_square(cell_func cf, int power)

[15.334]

[6.259197]

int apply_one_neighbouring_square(cell_func cf, int power, actor *agent)

Replacement in crawl-ref/source/spl-util.cc at line 639 [6.245665]
B:BD[6.259282] → [16.282:327]
```
    direction( bmove, DIR_DIR, TARG_ENEMY );
```
[6.259282]
[6.259327]
```
    direction(bmove, DIR_DIR, TARG_ENEMY);
```
Replacement in crawl-ref/source/spl-util.cc at line 647 [6.245665]
B:BD[6.259424] → [8.18498:18550]
```
    int rv = cf(you.pos() + bmove.delta, power, 1);
```
[6.259424]
[6.259497]
```
    int rv = cf(you.pos() + bmove.delta, power, 1, agent);
```

Replacement in crawl-ref/source/spl-util.cc at line 655 [6.245665]

B:BD[6.259646] → [7.6083:6214]

int apply_area_within_radius( cell_func cf, const coord_def& where,
                              int pow, int radius, int ctype )

[6.259646]

[6.259787]

int apply_area_within_radius(cell_func cf, const coord_def& where,
                             int pow, int radius, int ctype,
                             actor *agent)

Replacement in crawl-ref/source/spl-util.cc at line 662 [6.245665]

B:BD[6.260150] → [7.6232:6337]

    for ( radius_iterator ri(where, radius, false, false); ri; ++ri )
        rv += cf(*ri, pow, ctype);

[6.260150]

[6.260353]

    for (radius_iterator ri(where, radius, false, false); ri; ++ri)
        rv += cf(*ri, pow, ctype, agent);

Replacement in crawl-ref/source/spl-cast.cc at line 1361 [6.293070]

B:BD[6.323460] → [17.265:323]

        holy_word(100, HOLY_WORD_SPELL, you.pos(), true);

[6.323460]

[6.323483]

        holy_word(100, HOLY_WORD_SPELL, you.pos(), true, &you);

Replacement in crawl-ref/source/spells4.h at line 22 [6.434549]
∅:D[10.63315] → [7.6576:6638]
B:BD[13.3967] → [7.6576:6638]
```
int disperse_monsters(coord_def where, int pow, int message);
```
[10.63315]
[6.435074]
```
int disperse_monsters(coord_def where, int pow);
```
Deletion in crawl-ref/source/spells4.cc at line 69 [6.436250]
B:BD[7.6721] → [7.6721:6788]
```
static int _quadrant_blink(coord_def where, int pow, int garbage);
```

Replacement in crawl-ref/source/spells4.cc at line 93 [6.436250]

B:BD[6.440872] → [7.6789:6857]

static int _shatter_monsters(coord_def where, int pow, int garbage)

[6.440872]

[6.440936]

static int _shatter_monsters(coord_def where, int pow, int, actor *)

Deletion in crawl-ref/source/spells4.cc at line 95 [6.436250]
B:BD[6.440938] → [6.440938:440962]
```
    UNUSED( garbage );
```

Replacement in crawl-ref/source/spells4.cc at line 186 [6.436250]

B:BD[6.443429] → [7.6897:6962]

static int _shatter_items(coord_def where, int pow, int garbage)

[6.443429]

[6.443490]

static int _shatter_items(coord_def where, int pow, int, actor *)

Deletion in crawl-ref/source/spells4.cc at line 189 [6.436250]
B:BD[6.443511] → [6.443511:443534]
```
    UNUSED( garbage );
```

Replacement in crawl-ref/source/spells4.cc at line 212 [6.436250]

B:BD[6.444221] → [7.7206:7271]

static int _shatter_walls(coord_def where, int pow, int garbage)

[6.444221]

[6.444282]

static int _shatter_walls(coord_def where, int pow, int, actor *)

Deletion in crawl-ref/source/spells4.cc at line 214 [6.436250]
B:BD[6.444284] → [18.267:288]
∅:D[18.288] → [6.444307:444308]
B:BD[6.444307] → [6.444307:444308]
```
    UNUSED(garbage);
```

Replacement in crawl-ref/source/spells4.cc at line 385 [6.436250]

B:BD[6.457867] → [7.7746:7812]

static int _sleep_monsters(coord_def where, int pow, int garbage)

[6.457867]

[6.459142]

static int _sleep_monsters(coord_def where, int pow, int, actor *)

Deletion in crawl-ref/source/spells4.cc at line 387 [6.436250]
B:BD[6.459144] → [6.459144:459167]
```
    UNUSED( garbage );
```

Replacement in crawl-ref/source/spells4.cc at line 443 [6.436250]

B:BD[19.9103] → [7.7849:7920]

static int _tame_beast_monsters(coord_def where, int pow, int garbage)

[19.9103]

[6.460238]

static int _tame_beast_monsters(coord_def where, int pow, int, actor *)

Deletion in crawl-ref/source/spells4.cc at line 445 [6.436250]
B:BD[6.460240] → [6.460240:460263]
```
    UNUSED( garbage );
```

Replacement in crawl-ref/source/spells4.cc at line 483 [6.436250]

B:BD[6.461640] → [7.7962:8035]

static int _ignite_poison_objects(coord_def where, int pow, int garbage)

[6.461640]

[6.461709]

static int _ignite_poison_objects(coord_def where, int pow, int, actor *)

Deletion in crawl-ref/source/spells4.cc at line 486 [6.436250]
B:BD[6.461730] → [6.461730:461753]
```
    UNUSED( garbage );
```

Replacement in crawl-ref/source/spells4.cc at line 520 [6.436250]

B:BD[6.462789] → [7.8269:8343]

static int _ignite_poison_clouds( coord_def where, int pow, int garbage )

[6.462789]

[6.462859]

static int _ignite_poison_clouds( coord_def where, int pow, int, actor *)

Deletion in crawl-ref/source/spells4.cc at line 523 [6.436250]
B:BD[6.462880] → [6.462880:462903]
```
    UNUSED( garbage );
```

Replacement in crawl-ref/source/spells4.cc at line 550 [6.436250]

B:BD[6.463690] → [7.8385:8459]

static int _ignite_poison_monsters(coord_def where, int pow, int garbage)

[6.463690]

[6.463760]

static int _ignite_poison_monsters(coord_def where, int pow, int, actor *)

Deletion in crawl-ref/source/spells4.cc at line 552 [6.436250]
B:BD[6.463762] → [6.463762:463786]
```
    UNUSED( garbage );
```

Replacement in crawl-ref/source/spells4.cc at line 768 [6.436250]

B:BD[6.470366] → [7.8516:8588]

static int _discharge_monsters( coord_def where, int pow, int garbage )

[6.470366]

[6.470906]

static int _discharge_monsters( coord_def where, int pow, int, actor *)

Deletion in crawl-ref/source/spells4.cc at line 770 [6.436250]
B:BD[6.470908] → [6.470908:470932]
```
    UNUSED( garbage );
```

Replacement in crawl-ref/source/spells4.cc at line 853 [6.436250]

B:BD[20.5075] → [7.8814:8885]

static int _distortion_monsters(coord_def where, int pow, int message)

[20.5075]

[6.473820]

static int _distortion_monsters(coord_def where, int pow, int, actor *)

Replacement in crawl-ref/source/spells4.cc at line 926 [6.436250]
B:BD[6.475718] → [6.475718:475740]
```
    else if (message)
```
[6.475718]
[6.475740]
```
    else
```
Replacement in crawl-ref/source/spells4.cc at line 928 [6.436250]
B:BD[6.475746] → [6.475746:475787]
```
        mpr("Nothing seems to happen.");
```
[6.475746]
[6.475787]
```
        canned_msg(MSG_NOTHING_HAPPENS);
```

Replacement in crawl-ref/source/spells4.cc at line 945 [6.436250]

B:BD[6.476273] → [7.9089:9150]

int disperse_monsters(coord_def where, int pow, int message)

[6.476273]

[6.476331]

int disperse_monsters(coord_def where, int pow, int, actor *)

Deletion in crawl-ref/source/spells4.cc at line 947 [6.436250]
B:BD[6.476333] → [6.476333:476357]
```
    UNUSED( message );
```

Replacement in crawl-ref/source/spells4.cc at line 984 [6.436250]

B:BD[6.477087] → [7.9249:9325]

∅:D[7.9325] → [6.477209:477215]

B:BD[6.477209] → [6.477209:477215]

B:BD[6.477215] → [21.17412:17467]

∅:D[21.17467] → [6.477284:477290]

B:BD[6.477284] → [6.477284:477290]

    if (apply_area_around_square( disperse_monsters, you.pos(), pow ) == 0)
    {
        mpr( "The air shimmers briefly around you." );
    }

[6.477087]

[6.477290]

    if (apply_area_around_square(disperse_monsters, you.pos(), pow) == 0)
        mpr("The air shimmers briefly around you.");

Replacement in crawl-ref/source/spells4.cc at line 988 [6.436250]

B:BD[6.477293] → [7.9326:9393]

static int _spell_swap_func(coord_def where, int pow, int message)

[6.477293]

[6.477356]

static int _spell_swap_func(coord_def where, int pow, int, actor *)

Deletion in crawl-ref/source/spells4.cc at line 990 [6.436250]
B:BD[6.477358] → [6.477358:477382]
```
    UNUSED( message );
```

Replacement in crawl-ref/source/spells4.cc at line 1024 [6.436250]

B:BD[6.478414] → [20.5277:5337]

    apply_one_neighbouring_square( _spell_swap_func, pow );

[6.478414]

[6.478473]

    apply_one_neighbouring_square(_spell_swap_func, pow);

Replacement in crawl-ref/source/spells4.cc at line 1064 [6.436250]

B:BD[6.480634] → [7.9734:9794]

static int _passwall(coord_def where, int pow, int garbage)

[6.480634]

[6.480690]

static int _passwall(coord_def where, int pow, int, actor *)

Deletion in crawl-ref/source/spells4.cc at line 1066 [6.436250]
B:BD[6.480692] → [6.480692:480715]
∅:D[7.9830] → [6.480715:480716]
B:BD[6.480715] → [6.480715:480716]
```
    UNUSED( garbage );
```
Replacement in crawl-ref/source/spells4.cc at line 1141 [6.436250]
B:BD[6.482746] → [6.482746:482796]
```
}                               // end passwall()
```
[6.482746]
[6.482796]
```
}
```

Replacement in crawl-ref/source/spells4.cc at line 1148 [6.436250]

B:BD[6.482933] → [7.9831:9902]

static int _intoxicate_monsters(coord_def where, int pow, int garbage)

[6.482933]

[6.483000]

static int _intoxicate_monsters(coord_def where, int pow, int, actor *)

Deletion in crawl-ref/source/spells4.cc at line 1151 [6.436250]
B:BD[6.483021] → [6.483021:483044]
```
    UNUSED( garbage );
```

Replacement in crawl-ref/source/spells4.cc at line 1516 [6.436250]

B:BD[6.497240] → [7.10023:10085]

static int _rot_living(coord_def where, int pow, int message)

[6.497240]

[6.497298]

static int _rot_living(coord_def where, int pow, int, actor *)

Replacement in crawl-ref/source/spells4.cc at line 1518 [6.436250]
B:BD[6.497300] → [6.497300:497324]
B:BD[6.497324] → [7.10086:10113]
```
    UNUSED( message );
    int mon = mgrd(where);
```
[6.497300]
[6.497350]
```
    const int mon = mgrd(where);
```

Replacement in crawl-ref/source/spells4.cc at line 1538 [6.436250]

B:BD[6.497949] → [7.10114:10176]

static int _rot_undead(coord_def where, int pow, int garbage)

[6.497949]

[6.498007]

static int _rot_undead(coord_def where, int pow, int, actor *)

Replacement in crawl-ref/source/spells4.cc at line 1540 [6.436250]
B:BD[6.498009] → [6.498009:498033]
B:BD[6.498033] → [7.10177:10204]
```
    UNUSED( garbage );
    int mon = mgrd(where);
```
[6.498009]
[6.498059]
```
    const int mon = mgrd(where);
```

Replacement in crawl-ref/source/spells4.cc at line 1594 [6.436250]

B:BD[6.499740] → [7.10205:10268]

static int _rot_corpses(coord_def where, int pow, int garbage)

[6.499740]

[6.499799]

static int _rot_corpses(coord_def where, int pow, int, actor *)

Deletion in crawl-ref/source/spells4.cc at line 1596 [6.436250]
B:BD[6.499801] → [6.499801:499825]
```
    UNUSED( garbage );
```

Replacement in crawl-ref/source/spells4.cc at line 1621 [6.436250]

B:BD[6.500525] → [7.10326:10398]

static int _snake_charm_monsters(coord_def where, int pow, int message)

[6.500525]

[6.500593]

static int _snake_charm_monsters(coord_def where, int pow, int, actor *)

Replacement in crawl-ref/source/spells4.cc at line 1623 [6.436250]
B:BD[6.500595] → [6.500595:500618]
```
    UNUSED( message );
```
[6.500595]
[6.500618]
```
    const int mon = mgrd(where);
```
Deletion in crawl-ref/source/spells4.cc at line 1625 [6.436250]
B:BD[6.500619] → [7.10399:10426]
∅:D[7.10426] → [6.500645:500646]
B:BD[6.500645] → [6.500645:500646]
```
    int mon = mgrd(where);
```

Replacement in crawl-ref/source/spells4.cc at line 2366 [6.436250]

B:BD[22.1192] → [7.10427:10493]

static int _quadrant_blink(coord_def where, int pow, int garbage)

[22.1192]

[6.523756]

static int _quadrant_blink(coord_def where, int pow, int, actor *)

Deletion in crawl-ref/source/spells4.cc at line 2368 [6.436250]
B:BD[6.523758] → [6.523758:523782]
```
    UNUSED( garbage );
```
Replacement in crawl-ref/source/spells3.cc at line 1694 [6.531613]
B:BD[23.3217] → [23.3217:3248]
```
    viewwindow( true, false );
```
[23.3217]
[7.10587]
```
    viewwindow(true, false);
```
Replacement in crawl-ref/source/religion.cc at line 5975 [6.804403]
B:BD[24.194207] → [24.194207:194242]
```
        viewwindow( true, false );
```
[24.194207]
[24.194242]
```
        viewwindow(true, false);
```
Insertion in crawl-ref/source/religion.cc at line 5983 [6.804403]
[3.2903]
[25.2527]
```
#ifndef USE_TILE
            delay(1000);
#endif
```
Deletion in crawl-ref/source/religion.cc at line 5993 [6.804403]
∅:D[26.3359] → [24.194473:194495]
∅:D[27.3646] → [24.194473:194495]
∅:D[28.3920] → [24.194473:194495]
B:BD[24.194473] → [24.194473:194495]
```
        delay(1000);
```

Replacement in crawl-ref/source/item_use.cc at line 5043 [6.2781507]

B:BD[29.3938] → [29.3938:4004]

                                       !item_type_known(scroll));

[29.3938]

[29.4004]

                                       !item_type_known(scroll), &you);

Replacement in crawl-ref/source/fight.cc at line 269 [6.3140790]

B:BD[2.2784] → [2.2784:2850]

    if (!defender->cannot_fight() && attacker->can_see(defender))

[2.2784]

[30.4067]

    if (defender->cannot_fight() || (attacker && !attacker->can_see(defender)))
        return (unchivalric);
    // Distracted (but not batty); this only applies to players.
    if (attacker && attacker->atype() == ACT_PLAYER && def->foe != MHITYOU
        && !mons_is_batty(def))

Replacement in crawl-ref/source/fight.cc at line 276 [6.3140790]
B:BD[30.4073] → [31.4703:4772]
∅:D[31.4772] → [32.3349:3416]
B:BD[32.3349] → [32.3349:3416]
B:BD[32.3416] → [33.2813:2849]
∅:D[33.2849] → [32.3464:3474]
B:BD[32.3464] → [32.3464:3474]
∅:D[32.3474] → [34.3016:3059]
B:BD[34.3016] → [34.3016:3059]
B:BD[34.3059] → [32.3475:3485]
```
        // Distracted (but not batty); this only applies to players.
        if (attacker->atype() == ACT_PLAYER && def->foe != MHITYOU
            && !mons_is_batty(def))
        {
            unchivalric = UCAT_DISTRACTED;
        }
```
[30.4073]
[30.4116]
```
        unchivalric = UCAT_DISTRACTED;
    }
```

Replacement in crawl-ref/source/fight.cc at line 279 [6.3140790]

B:BD[30.4117] → [34.3060:3264]

        // confused (but not perma-confused)
        if (def->has_ench(ENCH_CONFUSION)
            && !mons_class_flag(def->type, M_CONFUSED))
        {
            unchivalric = UCAT_CONFUSED;
        }

[30.4117]

[35.7669]

    // confused (but not perma-confused)
    if (def->has_ench(ENCH_CONFUSION)
        && !mons_class_flag(def->type, M_CONFUSED))
    {
        unchivalric = UCAT_CONFUSED;
    }

Replacement in crawl-ref/source/fight.cc at line 286 [6.3140790]

B:BD[35.7670] → [34.3265:3284]

B:BD[34.3284] → [33.2850:2884]

∅:D[33.2884] → [34.3324:3364]

B:BD[34.3324] → [34.3324:3364]

        // fleeing
        if (mons_is_fleeing(def))
            unchivalric = UCAT_FLEEING;

[35.7670]

[30.4325]

    // fleeing
    if (mons_is_fleeing(def))
        unchivalric = UCAT_FLEEING;

Replacement in crawl-ref/source/fight.cc at line 290 [6.3140790]

B:BD[30.4326] → [34.3365:3386]

B:BD[34.3386] → [32.3486:3531]

∅:D[32.3531] → [34.3455:3497]

B:BD[34.3455] → [34.3455:3497]

        // invisible
        if (!attacker->visible_to(defender))
            unchivalric = UCAT_INVISIBLE;

[30.4326]

[30.4418]

    // invisible
    if (attacker && !attacker->visible_to(defender))
        unchivalric = UCAT_INVISIBLE;

Replacement in crawl-ref/source/fight.cc at line 294 [6.3140790]
B:BD[30.4419] → [34.3498:3523]
B:BD[34.3523] → [4.2748:2781]
∅:D[4.2781] → [34.3561:3605]
∅:D[33.2945] → [34.3561:3605]
∅:D[36.7570] → [34.3561:3605]
B:BD[34.3561] → [34.3561:3605]
```
        // held in a net
        if (mons_is_caught(def))
            unchivalric = UCAT_HELD_IN_NET;
```
[30.4419]
[4.2782]
```
    // held in a net
    if (mons_is_caught(def))
        unchivalric = UCAT_HELD_IN_NET;
```

Replacement in crawl-ref/source/fight.cc at line 298 [6.3140790]

B:BD[4.2783] → [4.2783:2885]

        // petrifying
        if (mons_is_petrifying(def))
            unchivalric = UCAT_PETRIFYING;

[4.2783]

[30.4513]

    // petrifying
    if (mons_is_petrifying(def))
        unchivalric = UCAT_PETRIFYING;

Replacement in crawl-ref/source/fight.cc at line 302 [6.3140790]

B:BD[30.4514] → [34.3606:3627]

B:BD[34.3627] → [36.7571:7602]

∅:D[36.7602] → [34.3670:3712]

B:BD[34.3670] → [34.3670:3712]

        // paralysed
        if (def->cannot_act())
            unchivalric = UCAT_PARALYSED;

[30.4514]

[30.4604]

    // paralysed
    if (def->cannot_act())
        unchivalric = UCAT_PARALYSED;

Replacement in crawl-ref/source/fight.cc at line 306 [6.3140790]

B:BD[30.4605] → [34.3713:3733]

B:BD[34.3733] → [33.2946:2981]

∅:D[33.2981] → [34.3774:3821]

B:BD[34.3774] → [34.3774:3821]

        // sleeping
        if (mons_is_sleeping(def))
            unchivalric = UCAT_SLEEPING;
    }

[30.4605]

[30.4759]

    // sleeping
    if (mons_is_sleeping(def))
        unchivalric = UCAT_SLEEPING;

Replacement in crawl-ref/source/fight.cc at line 310 [6.3140790]
B:BD[30.4889] → [30.4889:4913]
```
    return unchivalric;
```
[30.4760]
[30.4913]
```
    return (unchivalric);
```

Replacement in crawl-ref/source/effects.h at line 99 [6.3378996]

B:BD[37.5915] → [7.13600:13673]

int holy_word(int pow, int caster, const coord_def& where, bool silent);

[37.5915]

[38.3682]

int holy_word(int pow, int caster, const coord_def& where, bool silent = false,
              actor *attacker = NULL);

Replacement in crawl-ref/source/effects.h at line 102 [6.3378996]

B:BD[38.3683] → [39.2675:2718]

B:BD[39.2718] → [7.13674:13736]

int holy_word_player(int pow, int caster);
int holy_word_monsters(coord_def where, int pow, int caster);

[38.3683]

[37.5973]

int holy_word_player(int pow, int caster, actor *attacker = NULL);
int holy_word_monsters(coord_def where, int pow, int caster,
                       actor *attacker = NULL);

Replacement in crawl-ref/source/effects.h at line 115 [6.3378996]

B:BD[39.2760] → [7.13787:13847]

int torment_monsters(coord_def where, int pow, int caster);

[39.2760]

[40.2886]

int torment_monsters(coord_def where, int pow, int caster,
                     actor *attacker = NULL);

Replacement in crawl-ref/source/effects.cc at line 64 [6.3382105]
B:BD[37.5978] → [39.2762:2804]
```
int holy_word_player(int pow, int caster)
```
[37.5978]
[37.6027]
```
int holy_word_player(int pow, int caster, actor *attacker)
```
Insertion in crawl-ref/source/effects.cc at line 68 [6.3382105]
[39.2823]
[37.6162]
```
    int hploss;
```

Replacement in crawl-ref/source/effects.cc at line 71 [6.3382105]

B:BD[37.6163] → [41.2666:2712]

    int hploss = std::max(0, you.hp / 2 - 1);

[37.6163]

[37.6270]

    // Holy word won't kill its user.
    if (attacker != &you)
        hploss = roll_dice(2, 15) + (random2(pow) / 3);
    else
        hploss = std::max(0, you.hp / 2 - 1);

Replacement in crawl-ref/source/effects.cc at line 112 [6.3382105]

B:BD[42.2720] → [7.13849:13910]

int holy_word_monsters(coord_def where, int pow, int caster)

[42.2720]

[43.3526]

int holy_word_monsters(coord_def where, int pow, int caster,
                       actor *attacker)

Replacement in crawl-ref/source/effects.cc at line 122 [6.3382105]
∅:D[7.13939] → [39.2858:2906]
B:BD[38.3942] → [39.2858:2906]
```
        retval = holy_word_player(pow, caster);
```
[7.13939]
[37.7141]
```
        retval = holy_word_player(pow, caster, attacker);
```

Replacement in crawl-ref/source/effects.cc at line 132 [6.3382105]

B:BD[38.4163] → [5.2730:2795]

    if (!monster->alive() || monster->res_holy_energy(&you) > 0)

[38.4163]

[38.4257]

    if (!monster->alive() || !mons_is_unholy(monster))

Replacement in crawl-ref/source/effects.cc at line 135 [6.3382105]

B:BD[38.4344] → [44.7373:7451]

    const int hploss = roll_dice(2, 15) + (random2(pow) / 3);
    retval = 1;

[38.4344]

[45.2856]

    int hploss;
    // Holy word won't kill its user.
    if (attacker != monster)
        hploss = roll_dice(2, 15) + (random2(pow) / 3);
    else
        hploss = std::max(0, monster->hit_points / 2 - 1);

Replacement in crawl-ref/source/effects.cc at line 143 [6.3382105]

B:BD[37.7303] → [46.2676:2811]

∅:D[47.2769] → [38.4385:4434]

∅:D[46.2811] → [38.4385:4434]

B:BD[37.7303] → [38.4385:4434]

B:BD[38.4434] → [48.2541:2593]

B:BD[48.2593] → [44.7452:7485]

    // Currently, holy word annoys the monsters it affects because it
    // can kill them, and because hostile monsters don't use it.
    behaviour_event(monster, ME_ANNOY, MHITYOU);
    simple_monster_message(monster, " convulses!");
    monster->hurt(&you, hploss);

[45.2857]

[49.2562]

    if (hploss)
        simple_monster_message(monster, " convulses!");

Replacement in crawl-ref/source/effects.cc at line 146 [6.3382105]
∅:D[49.2563] → [44.7489:7515]
B:BD[44.7489] → [44.7489:7515]
```
    if (monster->alive())
```
[49.2563]
[38.4486]
```
    monster->hurt(attacker, hploss);
    if (hploss)
```

Replacement in crawl-ref/source/effects.cc at line 150 [6.3382105]

B:BD[38.4492] → [44.7516:7604]

        if (monster->speed_increment >= 25)
            monster->speed_increment -= 20;

[38.4492]

[50.2756]

        retval = 1;
        // Holy word won't annoy, slow, or frighten its user.
        if (monster->alive() && attacker != monster)
        {
            // Currently, holy word annoys the monsters it affects
            // because it can kill them, and because hostile monsters
            // don't use it.
            behaviour_event(monster, ME_ANNOY, MHITYOU);

Replacement in crawl-ref/source/effects.cc at line 160 [6.3382105]

B:BD[50.2757] → [44.7605:7643]

        monster->add_ench(ENCH_FEAR);

[50.2757]

[38.4723]

            if (monster->speed_increment >= 25)
                monster->speed_increment -= 20;
            monster->add_ench(ENCH_FEAR);
        }

Replacement in crawl-ref/source/effects.cc at line 170 [6.3382105]

B:BD[37.7894] → [7.13968:14040]

int holy_word(int pow, int caster, const coord_def& where, bool silent)

[37.7894]

[38.4873]

int holy_word(int pow, int caster, const coord_def& where, bool silent,
              actor *attacker)

Replacement in crawl-ref/source/effects.cc at line 173 [6.3382105]

B:BD[38.4875] → [38.4875:4943]

    if (!silent)
        mpr("You speak a Word of immense power!");

[38.4875]

[37.8042]

    if (!silent && attacker)
    {
        mprf("%s %s a Word of immense power!",
             attacker->name(DESC_CAP_THE).c_str(),
             attacker->conj_verb("speak").c_str());
    }

Replacement in crawl-ref/source/effects.cc at line 180 [6.3382105]

B:BD[37.8043] → [7.14041:14121]

    return apply_area_within_radius(holy_word_monsters, where, pow, 8, caster);

[37.8043]

[38.5023]

    return apply_area_within_radius(holy_word_monsters, where, pow, 8, caster,
                                    attacker);

Replacement in crawl-ref/source/effects.cc at line 252 [6.3382105]

B:BD[6.3383112] → [7.14122:14181]

int torment_monsters(coord_def where, int pow, int caster)

[6.3383112]

[6.3383176]

int torment_monsters(coord_def where, int pow, int caster, actor *attacker)

Replacement in crawl-ref/source/effects.cc at line 263 [6.3382105]
B:BD[38.5210] → [7.14211:14238]
```
    int mon = mgrd(where);
```
[38.5210]
[6.3383624]
```
    const int mon = mgrd(where);
```

Insertion in crawl-ref/source/effects.cc at line 275 [6.3382105]

[38.5425]

[46.2812]

    if (hploss)
        simple_monster_message(monster, " convulses!");

Deletion in crawl-ref/source/effects.cc at line 283 [6.3382105]
B:BD[38.5567] → [38.5567:5573]
```
    {
```
Deletion in crawl-ref/source/effects.cc at line 284 [6.3382105]
B:BD[38.5593] → [50.2810:2841]
∅:D[51.4026] → [50.2852:2879]
B:BD[38.5750] → [50.2852:2879]
∅:D[50.2889] → [38.5750:5756]
B:BD[38.5750] → [38.5750:5756]
```
        if (!monster->alive())
            return retval;
    }
```
Deletion in crawl-ref/source/effects.cc at line 285 [6.3382105]
B:BD[50.2891] → [50.2891:2943]
∅:D[50.2943] → [6.3383942:3383943]
∅:D[38.5756] → [6.3383942:3383943]
B:BD[6.3383942] → [6.3383942:3383943]
```
    simple_monster_message(monster, " convulses!");
```

Replacement in crawl-ref/source/delay.cc at line 84 [6.3963459]

B:BD[52.4576] → [7.14375:14444]

static int _recite_to_monsters(coord_def where, int pow, int unused)

[52.4576]

[53.3429]

static int _recite_to_monsters(coord_def where, int pow, int, actor *)

Deletion in crawl-ref/source/delay.cc at line 86 [6.3963459]
B:BD[53.3431] → [54.2969:2989]
B:BD[54.2989] → [55.2777:2778]
```
    UNUSED(unused);
```
Replacement in crawl-ref/source/decks.cc at line 1719 [6.3987460]
∅:D[56.18443] → [7.14482:14548]
B:BD[57.979] → [7.14482:14548]
```
static int _drain_monsters(coord_def where, int pow, int garbage)
```
[56.18443]
[57.1041]
```
static int _drain_monsters(coord_def where, int pow, int, actor *)
```
Deletion in crawl-ref/source/decks.cc at line 1721 [6.3987460]
B:BD[57.1043] → [57.1043:1066]
```
    UNUSED( garbage );
```

Replacement in crawl-ref/source/abl-show.cc at line 2411 [6.4494389]

B:BD[58.964] → [7.14936:14999]

static int _lugonu_warp_monster(coord_def where, int pow, int)

[58.964]

[58.1023]

static int _lugonu_warp_monster(coord_def where, int pow, int, actor *)

Expand effect applicator functions to take an actor parameter, and use

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-util.h at line 82 [6.242902]

Replacement in crawl-ref/source/spl-util.h at line 88 [6.242902]

Replacement in crawl-ref/source/spl-util.h at line 90 [6.242902]

Replacement in crawl-ref/source/spl-util.h at line 93 [6.242902]

Replacement in crawl-ref/source/spl-util.h at line 96 [6.242902]

Replacement in crawl-ref/source/spl-util.h at line 100 [6.242902]

Replacement in crawl-ref/source/spl-util.h at line 103 [6.242902]

Deletion in crawl-ref/source/spl-util.h at line 119 [6.242902]

Replacement in crawl-ref/source/spl-util.cc at line 470 [6.245665]

Replacement in crawl-ref/source/spl-util.cc at line 476 [6.245665]

Replacement in crawl-ref/source/spl-util.cc at line 484 [6.245665]

Replacement in crawl-ref/source/spl-util.cc at line 490 [6.245665]

Replacement in crawl-ref/source/spl-util.cc at line 498 [6.245665]

Replacement in crawl-ref/source/spl-util.cc at line 504 [6.245665]

Replacement in crawl-ref/source/spl-util.cc at line 509 [6.245665]

Replacement in crawl-ref/source/spl-util.cc at line 521 [6.245665]

Replacement in crawl-ref/source/spl-util.cc at line 524 [6.245665]

Replacement in crawl-ref/source/spl-util.cc at line 607 [6.245665]

Replacement in crawl-ref/source/spl-util.cc at line 611 [6.245665]

Replacement in crawl-ref/source/spl-util.cc at line 625 [6.245665]

Replacement in crawl-ref/source/spl-util.cc at line 634 [6.245665]

Replacement in crawl-ref/source/spl-util.cc at line 639 [6.245665]

Replacement in crawl-ref/source/spl-util.cc at line 647 [6.245665]

Replacement in crawl-ref/source/spl-util.cc at line 655 [6.245665]

Replacement in crawl-ref/source/spl-util.cc at line 662 [6.245665]

Replacement in crawl-ref/source/spl-cast.cc at line 1361 [6.293070]

Replacement in crawl-ref/source/spells4.h at line 22 [6.434549]

Deletion in crawl-ref/source/spells4.cc at line 69 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 93 [6.436250]

Deletion in crawl-ref/source/spells4.cc at line 95 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 186 [6.436250]

Deletion in crawl-ref/source/spells4.cc at line 189 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 212 [6.436250]

Deletion in crawl-ref/source/spells4.cc at line 214 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 385 [6.436250]

Deletion in crawl-ref/source/spells4.cc at line 387 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 443 [6.436250]

Deletion in crawl-ref/source/spells4.cc at line 445 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 483 [6.436250]

Deletion in crawl-ref/source/spells4.cc at line 486 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 520 [6.436250]

Deletion in crawl-ref/source/spells4.cc at line 523 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 550 [6.436250]

Deletion in crawl-ref/source/spells4.cc at line 552 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 768 [6.436250]

Deletion in crawl-ref/source/spells4.cc at line 770 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 853 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 926 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 928 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 945 [6.436250]

Deletion in crawl-ref/source/spells4.cc at line 947 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 984 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 988 [6.436250]

Deletion in crawl-ref/source/spells4.cc at line 990 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 1024 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 1064 [6.436250]

Deletion in crawl-ref/source/spells4.cc at line 1066 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 1141 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 1148 [6.436250]

Deletion in crawl-ref/source/spells4.cc at line 1151 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 1516 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 1518 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 1538 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 1540 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 1594 [6.436250]

Deletion in crawl-ref/source/spells4.cc at line 1596 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 1621 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 1623 [6.436250]

Deletion in crawl-ref/source/spells4.cc at line 1625 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 2366 [6.436250]

Deletion in crawl-ref/source/spells4.cc at line 2368 [6.436250]

Replacement in crawl-ref/source/spells3.cc at line 1694 [6.531613]

Replacement in crawl-ref/source/religion.cc at line 5975 [6.804403]

Insertion in crawl-ref/source/religion.cc at line 5983 [6.804403]

Deletion in crawl-ref/source/religion.cc at line 5993 [6.804403]

Replacement in crawl-ref/source/item_use.cc at line 5043 [6.2781507]