fiddlerwoaroof/crawl - Change FBJB2WMCYNDOICZJZT356VEMMD5L2FFRTKUARKSPIWIM2LHGBLTQC

Fix attack conduct handling to register more than one conduct for an

attack again. For example, if you make an unchivalric attack on a neutral monster, both the "unchivalric attack" and "attack neutral" conducts will be handled again, instead of just the former (big oops).

Passing a constant-sized array of god_conduct_triggers and adding wrapper functions to enable and disable them all is not the most elegant solution, but I don't quite have the time or the understanding right now to rewrite the god_conduct_trigger class to handle more than one conduct at once, and this does work in the meantime.

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

Created by dolorous on June 17, 2008

FBJB2WMCYNDOICZJZT356VEMMD5L2FFRTKUARKSPIWIM2LHGBLTQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells3.cc at line 208 [5.531613]

B:BD[5.537347] → [6.227:297]

        god_conduct_trigger conduct;
        conduct.enabled = false;

[5.537204]

[7.167]

        god_conduct_trigger conducts[4];
        disable_attack_conducts(conducts);

Replacement in crawl-ref/source/spells3.cc at line 215 [5.531613]

B:BD[8.332] → [9.167:218]

            set_attack_conducts(monster, conduct);

[8.332]

[10.280]

            set_attack_conducts(conducts, monster);

Replacement in crawl-ref/source/spells3.cc at line 224 [5.531613]
B:BD[6.571] → [6.571:603]
```
        conduct.enabled = true;
```
[6.571]
[5.537413]
```
        enable_attack_conducts(conducts);
```

Replacement in crawl-ref/source/spells3.cc at line 253 [5.531613]

B:BD[5.538103] → [8.975:1045]

        god_conduct_trigger conduct;
        conduct.enabled = false;

[5.538103]

[5.538269]

        god_conduct_trigger conducts[4];
        disable_attack_conducts(conducts);

Replacement in crawl-ref/source/spells3.cc at line 260 [5.531613]

B:BD[11.778] → [9.219:270]

            set_attack_conducts(monster, conduct);

[11.778]

[10.395]

            set_attack_conducts(conducts, monster);

Replacement in crawl-ref/source/spells3.cc at line 270 [5.531613]
B:BD[12.170] → [8.1325:1357]
```
        conduct.enabled = true;
```
[12.170]
[6.1051]
```
        enable_attack_conducts(conducts);
```

Replacement in crawl-ref/source/spells2.cc at line 913 [5.569242]

B:BD[5.597510] → [8.1736:1798]

    god_conduct_trigger conduct;
    conduct.enabled = false;

[5.597510]

[5.597538]

    god_conduct_trigger conducts[4];
    disable_attack_conducts(conducts);

Replacement in crawl-ref/source/spells2.cc at line 920 [5.569242]

B:BD[13.191] → [9.273:320]

        set_attack_conducts(monster, conduct);

[13.191]

[10.509]

        set_attack_conducts(conducts, monster);

Replacement in crawl-ref/source/spells2.cc at line 933 [5.569242]
B:BD[14.482] → [8.2303:2331]
```
    conduct.enabled = true;
```
[14.482]
[15.551]
```
    enable_attack_conducts(conducts);
```

Replacement in crawl-ref/source/religion.h at line 73 [5.800304]

B:BD[16.2591] → [2.2527:2603]

