fiddlerwoaroof/crawl - Change OUE4UGFN52K2EW3TMBP27S7VK3323S24J4UXFGO62U5ZLKKOPVEAC

More code cleanups; another goto bites the dust.

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

Created by haranp on February 19, 2009

OUE4UGFN52K2EW3TMBP27S7VK3323S24J4UXFGO62U5ZLKKOPVEAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/monstuff.cc at line 97 [5.1396662]
∅:D[4.2832] → [5.1398524:1398587]
∅:D[6.411388] → [5.1398524:1398587]
B:BD[5.1398524] → [5.1398524:1398587]
```
#define FAR_AWAY    1000000         // used in monster_move()
```
Replacement in crawl-ref/source/monstuff.cc at line 7383 [5.1396662]
B:BD[5.1518283] → [6.438955:438998]
```
    for (int i = 0; i < MAX_MONSTERS; i++)
```
[5.1518283]
[6.438998]
```
    for (int i = 0; i < MAX_MONSTERS; ++i)
```

Replacement in crawl-ref/source/monstuff.cc at line 7387 [5.1396662]

B:BD[5.1518329] → [7.2989:3045]

        if (monster->type == -1 || immobile_monster[i])

[5.1518329]

[6.439106]

        if (!monster->alive() || immobile_monster[i])

Replacement in crawl-ref/source/monstuff.cc at line 7400 [5.1396662]

B:BD[8.6897] → [9.8593:8647]

            // Clear list of mesmerisinging monsters.

[8.6897]

[9.8647]

            // Clear list of mesmerising monsters.

Insertion in crawl-ref/source/monstuff.cc at line 8119 [5.1396662]

[10.773]


// Uses, and updates the global variable mmov.
static void _find_good_alternate_move(monsters *monster,
                                      const FixedArray<bool, 3, 3>& good_move)
{
    const int current_distance = distance(monster->pos(), monster->target);
    int dir = -1;
    for (int i = 0; i < 8; i++)
    {
        if (mon_compass[i] == mmov)
        {
            dir = i;
            break;
        }
    }

Insertion in crawl-ref/source/monstuff.cc at line 8136 [5.1396662]

[10.774]

[11.10432]

    // Only handle if the original move is to an adjacent square.
    if (dir == -1)
        return;
    int dist[2];
    // First 1 away, then 2 (3 is silly).
    for (int j = 1; j <= 2; j++)
    {
        const int FAR_AWAY = 1000000;
        // Try both directions (but randomize which one is first.)
        const int sdir = coinflip() ? j : -j;
        const int inc = -2 * j;
        for (int mod = sdir, i = 0; i < 2; mod += inc, i++)
        {
            int newdir = (dir + 8 + mod) % 8;
            if (good_move[mon_compass[newdir].x+1][mon_compass[newdir].y+1])
            {
                dist[i] = distance(monster->pos()+mon_compass[newdir],
                                   monster->target);
            }
            else
            {
                dist[i] = (mons_is_fleeing(monster)) ? (-FAR_AWAY)
                    : FAR_AWAY;
            }
        }
        // Now choose.
        if (dist[0] == dist[1] && abs(dist[0]) == FAR_AWAY)
            continue;
        // Which one was better? -- depends on FLEEING or not.
        if (mons_is_fleeing(monster))
        {
            if (dist[0] >= dist[1] && dist[0] >= current_distance)
            {
                mmov = mon_compass[((dir+8)+sdir)%8];
                break;
            }
            if (dist[1] >= dist[0] && dist[1] >= current_distance)
            {
                mmov = mon_compass[((dir+8)-sdir)%8];
                break;
            }
        }
        else
        {
            if (dist[0] <= dist[1] && dist[0] <= current_distance)
            {
                mmov = mon_compass[((dir+8)+sdir)%8];
                break;
            }
            if (dist[1] <= dist[0] && dist[1] <= current_distance)
            {
                mmov = mon_compass[((dir+8)-sdir)%8];
                break;
            }
        }
    }
}

