fiddlerwoaroof/crawl - Change 4J2ILW7DGFLSRYX2TF4OYWN3WNJSQXC647MQGGIOBC63MPF4TXKAC

During arena mode make random_in_bounds() return a point inside the view port.

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

Created by zelgadis on January 27, 2009

4J2ILW7DGFLSRYX2TF4OYWN3WNJSQXC647MQGGIOBC63MPF4TXKAC

Dependencies

In channels

main

Change contents

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

B:BD[3.1371] → [2.421:572]

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

[3.1371]

[5.107626]

    if (crawl_state.arena)
    {
        const coord_def &ul = crawl_view.glos1; // Upper left
        const coord_def &lr = crawl_view.glos2; // Lower right
        return coord_def(random_range(ul.x, lr.x - 1),
                         random_range(ul.y, lr.y - 1));
    }
    else
        return coord_def(random_range(MAPGEN_BORDER, GXM - MAPGEN_BORDER - 1),
                         random_range(MAPGEN_BORDER, GYM - MAPGEN_BORDER - 1));

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

B:BD[6.2634] → [6.2634:2808]

        if (crawl_state.arena)
        {
            const coord_def &ul = crawl_view.glos1; // Upper left
            const coord_def &lr = crawl_view.glos2; // Lower right

[7.3880]

[6.2808]

        target = random_in_bounds();

Deletion in crawl-ref/source/mstuff2.cc at line 1071 [4.1340842]
B:BD[6.2809] → [2.3256:3379]
∅:D[2.3379] → [6.2913:2936]
B:BD[6.2913] → [6.2913:2936]
B:BD[6.2936] → [2.3380:3421]
∅:D[6.3050] → [7.3966:3967]
∅:D[2.3421] → [7.3966:3967]
B:BD[7.3966] → [7.3966:3967]
```
            target = coord_def(random_range(ul.x, lr.x - 1),
                               random_range(ul.y, lr.y - 1));
        }
        else
            target = random_in_bounds();
```