fiddlerwoaroof/crawl - Change OTNY2YDUXCJFXDSTHNRKSZ4A5DS5RJMDMJV2Z6TYT2AUODEQIX4QC

More mgrd elimination and moving to coord_def().

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

Created by haranp on February 14, 2009

OTNY2YDUXCJFXDSTHNRKSZ4A5DS5RJMDMJV2Z6TYT2AUODEQIX4QC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/view.cc at line 1249 [9.16817]
B:BD[4.58] → [4.58:59]
∅:D[4.59] → [10.7281:7311]
B:BD[9.40004] → [10.7281:7311]
```
    monsters *monster = NULL;
```
Replacement in crawl-ref/source/view.cc at line 1250 [9.16817]
B:BD[9.40059] → [9.40059:40102]
```
    for (int s = 0; s < MAX_MONSTERS; s++)
```
[9.40059]
[9.40102]
```
    for (int s = 0; s < MAX_MONSTERS; ++s)
```
Replacement in crawl-ref/source/view.cc at line 1252 [9.16817]
B:BD[9.40108] → [9.40108:40136]
```
        monster = &menv[s];
```
[9.40108]
[9.40136]
```
        monsters *monster = &menv[s];
```
Replacement in crawl-ref/source/travel.h at line 75 [12.29464]
B:BD[11.155] → [11.155:192]
```
const char *trap_name(int x, int y);
```
[11.155]
[11.192]
```
const char *trap_name(const coord_def &p);
```

Replacement in crawl-ref/source/travel.h at line 84 [12.29464]

B:BD[13.14] → [13.14:83]

bool is_travelsafe_square(int x, int y, bool ignore_hostile = false,

[13.14]

[13.83]

bool is_travelsafe_square(const coord_def& c, bool ignore_hostile = false,

Replacement in crawl-ref/source/travel.cc at line 202 [12.39949]
B:BD[12.43848] → [12.43848:43882]
```
inline bool is_trap(int x, int y)
```
[12.43848]
[12.43882]
```
inline bool is_trap(const coord_def& c)
```
Replacement in crawl-ref/source/travel.cc at line 204 [12.39949]
B:BD[12.43884] → [13.334:372]
```
    return grid_is_trap( grd[x][y] );
```
[12.43884]
[12.43917]
```
    return grid_is_trap(grd(c));
```
Replacement in crawl-ref/source/travel.cc at line 257 [12.39949]
B:BD[12.45356] → [11.201:237]
```
const char *trap_name(int x, int y)
```
[12.45356]
[12.45399]
```
const char *trap_name(const coord_def& c)
```
Replacement in crawl-ref/source/travel.cc at line 262 [12.39949]
∅:D[14.334] → [12.45451:45488]
B:BD[12.45451] → [12.45451:45488]
```
    const int ti = curr_traps[x][y];
```
[14.334]
[12.45488]
```
    const int ti = curr_traps[c.x][c.y];
```
Replacement in crawl-ref/source/travel.cc at line 512 [12.39949]
B:BD[15.343] → [16.1405:1451]
```
static bool _is_monster_blocked(int x, int y)
```
[15.343]
[15.388]
```
static bool _is_monster_blocked(const coord_def& c)
```
Replacement in crawl-ref/source/travel.cc at line 514 [12.39949]
B:BD[15.390] → [2.131:187]
```
    const monsters *mons = monster_at(coord_def(x, y));
```
[15.390]
[2.187]
```
    const monsters *mons = monster_at(c);
```
Replacement in crawl-ref/source/travel.cc at line 533 [12.39949]
B:BD[12.49463] → [16.1452:1493]
```
static bool _is_reseedable(int x, int y)
```
[12.49463]
[12.49503]
```
static bool _is_reseedable(const coord_def& c)
```
Replacement in crawl-ref/source/travel.cc at line 535 [12.39949]
B:BD[12.49505] → [17.3833:3871]
```
    if (is_excluded(coord_def(x, y)))
```
[12.49505]
[18.7332]
```
    if (is_excluded(c))
```
Replacement in crawl-ref/source/travel.cc at line 538 [12.39949]
B:BD[19.279] → [7.229:272]
```
    dungeon_feature_type grid = grd[x][y];
```
[19.279]
[20.372]
```
    const dungeon_feature_type grid = grd(c);
```

Replacement in crawl-ref/source/travel.cc at line 541 [12.39949]

B:BD[20.440] → [20.440:518]

               || is_trap(x, y)
               || _is_monster_blocked(x, y));

[20.440]

[12.49708]

               || is_trap(c)
               || _is_monster_blocked(c));