void set_attack_conducts(const monsters *mon, god_conduct_trigger& conduct,

[16.2591]

[2.2603]

void set_attack_conducts(god_conduct_trigger conduct[4], const monsters *mon,

Insertion in crawl-ref/source/religion.h at line 75 [5.800304]

[2.2648]

[17.195]

void enable_attack_conducts(god_conduct_trigger conduct[4]);
void disable_attack_conducts(god_conduct_trigger conduct[4]);

Replacement in crawl-ref/source/religion.cc at line 2746 [5.804403]

B:BD[2.2673] → [2.2673:2749]

void set_attack_conducts(const monsters *mon, god_conduct_trigger& conduct,

[2.2673]

[2.2749]

void set_attack_conducts(god_conduct_trigger conduct[4], const monsters *mon,

Replacement in crawl-ref/source/religion.cc at line 2750 [5.804403]

B:BD[2.2816] → [2.2816:2871]

        conduct.set(DID_ATTACK_FRIEND, 5, known, mon);

[2.2816]

[2.2871]

        conduct[0].set(DID_ATTACK_FRIEND, 5, known, mon);

Replacement in crawl-ref/source/religion.cc at line 2752 [5.804403]

B:BD[2.2903] → [2.2903:2959]

        conduct.set(DID_ATTACK_NEUTRAL, 5, known, mon);

[2.2903]

[2.2959]

        conduct[1].set(DID_ATTACK_NEUTRAL, 5, known, mon);

Replacement in crawl-ref/source/religion.cc at line 2755 [5.804403]

B:BD[2.3007] → [2.3007:3067]

        conduct.set(DID_UNCHIVALRIC_ATTACK, 4, known, mon);

[2.3007]

[2.3067]

        conduct[2].set(DID_UNCHIVALRIC_ATTACK, 4, known, mon);

Replacement in crawl-ref/source/religion.cc at line 2758 [5.804403]

B:BD[2.3095] → [2.3095:3160]

        conduct.set(DID_ATTACK_HOLY, mon->hit_dice, known, mon);

[2.3095]

[17.1627]

        conduct[3].set(DID_ATTACK_HOLY, mon->hit_dice, known, mon);
}
void enable_attack_conducts(god_conduct_trigger conduct[4])
{
    for (int i = 0; i < 4; ++i)
        conduct[i].enabled = true;

Insertion in crawl-ref/source/religion.cc at line 2767 [5.804403]

[17.1630]

[18.6865]

void disable_attack_conducts(god_conduct_trigger conduct[4])
{
    for (int i = 0; i < 4; ++i)
        conduct[i].enabled = false;
}

Replacement in crawl-ref/source/fight.cc at line 611 [5.3140790]

B:BD[19.3046] → [19.3046:3108]

    god_conduct_trigger conduct;
    conduct.enabled = false;

[19.3046]

[5.3147787]

    god_conduct_trigger conducts[4];
    disable_attack_conducts(conducts);

Replacement in crawl-ref/source/fight.cc at line 622 [5.3140790]

B:BD[10.3886] → [3.13266:13313]

            set_attack_conducts(def, conduct);

[10.3886]

[10.3920]

            set_attack_conducts(conducts, def);

Replacement in crawl-ref/source/fight.cc at line 631 [5.3140790]
B:BD[20.2884] → [19.3385:3413]
```
    conduct.enabled = true;
```
[20.2884]
[19.3413]
```
    enable_attack_conducts(conducts);
```

Replacement in crawl-ref/source/beam.cc at line 4377 [5.4128068]

B:BD[21.2763] → [21.2763:2833]

        god_conduct_trigger conduct;
        conduct.enabled = false;

[21.2763]

[22.2736]

        god_conduct_trigger conducts[4];
        disable_attack_conducts(conducts);

Replacement in crawl-ref/source/beam.cc at line 4392 [5.4128068]

B:BD[23.18261] → [4.2763:2814]

                set_attack_conducts(mon, conduct);

[23.18261]

[24.1489]

                set_attack_conducts(conducts, mon);

Replacement in crawl-ref/source/beam.cc at line 4408 [5.4128068]
B:BD[5.4235345] → [21.3130:3162]
```
        conduct.enabled = true;
```
[5.4235345]
[21.3162]
```
        enable_attack_conducts(conducts);
```

Replacement in crawl-ref/source/beam.cc at line 4560 [5.4128068]

B:BD[5.4238797] → [17.4716:4778]

    god_conduct_trigger conduct;
    conduct.enabled = false;

[5.4238797]

[22.2738]

    god_conduct_trigger conducts[4];
    disable_attack_conducts(conducts);

Replacement in crawl-ref/source/beam.cc at line 4577 [5.4128068]

B:BD[25.3387] → [9.3198:3252]

            set_attack_conducts(mon, conduct, !okay);

[25.3387]

[5.4239223]

            set_attack_conducts(conducts, mon, !okay);

Replacement in crawl-ref/source/beam.cc at line 4633 [5.4128068]
B:BD[26.27004] → [17.5027:5055]
```
    conduct.enabled = true;
```
[26.27004]
[27.15724]
```
    enable_attack_conducts(conducts);
```