fiddlerwoaroof/crawl - Change KPSCSVGHKEQ4ENM3QQU2U3GYMV52NDFO5L6ML7YDPUKV3365OA3QC

Add more god gift-related fixes. First, expand mgen_data::hostile_at()

to allow specifying more parameters, and merge it with mgen_data::alert_hostile_at(), since their only difference after expansion is the hostile monster's target. Second, if a god makes you cast Fire Storm, any fire vortices produced will finally be marked as god gifts. Third, for consistency, don't immediately alert miscast-produced spatial vortices to your presence, since the aforementioned fire vortices aren't.

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

Created by dolorous on June 14, 2008

KPSCSVGHKEQ4ENM3QQU2U3GYMV52NDFO5L6ML7YDPUKV3365OA3QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 859 [5.3]

B:BD[3.483] → [4.4:61]

                            mgen_data::alert_hostile_at(

[3.483]

[4.61]

                            mgen_data::hostile_at(

Replacement in crawl-ref/source/xom.cc at line 861 [5.3]

B:BD[4.129] → [2.283:349]

                                you.pos(), 4, 0, GOD_XOM)) != -1)

[4.129]

[6.399]

                                you.pos(), 4, 0, true, GOD_XOM)) != -1)

Replacement in crawl-ref/source/spl-cast.cc at line 2407 [8.293070]

B:BD[7.193] → [7.193:262]

B:BD[7.262] → [2.1938:1992]

                    mgen_data::alert_hostile_at(MONS_SPATIAL_VORTEX,
                        you.pos(), 3, 0, god)) != -1)

[7.193]

[7.308]

                    mgen_data::hostile_at(MONS_SPATIAL_VORTEX,
                        you.pos(), 3, 0, false, god)) != -1)

Replacement in crawl-ref/source/spl-cast.cc at line 2446 [8.293070]

B:BD[7.605] → [9.161:234]

B:BD[9.234] → [2.1993:2051]

                        mgen_data::alert_hostile_at(MONS_SPATIAL_VORTEX,
                            you.pos(), 3, 0, god)) != -1)

[7.605]

[7.720]

                        mgen_data::hostile_at(MONS_SPATIAL_VORTEX,
                            you.pos(), 3, 0, false, god)) != -1)

Replacement in crawl-ref/source/spl-cast.cc at line 2549 [8.293070]

B:BD[7.995] → [7.995:1064]

B:BD[7.1064] → [2.2201:2255]

                    mgen_data::alert_hostile_at(MONS_SPATIAL_VORTEX,
                        you.pos(), 3, 0, god)) != -1)

[7.995]

[7.1110]

                    mgen_data::hostile_at(MONS_SPATIAL_VORTEX,
                        you.pos(), 3, 0, false, god)) != -1)

Replacement in crawl-ref/source/spl-cast.cc at line 2560 [8.293070]

B:BD[3.2303] → [9.285:334]

                    mgen_data::alert_hostile_at(

[3.2303]

[9.334]

                    mgen_data::hostile_at(

Replacement in crawl-ref/source/spl-cast.cc at line 2562 [8.293070]

B:BD[9.390] → [2.2256:2310]

                        you.pos(), 5, 0, god)) != -1)

[9.390]

[10.12298]

                        you.pos(), 5, 0, true, god)) != -1)

Replacement in crawl-ref/source/spl-cast.cc at line 2582 [8.293070]

B:BD[7.1407] → [9.391:464]

B:BD[9.464] → [2.2311:2369]

                        mgen_data::alert_hostile_at(MONS_SPATIAL_VORTEX,
                            you.pos(), 3, 0, god)) != -1)

[7.1407]

[7.1522]

                        mgen_data::hostile_at(MONS_SPATIAL_VORTEX,
                            you.pos(), 3, 0, false, god)) != -1)

Replacement in crawl-ref/source/spl-cast.cc at line 2599 [8.293070]

