fiddlerwoaroof/crawl - Change 4FBWCGO5NTT2KBBTYTYVR2AOBI5LHSP7L3TB3ESYF6OFLMEJQESQC

Make advance direction and quadrants explicit as enums.

Created by Robert Vollmert on October 11, 2009

4FBWCGO5NTT2KBBTYTYVR2AOBI5LHSP7L3TB3ESYF6OFLMEJQESQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/ray.h at line 10 [5.47173]

B:BD[5.47509] → [6.3231:3346]

int shoot_ray(double accx, double accy, const double slope,
                int maxrange, int xpos[], int ypos[]);

[5.47509]

[6.3346]

// quadrant
enum quad_type
{
    QUAD_SE = 0,
    QUAD_SW = 1,
    QUAD_NW = 2,
    QUAD_NE = 3
};
// direction of advance:
enum adv_type
{
    ADV_X  = 0, // changed x
    ADV_Y  = 1, // changed y
    ADV_XY = 2  // changed x and y (diagonal)
};

Replacement in crawl-ref/source/ray.h at line 33 [5.47173]

B:BD[5.47586] → [7.2943:3018]

    int quadrant;      // 0 down-right, 1 down-left, 2 up-left, 3 up-right

[5.47586]

[7.3018]

    quad_type quadrant;

Replacement in crawl-ref/source/ray.h at line 38 [5.47173]

B:BD[8.3014] → [8.3014:3067]

            int quadrant = 0, int fullray_idx = -1);

[8.3014]

[2.2945]

            quad_type quadrant = QUAD_SE, int fullray_idx = -1);

Replacement in crawl-ref/source/ray.h at line 43 [5.47173]

∅:D[9.2531] → [5.47983:48141]

B:BD[5.47983] → [5.47983:48141]

    // returns the direction taken (0,1,2)
    int advance(bool shorten = false, const coord_def *p = NULL);
    int advance_through(const coord_def &point);

[9.2531]

[5.48141]

    // returns the direction taken
    adv_type advance(bool shorten = false, const coord_def *p = NULL);
    adv_type advance_through(const coord_def &point);

Replacement in crawl-ref/source/ray.h at line 57 [5.47173]
B:BD[5.48202] → [4.2946:2971]
```
    int raw_advance_0();
```
[5.48202]
[4.2971]
```
    adv_type raw_advance_0();
```
Replacement in crawl-ref/source/ray.h at line 59 [5.47173]
∅:D[10.2977] → [5.48202:48225]
∅:D[4.2988] → [5.48202:48225]
B:BD[5.48202] → [5.48202:48225]
```
    int raw_advance();
```
[4.2988]
[5.48225]
```
    adv_type raw_advance();
```

Replacement in crawl-ref/source/ray.cc at line 21 [6.3349]

B:BD[6.5912] → [8.3127:3192]

ray_def::ray_def(double ax, double ay, double s, int q, int idx)

[6.5912]

[8.3192]

ray_def::ray_def(double ax, double ay, double s, quad_type q, int idx)

Replacement in crawl-ref/source/ray.cc at line 86 [6.3349]

B:BD[6.7134] → [6.7134:7225]

    // 0 = down-right, 1 = down-left, 2 = up-left, 3 = up-right
    int bouncequad[4][3] =

[6.7134]

[6.7225]

    quad_type bouncequad[4][3] =

Replacement in crawl-ref/source/ray.cc at line 88 [6.3349]

B:BD[6.7231] → [6.7231:7290]

        { 1, 3, 2 }, { 0, 2, 3 }, { 3, 1, 0 }, { 2, 0, 1 }

[6.7231]

[6.7290]

    //    ADV_X    ADV_Y    ADV_XY
        { QUAD_SW, QUAD_NE, QUAD_NW }, // QUAD_SE
        { QUAD_SE, QUAD_NW, QUAD_NE }, // QUAD_SW
        { QUAD_NE, QUAD_SW, QUAD_SE }, // QUAD_NW
        { QUAD_NW, QUAD_SE, QUAD_SW }  // QUAD_NE

