fiddlerwoaroof/crawl - Change TADKPTKH3CWXZRGVDWOY3CMAQ6CQISITDYB4F27YU53U5XEB6NVAC

Simplify monster_random_space().

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

Created by dolorous on January 26, 2009

TADKPTKH3CWXZRGVDWOY3CMAQ6CQISITDYB4F27YU53U5XEB6NVAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 3123 [4.16817]
B:BD[3.18030] → [3.18030:18072]
```
    int maxradius = GXM > GYM? GXM : GYM;
```
[3.18030]
[5.1443]
```
    int maxradius = GXM > GYM ? GXM : GYM;
```

Replacement in crawl-ref/source/stuff.h at line 155 [4.217090]

B:BD[4.221773] → [6.103633:103699]


bool in_bounds( int x, int y );
bool map_bounds( int x, int y );

[4.221773]

[7.1305]

bool in_bounds(int x, int y);
bool map_bounds(int x, int y);

Replacement in crawl-ref/source/stuff.cc at line 1247 [4.224557]
∅:D[8.423] → [6.107194:107225]
B:BD[6.107194] → [6.107194:107225]
```
bool in_bounds( int x, int y )
```
[8.423]
[6.107225]
```
bool in_bounds(int x, int y)
```
Replacement in crawl-ref/source/stuff.cc at line 1256 [4.224557]
B:BD[6.107497] → [6.107497:107529]
```
bool map_bounds( int x, int y )
```
[6.107497]
[6.107529]
```
bool map_bounds(int x, int y)
```

Replacement in crawl-ref/source/stuff.cc at line 1264 [4.224557]

B:BD[7.1371] → [7.1371:1525]

    return coord_def( random_range(MAPGEN_BORDER, GXM - MAPGEN_BORDER - 1),
                      random_range(MAPGEN_BORDER, GYM - MAPGEN_BORDER - 1) );

[7.1371]

[6.107626]

    return coord_def(random_range(MAPGEN_BORDER, GXM - MAPGEN_BORDER - 1),
                     random_range(MAPGEN_BORDER, GYM - MAPGEN_BORDER - 1));

Replacement in crawl-ref/source/stuff.cc at line 1271 [4.224557]

B:BD[6.107822] → [9.2755:2859]

void random_in_bounds( int &x_pos, int &y_pos, int terr,
                       bool empty, bool excl )

[6.107822]

[6.107903]

void random_in_bounds(int &x_pos, int &y_pos, int terr,
                      bool empty, bool excl)

Replacement in crawl-ref/source/stuff.cc at line 1278 [4.224557]

B:BD[6.107942] → [6.107942:108082]

        x_pos = X_BOUND_1 + random2( X_WIDTH - 2 * excl ) + 1 * excl;
        y_pos = Y_BOUND_1 + random2( Y_WIDTH - 2 * excl ) + 1 * excl;

[6.107942]

[4.241365]

        x_pos = X_BOUND_1 + random2(X_WIDTH - 2 * excl) + 1 * excl;
        y_pos = Y_BOUND_1 + random2(Y_WIDTH - 2 * excl) + 1 * excl;

Replacement in crawl-ref/source/stuff.cc at line 1290 [4.224557]

B:BD[10.17164] → [10.17164:17223]

                 && (coord_def(x_pos,y_pos) != you.pos()))

[10.17164]

[6.108461]

                 && (coord_def(x_pos, y_pos) != you.pos()))

Replacement in crawl-ref/source/stuff.cc at line 1301 [4.224557]
B:BD[4.241432] → [4.241432:241487]
```
}                               // end random_colour()
```
[4.241432]
[11.61]
```
}
```
Deletion in crawl-ref/source/mstuff2.cc at line 1069 [4.1340842]
B:BD[12.3880] → [2.2633:2634]

Replacement in crawl-ref/source/mstuff2.cc at line 1074 [4.1340842]

B:BD[2.2809] → [2.2809:2913]

            target.x = ul.x + random2(lr.x - ul.x);
            target.y = ul.y + random2(lr.y - ul.y);

[2.2809]

[2.2913]

            target = coord_def(random_range(ul.x, lr.x - 1),
                               random_range(ul.y, lr.y - 1));

Replacement in crawl-ref/source/mstuff2.cc at line 1078 [4.1340842]

B:BD[2.2936] → [2.2936:3050]

        {
            target.x = 10 + random2(GXM - 20);
            target.y = 10 + random2(GYM - 20);
        }

[2.2936]

[12.3966]

            target = random_in_bounds();

Simplify monster_random_space().

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 3123 [4.16817]

Replacement in crawl-ref/source/stuff.h at line 155 [4.217090]

Replacement in crawl-ref/source/stuff.cc at line 1247 [4.224557]

Replacement in crawl-ref/source/stuff.cc at line 1256 [4.224557]