Replacement in crawl-ref/source/monstuff.cc at line 8202 [5.1396662]
B:BD[5.1529692] → [5.1529692:1529733]
```
    FixedArray < bool, 3, 3 > good_move;
```
[5.1529692]
[5.1529733]
```
    FixedArray<bool, 3, 3> good_move;
```
Replacement in crawl-ref/source/monstuff.cc at line 8260 [5.1396662]
B:BD[12.5270] → [13.32419:32470]
```
        if (mmov.x || mmov.y || one_chance_in(15))
```
[12.5270]
[14.75]
```
        if (!mmov.origin() || one_chance_in(15))
```

Replacement in crawl-ref/source/monstuff.cc at line 8273 [5.1396662]

B:BD[15.279] → [13.32589:32659]

    // Let's not even bother with this if mmov.x and mmov.y are zero.

[15.279]

[16.52109]

    // Let's not even bother with this if mmov is zero.

Replacement in crawl-ref/source/monstuff.cc at line 8380 [5.1396662]

∅:D[13.33239] → [5.1541215:1541221]

B:BD[5.1541215] → [5.1541215:1541221]

B:BD[5.1541221] → [2.2450:2524]

∅:D[2.2524] → [5.1541424:1541447]

∅:D[17.3288] → [5.1541424:1541447]

∅:D[13.33370] → [5.1541424:1541447]

∅:D[16.53061] → [5.1541424:1541447]

B:BD[5.1541424] → [5.1541424:1541447]

B:BD[5.1541475] → [5.1541475:1541476]

B:BD[5.1541476] → [18.4890:4926]

∅:D[18.4926] → [5.1541508:1541518]

B:BD[5.1541508] → [5.1541508:1541518]

B:BD[5.1541518] → [18.4927:4967]

∅:D[18.4967] → [5.1541584:1541743]

∅:D[13.33437] → [5.1541584:1541743]

B:BD[5.1541584] → [5.1541584:1541743]

B:BD[5.1541743] → [19.8264:8310]

∅:D[19.8310] → [5.1541789:1542074]

∅:D[6.446088] → [5.1541789:1542074]

B:BD[5.1541789] → [5.1541789:1542074]

B:BD[5.1542074] → [19.8311:8347]

B:BD[19.8347] → [18.4968:5032]

∅:D[18.5032] → [5.1542169:1542183]

B:BD[5.1542169] → [5.1542169:1542183]

B:BD[5.1542183] → [18.5033:5164]

∅:D[18.5164] → [5.1542306:1542324]

B:BD[5.1542306] → [5.1542306:1542324]

B:BD[5.1542324] → [2.2525:2657]

∅:D[2.2657] → [5.1542609:1542666]

∅:D[17.3568] → [5.1542609:1542666]

∅:D[18.5307] → [5.1542609:1542666]

∅:D[16.53353] → [5.1542609:1542666]

B:BD[5.1542609] → [5.1542609:1542666]

B:BD[5.1542666] → [20.3213:3353]

∅:D[20.3353] → [5.1542818:1542851]

B:BD[5.1542818] → [5.1542818:1542851]

B:BD[5.1542851] → [19.8348:8375]

∅:D[19.8375] → [5.1542877:1542968]

B:BD[5.1542877] → [5.1542877:1542968]

B:BD[5.1542968] → [21.7214:7281]

B:BD[21.7281] → [22.2992:3034]

∅:D[22.3034] → [5.1543082:1543185]

B:BD[5.1543082] → [5.1543082:1543185]

B:BD[5.1543185] → [18.5308:5366]

∅:D[18.5366] → [5.1543301:1543435]

∅:D[13.33554] → [5.1543301:1543435]

B:BD[5.1543301] → [5.1543301:1543435]

B:BD[5.1543435] → [18.5367:5425]

∅:D[18.5425] → [5.1543551:1543730]