Replacement in crawl-ref/source/travel.cc at line 548 [12.39949]
∅:D[21.557] → [13.418:479]
B:BD[12.49924] → [13.418:479]
```
bool is_travelsafe_square(int x, int y, bool ignore_hostile,
```
[21.557]
[13.479]
```
bool is_travelsafe_square(const coord_def& c, bool ignore_hostile,
```

Replacement in crawl-ref/source/travel.cc at line 551 [12.39949]

B:BD[12.49986] → [13.537:599]

    if (!ignore_terrain_knowledge && !is_terrain_known(x, y))

[12.49986]

[22.226]

    if (!ignore_terrain_knowledge && !is_terrain_known(c))

Replacement in crawl-ref/source/travel.cc at line 554 [12.39949]

B:BD[18.7357] → [23.520:557]

B:BD[23.557] → [8.229:379]

    const bool seen = see_grid(x,y);
    const int grid = ((seen || ignore_terrain_knowledge) ? grd[x][y]
                                                         : get_envmap_obj(x,y));

[18.7357]

[12.50116]

    const bool seen = see_grid(c);
    const int grid = ((seen || ignore_terrain_knowledge) ? grd(c)
                                                         : get_envmap_obj(c));

Replacement in crawl-ref/source/travel.cc at line 562 [12.39949]
B:BD[23.809] → [23.809:847]
```
        && _is_monster_blocked(x, y))
```
[23.809]
[22.385]
```
        && _is_monster_blocked(c))
```
Replacement in crawl-ref/source/travel.cc at line 571 [12.39949]
B:BD[23.924] → [23.924:957]
```
        && _is_reseedable(x, y))
```
[23.924]
[23.957]
```
        && _is_reseedable(c))
```
Replacement in crawl-ref/source/travel.cc at line 581 [12.39949]
B:BD[12.51925] → [19.427:461]
```
                || (is_trap(x, y)
```
[12.51925]
[19.461]
```
                || (is_trap(c)
```

Replacement in crawl-ref/source/travel.cc at line 583 [12.39949]

B:BD[19.527] → [19.527:592]

                                          "s", trap_name(x, y)))

[19.527]

[12.52097]

                                          "s", trap_name(c)))

Replacement in crawl-ref/source/travel.cc at line 586 [12.39949]
B:BD[12.52118] → [19.593:639]
```
            && !is_excluded(coord_def(x, y));
```
[12.52118]
[12.52153]
```
            && !is_excluded(c);
```
Replacement in crawl-ref/source/travel.cc at line 592 [12.39949]
B:BD[24.1006] → [16.1680:1720]
```
static bool _is_safe_move(int x, int y)
```
[24.1006]
[12.52271]
```
static bool _is_safe_move(const coord_def& c)
```
Replacement in crawl-ref/source/travel.cc at line 594 [12.39949]
B:BD[12.52273] → [15.998:1024]
∅:D[15.1024] → [12.52309:52337]
B:BD[12.52309] → [12.52309:52337]
```
    int mon = mgrd[x][y];
    if (mon != NON_MONSTER)
```
[12.52273]
[12.52337]
```
    if (const monsters *mon = monster_at(c))
```

Replacement in crawl-ref/source/travel.cc at line 597 [12.39949]

B:BD[25.113] → [25.113:225]

∅:D[25.225] → [12.52701:52711]