Replacement in crawl-ref/source/ray.cc at line 96 [6.3349]
B:BD[6.7378] → [6.7378:7407]
```
    int rc = advance(false);
```
[6.7378]
[6.7407]
```
    adv_type rc = advance(false);
```

Replacement in crawl-ref/source/ray.cc at line 104 [6.3349]

∅:D[3.3541] → [6.7655:7723]

B:BD[6.7655] → [6.7655:7723]

        quadrant = bouncequad[quadrant][2];
    else if ( rc != 2 )

[3.3541]

[6.7723]

        quadrant = bouncequad[quadrant][ADV_XY];
    else if (rc != ADV_XY)

Replacement in crawl-ref/source/ray.cc at line 110 [6.3349]
∅:D[3.3592] → [6.7835:7873]
B:BD[6.7835] → [6.7835:7873]
```
        if ( blocked_x && blocked_y )
```
[3.3592]
[6.7873]
```
        if (blocked_x && blocked_y)
```

Replacement in crawl-ref/source/ray.cc at line 112 [6.3349]

B:BD[6.7922] → [6.7922:8000]

        else if ( blocked_x )
            quadrant = bouncequad[quadrant][1];

[6.7922]

[6.8000]

        else if (blocked_x)
            quadrant = bouncequad[quadrant][ADV_Y];

Replacement in crawl-ref/source/ray.cc at line 115 [6.3349]

B:BD[6.8013] → [6.8013:8061]

            quadrant = bouncequad[quadrant][0];

[6.8013]

[6.8061]

            quadrant = bouncequad[quadrant][ADV_X];

Replacement in crawl-ref/source/ray.cc at line 125 [6.3349]

B:BD[6.8215] → [6.8215:8259]

        if (quadrant == 3 || quadrant == 2)

[6.8215]

[6.8259]

        if (quadrant == QUAD_NW || quadrant == QUAD_NE)

Replacement in crawl-ref/source/ray.cc at line 132 [6.3349]

B:BD[6.8375] → [6.8375:8419]

        if (quadrant == 0 || quadrant == 3)

[6.8375]

[6.8419]

        if (quadrant == QUAD_SE || quadrant == QUAD_NE)

Replacement in crawl-ref/source/ray.cc at line 138 [6.3349]

B:BD[6.8493] → [6.8493:8538]

    double deg = atan(slope) * 180.0 / M_PI;

[6.8493]

[6.8538]

    double deg = atan(slope) * 180.0 / M_PI; // 0 < deg < 90

Replacement in crawl-ref/source/ray.cc at line 142 [6.3349]
B:BD[6.8567] → [6.8567:8579]
```
    case 0:
```
[6.8567]
[6.8579]
```
    case QUAD_SE:
```
Replacement in crawl-ref/source/ray.cc at line 144 [6.3349]
B:BD[6.8609] → [6.8609:8622]
```
    case 1:
```
[6.8609]
[6.8622]
```
    case QUAD_SW:
```
Replacement in crawl-ref/source/ray.cc at line 146 [6.3349]
B:BD[6.8652] → [6.8652:8665]
```
    case 2:
```
[6.8652]
[6.8665]
```
    case QUAD_NW:
```
Replacement in crawl-ref/source/ray.cc at line 148 [6.3349]
B:BD[6.8695] → [6.8695:8708]
```
    case 3:
```
[6.8695]
[6.8708]
```
    case QUAD_NE:
    default:
```
Deletion in crawl-ref/source/ray.cc at line 152 [6.3349]
B:BD[6.8736] → [6.8736:8795]
```
    ASSERT(!"ray has illegal quadrant");
    return (0.0);
```
Replacement in crawl-ref/source/ray.cc at line 168 [6.3349]
B:BD[6.9075] → [6.9075:9115]
```
            quadrant = 0; // right/east
```
[6.9075]
[6.9115]
```
            quadrant = QUAD_SE;
```
Replacement in crawl-ref/source/ray.cc at line 170 [6.3349]
B:BD[6.9128] → [6.9128:9167]
```
            quadrant = 1; // left/west
```
[6.9128]
[6.9167]
```
            quadrant = QUAD_SW;
```
Replacement in crawl-ref/source/ray.cc at line 177 [6.3349]
B:BD[6.9271] → [6.9271:9297]
```
            quadrant = 1;
```
[6.9271]
[6.9297]
```
            quadrant = QUAD_SW;
```
Replacement in crawl-ref/source/ray.cc at line 179 [6.3349]
B:BD[6.9310] → [6.9310:9336]
```
            quadrant = 3;
```
[6.9310]
[6.9336]
```
            quadrant = QUAD_NE;
```
Replacement in crawl-ref/source/ray.cc at line 186 [6.3349]
B:BD[6.9420] → [6.9420:9446]
```
            quadrant = 2;
```
[6.9420]
[6.9446]
```
            quadrant = QUAD_NW;
```
Replacement in crawl-ref/source/ray.cc at line 188 [6.3349]
B:BD[6.9459] → [6.9459:9485]
```
            quadrant = 0;
```
[6.9459]
[6.9485]
```
            quadrant = QUAD_SE;
```