B:BD[3.2672] → [9.515:564]

                    mgen_data::alert_hostile_at(

[3.2672]

[9.564]

                    mgen_data::hostile_at(

Replacement in crawl-ref/source/spl-cast.cc at line 2601 [8.293070]

B:BD[9.620] → [2.2370:2424]

                        you.pos(), 5, 0, god)) != -1)

[9.620]

[10.12894]

                        you.pos(), 5, 0, true, god)) != -1)

Replacement in crawl-ref/source/spl-cast.cc at line 2618 [8.293070]

B:BD[11.551] → [9.621:674]

                        mgen_data::alert_hostile_at(

[11.551]

[9.674]

                        mgen_data::hostile_at(

Replacement in crawl-ref/source/spl-cast.cc at line 2620 [8.293070]

B:BD[9.734] → [2.2425:2483]

                            you.pos(), 5, 0, god)) != -1)

[9.734]

[11.677]

                            you.pos(), 5, 0, true, god)) != -1)

Replacement in crawl-ref/source/spl-cast.cc at line 2640 [8.293070]

B:BD[3.3517] → [12.481:553]

B:BD[12.553] → [2.2484:2538]

                    mgen_data::alert_hostile_at(MONS_ABOMINATION_SMALL,
                        you.pos(), 0, 0, god)) != -1)

[3.3517]

[8.363405]

                    mgen_data::hostile_at(MONS_ABOMINATION_SMALL,
                        you.pos(), 0, 0, true, god)) != -1)

Replacement in crawl-ref/source/spl-cast.cc at line 2651 [8.293070]

B:BD[3.3690] → [9.792:841]

                    mgen_data::alert_hostile_at(

[3.3690]

[9.841]

                    mgen_data::hostile_at(

Replacement in crawl-ref/source/spl-cast.cc at line 2653 [8.293070]

B:BD[9.898] → [2.2539:2593]

                        you.pos(), 0, 0, god)) != -1)

[9.898]

[8.364660]

                        you.pos(), 0, 0, true, god)) != -1)

Replacement in crawl-ref/source/spl-cast.cc at line 2668 [8.293070]

B:BD[11.1061] → [9.899:952]

                        mgen_data::alert_hostile_at(

[11.1061]

[9.952]

                        mgen_data::hostile_at(

Replacement in crawl-ref/source/spl-cast.cc at line 2670 [8.293070]

B:BD[9.1012] → [2.2594:2652]

                            you.pos(), 3, 0, god)) != -1)

[9.1012]

[11.1108]

                            you.pos(), 3, 0, true, god)) != -1)

Replacement in crawl-ref/source/spl-cast.cc at line 2900 [8.293070]

B:BD[13.306] → [13.306:371]

B:BD[13.371] → [2.2802:2860]

                        mgen_data::alert_hostile_at(MONS_SHADOW,
                            you.pos(), 2, 0, god)) != -1)

[13.306]

[13.428]

                        mgen_data::hostile_at(MONS_SHADOW,
                            you.pos(), 2, 0, true, god)) != -1)

Replacement in crawl-ref/source/spl-cast.cc at line 2965 [8.293070]

B:BD[3.4703] → [12.1339:1404]

B:BD[12.1404] → [2.2861:2915]

                    mgen_data::alert_hostile_at(MONS_SOUL_EATER,
                        you.pos(), 4, 0, god)) != -1)

[3.4703]

[10.21858]

                    mgen_data::hostile_at(MONS_SOUL_EATER,
                        you.pos(), 4, 0, true, god)) != -1)

Replacement in crawl-ref/source/spl-cast.cc at line 2976 [8.293070]

B:BD[3.4848] → [12.1451:1512]

B:BD[12.1512] → [2.2916:2970]

                    mgen_data::alert_hostile_at(MONS_REAPER,
                        you.pos(), 4, 0, god)) != -1)

[3.4848]

[8.372290]

                    mgen_data::hostile_at(MONS_REAPER,
                        you.pos(), 4, 0, true, god)) != -1)

Replacement in crawl-ref/source/religion.cc at line 3040 [8.804403]