B:BD[12.52701] → [12.52701:52711]

        if (player_monster_visible(&menv[mon])
            && mons_class_flag( menv[mon].type, M_NO_EXP_GAIN ))
        {

[25.113]

[25.226]

        if (you.can_see(mon) && mons_class_flag(mon->type, M_NO_EXP_GAIN))

Deletion in crawl-ref/source/travel.cc at line 599 [12.39949]
∅:D[25.254] → [12.52765:52775]
B:BD[12.52765] → [12.52765:52775]
```
        }
```
Replacement in crawl-ref/source/travel.cc at line 606 [12.39949]
B:BD[24.1008] → [24.1008:1030]
```
    if (is_trap(x, y)
```
[24.1008]
[24.1030]
```
    if (is_trap(c)
```

Replacement in crawl-ref/source/travel.cc at line 609 [12.39949]

∅:D[14.541] → [24.1107:1160]

B:BD[24.1107] → [24.1107:1160]

                               "s", trap_name(x, y))

[14.541]

[24.1160]

                               "s", trap_name(c))

Replacement in crawl-ref/source/travel.cc at line 616 [12.39949]
∅:D[14.543] → [22.535:574]
∅:D[24.1206] → [22.535:574]
B:BD[12.53206] → [22.535:574]
```
    const int cloud = env.cgrid[x][y];
```
[14.543]
[12.53246]
```
    const int cloud = env.cgrid(c);
```

Replacement in crawl-ref/source/travel.cc at line 621 [12.39949]

B:BD[12.53343] → [26.382:436]

    const cloud_type ctype = env.cloud[ cloud ].type;

[12.53343]

[27.135]

    const cloud_type ctype = env.cloud[cloud].type;

Replacement in crawl-ref/source/travel.cc at line 1020 [12.39949]

B:BD[28.179] → [28.179:239]

            while (is_travelsafe_square(target.x, target.y)

[28.179]

[28.239]

            while (is_travelsafe_square(target)

Replacement in crawl-ref/source/travel.cc at line 1547 [12.39949]

B:BD[18.13980] → [13.642:700]

B:BD[13.700] → [29.368:437]

        && !is_travelsafe_square(start.x, start.y, false)
        && !is_trap(start.x, start.y))          // player likes pain

[18.13980]

[12.69598]

        && !is_travelsafe_square(start, false)
        && !is_trap(start))          // player likes pain

Replacement in crawl-ref/source/travel.cc at line 1550 [12.39949]
B:BD[12.69604] → [18.14108:14140]
```
        return coord_def(0, 0);
```
[12.69604]
[12.69646]
```
        return coord_def();
```

Replacement in crawl-ref/source/travel.cc at line 1686 [12.39949]

B:BD[18.17178] → [13.701:760]

        && is_travelsafe_square(c.x, c.y, ignore_hostile))

[18.17178]

[18.17229]

        && is_travelsafe_square(c, ignore_hostile))

Replacement in crawl-ref/source/travel.cc at line 1751 [12.39949]
B:BD[30.16884] → [30.16884:16921]
```
        if (_is_safe_move(c.x, c.y))
```
[30.16884]
[30.16921]
```
        if (_is_safe_move(c))
```

Replacement in crawl-ref/source/travel.cc at line 1756 [12.39949]

B:BD[30.16985] → [30.16985:17049]

    else if (!is_travelsafe_square(dc.x, dc.y, ignore_hostile))

[30.16985]

[31.90911]

    else if (!is_travelsafe_square(dc, ignore_hostile))

Replacement in crawl-ref/source/travel.cc at line 1760 [12.39949]
B:BD[18.19495] → [16.4955:4994]
```
        if (_is_reseedable(dc.x, dc.y)
```
[18.19495]
[18.19534]
```
        if (_is_reseedable(dc)
```

Replacement in crawl-ref/source/travel.cc at line 1764 [12.39949]

B:BD[31.90995] → [16.4995:5069]

            if (features && (is_trap(dc.x, dc.y) || is_exclude_root(dc)))

[31.90995]

[18.19718]

            if (features && (is_trap(dc) || is_exclude_root(dc)))

Replacement in crawl-ref/source/travel.cc at line 2953 [12.39949]
B:BD[6.310] → [6.310:357]
```
    if (!is_travelsafe_square(p.x, p.y, true))
```
[6.310]
[6.357]
```
    if (!is_travelsafe_square(p, true))
```

