fiddlerwoaroof/crawl - Change S6Z5DI4LGLFHRSOVGGC7PW5CPP34GR5TJXPSJ2XMBFR5YU6VNF4QC

Fixing minimap issue where the markers could get confused if there were multiple squares with the player colour. Markers no longer depend on the contents of the map.

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

Created by ennewalker on April 20, 2008

S6Z5DI4LGLFHRSOVGGC7PW5CPP34GR5TJXPSJ2XMBFR5YU6VNF4QC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/libgui.cc at line 344 [6.5793336]

[6.5803643]

    if ((you.level_type == LEVEL_LABYRINTH) || (you.level_type == LEVEL_ABYSS))
        return;

Replacement in crawl-ref/source/libgui.cc at line 473 [6.5793336]

B:BD[6.5806252] → [6.5806252:5806332]

    if ( (you.level_type != LEVEL_LABYRINTH)&&(you.level_type != LEVEL_ABYSS) )

[6.5806252]

[6.5806332]

    bool show_mark = false;
    int mark_x = 0;
    int mark_y = 0;
    if ((you.level_type != LEVEL_LABYRINTH) && (you.level_type != LEVEL_ABYSS))

Insertion in crawl-ref/source/libgui.cc at line 480 [6.5793336]

[6.5806406]

[7.4419]


        mark_x = ox;
        mark_y = oy;
        show_mark = true;

Insertion in crawl-ref/source/libgui.cc at line 486 [6.5793336]
[7.4458]
[3.3767]
```
        // [enne] Maybe we need another colour for the highlight?
```
Replacement in crawl-ref/source/libgui.cc at line 491 [6.5793336]
B:BD[6.5806484] → [6.5806484:5806517]
```
    region_map->draw_data(buf2);
```
[6.5806484]
[6.5806517]
```
    region_map->draw_data(buf2, show_mark, mark_x, mark_y);
```
Replacement in crawl-ref/source/guic.h at line 355 [6.5854138]
B:BD[6.5863898] → [6.5863898:5863940]
```
class MapRegionClass  :public RegionClass
```
[6.5863898]
[6.5863940]
```
class MapRegionClass : public RegionClass
```
Replacement in crawl-ref/source/guic.h at line 357 [6.5854138]
B:BD[6.5863942] → [6.5863942:5863954]
```
    public:
```
[6.5863942]
[6.5863954]
```
public:
```

Replacement in crawl-ref/source/guic.h at line 366 [6.5854138]

B:BD[6.5864128] → [6.5864128:5864168]

    void draw_data(unsigned char *buf);

[6.5864128]

[6.5864168]

    void draw_data(unsigned char *buf, bool show_mark, int mark_x, int mark_y);

Insertion in crawl-ref/source/guic.h at line 380 [6.5854138]
[5.2890]
[6.5864524]
```
    ~MapRegionClass();
```
Replacement in crawl-ref/source/guic.h at line 385 [6.5854138]
B:BD[6.5864637] → [6.5864637:5864660]
```
    ~MapRegionClass();
```
[6.5864622]
[6.5864660]
```
protected:
    int old_mark_x;
    int old_mark_y;
```
Insertion in crawl-ref/source/guic.cc at line 319 [6.5865841]
[5.3004]
[6.5872392]
```
    old_mark_x = old_mark_y = 0;
```

Replacement in crawl-ref/source/guic-x11.cc at line 321 [6.5880963]

B:BD[6.5887034] → [8.3253:3304]

void MapRegionClass::draw_data(unsigned char *buf)

[6.5887034]

[8.3304]

void MapRegionClass::draw_data(unsigned char *buf, bool show_mark,
                               int mark_x, int mark_y)

Deletion in crawl-ref/source/guic-x11.cc at line 324 [6.5880963]
∅:D[8.3306] → [6.5887108:5887155]
B:BD[6.5887108] → [6.5887108:5887155]
```
    static int px = 0;
    static int py = 0;
```

Replacement in crawl-ref/source/guic-x11.cc at line 328 [6.5880963]

∅:D[4.8495] → [8.3393:3468]

B:BD[6.5887220] → [8.3393:3468]

        XPutPixel(backbuf, px*dx+dx/2 + x_margin, yy, map_pix[MAP_BLACK]);

[4.8495]

[4.8496]

    {
        XPutPixel(backbuf, old_mark_x*dx+dx/2 + x_margin, yy,
                  map_pix[MAP_BLACK]);
    }

Replacement in crawl-ref/source/guic-x11.cc at line 334 [6.5880963]

∅:D[4.8549] → [8.3521:3596]

B:BD[6.5887323] → [8.3521:3596]

        XPutPixel(backbuf, xx, py*dy+dy/2 + y_margin, map_pix[MAP_BLACK]);

[4.8549]

[6.5887393]

    {
        XPutPixel(backbuf, xx, old_mark_y*dy+dy/2 + y_margin,
                  map_pix[MAP_BLACK]);
    }

Deletion in crawl-ref/source/guic-x11.cc at line 345 [6.5880963]
∅:D[2.2765] → [8.3831:3879]
B:BD[8.3831] → [8.3831:3879]
∅:D[8.3879] → [6.5887672:5887748]
B:BD[6.5887672] → [6.5887672:5887748]
```
            if (col == Options.tile_player_col)
            {
                px = x;
                py = y;
            }
```

Replacement in crawl-ref/source/guic-x11.cc at line 360 [6.5880963]

B:BD[8.4255] → [4.8826:8878]

