fiddlerwoaroof/crawl - Change ZGZVOMRXLVC42FV67RBTLBOZWFYRL4UHL54A365BR76OUIYRWQXAC

[1837663] Fixed monsters' raise dead using player's LOS.

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

Created by dshaligram on November 28, 2007

ZGZVOMRXLVC42FV67RBTLBOZWFYRL4UHL54A365BR76OUIYRWQXAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.h at line 103 [3.13254]

B:BD[3.14720] → [4.5:147]

void losight(FixedArray<unsigned int, ENV_SHOW_DIAMETER, ENV_SHOW_DIAMETER>& sh,
             FixedArray<dungeon_feature_type, GXM, GYM>& gr,

[3.14720]

[2.5]

void losight(env_show_grid &sh, feature_grid &gr,

Replacement in crawl-ref/source/view.h at line 192 [3.13254]

B:BD[5.940] → [5.940:975]

B:BD[5.975] → [6.5:77]

bool see_grid( int grx, int gry );
inline bool see_grid(const coord_def &p) { return see_grid(p.x, p.y); }

[5.940]

[5.975]

bool see_grid( const env_show_grid &show,
               const coord_def &c,
               const coord_def &pos );
bool see_grid(const coord_def &p);
bool see_grid_no_trans( const coord_def &p );
bool trans_wall_blocking( const coord_def &p );

Replacement in crawl-ref/source/view.h at line 199 [3.13254]

B:BD[5.976] → [2.70:164]

bool see_grid_no_trans( int grx, int gry );
inline bool see_grid_no_trans(const coord_def &p)

[5.976]

[2.164]

inline bool see_grid( int grx, int gry )

Replacement in crawl-ref/source/view.h at line 201 [3.13254]

B:BD[2.166] → [2.166:206]

    return see_grid_no_trans(p.x, p.y);

[2.166]

[2.206]

    return see_grid(coord_def(grx, gry));
}
inline bool see_grid_no_trans(int x, int y)
{
    return see_grid_no_trans(coord_def(x, y));

Replacement in crawl-ref/source/view.h at line 209 [3.13254]

B:BD[2.209] → [2.209:255]

bool trans_wall_blocking( int grx, int gry );

[2.209]

[2.255]

inline bool trans_wall_blocking(int x, int y)
{
    return trans_wall_blocking(coord_def(x, y));
}

Replacement in crawl-ref/source/view.cc at line 2268 [3.16817]

∅:D[7.221] → [5.32863:32917]

B:BD[5.32863] → [5.32863:32917]

B:BD[5.32917] → [2.1901:1981]

void losight(FixedArray < unsigned int, 19, 19 > &sh,
             FixedArray < dungeon_feature_type, 80, 70 > &gr, int x_p, int y_p,

[7.221]

[2.1981]

void losight(env_show_grid &sh,
             feature_grid &gr, int x_p, int y_p,

Replacement in crawl-ref/source/view.cc at line 3305 [3.16817]

B:BD[3.89194] → [5.39345:39450]

// answers the question: "Is a grid within character's line of sight?"
bool see_grid( int grx, int gry )

[3.89194]

[5.39450]

bool see_grid( const env_show_grid &show,
               const coord_def &c,
               const coord_def &pos )

Replacement in crawl-ref/source/view.cc at line 3309 [3.16817]

B:BD[5.39452] → [5.39452:39551]

    // rare case: can player see self?  (of course!)
    if (grx == you.x_pos && gry == you.y_pos)

[5.39452]

[5.39551]

    if (c == pos)

Replacement in crawl-ref/source/view.cc at line 3312 [3.16817]

B:BD[3.89195] → [5.39575:39664]

    // check env.show array
    if (grid_distance( grx, gry, you.x_pos, you.y_pos ) < 9)

[3.89195]

[5.39664]

    const coord_def ip = pos - c;
    if (ip.rdist() < ENV_SHOW_OFFSET)

Replacement in crawl-ref/source/view.cc at line 3315 [3.16817]

B:BD[5.39670] → [5.39670:39789]

        const int ex = grx - you.x_pos + 9;
        const int ey = gry - you.y_pos + 9;
        if (env.show[ex][ey])

[5.39670]

[5.39789]

        const coord_def sp(ip + coord_def(ENV_SHOW_OFFSET, ENV_SHOW_OFFSET));
        if (show(sp))

Insertion in crawl-ref/source/view.cc at line 3319 [3.16817]
[5.39822]
[5.39822]
```
    return (false);
}
```

Replacement in crawl-ref/source/view.cc at line 3322 [3.16817]

B:BD[5.39823] → [5.39823:39865]

    return (false);
}  // end see_grid()

[5.39823]

[2.2153]

// answers the question: "Is a grid within character's line of sight?"
bool see_grid( const coord_def &p )
{
    return see_grid(env.show, you.pos(), p);
}

Replacement in crawl-ref/source/view.cc at line 3330 [3.16817]
B:BD[2.2288] → [2.2288:2331]
```
bool see_grid_no_trans( int grx, int gry )
```
[2.2288]
[2.2331]
```
bool see_grid_no_trans( const coord_def &p )
```

Replacement in crawl-ref/source/view.cc at line 3332 [3.16817]

B:BD[2.2333] → [2.2333:2738]

    // rare case: can player see self?  (of course!)
    if (grx == you.x_pos && gry == you.y_pos)
        return (true);
    // check no_trans_show array
    if (grid_distance( grx, gry, you.x_pos, you.y_pos ) < 9)
    {
        const int ex = grx - you.x_pos + 9;
        const int ey = gry - you.y_pos + 9;
        if (env.no_trans_show[ex][ey])
            return (true);
    }
    return (false);

[2.2333]

[2.2738]

    return see_grid(env.no_trans_show, you.pos(), p);

Replacement in crawl-ref/source/view.cc at line 3336 [3.16817]
B:BD[2.2803] → [2.2803:2848]
```
bool trans_wall_blocking( int grx, int gry )
```
[2.2803]
[2.2848]
```
bool trans_wall_blocking( const coord_def &p )
```

Replacement in crawl-ref/source/view.cc at line 3338 [3.16817]

B:BD[2.2850] → [2.2850:2913]

    return see_grid(grx, gry) && !see_grid_no_trans(grx, gry);

[2.2850]

[2.2913]

    return see_grid(p) && !see_grid_no_trans(p);

Replacement in crawl-ref/source/spl-cast.cc at line 1319 [3.293070]

B:BD[3.326627] → [3.326627:326692]

        animate_dead(powc + 1, BEH_FRIENDLY, you.pet_target, 1);

[3.326627]

[3.326692]

        animate_dead(&you, powc + 1, BEH_FRIENDLY, you.pet_target, 1);

Replacement in crawl-ref/source/spells2.h at line 40 [3.562867]

B:BD[3.563955] → [8.1232:1308]

int animate_dead(int power, beh_type corps_beh, int corps_hit, int actual);

[3.563955]

[3.564026]

int animate_dead(actor *caster, int power, beh_type corps_beh,
                 int corps_hit, int actual);

Replacement in crawl-ref/source/spells2.cc at line 300 [3.569242]

B:BD[3.575454] → [8.1507:1584]

int animate_dead( int power, beh_type corps_beh, int corps_hit, int actual )

[3.575454]

[3.575526]

int animate_dead( actor *caster, int power, beh_type corps_beh,
                  int corps_hit, int actual )

Insertion in crawl-ref/source/spells2.cc at line 304 [3.569242]
[3.575549]
[3.575549]
```
    static env_show_grid losgrid;
```

Replacement in crawl-ref/source/spells2.cc at line 306 [3.569242]

B:BD[3.575550] → [3.575550:575675]

B:BD[3.575675] → [9.192111:192141]

    int adx = 0;
    int ady = 0;
    int minx = you.x_pos - 6;
    int maxx = you.x_pos + 7;
    int miny = you.y_pos - 6;
    int maxy = you.y_pos + 7;

[3.575550]

[3.575705]

    const coord_def c(caster->pos());
    int minx = c.x - 6;
    int maxx = c.x + 7;
    int miny = c.y - 6;
    int maxy = c.y + 7;

Replacement in crawl-ref/source/spells2.cc at line 318 [3.569242]

B:BD[3.575796] → [3.575796:575856]

        minx = you.x_pos + 6;
        maxx = you.x_pos - 7;

[3.575796]

[3.575856]

        minx = c.x + 6;
        maxx = c.x - 7;

Replacement in crawl-ref/source/spells2.cc at line 325 [3.569242]

B:BD[3.575908] → [3.575908:575968]

        miny = you.y_pos + 6;
        maxy = you.y_pos - 7;

[3.575908]

[3.575968]

        miny = c.y + 6;
        maxy = c.y - 7;

Replacement in crawl-ref/source/spells2.cc at line 330 [3.569242]

B:BD[3.575994] → [3.575994:576041]

    for (adx = minx; adx != maxx; adx += xinc)

[3.575994]

[3.576041]

    if (caster != &you)
        losight(losgrid, grd, c.x, c.y, true);
    env_show_grid &los(caster == &you? env.no_trans_show : losgrid);
    coord_def a;
    for (a.x = minx; a.x != maxx; a.x += xinc)

Replacement in crawl-ref/source/spells2.cc at line 338 [3.569242]
B:BD[3.576109] → [3.576109:576160]
```
        for (ady = miny; ady != maxy; ady += yinc)
```
[3.576047]
[3.576160]
```
        for (a.y = miny; a.y != maxy; a.y += yinc)
```

Replacement in crawl-ref/source/spells2.cc at line 340 [3.569242]

B:BD[3.576170] → [2.5750:5795]

            if (see_grid_no_trans(adx, ady))

[3.576170]

[3.576206]

            if (in_bounds(a) && see_grid(los, c, a))

Replacement in crawl-ref/source/spells2.cc at line 342 [3.569242]
B:BD[3.576220] → [3.576220:576268]
```
                if (igrd[adx][ady] != NON_ITEM)
```
[3.576220]
[3.576268]
```
                if (igrd(a) != NON_ITEM)
```

Replacement in crawl-ref/source/spells2.cc at line 344 [3.569242]

B:BD[3.576286] → [3.576286:576333]

                    int objl = igrd[adx][ady];

[3.576286]

[3.576333]

                    int objl = igrd(a);

Replacement in crawl-ref/source/spells2.cc at line 353 [3.569242]

B:BD[3.576602] → [3.576602:576676]

                            number_raised += raise_corpse(objl, adx, ady,

[3.576602]

[3.576676]

                            number_raised += raise_corpse(objl, a.x, a.y,

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

B:BD[3.1355134] → [3.1355134:1355215]

        animate_dead( 5 + random2(5), SAME_ATTITUDE(monster), monster->foe, 1 );

[3.1355134]

[3.1355215]

        animate_dead( monster, 5 + random2(5), SAME_ATTITUDE(monster),
                      monster->foe, 1 );

Replacement in crawl-ref/source/monstuff.cc at line 3763 [3.1396662]

∅:D[10.29432] → [3.1497864:1497942]

B:BD[3.1497864] → [3.1497864:1497942]

            && !animate_dead( 100, SAME_ATTITUDE(monster), monster->foe, 0 ))

[10.29432]

[3.1497942]

            && !animate_dead( monster, 100, SAME_ATTITUDE(monster),
                              monster->foe, 0 ))

Replacement in crawl-ref/source/it_use3.cc at line 202 [3.2870456]

B:BD[3.2875555] → [3.2875555:2875624]

            animate_dead( 1 + random2(3), BEH_HOSTILE, MHITYOU, 1 );

[3.2875555]

[5.763674]

            animate_dead( &you, 1 + random2(3), BEH_HOSTILE, MHITYOU, 1 );

Insertion in crawl-ref/source/externs.h at line 1279 [3.3270163]

[11.6192]

[12.16999]

typedef FixedArray<unsigned, ENV_SHOW_DIAMETER, ENV_SHOW_DIAMETER>
    env_show_grid;

Deletion in crawl-ref/source/externs.h at line 1298 [3.3270163]

∅:D[13.3468] → [3.3282204:3282205]

∅:D[14.17859] → [3.3282204:3282205]

∅:D[9.441633] → [3.3282204:3282205]

B:BD[3.3282204] → [3.3282204:3282205]

B:BD[3.3282205] → [15.12808:13095]


    FixedArray<unsigned, ENV_SHOW_DIAMETER, ENV_SHOW_DIAMETER>
                                             show;      // view window char 
    FixedArray<unsigned short, ENV_SHOW_DIAMETER, ENV_SHOW_DIAMETER>
                                             show_col;  // view window colour

Insertion in crawl-ref/source/externs.h at line 1299 [3.3270163]
[3.3282361]
[2.12003]
```
    // Glyphs of squares that are in LOS.
    env_show_grid show;
    
```

Replacement in crawl-ref/source/externs.h at line 1304 [3.3270163]

B:BD[2.12089] → [2.12089:12212]

    FixedArray<unsigned, ENV_SHOW_DIAMETER, ENV_SHOW_DIAMETER>
                                             no_trans_show;

[2.12089]

[2.12212]

    env_show_grid no_trans_show;
    
    FixedArray<unsigned short, ENV_SHOW_DIAMETER, ENV_SHOW_DIAMETER>
                                             show_col;  // view window colour

Replacement in crawl-ref/source/abl-show.cc at line 1433 [3.4494389]

B:BD[3.4522494] → [3.4522494:4522562]

        animate_dead( 1 + you.skills[SK_INVOCATIONS], BEH_FRIENDLY,

[3.4522494]

[3.4522562]

        animate_dead( &you, 1 + you.skills[SK_INVOCATIONS], BEH_FRIENDLY,