pull in the recent unconditionals merge from master

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

3
sys/wince/.gitattributes vendored Normal file
View File

@@ -0,0 +1,3 @@
*.ce filter=NHtext merge=NHsubst
*.mak filter=NHtext merge=NHsubst
*.bat filter=NHtext merge=NHsubst

View File

@@ -4,7 +4,8 @@ NetHack may be freely redistributed. See license for details.
Instructions for compiling and installing
NetHack 3.5 on a Windows CE or PocketPC system
========================================================================
Last revision: $Date$
Last revision: $NHDT-Date$
Last revision: $Date: 2005/01/02 20:55:41 $
Credit for the porting of NetHack to Windows CE goes to Alex Kompel who
initially developed and contributed the port.

View File

@@ -1,4 +1,5 @@
# NetHack 3.5 bootstrp.mak $Date$ $Revision$
# NetHack 3.5 bootstrp.mak $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 bootstrp.mak $Date: 2012/01/10 17:47:33 $ $Revision: 1.10 $
# Copyright (c) Michael Allison
#
# NetHack Windows CE bootstrap file for MS Visual C++ V6.x and

View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 celib.c $Date$ $Revision$ */
/* NetHack 3.5 celib.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 celib.c $Date: 2009/10/22 02:59:30 $ $Revision: 1.6 $ */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

View File

@@ -1,4 +1,5 @@
@REM NetHack 3.5 cesetup.bat $Date$ $Revision$ */
@REM NetHack 3.5 cesetup.bat $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
@REM NetHack 3.5 cesetup.bat $Date: 2009/10/22 02:59:30 $ $Revision: 1.9 $ */
@REM Copyright (c) Alex Kompel, 2002
@REM NetHack may be freely redistributed. See license for details.
@REM Win32 nhsetup batch file, see Install.ce for details

View File

@@ -1,5 +1,7 @@
/* NetHack 3.5 cesound.c $Date$ $Revision$ */
/* SCCS Id: @(#)cesound.c 3.5 $Date$ */
/* NetHack 3.5 cesound.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 cesound.c $Date: 2009/05/06 10:52:00 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)cesound.c 3.5 $NHDT-Date$ */
/* SCCS Id: @(#)cesound.c 3.5 $Date: 2009/05/06 10:52:00 $ */
/* Copyright (c) NetHack PC Development Team 1993 */
/* NetHack may be freely redistributed. See license for details. */
/* */

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:52:00 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)mhaskyn.c 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

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:52:03 $ $Revision: 1.3 $ */
/* SCCS Id: @(#)mhaskyn.h 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 mhcmd.c $Date$ $Revision$ */
/* NetHack 3.5 mhcmd.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 mhcmd.c $Date: 2009/10/22 02:59:30 $ $Revision: 1.8 $ */
/* NetHack may be freely redistributed. See license for details. */
#include "winMS.h"
@@ -295,7 +296,6 @@ NHCmdPadCell cells_layout_lookup[NH_CMDPAD_CELLNUM] =
{ -1, "X", "X", 13, NH_CELL_LAYOUT_MENU, 1 , 0 }
};
#ifdef WIZARD
/* wizard mode layout */
NHCmdPadCell cells_layout_wizard[NH_CMDPAD_CELLNUM] =
{
@@ -312,7 +312,6 @@ NHCmdPadCell cells_layout_wizard[NH_CMDPAD_CELLNUM] =
{ -1, "", "", -NH_CMDPAD_FONT_NORMAL, NH_CELL_REG, 1, (void*)-1 },
{ -1, "X", "X", 13, NH_CELL_LAYOUT_MENU, 1 , 0 }
};
#endif
#else /* !WIN_CE_SMARTPHONE */
@@ -556,13 +555,11 @@ void register_command_window_class()
nhcmdlayout_init(plt, cells_layout_lookup);
nhcmdset_add(nhcmdset_current, plt);
#ifdef WIZARD
if( wizard ) {
plt = nhcmdlayout_create("Wizard Mode", NH_CMDPAD_ROWS, NH_CMDPAD_COLS);
nhcmdlayout_init(plt, cells_layout_wizard);
nhcmdset_add(nhcmdset_current, plt);
}
#endif
#else /* ! WIN_CE_SMARTPHONE */
plt = nhcmdlayout_create("lowercase", NH_CMDPAD_ROWS, NH_CMDPAD_COLS);

View File

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

