fiddlerwoaroof/crawl - Change KPSH6IYEMTSS3MRR27KDXO75PCGQJHJ76NBQ3T6PPZDB7BF75M5AC

Simplify yet again.

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

Created by dolorous on November 4, 2008

KPSH6IYEMTSS3MRR27KDXO75PCGQJHJ76NBQ3T6PPZDB7BF75M5AC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/religion.cc at line 3677 [4.804403]

B:BD[3.2794] → [3.2794:2972]

                coord_def mon_pos;
                {
                    monsters dummy;
                    dummy.type = mon;
                    dummy.attitude = ATT_HOSTILE;

Replacement in crawl-ref/source/religion.cc at line 3678 [4.804403]

B:BD[3.2973] → [2.2431:2490]

∅:D[2.2490] → [3.3077:3095]

B:BD[3.3077] → [3.3077:3095]

                    monster_random_space(&dummy, mon_pos);
                }

[3.2973]

[3.3095]

                coord_def mon_pos;
                monster_random_space(mon, mon_pos, true);

Replacement in crawl-ref/source/mstuff2.h at line 28 [4.1336995]

B:BD[5.4312] → [2.2527:2598]

void monster_random_space(const monsters *monster, coord_def& target);

[5.4312]

[6.2565]

void monster_random_space(const monsters *monster, coord_def& target,
                          bool forbid_sanctuary = false);
void monster_random_space(monster_type mon, coord_def& target,
                          bool forbid_sanctuary = false);

Replacement in crawl-ref/source/mstuff2.cc at line 602 [4.1340842]

B:BD[3.3634] → [2.2600:2670]

void monster_random_space(const monsters *monster, coord_def& target)

[3.3634]

[3.3827]

void monster_random_space(const monsters *monster, coord_def& target,
                          bool forbid_sanctuary)

Replacement in crawl-ref/source/mstuff2.cc at line 614 [4.1340842]

B:BD[3.4103] → [3.4103:4167]

        if (is_sanctuary(target) && !mons_wont_attack(monster))

[3.4103]

[3.4240]

        if (is_sanctuary(target) && forbid_sanctuary)

Insertion in crawl-ref/source/mstuff2.cc at line 620 [4.1340842]

[7.399829]

[8.3151]

}
void monster_random_space(monster_type mon, coord_def& target,
                          bool forbid_sanctuary)
{
    monsters dummy;
    dummy.type = mon;
    return monster_random_space(&dummy, target, forbid_sanctuary);

Replacement in crawl-ref/source/mstuff2.cc at line 666 [4.1340842]

B:BD[9.20241] → [2.2709:2754]


    monster_random_space(monster, newpos);

[9.20241]

[2.2754]

    monster_random_space(monster, newpos, !mons_wont_attack(monster));