Replacement in crawl-ref/source/terrain.h at line 17 [32.24828]

B:BD[32.25246] → [32.25246:25451]

// last updated 12may2000 {dlb}
/* ***********************************************************************
 * called from: acr
 * *********************************************************************** */

[32.25246]

[33.7317]


actor* actor_at(const coord_def& c);

Insertion in crawl-ref/source/terrain.cc at line 37 [32.26938]

[32.27633]


actor* actor_at(const coord_def& c)
{
    if (!in_bounds(c))
        return (NULL);
    if (c == you.pos())
        return (&you);
    return (monster_at(c));
}

Replacement in crawl-ref/source/terrain.cc at line 561 [32.26938]

B:BD[34.1475] → [34.1475:1646]

        const int midx = mgrd(you.pos());
        if ( midx != NON_MONSTER && !mons_is_submerged( &menv[midx] ) )
            monster_teleport( &menv[midx], true, false);

[34.1475]

[34.1646]

        monsters* mon = monster_at(pos);
        if (mon && !mons_is_submerged(mon))
            monster_teleport(mon, true, false);

Replacement in crawl-ref/source/terrain.cc at line 601 [32.26938]
B:BD[35.1369] → [35.1369:1408]
```
    set_terrain_changed(pos.x, pos.y);
```
[35.1369]
[35.1408]
```
    set_terrain_changed(pos);
```
Deletion in crawl-ref/source/terrain.cc at line 868 [32.26938]
B:BD[34.5473] → [34.5473:5504]
```
    actor* dest_actor = NULL;
```
Replacement in crawl-ref/source/terrain.cc at line 869 [32.26938]
B:BD[34.5505] → [34.5505:5536]
B:BD[34.5536] → [5.250:277]
∅:D[5.277] → [34.5585:5629]
B:BD[34.5585] → [34.5585:5629]
B:BD[34.5629] → [5.278:322]
```
    if (dest_pos == you.pos())
        dest_actor = &you;
    else if (mgrd(dest_pos) != NON_MONSTER)
        dest_actor = &menv[mgrd(dest_pos)];
```
[34.5505]
[34.5695]
```
    actor* dest_actor = actor_at(dest_pos);
```
Replacement in crawl-ref/source/terrain.cc at line 885 [32.26938]
B:BD[34.6091] → [34.6091:6121]
```
    actor* orig_actor = NULL;
```
[34.6091]
[34.6121]
```
    const actor* orig_actor = actor_at(src);
```
Deletion in crawl-ref/source/terrain.cc at line 887 [32.26938]
B:BD[34.6122] → [34.6122:6148]
B:BD[34.6148] → [5.323:350]
∅:D[5.350] → [34.6197:6236]
B:BD[34.6197] → [34.6197:6236]
B:BD[34.6236] → [5.351:390]
∅:D[5.390] → [34.6297:6298]
B:BD[34.6297] → [34.6297:6298]
```
    if (src == you.pos())
        orig_actor = &you;
    else if (mgrd(src) != NON_MONSTER)
        orig_actor = &menv[mgrd(src)];
```

Replacement in crawl-ref/source/player.cc at line 206 [9.962854]

B:BD[3.5607] → [3.5607:5682]

                                                "s", trap_name(p.x, p.y)))

[3.5607]

[11.3613]

                                                "s", trap_name(p)))

Replacement in crawl-ref/source/luadgn.cc at line 2349 [37.1232]

B:BD[36.5834] → [36.5834:5904]

    lua_pushboolean(ls, is_travelsafe_square(c.x, c.y, false, true));

[36.5834]

[36.5904]

    lua_pushboolean(ls, is_travelsafe_square(c, false, true));

Replacement in crawl-ref/source/dungeon.cc at line 488 [9.3429798]

B:BD[38.2895] → [38.2895:2995]

    return (is_travelsafe_square(c.x, c.y, false, true)
            || grd(c) == DNGN_SECRET_DOOR);

[38.2895]

[39.1034]

    return (is_travelsafe_square(c, false, true) || grd(c) == DNGN_SECRET_DOOR);

