fiddlerwoaroof/crawl - Change 4OV4JZ6NWQ2ZK4LEWCUWALLB3BVANJJ2EMLHC5LJLA5WYSP25OIQC

Halo-related cleanups: limit the halo's radius to (roughly) FOV, add

sanity checks to make sure we're not looking for monsters outside the monster grid, and reduce some code duplication.

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

Created by dolorous on March 16, 2008

4OV4JZ6NWQ2ZK4LEWCUWALLB3BVANJJ2EMLHC5LJLA5WYSP25OIQC

Dependencies

In channels

main

Change contents

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

B:BD[4.3538] → [4.3538:3674]

B:BD[4.3674] → [3.298:363]

         for (int y=-radius; y<=radius; y++)
         {
              int posx = you.x_pos + x;
              int posy = you.y_pos + y;
              int dist = mons_inside_circle(posx, posy, radius);

[4.3538]

[4.3911]

    {
        for (int y=-radius; y<=radius; y++)
        {
            int posx = you.x_pos + x;
            int posy = you.y_pos + y;
            int dist = mons_inside_circle(posx, posy, radius);
            // scare all hostile monsters inside sanctuary
            if (dist != -1)
            {
                monster = mgrd[posx][posy];
                monsters *mon = &menv[monster];

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

B:BD[4.3912] → [4.3912:3973]

B:BD[4.3973] → [3.364:394]

∅:D[3.394] → [4.4024:4136]

B:BD[4.4024] → [4.4024:4136]

              // scare all hostile monsters inside sanctuary
              if (dist != -1)
              {
                  monster = mgrd[posx][posy];
                  monsters *mon = &menv[monster];

[4.3912]

[3.395]

                if (!mons_friendly(mon)
                    && mon->add_ench(mon_enchant(ENCH_FEAR, 0, KC_YOU)))
                {
                    behaviour_event(mon, ME_SCARE, MHITYOU);
                    count++;
                }
            }

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

∅:D[3.396] → [4.4155:4422]

B:BD[4.4155] → [4.4155:4422]

                  if (!mons_friendly(mon)
                      && mon->add_ench(mon_enchant(ENCH_FEAR, 0, KC_YOU)))
                  {
                      behaviour_event(mon, ME_SCARE, MHITYOU);
                      count++;
                  }
              }

[3.396]

[3.397]

            // forming patterns
            if (pattern == 0    // outward rays
                  && (x == 0 || y == 0 || x == y || x == -y)
                || pattern == 1 // circles
                  && (dist >= (radius-1)*(radius-1) && dist <= radius*radius
                      || dist >= (radius/2-1)*(radius/2-1)
                         && dist <= radius*radius/4)
                || pattern == 2 // latticed
                  && (x%2 == 0 || y%2 == 0)
                || pattern == 3 // cross-like
                  && (abs(x)+abs(y) < 5 && x != y && x != -y))
            {
                env.map[posx][posy].property = FPROP_SANCTUARY_1; // yellow
            }
            else
                env.map[posx][posy].property = FPROP_SANCTUARY_2; // white
        }
    }

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

∅:D[3.398] → [4.4441:4475]

B:BD[4.4441] → [4.4441:4475]

B:BD[4.4475] → [2.164:214]

∅:D[2.214] → [4.4506:4569]

B:BD[4.4506] → [4.4506:4569]

B:BD[4.4569] → [2.215:501]

∅:D[2.501] → [4.4717:4763]

B:BD[4.4717] → [4.4717:4763]

B:BD[4.4763] → [2.502:550]

∅:D[2.550] → [4.4797:4878]

B:BD[4.4797] → [4.4797:4878]

B:BD[4.4878] → [2.551:629]

∅:D[2.629] → [4.4946:4981]

B:BD[4.4946] → [4.4946:4981]

B:BD[4.4981] → [2.630:707]

∅:D[2.707] → [4.5049:5257]

B:BD[4.5049] → [4.5049:5257]

              // forming patterns
              if (pattern == 0    // outward rays
                    && (x == 0 || y == 0 || x == y || x == -y)
                  || pattern == 1 // circles
                    && (dist >= (radius-1)*(radius-1) && dist <= radius*radius
                        || dist >= (radius/2-1)*(radius/2-1)
                           && dist <= radius*radius/4)
                  || pattern == 2 // latticed
                    && (x%2 == 0 || y%2 == 0)
                  || pattern == 3 // cross-like
                    && (abs(x)+abs(y) < 5 && x != y && x != -y))
              {
                  env.map[posx][posy].property = FPROP_SANCTUARY_1; // yellow
              }
              else
                  env.map[posx][posy].property = FPROP_SANCTUARY_2; // white
         }
         if (count == 1)
             simple_monster_message(&menv[monster], " turns to flee the light!");
         else if (count > 0)
             mpr("The monsters scatter in all directions!");

