fiddlerwoaroof/crawl - Change V2LAHZJVKBRUAKHRXZZTHOAAHKHUS4CWWZICYEJHTDI6IA7X4LUQC

Revert previous attempt at simplification, as there has to be a better

way to do that.

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

Created by dolorous on March 17, 2008

V2LAHZJVKBRUAKHRXZZTHOAAHKHUS4CWWZICYEJHTDI6IA7X4LUQC

Dependencies

In channels

main

Change contents

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

B:BD[3.2037] → [2.4703:4759]

        const int radius = 9;
        int monster = -1;

[3.2037]

[5.4021]

        int ystart = you.y_pos - 9, xstart = you.x_pos - 9;
        int yend = you.y_pos + 9, xend = you.x_pos + 9;
        if ( xstart < 0 ) xstart = 0;
        if ( ystart < 0 ) ystart = 0;
        if ( xend >= GXM ) xend = GXM;
        if ( ystart >= GYM ) yend = GYM;

Replacement in crawl-ref/source/religion.cc at line 3089 [4.804403]
B:BD[5.4047] → [2.4760:4804]
```
        for (int x=-radius; x<=radius; x++)
```
[5.4047]
[3.2083]
```
        for ( int y = ystart; y < yend; ++y )
```

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

B:BD[3.2093] → [2.4805:4853]

            for (int y=-radius; y<=radius; y++)

[3.2093]

[3.2195]

            for ( int x = xstart; x < xend; ++x )

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

B:BD[3.2209] → [2.4854:5005]

                int posx = you.x_pos + x;
                int posy = you.y_pos + y;
                if (mons_inside_circle(posx, posy, radius) != -1)

[3.2209]

[3.2446]

                const unsigned short targ_monst = mgrd[x][y];
                if ( targ_monst != NON_MONSTER )

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

B:BD[3.2464] → [2.5006:5289]

                    monster = mgrd[posx][posy];
                    monsters *mon = &menv[monster];
                    if (mons_species(mon->type) == MONS_ORC
                        && mon->attitude == ATT_FRIENDLY
                        && (mon->flags & MF_ATT_CHANGE_ATTEMPT))

[3.2464]

[3.2665]

                    monsters *monster = &menv[targ_monst];
                    if (mons_species(monster->type) == MONS_ORC
                        && monster->attitude == ATT_FRIENDLY
                        && (monster->flags & MF_ATT_CHANGE_ATTEMPT))

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

B:BD[6.412] → [2.5290:5507]

                        if (mons_player_visible(mon)
                            && !mons_is_sleeping(mon)
                            && !mons_is_confused(mon)
                            && !mons_is_paralysed(mon))

[6.412]

[6.689]

                        if (mons_player_visible(monster)
                            && !mons_is_sleeping(monster)
                            && !mons_is_confused(monster)
                            && !mons_is_paralysed(monster))

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

B:BD[6.715] → [2.5508:5566]

                            const int hd = mon->hit_dice;

[6.715]

[5.4844]

                            const int hd = monster->hit_dice;

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

B:BD[5.5241] → [2.5567:5693]

                            mon->attitude = ATT_HOSTILE;
                            behaviour_event(mon, ME_ALERT, MHITYOU);

[5.5241]

[5.5364]

                            monster->attitude = ATT_HOSTILE;
                            behaviour_event(monster, ME_ALERT, MHITYOU);

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

B:BD[6.779] → [2.5694:5755]

                            if (player_monster_visible(mon))

[6.779]

[5.5492]

                            if (player_monster_visible(monster))