fiddlerwoaroof/crawl - Change AL3SLCDLHEM2K7XFORCHBSO2WRSHWAPRCSMH7HHMRWVBPNA5EM7AC

Some more ray_def cleanup.

Created by Robert Vollmert on October 11, 2009

AL3SLCDLHEM2K7XFORCHBSO2WRSHWAPRCSMH7HHMRWVBPNA5EM7AC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/ray.h at line 46 [3.47173]
B:BD[3.48285] → [3.48285:48331]
```
    double reflect(double x, double c) const;
```
Deletion in crawl-ref/source/ray.h at line 47 [3.47173]
B:BD[3.48396] → [3.48396:48451]
```
                           double *newx, double *newy,
```
Replacement in crawl-ref/source/ray.cc at line 41 [4.3349]
B:BD[4.6022] → [4.6022:6072]
```
double ray_def::reflect(double p, double c) const
```
[4.6022]
[4.6072]
```
double _reflect(double p, double c)
```
Replacement in crawl-ref/source/ray.cc at line 49 [4.3349]
∅:D[2.3316] → [4.6219:6270]
B:BD[4.6219] → [4.6219:6270]
```
        return (reflect(oldx, floor(oldx) + 0.5));
```
[2.3316]
[4.6270]
```
        return (_reflect(oldx, floor(oldx) + 0.5));
```

Replacement in crawl-ref/source/ray.cc at line 53 [4.3349]

B:BD[4.6347] → [4.6347:6500]

    return (reflect(oldx,
                    flnew > flold? flnew :
                    flold > flnew? flold :
                    (newx + oldx) / 2));

[4.6347]

[4.6500]

    return (_reflect(oldx,
                     flnew > flold ? flnew :
                     flold > flnew ? flold :
                     (newx + oldx) / 2));

Deletion in crawl-ref/source/ray.cc at line 60 [4.3349]

B:BD[4.6573] → [4.6573:6633]

                                double *newx, double *newy,

Replacement in crawl-ref/source/ray.cc at line 65 [4.3349]

B:BD[4.6760] → [4.6760:6804]

        *newx = oldx;
        *newy = oldy;

[4.6760]

[4.6804]

        accx = oldx;
        accy = oldy;

Replacement in crawl-ref/source/ray.cc at line 72 [4.3349]

B:BD[4.6852] → [4.6852:6959]

        ASSERT(int(oldy) != int(*newy));
        *newy = oldy;
        *newx = reflect(true, oldx, *newx);

[4.6852]

[4.6959]

        ASSERT(int(oldy) != int(accy));
        accy = oldy;
        accx = reflect(true, oldx, accx);

Replacement in crawl-ref/source/ray.cc at line 78 [4.3349]

B:BD[4.6980] → [4.6980:7088]

        ASSERT(int(oldx) != int(*newx));
        *newx = oldx;
        *newy = reflect(false, oldy, *newy);

[4.6980]

[4.7088]

        ASSERT(int(oldx) != int(accx));
        accx = oldx;
        accy = reflect(false, oldy, accy);

Replacement in crawl-ref/source/ray.cc at line 95 [4.3349]
B:BD[4.7439] → [4.7439:7485]
```
    ASSERT( grid_is_solid(grd[newx][newy]) );
```
[4.7439]
[4.7485]
```
    ASSERT(grid_is_solid(grd[newx][newy]));
```

Replacement in crawl-ref/source/ray.cc at line 100 [4.3349]

B:BD[4.7605] → [4.7605:7655]

    if ( double_is_zero(slope) || slope > 100.0 )

[4.7605]

[4.7655]

    if (double_is_zero(slope) || slope > 100.0)

Replacement in crawl-ref/source/ray.cc at line 106 [4.3349]

B:BD[4.7783] → [4.7783:7835]

        ASSERT( (oldx != newx) && (oldy != newy) );

[4.7783]

[4.7835]

        ASSERT((oldx != newx) && (oldy != newy));

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

B:BD[4.8068] → [4.8068:8145]

    set_reflect_point(oldaccx, oldaccy, &accx, &accy, blocked_x, blocked_y);

[4.8068]

[4.8145]

    set_reflect_point(oldaccx, oldaccy, blocked_x, blocked_y);