From 385d4c4293ed09524f1bdcc0f10a62f95baf6022 Mon Sep 17 00:00:00 2001 From: nhmall Date: Sat, 20 Jun 2015 08:33:49 -0400 Subject: [PATCH] Pilemark support for windows Changes to be committed: modified: win/win32/mhmap.c modified: win/win32/winMS.h modified: win/win32/winhack.c --- win/win32/mhmap.c | 6 +++--- win/win32/winMS.h | 4 ++-- win/win32/winhack.c | 12 +++++++----- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/win/win32/mhmap.c b/win/win32/mhmap.c index 71f82791e..c3a935ce8 100644 --- a/win/win32/mhmap.c +++ b/win/win32/mhmap.c @@ -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 */ /* NetHack may be freely redistributed. See license for details. */ @@ -763,7 +763,7 @@ onPaint(HWND hWnd) layer ++; } -#ifndef IGNORE_NHMALL +#ifdef USE_PILEMARK /* rely on NetHack core helper routine */ (void) mapglyph(data->map[i][j], &mgch, &color, &special, i, j); @@ -789,7 +789,7 @@ onPaint(HWND hWnd) SelectObject(hdcPetMark, bmPetMarkOld); DeleteDC(hdcPetMark); } -#ifndef IGNORE_NHMALL +#ifdef USE_PILEMARK if ((glyph != NO_GLYPH) && (special & MG_OBJPILE)) { /* apply pilemark transparently over other image */ HDC hdcPileMark; diff --git a/win/win32/winMS.h b/win/win32/winMS.h index 3595ba300..6be564015 100644 --- a/win/win32/winMS.h +++ b/win/win32/winMS.h @@ -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 */ /* NetHack may be freely redistributed. See license for details. */ @@ -71,7 +71,7 @@ typedef struct mswin_nhwindow_app { HBITMAP bmpTiles; HBITMAP bmpPetMark; -#ifndef IGNORE_NHMALL +#ifdef USE_PILEMARK HBITMAP bmpPileMark; #endif HBITMAP bmpMapTiles; /* custom tiles bitmap */ diff --git a/win/win32/winhack.c b/win/win32/winhack.c index 5f572db50..d47762d8c 100644 --- a/win/win32/winhack.c +++ b/win/win32/winhack.c @@ -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 */ /* 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"); _nethack_app.bmpPetMark = LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_PETMARK)); -#ifndef IGNORE_NHMALL - _nethack_app.bmpPileMark = - LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_PILEMARK)); -#endif if (_nethack_app.bmpPetMark == NULL) 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)); if (_nethack_app.bmpRip == NULL) panic("cannot load rip bitmap");