B:BD[14.4127] → [14.4127:4187]

B:BD[14.4187] → [2.11711:11777]

                    mgen_data::alert_hostile_at(MONS_DAEVA,
                        you.pos(), 0, 0, GOD_SHINING_ONE)) != -1)

[14.4127]

[15.2594]

                    mgen_data::hostile_at(MONS_DAEVA,
                        you.pos(), 0, 0, true, GOD_SHINING_ONE)) != -1)

Replacement in crawl-ref/source/religion.cc at line 3141 [8.804403]

B:BD[14.4280] → [14.4280:4344]

B:BD[14.4344] → [2.11778:11840]

                        mgen_data::alert_hostile_at(MONS_ANGEL,
                            you.pos(), 0, 0, GOD_ZIN)) != -1)

[14.4280]

[16.2952]

                        mgen_data::hostile_at(MONS_ANGEL,
                            you.pos(), 0, 0, true, GOD_ZIN)) != -1)

Replacement in crawl-ref/source/religion.cc at line 3303 [8.804403]

B:BD[14.4445] → [14.4445:4501]

                           mgen_data::alert_hostile_at(

[14.4445]

[14.4501]

                           mgen_data::hostile_at(

Replacement in crawl-ref/source/religion.cc at line 3306 [8.804403]

B:BD[14.4626] → [2.11903:11973]

                               you.pos(), 0, 0, GOD_MAKHLEB)) != -1);

[14.4626]

[17.10409]

                               you.pos(), 0, 0, true, GOD_MAKHLEB)) != -1);

Replacement in crawl-ref/source/religion.cc at line 3321 [8.804403]

B:BD[14.4723] → [14.4723:4771]

                   mgen_data::alert_hostile_at(

[14.4723]

[14.4771]

                   mgen_data::hostile_at(

Replacement in crawl-ref/source/religion.cc at line 3324 [8.804403]

B:BD[14.4876] → [2.11974:12035]

                       you.pos(), 0, 0, GOD_MAKHLEB)) != -1)

[14.4876]

[17.10997]

                       you.pos(), 0, 0, true, GOD_MAKHLEB)) != -1)

Replacement in crawl-ref/source/religion.cc at line 3351 [8.804403]

B:BD[14.4964] → [14.4964:5025]

B:BD[14.5025] → [2.12036:12104]

                    mgen_data::alert_hostile_at(MONS_REAPER,
                        you.pos(), 0, 0, GOD_KIKUBAAQUDGHA)) != -1)

[14.4964]

[17.11455]

                    mgen_data::hostile_at(MONS_REAPER,
                        you.pos(), 0, 0, true, GOD_KIKUBAAQUDGHA)) != -1)

Replacement in crawl-ref/source/religion.cc at line 3390 [8.804403]

B:BD[3.13118] → [17.11495:11553]

B:BD[17.11553] → [2.12105:12171]

                    mgen_data::alert_hostile_at(punisher,
                        you.pos(), 0, 0, GOD_YREDELEMNUL)) != -1)

[3.13118]

[17.11609]

                    mgen_data::hostile_at(punisher,
                        you.pos(), 0, 0, true, GOD_YREDELEMNUL)) != -1)

Replacement in crawl-ref/source/religion.cc at line 3555 [8.804403]

B:BD[3.13288] → [17.11934:12003]

B:BD[17.12003] → [2.12238:12292]

                    mgen_data::alert_hostile_at(MONS_DANCING_WEAPON,
                        you.pos(), 0, 0, GOD_BEOGH));

[3.13288]

[18.3237]

                    mgen_data::hostile_at(MONS_DANCING_WEAPON,
                        you.pos(), 0, 0, true, GOD_BEOGH));

Replacement in crawl-ref/source/religion.cc at line 3610 [8.804403]

B:BD[19.2896] → [17.12054:12115]

B:BD[17.12115] → [2.12293:12364]

                       mgen_data::alert_hostile_at(punisher,
                           you.pos(), 0, MG_PERMIT_BANDS, GOD_BEOGH));

