fiddlerwoaroof/crawl - Change U6UUTZZVZHQVN3HWPN2CLRNE4VXESLNHS75W4CYUZIAKVHCYRCDQC

More minor fixes.

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

Created by haranp on August 1, 2008

U6UUTZZVZHQVN3HWPN2CLRNE4VXESLNHS75W4CYUZIAKVHCYRCDQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/stuff.cc at line 1563 [3.224557]

B:BD[3.242236] → [4.4344:4363]

B:BD[4.4363] → [5.398:455]

    coord_def inc;
    for (inc.x = -max_dist; inc.x <= max_dist; ++inc.x)

[3.242236]

[5.455]

    for (radius_iterator ri(p, max_dist, true, false); ri; ++ri)

Replacement in crawl-ref/source/stuff.cc at line 1565 [3.224557]

B:BD[5.461] → [5.461:521]

        for (inc.y = -max_dist; inc.y <= max_dist; ++inc.y)

[5.461]

[3.242338]

        const dungeon_feature_type feat = grd(*ri);
        if (is_stair(feat))

Replacement in crawl-ref/source/stuff.cc at line 1568 [3.224557]
B:BD[3.242348] → [4.4480:4521]
∅:D[4.4521] → [3.242404:242405]
B:BD[3.242404] → [3.242404:242405]
B:BD[3.242405] → [4.4522:4554]
```
            const coord_def np(p + inc);
            if (!in_bounds(np))
```
[3.242348]
[3.242453]
```
            // Shouldn't happen for escape hatches.
            if (grid_is_escape_hatch(feat))
```

Replacement in crawl-ref/source/stuff.cc at line 1571 [3.224557]

B:BD[3.242479] → [3.242479:242480]

B:BD[3.242480] → [4.4555:4642]


            const dungeon_feature_type feat = grd(np);
            if (is_stair(feat))

[3.242479]

[3.242687]

            
            stair_type = get_feature_dchar(feat);
            
            // Is it a branch stair?
            for (int i = 0; i < NUM_BRANCHES; ++i)

Replacement in crawl-ref/source/stuff.cc at line 1577 [3.224557]

B:BD[3.242701] → [6.1477:1533]

∅:D[6.1533] → [7.1875:1923]

B:BD[8.401] → [7.1875:1923]

∅:D[7.1923] → [8.531:561]

∅:D[4.4689] → [8.531:561]

B:BD[8.531] → [8.531:561]

B:BD[8.579] → [8.579:580]

B:BD[8.580] → [4.4690:4744]

B:BD[4.4744] → [9.3655:3656]

B:BD[9.3656] → [6.1534:1575]

∅:D[6.1575] → [4.4745:4800]

B:BD[8.639] → [4.4745:4800]

                // Shouldn't happen for escape hatches.
                if (grid_is_escape_hatch(feat))
                    continue;
                stair_type = get_feature_dchar(feat);
                // Is it a branch stair?
                for (int i = 0; i < NUM_BRANCHES; ++i)

[3.242701]

[8.692]

                if (branches[i].entry_stairs == feat)
                {
                    branch = branches[i].id;
                    break;
                }
                else if (branches[i].exit_stairs == feat)

Replacement in crawl-ref/source/stuff.cc at line 1584 [3.224557]

B:BD[8.710] → [4.4801:4860]

∅:D[4.4860] → [8.774:902]

B:BD[8.774] → [8.774:902]

B:BD[8.902] → [4.4861:4924]

∅:D[4.4924] → [8.970:1109]

B:BD[8.970] → [8.970:1109]

                     if (branches[i].entry_stairs == feat)
                     {
                         branch = branches[i].id;
                         break;
                     }
                     else if (branches[i].exit_stairs == feat)
                     {
                         branch = branches[i].parent_branch;
                         break;
                     }

[8.710]

[8.1109]

                    branch = branches[i].parent_branch;
                    break;

Deletion in crawl-ref/source/stuff.cc at line 1587 [3.224557]
B:BD[8.1127] → [5.522:572]
```
                return (np == you.pos()) ? 2 : 1;
```
Insertion in crawl-ref/source/stuff.cc at line 1588 [3.224557]
[3.242830]
[3.242830]
```
            return (*ri == you.pos()) ? 2 : 1;
```

Replacement in crawl-ref/source/stuff.cc at line 1597 [3.224557]

B:BD[10.115353] → [7.1972:2061]

    return (grid >= DNGN_TRAP_MECHANICAL
            && grid <= DNGN_UNDISCOVERED_TRAP);

[10.115353]

[3.242865]

    return (grid >= DNGN_TRAP_MECHANICAL && grid <= DNGN_UNDISCOVERED_TRAP);

Replacement in crawl-ref/source/stuff.cc at line 1606 [3.224557]

B:BD[10.115628] → [11.6897:6964]

B:BD[10.115677] → [11.6965:7036]

∅:D[11.7036] → [10.115724:115792]

B:BD[10.115724] → [10.115724:115792]

    for (int y = crawl_view.vlos1.y; y <= crawl_view.vlos2.y; ++y)
        for (int x = crawl_view.vlos1.x; x <= crawl_view.vlos2.x; ++x)
        {
            if (!in_vlos(x, y))
                continue;

[10.115628]

[10.115792]

    for (rectangle_iterator ri(crawl_view.vlos1, crawl_view.vlos2); ri; ++ri )
    {
        if (!in_vlos(*ri))
            continue;

Replacement in crawl-ref/source/stuff.cc at line 1611 [3.224557]

B:BD[10.115793] → [10.115793:115877]

            const int gx = view2gridX(x),
                      gy = view2gridY(y);

[10.115793]

[10.115877]

        const coord_def g = view2grid(*ri);

Replacement in crawl-ref/source/stuff.cc at line 1613 [3.224557]

B:BD[10.115878] → [10.115878:115941]

            if (!map_bounds(gx, gy))
                continue;

[10.115878]

[10.115941]

        if (!map_bounds(g))
            continue;

Replacement in crawl-ref/source/stuff.cc at line 1616 [3.224557]
B:BD[10.115942] → [2.17224:17280]
∅:D[2.17280] → [10.115994:116020]
B:BD[10.115994] → [10.115994:116020]
```
            if (gx == you.pos().x && gy == you.pos().y)
                continue;
```
[10.115942]
[10.116020]
```
        if (g == you.pos())
            continue;
```
Replacement in crawl-ref/source/stuff.cc at line 1619 [3.224557]
B:BD[10.116021] → [10.116021:116058]
```
            int imon = mgrd[gx][gy];
```
[10.116021]
[9.3657]
```
        int imon = mgrd(g);
```

Replacement in crawl-ref/source/stuff.cc at line 1621 [3.224557]

B:BD[9.3658] → [12.642:712]

∅:D[12.712] → [13.71561:71680]

B:BD[13.71561] → [13.71561:71680]

B:BD[13.71680] → [9.3659:3660]

∅:D[9.3660] → [13.71693:71816]

B:BD[13.71693] → [13.71693:71816]

∅:D[13.71816] → [10.116058:116140]

B:BD[10.116058] → [10.116058:116140]

            // At tutorial beginning disallow items in line of sight.
            if (Options.tutorial_events[TUT_SEEN_FIRST_OBJECT])
            {
                int item = igrd[gx][gy];
                if (item != NON_ITEM && is_valid_item(mitm[item]) )
                    destroy_item(item);
            }
            if (imon == NON_MONSTER || imon == MHITYOU)
                continue;

[9.3658]

[10.116140]

        // At tutorial beginning disallow items in line of sight.
        if (Options.tutorial_events[TUT_SEEN_FIRST_OBJECT])
        {
            int item = igrd(g);
            
            if (item != NON_ITEM && is_valid_item(mitm[item]) )
                destroy_item(item);
        }

Replacement in crawl-ref/source/stuff.cc at line 1630 [3.224557]

B:BD[10.116141] → [10.116141:116289]

            // If we ever allow starting with a friendly monster,
            // we'll have to check here.
            monsters *mon = &menv[imon];

[10.116141]

[14.20]

        if (imon == NON_MONSTER || imon == MHITYOU)
            continue;

Replacement in crawl-ref/source/stuff.cc at line 1633 [3.224557]

B:BD[14.21] → [14.21:108]

            if (mons_class_flag( mon->type, M_NO_EXP_GAIN ))
                continue;

[14.21]

[9.3661]

        // If we ever allow starting with a friendly monster,
        // we'll have to check here.
        monsters *mon = &menv[imon];
        
        if (mons_class_flag( mon->type, M_NO_EXP_GAIN ))
            continue;

Replacement in crawl-ref/source/stuff.cc at line 1641 [3.224557]

B:BD[10.116314] → [15.24118:24171]

B:BD[15.24171] → [16.196:252]

            mprf(MSGCH_DIAGNOSTICS, "Dismissing %s",
                 mon->name(DESC_PLAIN, true).c_str() );

[10.116314]

[10.116470]

        mprf(MSGCH_DIAGNOSTICS, "Dismissing %s",
             mon->name(DESC_PLAIN, true).c_str() );

Replacement in crawl-ref/source/stuff.cc at line 1644 [3.224557]

B:BD[10.116477] → [17.141:251]

∅:D[17.251] → [10.116477:116536]

B:BD[10.116477] → [10.116477:116536]

            // Mark as summoned so its items will also be discarded.
            mon->mark_summoned(1, true);
            monster_die(mon, KILL_DISMISSED, 0);
        }

[10.116477]

[18.143]

        // Mark as summoned so its items will also be discarded.
        mon->mark_summoned(1, true);
        monster_die(mon, KILL_DISMISSED, 0);
    }

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

B:BD[3.1398410] → [3.1398410:1398524]

static int compass_x[8] = { -1, 0, 1, 1, 1, 0, -1, -1 };
static int compass_y[8] = { -1, -1, -1, 0, 1, 1, 1, 0 };

[3.1398410]

[10.411343]

static const coord_def mon_compass[8] = {
    coord_def(-1,-1), coord_def(0,-1), coord_def(1,-1), coord_def(1,0),
    coord_def( 1, 1), coord_def(0, 1), coord_def(-1,1), coord_def(-1,0)
};

Replacement in crawl-ref/source/monstuff.cc at line 6109 [3.1396662]
B:BD[10.438770] → [10.438770:438797]
```
void handle_monsters(void)
```
[10.438770]
[10.438797]
```
void handle_monsters()
```
Deletion in crawl-ref/source/monstuff.cc at line 7125 [3.1396662]
B:BD[3.1541447] → [3.1541447:1541475]
```
        int i, mod, newdir;
```
Replacement in crawl-ref/source/monstuff.cc at line 7126 [3.1396662]
B:BD[3.1541476] → [3.1541476:1541508]
```
        for (i = 0; i < 8; i++)
```
[3.1541476]
[3.1541508]
```
        for (int i = 0; i < 8; i++)
```

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

B:BD[3.1541518] → [19.33371:33437]

            if (compass_x[i] == mmov.x && compass_y[i] == mmov.y)

[3.1541518]

[3.1541584]

            if (mon_compass[i] == mmov)

Replacement in crawl-ref/source/monstuff.cc at line 7157 [3.1396662]
∅:D[20.8347] → [3.1542109:1542169]
B:BD[3.1542109] → [3.1542109:1542169]
```
            for (mod = sdir, i = 0; i < 2; mod += inc, i++)
```
[20.8347]
[3.1542169]
```
            for (int mod = sdir, i = 0; i < 2; mod += inc, i++)
```

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

B:BD[3.1542183] → [3.1542183:1542306]

                newdir = (dir + 8 + mod) % 8;
                if (good_move[compass_x[newdir] + 1][compass_y[newdir] + 1])

[3.1542183]

[3.1542306]

                int newdir = (dir + 8 + mod) % 8;
                if (good_move[mon_compass[newdir].x+1][mon_compass[newdir].y+1])

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

B:BD[3.1542324] → [2.53062:53353]

                    dist[i] = grid_distance(monster->pos().x + compass_x[newdir],
                                            monster->pos().y + compass_y[newdir],
                                            monster->target.x,
                                            monster->target.y);

[3.1542324]

[3.1542609]

                    dist[i] = grid_distance(monster->pos()+mon_compass[newdir],
                                            monster->target);

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

B:BD[3.1543185] → [19.33438:33554]

                    mmov.x = compass_x[((dir+8)+sdir)%8];
                    mmov.y = compass_y[((dir+8)+sdir)%8];

[3.1543185]

[3.1543301]

                    mmov = mon_compass[((dir+8)+sdir)%8];

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

B:BD[3.1543435] → [19.33555:33671]

                    mmov.x = compass_x[((dir+8)-sdir)%8];
                    mmov.y = compass_y[((dir+8)-sdir)%8];

[3.1543435]

[3.1543551]

                    mmov = mon_compass[((dir+8)-sdir)%8];

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

B:BD[3.1543730] → [19.33672:33788]

                    mmov.x = compass_x[((dir+8)+sdir)%8];
                    mmov.y = compass_y[((dir+8)+sdir)%8];

[3.1543730]

[3.1543846]

                    mmov = mon_compass[((dir+8)+sdir)%8];

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

B:BD[3.1543980] → [19.33789:33905]

                    mmov.x = compass_x[((dir+8)-sdir)%8];
                    mmov.y = compass_y[((dir+8)-sdir)%8];

[3.1543980]

[3.1544096]

                    mmov = mon_compass[((dir+8)-sdir)%8];

Replacement in crawl-ref/source/monplace.cc at line 2687 [3.1641732]
B:BD[21.9533] → [21.9533:9595]
```
    ASSERT(grid_distance(pos.x, pos.y, npos.x, npos.y) <= 1);
```
[21.9533]
[22.3953]
```
    ASSERT(grid_distance(pos, npos) <= 1);
```
Replacement in crawl-ref/source/monplace.cc at line 2746 [3.1641732]
B:BD[21.9724] → [21.9724:9782]
```
    return (grid_distance(p.x, p.y, target.x, target.y));
```
[21.9724]
[21.9782]
```
    return (grid_distance(p, target));
```