Replacement in crawl-ref/source/dungeon.cc at line 499 [9.3429798]

∅:D[40.3049] → [41.2668:2821]

∅:D[38.3051] → [41.2668:2821]

B:BD[39.1113] → [41.2668:2821]

    return (!(dgn_Map_Mask(c) & MMT_OPAQUE)
            && (is_travelsafe_square(c.x, c.y, false, true)
                || grd(c) == DNGN_SECRET_DOOR));

[40.3049]

[42.3551]

    return (!(dgn_Map_Mask(c) & MMT_OPAQUE) && (_is_passable_ignore_vault(c)));

Replacement in crawl-ref/source/debug.cc at line 4643 [9.4016436]
B:BD[31.1038710] → [43.9432:9470]
```
    std::vector<int>         matches;
```
[31.1038710]
[43.9470]
```
    std::vector<trap_type>   matches;
```

Replacement in crawl-ref/source/debug.cc at line 4647 [9.4016436]

B:BD[31.1038764] → [44.12423:12458]

∅:D[44.12458] → [31.1038800:1038845]

B:BD[31.1038800] → [31.1038800:1038845]

        if (strstr(requested_trap,
                   trap_name(trap_type(t))))

[31.1038764]

[31.1038845]

        const trap_type tr = static_cast<trap_type>(t);
        const char* tname = trap_name(tr);
        if (strstr(requested_trap, tname))

Replacement in crawl-ref/source/debug.cc at line 4651 [9.4016436]
B:BD[31.1038855] → [31.1038855:1038888]
```
            trap = trap_type(t);
```
[31.1038855]
[31.1038888]
```
            trap = tr;
```

Replacement in crawl-ref/source/debug.cc at line 4654 [9.4016436]

B:BD[43.9523] → [43.9523:9589]

        else if (strstr(trap_name(trap_type(t)), requested_trap))

[43.9523]

[43.9589]

        else if (strstr(tname, requested_trap))

Replacement in crawl-ref/source/debug.cc at line 4656 [9.4016436]

B:BD[43.9599] → [43.9599:9693]

            matches.push_back(t);
            match_names.push_back(trap_name(trap_type(t)));

[43.9599]

[31.1038907]

            matches.push_back(tr);
            match_names.push_back(tname);

Replacement in crawl-ref/source/debug.cc at line 4670 [9.4016436]
B:BD[43.9903] → [43.9903:9945]
```
            trap = trap_type(matches[0]);
```
[43.9903]
[43.9945]
```
            trap = matches[0];
```

More mgrd elimination and moving to coord_def().

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/view.cc at line 1249 [9.16817]

Replacement in crawl-ref/source/view.cc at line 1250 [9.16817]

Replacement in crawl-ref/source/view.cc at line 1252 [9.16817]

Replacement in crawl-ref/source/travel.h at line 75 [12.29464]

Replacement in crawl-ref/source/travel.h at line 84 [12.29464]

Replacement in crawl-ref/source/travel.cc at line 202 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 204 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 257 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 262 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 512 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 514 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 533 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 535 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 538 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 541 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 548 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 551 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 554 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 562 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 571 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 581 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 583 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 586 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 592 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 594 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 597 [12.39949]

Deletion in crawl-ref/source/travel.cc at line 599 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 606 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 609 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 616 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 621 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 1020 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 1547 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 1550 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 1686 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 1751 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 1756 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 1760 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 1764 [12.39949]

Replacement in crawl-ref/source/travel.cc at line 2953 [12.39949]

Replacement in crawl-ref/source/terrain.h at line 17 [32.24828]

Insertion in crawl-ref/source/terrain.cc at line 37 [32.26938]

Replacement in crawl-ref/source/terrain.cc at line 561 [32.26938]

Replacement in crawl-ref/source/terrain.cc at line 601 [32.26938]

Deletion in crawl-ref/source/terrain.cc at line 868 [32.26938]

Replacement in crawl-ref/source/terrain.cc at line 869 [32.26938]

Replacement in crawl-ref/source/terrain.cc at line 885 [32.26938]

Deletion in crawl-ref/source/terrain.cc at line 887 [32.26938]