View File

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

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: 2009/10/13 01:55:10 $ $Revision: 1.8 $ */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

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: 2009/05/06 10:52:06 $ $Revision: 1.3 $ */
/* SCCS Id: @(#)mhdlg.h 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

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:52:08 $ $Revision: 1.6 $ */
/* SCCS Id: @(#)mhfont.c 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

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:52:08 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)mhfont.h 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

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:52:10 $ $Revision: 1.5 $ */
/* SCCS Id: @(#)mhinput.c 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

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:52:10 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)mhinput.h 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

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: 2011/10/11 02:37:20 $ $Revision: 1.14 $ */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */
@@ -1052,9 +1053,7 @@ void mswin_select_map_mode(int mode)
#endif
/* 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) ) {

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:52:13 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)mhmain.h 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

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: 2009/10/13 01:55:11 $ $Revision: 1.10 $ */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */
@@ -568,12 +569,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);

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/10/13 01:55:12 $ $Revision: 1.6 $ */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

View File

@@ -1,4 +1,8 @@
/* NetHack may be freely redistributed. See license for details. */
/*
* $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
* $Date: 2002/07/22 03:19:13 $ $Revision: 1.1 $
*/
#ifndef MSWINMenuWindow_h
#define MSWINMenuWindow_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 10:52:21 $ $Revision: 1.3 $ */
/* SCCS Id: @(#)mhmsg.h 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

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: 2009/10/13 01:55:12 $ $Revision: 1.7 $ */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

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 10:52:26 $ $Revision: 1.3 $ */
/* SCCS Id: @(#)mhmsgwnd.h 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

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: 2009/05/06 10:52:26 $ $Revision: 1.5 $ */
/* SCCS Id: @(#)mhrip.c 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

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 10:52:28 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)mhrip.h 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 mhstatus.c $Date$ $Revision$ */
/* NetHack 3.5 mhstatus.c $NHDT-Date: 1425083082 2015/02/28 00:24:42 $ $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.8 $ */
/* NetHack 3.5 mhstatus.c $Date: 2009/05/06 10:52:28 $ $Revision: 1.7 $ */
/* SCCS Id: @(#)mhstatus.c 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */
@@ -232,19 +233,13 @@ void FormatStatusString(char* text, int format)
(void) describe_level(nb=eos(nb));
Sprintf(nb = eos(nb),
"%c:%-2ld HP:%d(%d) Pw:%d(%d) AC:%-2d", showsyms[COIN_CLASS + SYM_OFF_O],
#ifndef GOLDOBJ
u.ugold,
#else
money_cnt(invent),
#endif
hp, hpmax, u.uen, u.uenmax, u.uac);
if (Upolyd)
Sprintf(nb = eos(nb), " HD:%d", mons[u.umonnum].mlevel);
#ifdef EXP_ON_BOTL
else if(flags.showexp)
Sprintf(nb = eos(nb), " Xp:%u/%-1ld", u.ulevel,u.uexp);
#endif
else
Sprintf(nb = eos(nb), " Exp:%u", u.ulevel);
if( format==NHSTAT_LINES_4 ) strcat(text, "\r\n");

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 10:52:29 $ $Revision: 1.3 $ */
/* SCCS Id: @(#)mhstatus.h 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

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: 2009/10/22 02:59:34 $ $Revision: 1.8 $ */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

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 10:52:32 $ $Revision: 1.3 $ */
/* SCCS Id: @(#)mhtext.h 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 mhtxtbuf.c $Date$ $Revision$ */
/* NetHack 3.5 mhtxtbuf.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 mhtxtbuf.c $Date: 2009/10/13 01:55:12 $ $Revision: 1.6 $ */
/* Copyright (C) 2003 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 mhtxtbuf.h $Date$ $Revision$ */
/* NetHack 3.5 mhtxtbuf.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 mhtxtbuf.h $Date: 2009/10/13 01:55:12 $ $Revision: 1.5 $ */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

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:22 $ $Revision: 1.19 $ */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */
@@ -792,14 +793,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,

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:22 $ $Revision: 1.9 $ */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */

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/10/22 02:59:35 $ $Revision: 1.11 $ */
/* Copyright (C) 2001 by Alex Kompel */
// winhack.cpp : Defines the entry point for the application.
//
@@ -339,10 +340,8 @@ register char *s;
void win32_abort()
{
#ifdef WIZARD
if (wizard)
DebugBreak();
#endif
abort();
}

View File

@@ -1,4 +1,7 @@
// winmain.cpp : Defines the entry point for the application.
//
// $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
// $Date: 2002/12/18 03:51:34 $ $Revision: 1.2 $
#include "winMS.h"
#include <string.h>