nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

win32_gui: correctly handle NO_GLYPH as backgroung glyph

Browse Source
This commit is contained in:
Alex Kompel
2015-06-10 23:12:18 -07:00
parent ad654cdc61
commit 979cf90a0d
1 changed files with 42 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
win/win32/mhmap.c
View File

@@ -452,14 +452,16 @@ onMSNHCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
switch (wParam) { switch (wParam) {
case MSNH_MSG_PRINT_GLYPH: { case MSNH_MSG_PRINT_GLYPH: {
PMSNHMsgPrintGlyph msg_data = (PMSNHMsgPrintGlyph) lParam; PMSNHMsgPrintGlyph msg_data = (PMSNHMsgPrintGlyph) lParam;
if((data->map[msg_data->x][msg_data->y] != msg_data->glyph) if ((data->map[msg_data->x][msg_data->y] != msg_data->glyph)
|| (data->bkmap[msg_data->x][msg_data->y] != msg_data->bkglyph)) { || (data->bkmap[msg_data->x][msg_data->y] != msg_data->bkglyph)) {
data->map[msg_data->x][msg_data->y] = msg_data->glyph; data->map[msg_data->x][msg_data->y] = msg_data->glyph;
data->bkmap[msg_data->x][msg_data->y] = msg_data->bkglyph; data->bkmap[msg_data->x][msg_data->y] = msg_data->bkglyph;
/* invalidate the update area */ /* invalidate the update area. Erase backround if there
is nothing to paint */
nhcoord2display(data, msg_data->x, msg_data->y, &rt); nhcoord2display(data, msg_data->x, msg_data->y, &rt);
InvalidateRect(hWnd, &rt, FALSE); InvalidateRect(hWnd, &rt,
((msg_data->glyph == NO_GLYPH) && (msg_data->bkglyph == NO_GLYPH)));
} }
} break; } break;
@@ -707,6 +709,7 @@ onPaint(HWND hWnd)
int t_x, t_y; int t_x, t_y;
int glyph, bkglyph; int glyph, bkglyph;
RECT glyph_rect; RECT glyph_rect;
int layer;
/* prepare tiles DC for mapping */ /* prepare tiles DC for mapping */
tileDC = CreateCompatibleDC(hDC); tileDC = CreateCompatibleDC(hDC);
@@ -715,12 +718,9 @@ onPaint(HWND hWnd)
/* draw the map */ /* draw the map */
for (i = paint_rt.left; i < paint_rt.right; i++) for (i = paint_rt.left; i < paint_rt.right; i++)
for (j = paint_rt.top; j < paint_rt.bottom; j++) { for (j = paint_rt.top; j < paint_rt.bottom; j++) {
layer = 0;
glyph = data->map[i][j]; glyph = data->map[i][j];
bkglyph = (glyph != NO_GLYPH)? data->bkmap[i][j] : NO_GLYPH; bkglyph = data->bkmap[i][j];
if (glyph == bkglyph) {
glyph = NO_GLYPH;
}
if (bkglyph != NO_GLYPH) { if (bkglyph != NO_GLYPH) {
ntile = glyph2tile[bkglyph]; ntile = glyph2tile[bkglyph];
@@ -732,41 +732,52 @@ onPaint(HWND hWnd)
data->xScrTile, data->yScrTile, tileDC, data->xScrTile, data->yScrTile, tileDC,
t_x, t_y, GetNHApp()->mapTile_X, t_x, t_y, GetNHApp()->mapTile_X,
GetNHApp()->mapTile_Y, SRCCOPY); GetNHApp()->mapTile_Y, SRCCOPY);
layer ++;
} }
if (glyph != NO_GLYPH) { if ((glyph != NO_GLYPH) && (glyph != bkglyph)) {
ntile = glyph2tile[glyph]; ntile = glyph2tile[glyph];
t_x = TILEBMP_X(ntile); t_x = TILEBMP_X(ntile);
t_y = TILEBMP_Y(ntile); t_y = TILEBMP_Y(ntile);
nhcoord2display(data, i, j, &glyph_rect); nhcoord2display(data, i, j, &glyph_rect);
(*GetNHApp()->lpfnTransparentBlt)( if (layer > 0) {
hDC, glyph_rect.left, glyph_rect.top,
data->xScrTile, data->yScrTile, tileDC,
t_x, t_y, GetNHApp()->mapTile_X,
GetNHApp()->mapTile_Y, TILE_BK_COLOR);
if (glyph_is_pet(glyph)
&& iflags.wc_hilite_pet) {
/* apply pet mark transparently over
pet image */
HDC hdcPetMark;
HBITMAP bmPetMarkOld;
/* this is DC for petmark bitmap */
hdcPetMark = CreateCompatibleDC(hDC);
bmPetMarkOld = SelectObject(
hdcPetMark, GetNHApp()->bmpPetMark);
(*GetNHApp()->lpfnTransparentBlt)( (*GetNHApp()->lpfnTransparentBlt)(
hDC, glyph_rect.left, glyph_rect.top, hDC, glyph_rect.left, glyph_rect.top,
data->xScrTile, data->yScrTile, hdcPetMark, 0, data->xScrTile, data->yScrTile, tileDC,
0, TILE_X, TILE_Y, TILE_BK_COLOR); t_x, t_y, GetNHApp()->mapTile_X,
SelectObject(hdcPetMark, bmPetMarkOld); GetNHApp()->mapTile_Y, TILE_BK_COLOR);
DeleteDC(hdcPetMark); } else {
StretchBlt(hDC, glyph_rect.left, glyph_rect.top,
data->xScrTile, data->yScrTile, tileDC,
t_x, t_y, GetNHApp()->mapTile_X,
GetNHApp()->mapTile_Y, SRCCOPY);
} }
layer ++;
}
if ((glyph != NO_GLYPH) && glyph_is_pet(glyph)
&& iflags.wc_hilite_pet) {
/* apply pet mark transparently over
pet image */
HDC hdcPetMark;
HBITMAP bmPetMarkOld;
/* this is DC for petmark bitmap */
hdcPetMark = CreateCompatibleDC(hDC);
bmPetMarkOld = SelectObject(
hdcPetMark, GetNHApp()->bmpPetMark);
(*GetNHApp()->lpfnTransparentBlt)(
hDC, glyph_rect.left, glyph_rect.top,
data->xScrTile, data->yScrTile, hdcPetMark, 0,
0, TILE_X, TILE_Y, TILE_BK_COLOR);
SelectObject(hdcPetMark, bmPetMarkOld);
DeleteDC(hdcPetMark);
} }
} }
SelectObject(tileDC, saveBmp); SelectObject(tileDC, saveBmp);
DeleteDC(tileDC); DeleteDC(tileDC);
} }