fiddlerwoaroof/crawl - Change 4PAWVDF5IXOGPB5OLYXGTLUNAEZI3KNSW7AKJKQAIOLQGQBFAFBAC

Fixing assert problem due to wherex() inconsistency between tile and console versions.

Removed jpeg's commented out code in the health bar drawing routine, as the reamining code is correct. (Thanks!)

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

Created by ennewalker on April 18, 2008

4PAWVDF5IXOGPB5OLYXGTLUNAEZI3KNSW7AKJKQAIOLQGQBFAFBAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 5226 [6.16817]

B:BD[5.6743] → [5.6743:6811]

    gui_init_view_params(termsz, viewsz, msgp, msgsz, hudp, hudsz);

[5.6743]

[5.6811]

    gui_init_view_params(*this);

Replacement in crawl-ref/source/output.cc at line 115 [6.1088282]

B:BD[7.4578] → [4.3349:3425]

            else if (/*old_val > val &&*/ old_disp > disp && cx < old_disp)

[7.4578]

[7.4650]

            else if (old_disp > disp && cx < old_disp)

Insertion in crawl-ref/source/libgui.h at line 72 [5.5789586]
[8.5284]
[5.5790851]
```
struct crawl_view_geometry;
```

Replacement in crawl-ref/source/libgui.h at line 74 [5.5789586]

B:BD[5.5790852] → [2.2612:2805]

void gui_init_view_params(coord_def &termsz, coord_def &viewsz,
                          coord_def &msgp, coord_def &msgsz,
                          coord_def &hudp, const coord_def &hudsz);

[5.5790852]

[5.5790992]

void gui_init_view_params(crawl_view_geometry &geom);

Replacement in crawl-ref/source/libgui.cc at line 2018 [5.5793336]

B:BD[5.5837749] → [9.5267:5392]

B:BD[9.5392] → [2.2807:2874]

void gui_init_view_params(coord_def &termsz, coord_def &viewsz,
                          coord_def &msgp, coord_def &msgsz,
                          coord_def &hudp, const coord_def &hudsz)

[5.5837749]

[5.5837888]

void gui_init_view_params(crawl_view_geometry &geom)

Replacement in crawl-ref/source/libgui.cc at line 2020 [5.5793336]

B:BD[5.5837937] → [5.5837937:5837979]

    msgsz.x = msg_x;
    msgsz.y = msg_y;

[5.5837890]

[3.2613]

    // The tile version handles its own layout on a pixel-by-pixel basis.
    // Pretend that all of the regions start at character location (1,1).
    geom.termp.x = 1;
    geom.termp.y = 1;

Replacement in crawl-ref/source/libgui.cc at line 2026 [5.5793336]

B:BD[3.2614] → [3.2614:2670]

    viewsz.x = tile_dngn_x;
    viewsz.y = tile_dngn_y;

[3.2614]

[5.5837979]

    geom.viewp.x = 1;
    geom.viewp.y = 1;
    geom.viewsz.x = tile_dngn_x;
    geom.viewsz.y = tile_dngn_y;
    geom.hudp.x = 1;
    geom.hudp.y = 1;
    geom.msgp.x = 1;
    geom.msgp.y = 1;
    geom.msgsz.x = msg_x;
    geom.msgsz.y = msg_y;
    geom.mlistp.x = 1;
    geom.mlistp.y = 1;
    geom.mlistsz.x = 0;
    geom.mlistsz.y = 0;