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

Pilemark support for windows

Browse Source 
Changes to be committed:
	modified:   win/win32/mhmap.c
	modified:   win/win32/winMS.h
	modified:   win/win32/winhack.c
This commit is contained in:
nhmall
2015-06-20 08:33:49 -04:00
parent 72a0841dbb
commit 385d4c4293
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/win32/mhmap.c
+3 -3
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 mhmap.c $NHDT-Date: 1434321129 2015/06/14 22:32:09 $ $NHDT-Branch: win32-x64-working $:$NHDT-Revision: 1.53 $ */ /* NetHack 3.6 mhmap.c $NHDT-Date: 1434803617 2015/06/20 12:33:37 $ $NHDT-Branch: win32-x64-working $:$NHDT-Revision: 1.54 $ */
/* Copyright (C) 2001 by Alex Kompel */ /* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -763,7 +763,7 @@ onPaint(HWND hWnd)
layer ++; layer ++;
} }
#ifndef IGNORE_NHMALL #ifdef USE_PILEMARK
/* rely on NetHack core helper routine */ /* rely on NetHack core helper routine */
(void) mapglyph(data->map[i][j], &mgch, &color, (void) mapglyph(data->map[i][j], &mgch, &color,
&special, i, j); &special, i, j);
@@ -789,7 +789,7 @@ onPaint(HWND hWnd)
SelectObject(hdcPetMark, bmPetMarkOld); SelectObject(hdcPetMark, bmPetMarkOld);
DeleteDC(hdcPetMark); DeleteDC(hdcPetMark);
} }
#ifndef IGNORE_NHMALL #ifdef USE_PILEMARK
if ((glyph != NO_GLYPH) && (special & MG_OBJPILE)) { if ((glyph != NO_GLYPH) && (special & MG_OBJPILE)) {
/* apply pilemark transparently over other image */ /* apply pilemark transparently over other image */
HDC hdcPileMark; HDC hdcPileMark;
win/win32/winMS.h
+2 -2
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 winMS.h $NHDT-Date: 1434321135 2015/06/14 22:32:15 $ $NHDT-Branch: win32-x64-working $:$NHDT-Revision: 1.39 $ */ /* NetHack 3.6 winMS.h $NHDT-Date: 1434803624 2015/06/20 12:33:44 $ $NHDT-Branch: win32-x64-working $:$NHDT-Revision: 1.40 $ */
/* Copyright (C) 2001 by Alex Kompel */ /* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -71,7 +71,7 @@ typedef struct mswin_nhwindow_app {
HBITMAP bmpTiles; HBITMAP bmpTiles;
HBITMAP bmpPetMark; HBITMAP bmpPetMark;
#ifndef IGNORE_NHMALL #ifdef USE_PILEMARK
HBITMAP bmpPileMark; HBITMAP bmpPileMark;
#endif #endif
HBITMAP bmpMapTiles; /* custom tiles bitmap */ HBITMAP bmpMapTiles; /* custom tiles bitmap */
win/win32/winhack.c
+7 -5
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 winhack.c $NHDT-Date: 1432512811 2015/05/25 00:13:31 $ $NHDT-Branch: master $:$NHDT-Revision: 1.40 $ */ /* NetHack 3.6 winhack.c $NHDT-Date: 1434803624 2015/06/20 12:33:44 $ $NHDT-Branch: win32-x64-working $:$NHDT-Revision: 1.43 $ */
/* Copyright (C) 2001 by Alex Kompel */ /* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -103,12 +103,14 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine,
panic("cannot load tiles bitmap"); panic("cannot load tiles bitmap");
_nethack_app.bmpPetMark = _nethack_app.bmpPetMark =
LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_PETMARK)); LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_PETMARK));
#ifndef IGNORE_NHMALL
_nethack_app.bmpPileMark =
LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_PILEMARK));
#endif
if (_nethack_app.bmpPetMark == NULL) if (_nethack_app.bmpPetMark == NULL)
panic("cannot load pet mark bitmap"); panic("cannot load pet mark bitmap");
#ifdef USE_PILEMARK
_nethack_app.bmpPileMark =
LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_PILEMARK));
if (_nethack_app.bmpPileMark == NULL)
panic("cannot load pile mark bitmap");
#endif
_nethack_app.bmpRip = LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_RIP)); _nethack_app.bmpRip = LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_RIP));
if (_nethack_app.bmpRip == NULL) if (_nethack_app.bmpRip == NULL)
panic("cannot load rip bitmap"); panic("cannot load rip bitmap");