[19.2896]

[8.869564]

                       mgen_data::hostile_at(punisher,
                           you.pos(), 0, MG_PERMIT_BANDS, true, GOD_BEOGH));

Replacement in crawl-ref/source/religion.cc at line 3640 [8.804403]

B:BD[3.13594] → [17.12186:12240]

B:BD[17.12240] → [2.12365:12423]

                mgen_data::alert_hostile_at(punisher,
                    you.pos(), 0, 0, GOD_OKAWARU)) != -1)

[3.13594]

[20.8021]

                mgen_data::hostile_at(punisher,
                    you.pos(), 0, 0, true, GOD_OKAWARU)) != -1)

Replacement in crawl-ref/source/religion.cc at line 3731 [8.804403]

B:BD[14.5122] → [14.5122:5178]

                           mgen_data::alert_hostile_at(

[14.5122]

[14.5178]

                           mgen_data::hostile_at(

Replacement in crawl-ref/source/religion.cc at line 3734 [8.804403]

B:BD[14.5303] → [2.12424:12493]

                               you.pos(), 0, 0, GOD_LUGONU)) != -1);

[14.5303]

[21.2583]

                               you.pos(), 0, 0, true, GOD_LUGONU)) != -1);

Replacement in crawl-ref/source/religion.cc at line 3749 [8.804403]

B:BD[14.5400] → [14.5400:5448]

                   mgen_data::alert_hostile_at(

[14.5400]

[14.5448]

                   mgen_data::hostile_at(

Replacement in crawl-ref/source/religion.cc at line 3752 [8.804403]

B:BD[14.5553] → [2.12494:12554]

                       you.pos(), 0, 0, GOD_LUGONU)) != -1)

[14.5553]

[8.873686]

                       you.pos(), 0, 0, true, GOD_LUGONU)) != -1)

Replacement in crawl-ref/source/monplace.h at line 219 [8.1638277]

B:BD[3.21529] → [3.21529:21652]

B:BD[3.21652] → [19.3839:3840]

∅:D[19.3840] → [3.21654:21773]

B:BD[3.21654] → [3.21654:21773]

B:BD[3.21773] → [19.3841:3896]

B:BD[19.3896] → [2.13605:13728]

                                const coord_def &where)
    {
        return mgen_data(what, BEH_HOSTILE, 0, where);
    }
    static mgen_data alert_hostile_at(monster_type what,
                                      const coord_def &where,
                                      int abj_deg = 0,
                                      unsigned flags = 0,
                                      god_type god = GOD_NO_GOD)

[3.21529]

[3.21828]

                                const coord_def &where,
                                int abj_deg = 0,
                                unsigned flags = 0,
                                bool alert = false,
                                god_type god = GOD_NO_GOD)

Replacement in crawl-ref/source/monplace.h at line 225 [8.1638277]

B:BD[3.21834] → [2.13729:13836]

        return mgen_data(what, BEH_HOSTILE, abj_deg, where, MHITYOU, flags,
                         god);

[3.21834]

[19.4032]

        return mgen_data(what, BEH_HOSTILE, abj_deg, where,
                         alert ? MHITYOU : MHITNOT,
                         flags, god);

Insertion in crawl-ref/source/beam.cc at line 63 [8.4128068]
[8.4129319]
[8.4129319]
```
#include "state.h"
```

Insertion in crawl-ref/source/beam.cc at line 3505 [8.4128068]

[8.4220834]

[3.53867]

            const god_type god =
                (crawl_state.is_god_acting()) ? crawl_state.which_god_acting()
                                              : GOD_NO_GOD;

Replacement in crawl-ref/source/beam.cc at line 3511 [8.4128068]

B:BD[3.53930] → [3.53930:53987]

                    MONS_FIRE_VORTEX, coord_def(x, y)));

[3.53930]

[8.4220912]

                    MONS_FIRE_VORTEX, coord_def(x, y), 0, 0, false, god));