Replacement in crawl-ref/source/ray.cc at line 197 [6.3349]

B:BD[6.9569] → [6.9569:9611]

    int opp_quadrant[4] = { 2, 3, 0, 1 };

[6.9569]

[6.9611]

    quad_type opp_quadrant[4] = { QUAD_NW, QUAD_NE, QUAD_SE, QUAD_SW };

Replacement in crawl-ref/source/ray.cc at line 203 [6.3349]

B:BD[6.9712] → [6.9712:9766]

int ray_def::advance_through(const coord_def &target)

[6.9712]

[6.9766]

adv_type ray_def::advance_through(const coord_def &target)

Replacement in crawl-ref/source/ray.cc at line 208 [6.3349]

B:BD[6.9808] → [6.9808:9878]

int ray_def::advance(bool shortest_possible, const coord_def *target)

[6.9808]

[6.9878]

adv_type ray_def::advance(bool shortest_possible, const coord_def *target)

Replacement in crawl-ref/source/ray.cc at line 217 [6.3349]
∅:D[2.3306] → [6.10138:10173]
B:BD[6.10138] → [6.10138:10173]
```
    const int ret = raw_advance();
```
[2.3306]
[6.10173]
```
    const adv_type ret = raw_advance();
```

Replacement in crawl-ref/source/ray.cc at line 219 [6.3349]

B:BD[6.10174] → [6.10174:10224]

    if (ret == 2 || (target && pos() == *target))

[6.10174]

[6.10224]

    if (ret == ADV_XY || (target && pos() == *target))