[3.398]

[3.399]

    if (count == 1)
        simple_monster_message(&menv[monster], " turns to flee the light!");
    else if (count > 0)
        mpr("The monsters scatter in all directions!");

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

B:BD[3.548] → [3.548:579]

        return you.piety / 20;

[3.548]

[3.579]

        int radius = you.piety / 20;
        if (radius > 9)
            radius = 9;
        return radius;

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

B:BD[3.850] → [3.850:986]

         for (int y=-radius; y<=radius; y++)
         {
              int posx = you.x_pos + x;
              int posy = you.y_pos + y;

[3.850]

[3.986]

    {
        for (int y=-radius; y<=radius; y++)
        {
            int posx = you.x_pos + x;
            int posy = you.y_pos + y;

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

B:BD[3.987] → [3.987:1200]

              // affect all monsters inside the halo
              if (mons_inside_halo(posx, posy))
              {
                  monster = mgrd[posx][posy];
                  monsters *mon = &menv[monster];

[3.987]

[3.1200]

            // affect all monsters inside the halo
            if (mons_inside_halo(posx, posy))
            {
                monster = mgrd[posx][posy];
                monsters *mon = &menv[monster];

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

B:BD[3.1201] → [3.1201:1335]

                  if (!mon->has_ench(ENCH_BACKLIGHT))
                      mon->add_ench(ENCH_BACKLIGHT);
              }
         }

[3.1201]

[3.1335]

                if (!mon->has_ench(ENCH_BACKLIGHT))
                    mon->add_ench(ENCH_BACKLIGHT);
            }
        }
    }

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

B:BD[6.2037] → [7.3749: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;

[6.2037]

[7.4021]

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

Replacement in crawl-ref/source/religion.cc at line 3087 [5.804403]
B:BD[7.4047] → [7.4047:4093]
```
        for ( int y = ystart; y < yend; ++y )
```
[7.4047]
[6.2083]
```
        for (int x=-radius; x<=radius; x++)
```

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

B:BD[6.2093] → [7.4094:4144]

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

[6.2093]

[6.2195]

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

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

B:BD[6.2209] → [7.4145:4256]

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

[6.2209]

[6.2446]

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

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

B:BD[6.2464] → [7.4257:4441]

B:BD[7.4441] → [8.3781:3850]

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

[6.2464]

[6.2665]

                    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))

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

B:BD[9.412] → [7.4550:4607]

B:BD[7.4607] → [10.2623:2681]

∅:D[10.2681] → [7.4607:4665]

B:BD[7.4607] → [7.4607:4665]

B:BD[7.4665] → [11.2810:2870]

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

[9.412]

[9.689]

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

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

B:BD[9.715] → [7.4782:4844]

                            const int hd = monster->hit_dice;

[9.715]

[7.4844]

                            const int hd = mon->hit_dice;

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

B:BD[7.5241] → [7.5241:5302]

B:BD[7.5302] → [12.2746:2819]

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

[7.5241]

[7.5364]

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

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

B:BD[9.779] → [7.5427:5492]

                            if (player_monster_visible(monster))

[9.779]

[7.5492]

                            if (player_monster_visible(mon))

Insertion in crawl-ref/source/misc.cc at line 2120 [5.1933596]

[3.5862]

    if (posx < 0 || posx >= GXM || posy < 0 || posy >= GYM)
        return -1;