fiddlerwoaroof/crawl - Change MAHWWMQ6YJTLBFRX3NUHORP42TGEYROVNEG2KBXCIEZRHS7SQ4HAC

Fix 2118669: scrolling could cause double-scrolling. I left the Tiles

code alone so I might have broken that.

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

Created by haranp on September 20, 2008

MAHWWMQ6YJTLBFRX3NUHORP42TGEYROVNEG2KBXCIEZRHS7SQ4HAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 3136 [5.16817]

B:BD[3.23324] → [4.1369:1423]

    char min_x = 80, max_x = 0, min_y = 0, max_y = 0;

[3.23324]

[4.1423]

    int min_x = GXM, max_x = 0, min_y = 0, max_y = 0;

Replacement in crawl-ref/source/view.cc at line 3530 [5.16817]

B:BD[4.9698] → [6.442:571]

∅:D[6.571] → [5.77979:77980]

∅:D[4.9828] → [5.77979:77980]

B:BD[5.77979] → [5.77979:77980]

B:BD[5.77980] → [6.572:701]

∅:D[6.701] → [5.78077:78078]

∅:D[4.9934] → [5.78077:78078]

B:BD[5.78077] → [5.78077:78078]

B:BD[5.78078] → [6.702:728]

            if (scroll_y < 0 && ((screen_y += scroll_y) <= min_y + half_screen))
                screen_y = min_y + half_screen;
            if (scroll_y > 0 && ((screen_y += scroll_y) >= max_y - half_screen))
                screen_y = max_y - half_screen;
            scroll_y = 0;

[4.9698]

[2.761]

            if (scroll_y != 0)
            {
                const int old_screen_y = screen_y;
                screen_y += scroll_y;
                if (scroll_y < 0)
                    screen_y = std::max(screen_y, min_y + half_screen);
                else
                    screen_y = std::min(screen_y, max_y - half_screen);
                curs_y -= (screen_y - old_screen_y);
                scroll_y = 0;
            }