Replacement in crawl-ref/source/ray.cc at line 223 [6.3349]
B:BD[6.10292] → [6.10292:10320]
```
    if (raw_advance() != 2)
```
[6.10292]
[6.10320]
```
    if (raw_advance() != ADV_XY)
```
Replacement in crawl-ref/source/ray.cc at line 228 [6.3349]
B:BD[6.10496] → [6.10496:10520]
```
            return (2);
```
[6.10496]
[6.10520]
```
            return (ADV_XY);
```
Replacement in crawl-ref/source/ray.cc at line 242 [6.3349]
B:BD[10.3135] → [4.2990:3019]
```
int ray_def::raw_advance_0()
```
[10.3135]
[10.3171]
```
adv_type ray_def::raw_advance_0()
```
Replacement in crawl-ref/source/ray.cc at line 248 [6.3349]
B:BD[10.3260] → [10.3260:3278]
```
        return 0;
```
[10.3260]
[10.3278]
```
        return ADV_X;
```
Replacement in crawl-ref/source/ray.cc at line 253 [6.3349]
B:BD[10.3334] → [10.3334:3352]
```
        return 1;
```
[10.3334]
[10.3352]
```
        return ADV_Y;
```
Replacement in crawl-ref/source/ray.cc at line 276 [6.3349]
B:BD[10.4005] → [10.4005:4023]
```
        return 2;
```
[10.4005]
[10.4023]
```
        return ADV_XY;
```
Replacement in crawl-ref/source/ray.cc at line 281 [6.3349]
B:BD[10.4081] → [10.4081:4098]
```
    int rc = -1;
```
[10.4081]
[10.4098]
```
    adv_type rc;
```
Replacement in crawl-ref/source/ray.cc at line 285 [6.3349]
B:BD[10.4168] → [10.4168:4184]
```
        rc = 1;
```
[10.4168]
[10.4184]
```
        rc = ADV_Y;
```
Replacement in crawl-ref/source/ray.cc at line 290 [6.3349]
B:BD[10.4237] → [10.4237:4253]
```
        rc = 0;
```
[10.4237]
[10.4253]
```
        rc = ADV_X;
```
Replacement in crawl-ref/source/ray.cc at line 316 [6.3349]
∅:D[4.3285] → [6.10619:10646]
∅:D[10.4540] → [6.10619:10646]
B:BD[6.10619] → [6.10619:10646]
```
int ray_def::raw_advance()
```
[4.3285]
[6.10646]
```
adv_type ray_def::raw_advance()
```
Replacement in crawl-ref/source/ray.cc at line 318 [6.3349]
B:BD[6.10648] → [6.10648:10660]
```
    int rc;
```
[6.10648]
[4.3286]
```
    adv_type rc;
```
Replacement in crawl-ref/source/los.cc at line 202 [6.26450]
∅:D[11.3972] → [8.4118:4167]
B:BD[6.32219] → [8.4118:4167]
```
    ray_def ray = ray_def(accx, accy, slope, 0);
```
[11.3972]
[8.4167]
```
    ray_def ray = ray_def(accx, accy, slope, QUAD_SE);
```
Replacement in crawl-ref/source/los.cc at line 362 [6.26450]
B:BD[6.38385] → [6.38385:38411]
```
        ray.quadrant = 0;
```
[6.38385]
[6.38411]
```
        ray.quadrant = QUAD_SE;
```
Replacement in crawl-ref/source/los.cc at line 364 [6.26450]
B:BD[6.38447] → [6.38447:38473]
```
        ray.quadrant = 1;
```
[6.38447]
[6.38473]
```
        ray.quadrant = QUAD_SW;
```
Replacement in crawl-ref/source/los.cc at line 366 [6.26450]
B:BD[6.38508] → [6.38508:38534]
```
        ray.quadrant = 2;
```
[6.38508]
[6.38534]
```
        ray.quadrant = QUAD_NW;
```
Replacement in crawl-ref/source/los.cc at line 368 [6.26450]
B:BD[6.38570] → [6.38570:38596]
```
        ray.quadrant = 3;
```
[6.38570]
[6.38596]
```
        ray.quadrant = QUAD_NE;
```

Make advance direction and quadrants explicit as enums.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/ray.h at line 10 [5.47173]

Replacement in crawl-ref/source/ray.h at line 33 [5.47173]

Replacement in crawl-ref/source/ray.h at line 38 [5.47173]

Replacement in crawl-ref/source/ray.h at line 43 [5.47173]

Replacement in crawl-ref/source/ray.h at line 57 [5.47173]

Replacement in crawl-ref/source/ray.h at line 59 [5.47173]

Replacement in crawl-ref/source/ray.cc at line 21 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 86 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 88 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 96 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 104 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 110 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 112 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 115 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 125 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 132 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 138 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 142 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 144 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 146 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 148 [6.3349]

Deletion in crawl-ref/source/ray.cc at line 152 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 168 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 170 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 177 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 179 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 186 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 188 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 197 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 203 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 208 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 217 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 219 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 223 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 228 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 242 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 248 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 253 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 276 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 281 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 285 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 290 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 316 [6.3349]

Replacement in crawl-ref/source/ray.cc at line 318 [6.3349]

Replacement in crawl-ref/source/los.cc at line 202 [6.26450]

Replacement in crawl-ref/source/los.cc at line 362 [6.26450]

Replacement in crawl-ref/source/los.cc at line 364 [6.26450]

Replacement in crawl-ref/source/los.cc at line 366 [6.26450]

Replacement in crawl-ref/source/los.cc at line 368 [6.26450]