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

pull in the recent unconditionals merge from master

Browse Source
This commit is contained in:
Derek S. Ray
2015-02-27 21:25:00 -05:00
parent 7f0ff8f011
commit b1a7bbbbdb
538 changed files with 1715 additions and 5685 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
win/win32/dgnstuff.mak
View File

@@ -1,3 +1,6 @@
# $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# $Date: 2002/01/22 22:54:54 $ $Revision: 1.3 $
#Set all of these or none of them
#YACC = byacc.exe
#LEX = flex.exe

2
win/win32/levstuff.mak
View File

@@ -1,3 +1,5 @@
# $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# $Date:2002/01/22 22:54:54 $ $Revision: 1.2 $
#YACC = byacc.exe
#LEX = flex.exe
#YTABC = y_tab.c

3
win/win32/mhaskyn.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 mhaskyn.c $Date$ $Revision$ */
/* NetHack 3.5 mhaskyn.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 mhaskyn.c $Date: 2009/05/06 10:59:46 $ $Revision: 1.5 $ */
/* SCCS Id: @(#)mhaskyn.c 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

3
win/win32/mhaskyn.h
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 mhaskyn.h $Date$ $Revision$ */
/* NetHack 3.5 mhaskyn.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 mhaskyn.h $Date: 2009/05/06 10:59:46 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)mhaskyn.h 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

3
win/win32/mhdlg.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 mhdlg.c $Date$ $Revision$ */
/* NetHack 3.5 mhdlg.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 mhdlg.c $Date: 2012/01/11 01:45:02 $ $Revision: 1.18 $ */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

3
win/win32/mhdlg.h
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 mhdlg.h $Date$ $Revision$ */
/* NetHack 3.5 mhdlg.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 mhdlg.h $Date: 2012/01/11 01:15:36 $ $Revision: 1.5 $ */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