∅:D[13.33671] → [5.1543551:1543730]

B:BD[5.1543551] → [5.1543551:1543730]

B:BD[5.1543730] → [18.5426:5484]

∅:D[18.5484] → [5.1543846:1543980]

∅:D[13.33788] → [5.1543846:1543980]

B:BD[5.1543846] → [5.1543846:1543980]

B:BD[5.1543980] → [18.5485:5543]

∅:D[18.5543] → [5.1544096:1544212]

∅:D[13.33905] → [5.1544096:1544212]

B:BD[5.1544096] → [5.1544096:1544212]

    {
        int current_distance = distance(monster->pos(), monster->target);
        int dir = -1;
        for (int i = 0; i < 8; i++)
        {
            if (mon_compass[i] == mmov)
            {
                dir = i;
                break;
            }
        }
        if (dir < 0)
            goto forget_it;
        int dist[2];
        // First 1 away, then 2 (3 is silly).
        for (int j = 1; j <= 2; j++)
        {
            int sdir, inc;
            if (coinflip())
            {
                sdir = -j;
                inc = 2*j;
            }
            else
            {
                sdir = j;
                inc = -2*j;
            }
            // Try both directions.
            for (int mod = sdir, i = 0; i < 2; mod += inc, i++)
            {
                int newdir = (dir + 8 + mod) % 8;
                if (good_move[mon_compass[newdir].x+1][mon_compass[newdir].y+1])
                {
                    dist[i] = distance(monster->pos()+mon_compass[newdir],
                                       monster->target);
                }
                else
                {
                    dist[i] = (mons_is_fleeing(monster)) ? (-FAR_AWAY)
                                                         : FAR_AWAY;
                }
            }
            // Now choose.
            if (dist[0] == dist[1] && abs(dist[0]) == FAR_AWAY)
                continue;
            // Which one was better? -- depends on FLEEING or not.
            if (mons_is_fleeing(monster))
            {
                if (dist[0] >= dist[1] && dist[0] >= current_distance)
                {
                    mmov = mon_compass[((dir+8)+sdir)%8];
                    break;
                }
                if (dist[1] >= dist[0] && dist[1] >= current_distance)
                {
                    mmov = mon_compass[((dir+8)-sdir)%8];
                    break;
                }
            }
            else
            {
                if (dist[0] <= dist[1] && dist[0] <= current_distance)
                {
                    mmov = mon_compass[((dir+8)+sdir)%8];
                    break;
                }
                if (dist[1] <= dist[0] && dist[1] <= current_distance)
                {
                    mmov = mon_compass[((dir+8)-sdir)%8];
                    break;
                }
            }
        }
    } // end - try to find good alternate move

[13.33239]

[5.1544212]

        _find_good_alternate_move(monster, good_move);

Deletion in crawl-ref/source/monstuff.cc at line 8382 [5.1396662]
B:BD[5.1544213] → [5.1544213:1544225]
```
forget_it:
```
Replacement in crawl-ref/source/monstuff.cc at line 8396 [5.1396662]
B:BD[5.1544753] → [13.34146:34184]
```
            if (!silenced(you.pos()))
```
[5.1544753]
[3.3819]
```
            if (player_can_hear(monster->pos() + mmov))
```

Replacement in crawl-ref/source/monstuff.cc at line 8408 [5.1396662]

B:BD[23.8070] → [13.34185:34261]

    if (good_move[mmov.x + 1][mmov.y + 1] && !(mmov.x == 0 && mmov.y == 0))

[23.8070]

[5.1544995]

    if (good_move[mmov.x + 1][mmov.y + 1] && !mmov.origin())

More code cleanups; another goto bites the dust.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/monstuff.cc at line 97 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7383 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7387 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7400 [5.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 8119 [5.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 8136 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 8202 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 8260 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 8273 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 8380 [5.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 8382 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 8396 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 8408 [5.1396662]