fiddlerwoaroof/crawl - Change AXB2FZCJPA5YETYDCAEQ7ZS5HBT2KAS4NBVUVWKH5TQJI2O2DMVQC

Finally remove the code that was preventing the coloured bars from

updating while resting in Tiles. With the overhaul of the drawing routines (already one or two months old) it's not needed anymore, and I really should have reacted to the new circumstances sooner. :P

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

Created by j-p-e-g on June 23, 2008

AXB2FZCJPA5YETYDCAEQ7ZS5HBT2KAS4NBVUVWKH5TQJI2O2DMVQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/output.cc at line 80 [4.1088282]

B:BD[2.3410] → [2.3410:3483]

        // m_old_disp < 0 means it's invalid and needs to be initialized

[2.3410]

[2.3483]

        // m_old_disp < 0 means it's invalid and needs to be initialized.

Replacement in crawl-ref/source/output.cc at line 85 [4.1088282]

B:BD[2.3526] → [2.3526:3610]

        return (m_request_redraw_after && you.num_turns >= m_request_redraw_after);

[2.3526]

[2.3610]

        return (m_request_redraw_after
                && you.num_turns >= m_request_redraw_after);

Deletion in crawl-ref/source/output.cc at line 98 [4.1088282]

B:BD[2.3803] → [2.3803:4067]

#ifdef USE_TILE
        // Don't redraw colour bars while resting
        // *unless* we'll stop doing so right after that
        if (you.running >= 2 && is_resting() && val != max_val)
        {
            m_old_disp = -1;
            return;
        }
#endif

Replacement in crawl-ref/source/output.cc at line 109 [4.1088282]

B:BD[2.4397] → [2.4397:4454]

            // maybe this should use textbackground too?

[2.4397]

[2.4454]

            // Maybe this should use textbackground too?

Replacement in crawl-ref/source/output.cc at line 123 [4.1088282]

B:BD[2.4872] → [2.4872:4928]

            else if (/* old_disp <= cx && */ cx < disp)

[2.4872]

[2.4928]

            else if (cx < disp)

Replacement in crawl-ref/source/output.cc at line 128 [4.1088282]

B:BD[2.5025] → [2.5025:5081]

            else if (/* disp <= cx && */ cx < old_disp)

[2.5025]

[2.5081]

            else if (cx < old_disp)

Deletion in crawl-ref/source/misc.cc at line 1502 [4.1933596]
B:BD[5.16542] → [5.16542:16596]
B:BD[5.16596] → [3.2713:2796]
∅:D[3.2796] → [4.1944249:1944250]
∅:D[6.4297] → [4.1944249:1944250]
B:BD[4.1944249] → [4.1944249:1944250]
```
    // Does the next level have a warning annotation?
//    if (!force_stair && !check_annotation_exclusion_warning())
//        return;
```

Deletion in crawl-ref/source/misc.cc at line 1812 [4.1933596]

B:BD[4.1949851] → [4.1949851:1949852]

B:BD[4.1949852] → [3.2797:2934]


    // Does the next level have a warning annotation?
//    if (!force_stair && !check_annotation_exclusion_warning())
//        return;

Replacement in crawl-ref/source/misc.cc at line 1825 [4.1933596]

B:BD[7.378] → [7.378:441]

        else if (grd[you.x_pos][you.y_pos] == DNGN_EXIT_ABYSS)

[7.378]

[7.441]

        else if (grd[you.x_pos][you.y_pos] == DNGN_EXIT_ABYSS)Picture