3
win/win32/mhfont.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 mhfont.c $Date$ $Revision$ */
/* NetHack 3.5 mhfont.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 mhfont.c $Date: 2009/05/06 10:59:46 $ $Revision: 1.17 $ */
/* SCCS Id: @(#)mhfont.c 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

3
win/win32/mhfont.h
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 mhfont.h $Date$ $Revision$ */
/* NetHack 3.5 mhfont.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 mhfont.h $Date: 2009/05/06 10:59:46 $ $Revision: 1.8 $ */
/* SCCS Id: @(#)mhfont.h 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

3
win/win32/mhinput.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 mhinput.c $Date$ $Revision$ */
/* NetHack 3.5 mhinput.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 mhinput.c $Date: 2009/05/06 10:59:48 $ $Revision: 1.7 $ */
/* SCCS Id: @(#)mhinput.c 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

3
win/win32/mhinput.h
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 mhinput.h $Date$ $Revision$ */
/* NetHack 3.5 mhinput.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 mhinput.h $Date: 2009/05/06 10:59:49 $ $Revision: 1.6 $ */
/* SCCS Id: @(#)mhinput.h 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

5
win/win32/mhmain.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 mhmain.c $Date$ $Revision$ */
/* NetHack 3.5 mhmain.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 mhmain.c $Date: 2012/01/11 01:53:44 $ $Revision: 1.49 $ */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */
@@ -1042,9 +1043,7 @@ void mswin_select_map_mode(int mode)
data = (PNHMainWindow)GetWindowLong(GetNHApp()->hMainWnd, GWL_USERDATA);
/* override for Rogue level */
#ifdef REINCARNATION
if( Is_rogue_level(&u.uz) && !IS_MAP_ASCII(mode) ) return;
#endif
/* set map mode menu mark */
if( IS_MAP_ASCII(mode) ) {

3
win/win32/mhmain.h
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 mhmain.h $Date$ $Revision$ */
/* NetHack 3.5 mhmain.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 mhmain.h $Date: 2009/05/06 10:59:52 $ $Revision: 1.10 $ */
/* SCCS Id: @(#)mhmain.h 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

9
win/win32/mhmap.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 mhmap.c $Date$ $Revision$ */
/* NetHack 3.5 mhmap.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 mhmap.c $Date: 2012/01/11 01:45:02 $ $Revision: 1.37 $ */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */
@@ -602,12 +603,8 @@ void onPaint(HWND hWnd)
paint_rt.right = min(data->xPos + (ps.rcPaint.right - data->map_orig.x)/data->xScrTile+1, COLNO);
paint_rt.bottom = min(data->yPos + (ps.rcPaint.bottom - data->map_orig.y)/data->yScrTile+1, ROWNO);
if( data->bAsciiMode
#ifdef REINCARNATION
|| Is_rogue_level(&u.uz)
if( data->bAsciiMode || Is_rogue_level(&u.uz) ) {
/* You enter a VERY primitive world! */
#endif
) {
HGDIOBJ oldFont;
oldFont = SelectObject(hDC, data->hMapFont);

3
win/win32/mhmap.h
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 mhmap.h $Date$ $Revision$ */
/* NetHack 3.5 mhmap.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 mhmap.h $Date: 2009/05/06 10:59:56 $ $Revision: 1.10 $ */
/* SCCS Id: @(#)mhmap.h 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

3
win/win32/mhmenu.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 mhmenu.c $Date$ $Revision$ */
/* NetHack 3.5 mhmenu.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 mhmenu.c $Date: 2012/01/11 01:53:44 $ $Revision: 1.36 $ */
/* Copyright (c) Alex Kompel, 2002 */
/* NetHack may be freely redistributed. See license for details. */

3
win/win32/mhmenu.h
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 mhmenu.h $Date$ $Revision$ */
/* NetHack 3.5 mhmenu.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 mhmenu.h $Date: 2009/05/06 11:00:00 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)mhmenu.h 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

3
win/win32/mhmsg.h
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 mhmsg.h $Date$ $Revision$ */
/* NetHack 3.5 mhmsg.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 mhmsg.h $Date: 2009/05/06 11:00:00 $ $Revision: 1.9 $ */
/* SCCS Id: @(#)mhmsg.h 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

3
win/win32/mhmsgwnd.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 mhmsgwnd.c $Date$ $Revision$ */
/* NetHack 3.5 mhmsgwnd.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 mhmsgwnd.c $Date: 2012/01/11 01:45:02 $ $Revision: 1.25 $ */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

3
win/win32/mhmsgwnd.h
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 mhmsgwnd.h $Date$ $Revision$ */
/* NetHack 3.5 mhmsgwnd.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 mhmsgwnd.h $Date: 2009/05/06 11:00:10 $ $Revision: 1.5 $ */
/* SCCS Id: @(#)mhmsgwnd.h 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

3
win/win32/mhrip.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 mhrip.c $Date$ $Revision$ */
/* NetHack 3.5 mhrip.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 mhrip.c $Date: 2012/01/11 01:45:02 $ $Revision: 1.13 $ */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

3
win/win32/mhrip.h
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 mhrip.h $Date$ $Revision$ */
/* NetHack 3.5 mhrip.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 mhrip.h $Date: 2009/05/06 11:00:15 $ $Revision: 1.6 $ */
/* SCCS Id: @(#)mhrip.h 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

3
win/win32/mhsplash.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 mhsplash.c $Date$ $Revision$ */
/* NetHack 3.5 mhsplash.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 mhsplash.c $Date: 2012/01/11 01:15:37 $ $Revision: 1.17 $ */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

4
win/win32/mhsplash.h
View File

@@ -1,5 +1,9 @@
/* Copyright (C) 2002 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */
/*
$NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
$Date: 2003/03/03 23:31:36 $ $Revision: 1.3 $
*/
#ifndef MSWINSplashWindow_h
#define MSWINSplashWindow_h

3
win/win32/mhstatus.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 mhstatus.c $Date$ $Revision$ */
/* NetHack 3.5 mhstatus.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 mhstatus.c $Date: 2012/01/11 01:45:02 $ $Revision: 1.14 $ */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

3
win/win32/mhstatus.h
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 mhstatus.h $Date$ $Revision$ */
/* NetHack 3.5 mhstatus.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 mhstatus.h $Date: 2009/05/06 11:00:19 $ $Revision: 1.5 $ */
/* SCCS Id: @(#)mhstatus.h 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

3
win/win32/mhtext.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 mhtext.c $Date$ $Revision$ */
/* NetHack 3.5 mhtext.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 mhtext.c $Date: 2012/01/11 01:53:44 $ $Revision: 1.17 $ */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

3
win/win32/mhtext.h
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 mhtext.h $Date$ $Revision$ */
/* NetHack 3.5 mhtext.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 mhtext.h $Date: 2009/05/06 11:00:26 $ $Revision: 1.5 $ */
/* SCCS Id: @(#)mhtext.h 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

9
win/win32/mswproc.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 mswproc.c $Date$ $Revision$ */
/* NetHack 3.5 mswproc.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 mswproc.c $Date: 2012/01/24 04:26:33 $ $Revision: 1.71 $ */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */
@@ -801,14 +802,12 @@ void mswin_clear_nhwindow(winid wid)
(wid < MAXWINDOWS) &&
(GetNHApp()->windowlist[wid].win != NULL))
{
#ifdef REINCARNATION
if( GetNHApp()->windowlist[wid].type == NHW_MAP ) {
if( Is_rogue_level(&u.uz) )
mswin_map_mode(mswin_hwnd_from_winid(WIN_MAP), ROGUE_LEVEL_MAP_MODE);
else
mswin_map_mode(mswin_hwnd_from_winid(WIN_MAP), iflags.wc_map_mode);
}
#endif
SendMessage(
GetNHApp()->windowlist[wid].win,
@@ -1797,11 +1796,7 @@ void mswin_outrip(winid wid, int how, time_t when)
putstr(wid, 0, buf);
/* Put $ on stone */
#ifndef GOLDOBJ
Sprintf(buf, "%ld Au", u.ugold);
#else
Sprintf(buf, "%ld Au", done_money);
#endif
buf[STONE_LINE_LEN] = 0; /* It could be a *lot* of gold :-) */
putstr(wid, 0, buf);

3
win/win32/tiles.mak
View File

@@ -1,3 +1,6 @@
#$NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
#$Date: 2002/01/18 12:55:00 $ $Revision: 1.1 $
default: all
all: ..\win\win32\tiles.bmp

3
win/win32/winMS.h
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 winMS.h $Date$ $Revision$ */
/* NetHack 3.5 winMS.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 winMS.h $Date: 2012/01/24 04:26:33 $ $Revision: 1.28 $ */
/* SCCS Id: @(#)winMS.h 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

3
win/win32/winhack.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 winhack.c $Date$ $Revision$ */
/* NetHack 3.5 winhack.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 winhack.c $Date: 2009/05/06 11:00:43 $ $Revision: 1.32 $ */
/* SCCS Id: @(#)winhack.c 3.5 2006/04/01 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */