fiddlerwoaroof/crawl - Change XK3UF67LUGQZ2RGUSY5MW6W6VVVNERDYXR7CZMJS45RIVLW3A3DAC

Speed up explosion() by reducing the amount of useless recursion that

_explosion_map() does.

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

Created by zelgadis on November 28, 2008

XK3UF67LUGQZ2RGUSY5MW6W6VVVNERDYXR7CZMJS45RIVLW3A3DAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/beam.cc at line 65 [4.4128068]
B:BD[4.4129867] → [4.4129867:4129915]
```
static FixedArray < bool, 19, 19 > explode_map;
```
[4.4129671]
[4.4129915]
```
static FixedArray < int, 19, 19 > explode_map;
```

Replacement in crawl-ref/source/beam.cc at line 86 [4.4128068]

∅:D[5.55560] → [6.12416:12471]

B:BD[6.12416] → [6.12416:12471]

                           int count, int dir, int r);

[5.55560]

[2.4063]

                           int count, int r);

Replacement in crawl-ref/source/beam.cc at line 5045 [4.4128068]
B:BD[4.4254029] → [4.4254029:4254053]
B:BD[4.4254053] → [7.711:740]
```
    // set map to false
    explode_map.init(false);
```
[4.4254029]
[4.4254166]
```
    // set map to INT_MAX
    explode_map.init(INT_MAX);
```
Replacement in crawl-ref/source/beam.cc at line 5053 [4.4128068]
B:BD[8.2812] → [3.2698:2751]
```
    _explosion_map(beam, coord_def(0, 0), 0, -1, r);
```
[8.2812]
[4.4254498]
```
    _explosion_map(beam, coord_def(0, 0), 0, r);
```

Replacement in crawl-ref/source/beam.cc at line 5082 [4.4128068]

B:BD[4.4255316] → [4.4255316:4255363]

                if (explode_map[-rad+9][ay+9])

[4.4255316]

[2.4659]

                if (explode_map[-rad+9][ay+9] < INT_MAX)

Replacement in crawl-ref/source/beam.cc at line 5087 [4.4128068]
∅:D[2.4818] → [4.4255425:4255471]
B:BD[4.4255425] → [4.4255425:4255471]
```
                if (explode_map[rad+9][ay+9])
```
[2.4818]
[2.4819]
```
                if (explode_map[rad+9][ay+9] < INT_MAX)
```

Replacement in crawl-ref/source/beam.cc at line 5097 [4.4128068]

B:BD[4.4255643] → [4.4255643:4255690]

                if (explode_map[ax+9][-rad+9])

[4.4255643]

[2.4978]

                if (explode_map[ax+9][-rad+9] < INT_MAX)

Replacement in crawl-ref/source/beam.cc at line 5102 [4.4128068]
∅:D[2.5137] → [4.4255752:4255798]
B:BD[4.4255752] → [4.4255752:4255798]
```
                if (explode_map[ax+9][rad+9])
```
[2.5137]
[2.5138]
```
                if (explode_map[ax+9][rad+9] < INT_MAX)
```
Replacement in crawl-ref/source/beam.cc at line 5197 [4.4128068]
∅:D[9.4743] → [4.4257828:4257883]
∅:D[6.20341] → [4.4257828:4257883]
∅:D[5.64192] → [4.4257828:4257883]
B:BD[4.4257828] → [4.4257828:4257883]
```
                           int count, int dir, int r )
```
[5.64192]
[4.4257883]
```
                           int count, int r )
```
Replacement in crawl-ref/source/beam.cc at line 5234 [4.4128068]
B:BD[10.22453] → [5.64429:64473]
```
    explode_map(p + coord_def(9,9)) = true;
```
[10.22453]
[4.4258610]
```
    explode_map(p + coord_def(9,9)) = count;
```
Replacement in crawl-ref/source/beam.cc at line 5236 [4.4128068]
B:BD[4.4258611] → [10.22454:22521]
```
    // Now recurse in every direction except the one we came from.
```
[4.4258611]
[3.2752]
```
    // Now recurse in every direction.
```

Replacement in crawl-ref/source/beam.cc at line 5239 [4.4128068]

B:BD[4.4258717] → [3.2785:2813]

∅:D[3.2813] → [4.4258741:4258777]

B:BD[4.4258741] → [4.4258741:4258777]

B:BD[4.4258777] → [3.2814:2880]

∅:D[3.2880] → [4.4258835:4258862]

∅:D[5.64812] → [4.4258835:4258862]

B:BD[4.4258835] → [4.4258835:4258862]

        if ((i + 1) != dir)
        {
            int cadd = 5;
            if (p.x * Compass[i].x < 0 || p.y * Compass[i].y < 0)
                cadd = 17;

[4.4258717]

[4.4258862]

        // Is that cell already covered by a recursion that was closer
        // to the center?
        if (explode_map(p + coord_def(9,9) + Compass[i]) <= count)
            continue;

Replacement in crawl-ref/source/beam.cc at line 5244 [4.4128068]

B:BD[4.4258863] → [3.2881:2991]

∅:D[3.2991] → [4.4258984:4258994]

∅:D[6.20530] → [4.4258984:4258994]

∅:D[5.64891] → [4.4258984:4258994]

B:BD[4.4258984] → [4.4258984:4258994]

            _explosion_map( beam, p + Compass[i], count + cadd,
                            (i + 4) % 8, r );
        }

[4.4258863]

[4.4258994]

        int cadd = 5;
        if (p.x * Compass[i].x < 0 || p.y * Compass[i].y < 0)
            cadd = 17;
        _explosion_map( beam, p + Compass[i], count + cadd, r);

Speed up explosion() by reducing the amount of useless recursion that

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/beam.cc at line 65 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 86 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 5045 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 5053 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 5082 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 5087 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 5097 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 5102 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 5197 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 5234 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 5236 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 5239 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 5244 [4.4128068]