∅:D[4.8878] → [8.4307:4382]

B:BD[6.5888061] → [8.4307:4382]

    for (int yy = 0; yy < dy * marker_length; yy++)
        XPutPixel(backbuf, px*dx+dx/2 + x_margin, yy, map_pix[MAP_WHITE]);

[8.4255]

[4.8879]

    old_mark_x = mark_x;
    old_mark_y = mark_y;

Replacement in crawl-ref/source/guic-x11.cc at line 363 [6.5880963]

B:BD[4.8880] → [4.8880:8932]

∅:D[4.8932] → [8.4435:4510]

B:BD[6.5888164] → [8.4435:4510]

    for (int xx = 0; xx < dx * marker_length; xx++)
        XPutPixel(backbuf, xx, py*dy+dy/2 + y_margin, map_pix[MAP_WHITE]);

[4.8880]

[6.5888234]

    if (show_mark)
    {
        for (int yy = 0; yy < dy * marker_length; yy++)
        {
            XPutPixel(backbuf, old_mark_x*dx+dx/2 + x_margin, yy, 
                      map_pix[MAP_WHITE]);
        }
        for (int xx = 0; xx < dx * marker_length; xx++)
        {
            XPutPixel(backbuf, xx, old_mark_y*dy+dy/2 + y_margin, 
                      map_pix[MAP_WHITE]);
        }
    }

Replacement in crawl-ref/source/guic-win.cc at line 577 [6.5907718]

B:BD[6.5921595] → [8.4664:4715]

void MapRegionClass::draw_data(unsigned char *buf)

[6.5921595]

[8.4715]

void MapRegionClass::draw_data(unsigned char *buf, bool show_mark,
                               int mark_x, int mark_y)

Deletion in crawl-ref/source/guic-win.cc at line 580 [6.5907718]
∅:D[8.4717] → [6.5921690:5921737]
B:BD[6.5921690] → [6.5921690:5921737]
```
    static int px = 0;
    static int py = 0;
```

Replacement in crawl-ref/source/guic-win.cc at line 604 [6.5907718]

B:BD[9.184364] → [8.4909:4979]

        *(pDibBit0 + BUF_IDX(px, 0, dx/2 + x_margin, j)) = MAP_BLACK;

[8.4908]

[4.23480]

        *(pDibBit0 + BUF_IDX(old_mark_x, 0, dx/2 + x_margin, j)) = MAP_BLACK;

Replacement in crawl-ref/source/guic-win.cc at line 607 [6.5907718]

B:BD[9.184436] → [8.5030:5100]

        *(pDibBit0 + BUF_IDX(0, py, j, dy/2 + y_margin)) = MAP_BLACK;

[8.5029]

[6.5922639]

        *(pDibBit0 + BUF_IDX(0, old_mark_y, j, dy/2 + y_margin)) = MAP_BLACK;

Deletion in crawl-ref/source/guic-win.cc at line 619 [6.5907718]

B:BD[8.5379] → [8.5379:5427]

∅:D[8.5427] → [6.5922841:5922917]

B:BD[6.5922841] → [6.5922841:5922917]

            if (col == Options.tile_player_col)
            {
                px = i;
                py = j;
            }

Replacement in crawl-ref/source/guic-win.cc at line 639 [6.5907718]

B:BD[6.5923405] → [8.5680:5753]

B:BD[9.184527] → [8.5754:5824]

    // draw new markers
    for (int j = 0; j < dy * marker_length; j++)
        *(pDibBit0 + BUF_IDX(px, 0, dx/2 + x_margin, j)) = MAP_WHITE;

[6.5923405]

[4.23596]

    old_mark_x = mark_x;
    old_mark_y = mark_y;
    if (show_mark)
    {
        // draw new markers
        for (int j = 0; j < dy * marker_length; j++)
            *(pDibBit0 + BUF_IDX(mark_x, 0, dx/2 + x_margin, j)) = MAP_WHITE;

Replacement in crawl-ref/source/guic-win.cc at line 648 [6.5907718]

∅:D[4.23597] → [8.5825:5874]

B:BD[9.184592] → [8.5825:5874]

B:BD[9.184599] → [8.5875:5945]

    for (int j = 0; j < dx * marker_length; j++)
        *(pDibBit0 + BUF_IDX(0, py, j, dy/2 + y_margin)) = MAP_WHITE;

[4.23597]

[6.5923606]

        for (int j = 0; j < dx * marker_length; j++)
            *(pDibBit0 + BUF_IDX(0, mark_y, j, dy/2 + y_margin)) = MAP_WHITE;
    }

Fixing minimap issue where the markers could get confused if there were multiple squares with the player colour. Markers no longer depend on the contents of the map.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/libgui.cc at line 344 [6.5793336]

Replacement in crawl-ref/source/libgui.cc at line 473 [6.5793336]

Insertion in crawl-ref/source/libgui.cc at line 480 [6.5793336]

Insertion in crawl-ref/source/libgui.cc at line 486 [6.5793336]

Replacement in crawl-ref/source/libgui.cc at line 491 [6.5793336]

Replacement in crawl-ref/source/guic.h at line 355 [6.5854138]

Replacement in crawl-ref/source/guic.h at line 357 [6.5854138]

Replacement in crawl-ref/source/guic.h at line 366 [6.5854138]

Insertion in crawl-ref/source/guic.h at line 380 [6.5854138]

Replacement in crawl-ref/source/guic.h at line 385 [6.5854138]

Insertion in crawl-ref/source/guic.cc at line 319 [6.5865841]