fiddlerwoaroof/crawl - Change 645DB5PFOPGGO5Y4MYJEPNPSNZ2QQHJGCP2O5TFYBOOTDAI6RI4QC

Implement FR 2872334 'don't auto-target neutrals' by replacing most uses of TARG_ENEMY with TARG_HOSTILE.

Created by Charles Otto on October 6, 2009

645DB5PFOPGGO5Y4MYJEPNPSNZ2QQHJGCP2O5TFYBOOTDAI6RI4QC

Dependencies

In channels

main

Change contents

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

∅:D[4.525] → [5.7750:7806]

B:BD[7.81] → [5.7750:7806]

                      targ_mode_type mode = TARG_ENEMY,

[4.525]

[2.263]

                      targ_mode_type mode = TARG_HOSTILE,

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

B:BD[5.8122] → [5.8122:8196]

            (testbits(flags, SPFLAG_HELPFUL) ? TARG_FRIEND : TARG_ENEMY);

[5.8122]

[8.6095]

              (testbits(flags, SPFLAG_HELPFUL) ? TARG_FRIEND : TARG_HOSTILE);

Replacement in crawl-ref/source/spells2.cc at line 1887 [6.569242]

B:BD[9.3621] → [3.1750:1822]

    direction(spelld, DIR_TARGET, TARG_ENEMY, LOS_RADIUS, false, false,

[9.3621]

[3.1822]

    direction(spelld, DIR_TARGET, TARG_HOSTILE, LOS_RADIUS, false, false,

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

B:BD[10.33312] → [11.4623:4703]

    direction( target, DIR_NONE, TARG_ENEMY, -1, false, !teleport, true, false,

[10.33312]

[12.3408]

    direction( target, DIR_NONE, TARG_HOSTILE, -1, false, !teleport, true, false,

Replacement in crawl-ref/source/item_use.cc at line 2234 [6.2781507]
B:BD[13.4664] → [13.4664:4712]
```
        direction( thr, DIR_NONE, TARG_ENEMY );
```
[13.4664]
[13.4712]
```
        direction( thr, DIR_NONE, TARG_HOSTILE);
```
Replacement in crawl-ref/source/item_use.cc at line 3867 [6.2781507]
B:BD[14.185] → [5.13805:13848]
```
    targ_mode_type targ_mode = TARG_ENEMY;
```
[14.185]
[6.2841241]
```
    targ_mode_type targ_mode = TARG_HOSTILE;
```
Replacement in crawl-ref/source/item_use.cc at line 3950 [6.2781507]
∅:D[15.1280] → [6.2842142:2842178]
B:BD[6.2842142] → [6.2842142:2842178]
```
            targ_mode = TARG_ENEMY;
```
[15.1280]
[15.1281]
```
            targ_mode = TARG_HOSTILE;
```
Replacement in crawl-ref/source/it_use3.cc at line 184 [6.2870456]
B:BD[6.2878067] → [16.2915:2963]
```
    direction(beam, DIR_TARGET, TARG_ENEMY, 2);
```
[6.2878067]
[17.349]
```
    direction(beam, DIR_TARGET, TARG_HOSTILE, 2);
```

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

B:BD[6.3427440] → [18.10260:10327]

        direction(targ, DIR_TARGET, TARG_ENEMY, -1, false, false);

[6.3427440]

[6.3427491]

        direction(targ, DIR_TARGET, TARG_HOSTILE, -1, false, false);

Replacement in crawl-ref/source/directn.cc at line 422 [6.3697945]

B:BD[19.20725] → [20.875:907]

        if (mode == TARG_ENEMY)

[19.20725]

[19.20788]

        // Changed this, was that necessary? -cao
        //if (mode == TARG_ENEMY)
        if (mode == TARG_ENEMY || mode == TARG_HOSTILE)

Replacement in crawl-ref/source/directn.cc at line 937 [6.3697945]

B:BD[21.3723] → [21.3723:3779]

            if (!may_target_self && mode == TARG_ENEMY)

[21.3723]

[21.3779]

            if (!may_target_self && (mode == TARG_ENEMY
                                     || mode == TARG_HOSTILE))

Replacement in crawl-ref/source/decks.cc at line 1804 [6.3987460]
∅:D[22.3229] → [23.9887:9947]
B:BD[24.5432] → [23.9887:9947]
```
    if (spell_direction(target, beam, DIR_NONE, TARG_ENEMY,
```
[22.3229]
[23.9947]
```
    if (spell_direction(target, beam, DIR_NONE, TARG_HOSTILE,
```

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

B:BD[25.7144] → [26.3855:3966]

            if (!spell_direction(spd, beam, DIR_NONE, TARG_ENEMY, fake_range))
                return (false);

[25.7144]

[26.3966]

            if (!spell_direction(spd, beam, DIR_NONE, TARG_HOSTILE, fake_range))
              return (false);