Merge branch 'master' into derek-farming

* master: (160 commits)
  Add doors correctly
  bug fixes for nhsub
  Generate oracle monsters after subroom
  Generate minetown guards after subrooms
  ...

Conflicts:
	src/do.c
	src/files.c
	src/hack.c
	src/mon.c
	src/vision.c

sys/amiga/.gitattributes

@@ -1 +1 @@
-*.p filter=NHtext merge=NHsubst
+*.p NHSUBST

sys/mac/.gitattributes

@@ -1 +1 @@
-NHDeflts filter=NHtext merge=NHsubst
+NHDeflts NHSUBST

sys/msdos/.gitattributes

@@ -1,4 +1,4 @@
-*.BC filter=NHtext merge=NHsubst
-*.bat filter=NHtext merge=NHsubst
-Makefile.* filter=NHtext merge=NHsubst
-Install.* filter=NHtext merge=NHsubst
+*.BC NHSUBST
+*.bat NHSUBST
+Makefile.* NHSUBST
+Install.* NHSUBST

sys/os2/.gitattributes

@@ -1 +1 @@
-Makefile.* filter=NHtext merge=NHsubst
+Makefile.* NHSUBST

sys/share/.gitattributes

@@ -1 +1 @@
-Makefile.* filter=NHtext merge=NHsubst
+Makefile.* NHSUBST

sys/share/lev_comp.h

@@ -1,79 +1,453 @@
-#define CHAR 257
-#define INTEGER 258
-#define BOOLEAN 259
-#define PERCENT 260
-#define MESSAGE_ID 261
-#define MAZE_ID 262
-#define LEVEL_ID 263
-#define LEV_INIT_ID 264
-#define GEOMETRY_ID 265
-#define NOMAP_ID 266
-#define OBJECT_ID 267
-#define COBJECT_ID 268
-#define MONSTER_ID 269
-#define TRAP_ID 270
-#define DOOR_ID 271
-#define DRAWBRIDGE_ID 272
-#define MAZEWALK_ID 273
-#define WALLIFY_ID 274
-#define REGION_ID 275
-#define FILLING 276
-#define RANDOM_OBJECTS_ID 277
-#define RANDOM_MONSTERS_ID 278
-#define RANDOM_PLACES_ID 279
-#define ALTAR_ID 280
-#define LADDER_ID 281
-#define STAIR_ID 282
-#define NON_DIGGABLE_ID 283
-#define NON_PASSWALL_ID 284
-#define ROOM_ID 285
-#define PORTAL_ID 286
-#define TELEPRT_ID 287
-#define BRANCH_ID 288
-#define LEV 289
-#define CHANCE_ID 290
-#define CORRIDOR_ID 291
-#define GOLD_ID 292
-#define ENGRAVING_ID 293
-#define FOUNTAIN_ID 294
-#define POOL_ID 295
-#define SINK_ID 296
-#define NONE 297
-#define RAND_CORRIDOR_ID 298
-#define DOOR_STATE 299
-#define LIGHT_STATE 300
-#define CURSE_TYPE 301
-#define ENGRAVING_TYPE 302
-#define DIRECTION 303
-#define RANDOM_TYPE 304
-#define O_REGISTER 305
-#define M_REGISTER 306
-#define P_REGISTER 307
-#define A_REGISTER 308
-#define ALIGNMENT 309
-#define LEFT_OR_RIGHT 310
-#define CENTER 311
-#define TOP_OR_BOT 312
-#define ALTAR_TYPE 313
-#define UP_OR_DOWN 314
-#define SUBROOM_ID 315
-#define NAME_ID 316
-#define FLAGS_ID 317
-#define FLAG_TYPE 318
-#define MON_ATTITUDE 319
-#define MON_ALERTNESS 320
-#define MON_APPEARANCE 321
-#define CONTAINED 322
-#define STRING 323
-#define MAP_ID 324
-typedef union
+/* A Bison parser, made by GNU Bison 3.0.2.  */
+
+/* Bison interface for Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+#ifndef YY_YY_Y_TAB_H_INCLUDED
+# define YY_YY_Y_TAB_H_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int yydebug;
+#endif
+
+/* Token type.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+  enum yytokentype
+  {
+    CHAR = 258,
+    INTEGER = 259,
+    BOOLEAN = 260,
+    PERCENT = 261,
+    SPERCENT = 262,
+    MINUS_INTEGER = 263,
+    PLUS_INTEGER = 264,
+    MAZE_GRID_ID = 265,
+    SOLID_FILL_ID = 266,
+    MINES_ID = 267,
+    ROGUELEV_ID = 268,
+    MESSAGE_ID = 269,
+    MAZE_ID = 270,
+    LEVEL_ID = 271,
+    LEV_INIT_ID = 272,
+    GEOMETRY_ID = 273,
+    NOMAP_ID = 274,
+    OBJECT_ID = 275,
+    COBJECT_ID = 276,
+    MONSTER_ID = 277,
+    TRAP_ID = 278,
+    DOOR_ID = 279,
+    DRAWBRIDGE_ID = 280,
+    object_ID = 281,
+    monster_ID = 282,
+    terrain_ID = 283,
+    MAZEWALK_ID = 284,
+    WALLIFY_ID = 285,
+    REGION_ID = 286,
+    FILLING = 287,
+    IRREGULAR = 288,
+    JOINED = 289,
+    ALTAR_ID = 290,
+    LADDER_ID = 291,
+    STAIR_ID = 292,
+    NON_DIGGABLE_ID = 293,
+    NON_PASSWALL_ID = 294,
+    ROOM_ID = 295,
+    PORTAL_ID = 296,
+    TELEPRT_ID = 297,
+    BRANCH_ID = 298,
+    LEV = 299,
+    MINERALIZE_ID = 300,
+    CORRIDOR_ID = 301,
+    GOLD_ID = 302,
+    ENGRAVING_ID = 303,
+    FOUNTAIN_ID = 304,
+    POOL_ID = 305,
+    SINK_ID = 306,
+    NONE = 307,
+    RAND_CORRIDOR_ID = 308,
+    DOOR_STATE = 309,
+    LIGHT_STATE = 310,
+    CURSE_TYPE = 311,
+    ENGRAVING_TYPE = 312,
+    DIRECTION = 313,
+    RANDOM_TYPE = 314,
+    RANDOM_TYPE_BRACKET = 315,
+    A_REGISTER = 316,
+    ALIGNMENT = 317,
+    LEFT_OR_RIGHT = 318,
+    CENTER = 319,
+    TOP_OR_BOT = 320,
+    ALTAR_TYPE = 321,
+    UP_OR_DOWN = 322,
+    SUBROOM_ID = 323,
+    NAME_ID = 324,
+    FLAGS_ID = 325,
+    FLAG_TYPE = 326,
+    MON_ATTITUDE = 327,
+    MON_ALERTNESS = 328,
+    MON_APPEARANCE = 329,
+    ROOMDOOR_ID = 330,
+    IF_ID = 331,
+    ELSE_ID = 332,
+    TERRAIN_ID = 333,
+    HORIZ_OR_VERT = 334,
+    REPLACE_TERRAIN_ID = 335,
+    EXIT_ID = 336,
+    SHUFFLE_ID = 337,
+    QUANTITY_ID = 338,
+    BURIED_ID = 339,
+    LOOP_ID = 340,
+    FOR_ID = 341,
+    TO_ID = 342,
+    SWITCH_ID = 343,
+    CASE_ID = 344,
+    BREAK_ID = 345,
+    DEFAULT_ID = 346,
+    ERODED_ID = 347,
+    TRAPPED_ID = 348,
+    RECHARGED_ID = 349,
+    INVIS_ID = 350,
+    GREASED_ID = 351,
+    FEMALE_ID = 352,
+    CANCELLED_ID = 353,
+    REVIVED_ID = 354,
+    AVENGE_ID = 355,
+    FLEEING_ID = 356,
+    BLINDED_ID = 357,
+    PARALYZED_ID = 358,
+    STUNNED_ID = 359,
+    CONFUSED_ID = 360,
+    SEENTRAPS_ID = 361,
+    ALL_ID = 362,
+    MONTYPE_ID = 363,
+    GRAVE_ID = 364,
+    ERODEPROOF_ID = 365,
+    FUNCTION_ID = 366,
+    MSG_OUTPUT_TYPE = 367,
+    COMPARE_TYPE = 368,
+    UNKNOWN_TYPE = 369,
+    rect_ID = 370,
+    fillrect_ID = 371,
+    line_ID = 372,
+    randline_ID = 373,
+    grow_ID = 374,
+    selection_ID = 375,
+    flood_ID = 376,
+    rndcoord_ID = 377,
+    circle_ID = 378,
+    ellipse_ID = 379,
+    filter_ID = 380,
+    complement_ID = 381,
+    gradient_ID = 382,
+    GRADIENT_TYPE = 383,
+    LIMITED = 384,
+    HUMIDITY_TYPE = 385,
+    STRING = 386,
+    MAP_ID = 387,
+    NQSTRING = 388,
+    VARSTRING = 389,
+    CFUNC = 390,
+    CFUNC_INT = 391,
+    CFUNC_STR = 392,
+    CFUNC_COORD = 393,
+    CFUNC_REGION = 394,
+    VARSTRING_INT = 395,
+    VARSTRING_INT_ARRAY = 396,
+    VARSTRING_STRING = 397,
+    VARSTRING_STRING_ARRAY = 398,
+    VARSTRING_VAR = 399,
+    VARSTRING_VAR_ARRAY = 400,
+    VARSTRING_COORD = 401,
+    VARSTRING_COORD_ARRAY = 402,
+    VARSTRING_REGION = 403,
+    VARSTRING_REGION_ARRAY = 404,
+    VARSTRING_MAPCHAR = 405,
+    VARSTRING_MAPCHAR_ARRAY = 406,
+    VARSTRING_MONST = 407,
+    VARSTRING_MONST_ARRAY = 408,
+    VARSTRING_OBJ = 409,
+    VARSTRING_OBJ_ARRAY = 410,
+    VARSTRING_SEL = 411,
+    VARSTRING_SEL_ARRAY = 412,
+    METHOD_INT = 413,
+    METHOD_INT_ARRAY = 414,
+    METHOD_STRING = 415,
+    METHOD_STRING_ARRAY = 416,
+    METHOD_VAR = 417,
+    METHOD_VAR_ARRAY = 418,
+    METHOD_COORD = 419,
+    METHOD_COORD_ARRAY = 420,
+    METHOD_REGION = 421,
+    METHOD_REGION_ARRAY = 422,
+    METHOD_MAPCHAR = 423,
+    METHOD_MAPCHAR_ARRAY = 424,
+    METHOD_MONST = 425,
+    METHOD_MONST_ARRAY = 426,
+    METHOD_OBJ = 427,
+    METHOD_OBJ_ARRAY = 428,
+    METHOD_SEL = 429,
+    METHOD_SEL_ARRAY = 430,
+    DICE = 431
+  };
+#endif
+/* Tokens.  */
+#define CHAR 258
+#define INTEGER 259
+#define BOOLEAN 260
+#define PERCENT 261
+#define SPERCENT 262
+#define MINUS_INTEGER 263
+#define PLUS_INTEGER 264
+#define MAZE_GRID_ID 265
+#define SOLID_FILL_ID 266
+#define MINES_ID 267
+#define ROGUELEV_ID 268
+#define MESSAGE_ID 269
+#define MAZE_ID 270
+#define LEVEL_ID 271
+#define LEV_INIT_ID 272
+#define GEOMETRY_ID 273
+#define NOMAP_ID 274
+#define OBJECT_ID 275
+#define COBJECT_ID 276
+#define MONSTER_ID 277
+#define TRAP_ID 278
+#define DOOR_ID 279
+#define DRAWBRIDGE_ID 280
+#define object_ID 281
+#define monster_ID 282
+#define terrain_ID 283
+#define MAZEWALK_ID 284
+#define WALLIFY_ID 285
+#define REGION_ID 286
+#define FILLING 287
+#define IRREGULAR 288
+#define JOINED 289
+#define ALTAR_ID 290
+#define LADDER_ID 291
+#define STAIR_ID 292
+#define NON_DIGGABLE_ID 293
+#define NON_PASSWALL_ID 294
+#define ROOM_ID 295
+#define PORTAL_ID 296
+#define TELEPRT_ID 297
+#define BRANCH_ID 298
+#define LEV 299
+#define MINERALIZE_ID 300
+#define CORRIDOR_ID 301
+#define GOLD_ID 302
+#define ENGRAVING_ID 303
+#define FOUNTAIN_ID 304
+#define POOL_ID 305
+#define SINK_ID 306
+#define NONE 307
+#define RAND_CORRIDOR_ID 308
+#define DOOR_STATE 309
+#define LIGHT_STATE 310
+#define CURSE_TYPE 311
+#define ENGRAVING_TYPE 312
+#define DIRECTION 313
+#define RANDOM_TYPE 314
+#define RANDOM_TYPE_BRACKET 315
+#define A_REGISTER 316
+#define ALIGNMENT 317
+#define LEFT_OR_RIGHT 318
+#define CENTER 319
+#define TOP_OR_BOT 320
+#define ALTAR_TYPE 321
+#define UP_OR_DOWN 322
+#define SUBROOM_ID 323
+#define NAME_ID 324
+#define FLAGS_ID 325
+#define FLAG_TYPE 326
+#define MON_ATTITUDE 327
+#define MON_ALERTNESS 328
+#define MON_APPEARANCE 329
+#define ROOMDOOR_ID 330
+#define IF_ID 331
+#define ELSE_ID 332
+#define TERRAIN_ID 333
+#define HORIZ_OR_VERT 334
+#define REPLACE_TERRAIN_ID 335
+#define EXIT_ID 336
+#define SHUFFLE_ID 337
+#define QUANTITY_ID 338
+#define BURIED_ID 339
+#define LOOP_ID 340
+#define FOR_ID 341
+#define TO_ID 342
+#define SWITCH_ID 343
+#define CASE_ID 344
+#define BREAK_ID 345
+#define DEFAULT_ID 346
+#define ERODED_ID 347
+#define TRAPPED_ID 348
+#define RECHARGED_ID 349
+#define INVIS_ID 350
+#define GREASED_ID 351
+#define FEMALE_ID 352
+#define CANCELLED_ID 353
+#define REVIVED_ID 354
+#define AVENGE_ID 355
+#define FLEEING_ID 356
+#define BLINDED_ID 357
+#define PARALYZED_ID 358
+#define STUNNED_ID 359
+#define CONFUSED_ID 360
+#define SEENTRAPS_ID 361
+#define ALL_ID 362
+#define MONTYPE_ID 363
+#define GRAVE_ID 364
+#define ERODEPROOF_ID 365
+#define FUNCTION_ID 366
+#define MSG_OUTPUT_TYPE 367
+#define COMPARE_TYPE 368
+#define UNKNOWN_TYPE 369
+#define rect_ID 370
+#define fillrect_ID 371
+#define line_ID 372
+#define randline_ID 373
+#define grow_ID 374
+#define selection_ID 375
+#define flood_ID 376
+#define rndcoord_ID 377
+#define circle_ID 378
+#define ellipse_ID 379
+#define filter_ID 380
+#define complement_ID 381
+#define gradient_ID 382
+#define GRADIENT_TYPE 383
+#define LIMITED 384
+#define HUMIDITY_TYPE 385
+#define STRING 386
+#define MAP_ID 387
+#define NQSTRING 388
+#define VARSTRING 389
+#define CFUNC 390
+#define CFUNC_INT 391
+#define CFUNC_STR 392
+#define CFUNC_COORD 393
+#define CFUNC_REGION 394
+#define VARSTRING_INT 395
+#define VARSTRING_INT_ARRAY 396
+#define VARSTRING_STRING 397
+#define VARSTRING_STRING_ARRAY 398
+#define VARSTRING_VAR 399
+#define VARSTRING_VAR_ARRAY 400
+#define VARSTRING_COORD 401
+#define VARSTRING_COORD_ARRAY 402
+#define VARSTRING_REGION 403
+#define VARSTRING_REGION_ARRAY 404
+#define VARSTRING_MAPCHAR 405
+#define VARSTRING_MAPCHAR_ARRAY 406
+#define VARSTRING_MONST 407
+#define VARSTRING_MONST_ARRAY 408
+#define VARSTRING_OBJ 409
+#define VARSTRING_OBJ_ARRAY 410
+#define VARSTRING_SEL 411
+#define VARSTRING_SEL_ARRAY 412
+#define METHOD_INT 413
+#define METHOD_INT_ARRAY 414
+#define METHOD_STRING 415
+#define METHOD_STRING_ARRAY 416
+#define METHOD_VAR 417
+#define METHOD_VAR_ARRAY 418
+#define METHOD_COORD 419
+#define METHOD_COORD_ARRAY 420
+#define METHOD_REGION 421
+#define METHOD_REGION_ARRAY 422
+#define METHOD_MAPCHAR 423
+#define METHOD_MAPCHAR_ARRAY 424
+#define METHOD_MONST 425
+#define METHOD_MONST_ARRAY 426
+#define METHOD_OBJ 427
+#define METHOD_OBJ_ARRAY 428
+#define METHOD_SEL 429
+#define METHOD_SEL_ARRAY 430
+#define DICE 431
+
+/* Value type.  */
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE YYSTYPE;
+union YYSTYPE
 {
-	int	i;
+#line 148 "lev_comp.y" /* yacc.c:1909  */
+
+	long	i;
 	char*	map;
 	struct {
-		xchar room;
-		xchar wall;
-		xchar door;
+		long room;
+		long wall;
+		long door;
 	} corpos;
-} YYSTYPE;
+    struct {
+	long area;
+	long x1;
+	long y1;
+	long x2;
+	long y2;
+    } lregn;
+    struct {
+	long x;
+	long y;
+    } crd;
+    struct {
+	long ter;
+	long lit;
+    } terr;
+    struct {
+	long height;
+	long width;
+    } sze;
+    struct {
+	long die;
+	long num;
+    } dice;
+    struct {
+	long cfunc;
+	char *varstr;
+    } meth;
+
+#line 443 "y.tab.h" /* yacc.c:1909  */
+};
+# define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+
 extern YYSTYPE yylval;
+
+int yyparse (void);
+
+#endif /* !YY_YY_Y_TAB_H_INCLUDED  */

sys/unix/.gitattributes

@@ -1 +1 @@
-Makefile.* filter=NHtext merge=NHsubst
+Makefile.* NHSUBST

sys/unix/hints/.gitattributes

@@ -1 +1 @@
-* filter=NHtext merge=NHsubst
+* NHSUBST

sys/unix/sysconf

@@ -14,6 +14,9 @@ WIZARDS=root games
 # Uses the same syntax as the WIZARDS option above.
 #SHELLERS=
 
+# Users allowed to use #exploremode. Same syntax as WIZARDS above.
+EXPLORERS=*
+
 # Show debugging information originating from these source files.
 # Use '*' for all, or list source files separated by spaces.
 # Only available if game has been compiled with DEBUG.

sys/vms/.gitattributes

@@ -1 +1 @@
-Makefile.* filter=NHtext merge=NHsubst
+Makefile.* NHSUBST

sys/wince/.gitattributes

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

sys/winnt/.gitattributes

@@ -1,4 +1,4 @@
-Install.nt filter=NHtext merge=NHsubst
-Makefile.* filter=NHtext merge=NHsubst
-*.rc filter=NHtext merge=NHsubst
-*.bat filter=NHtext merge=NHsubst
+Install.nt NHSUBST
+Makefile.* NHSUBST
+*.rc NHSUBST
+*.bat NHSUBST

sys/winnt/Makefile.msc

@@ -151,7 +151,7 @@ TARGET_CPU=x86
 #   -Zd  - generate only public symbols and line numbers for debugging
 #   -GS  - enable security checks
 #
-ccommon=-c $(CDBFLAG) -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -GS -c
+ccommon=-c -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -GS -c
 lflags=/INCREMENTAL:NO /NOLOGO
 
 !IF "$(TARGET_CPU)" == "x86"
@@ -195,10 +195,6 @@ guilibs     = $(winlibs)
 # Exe File Info.
 #==========================================
  
-#
-# For the level compiler bits,
-# we just defer to win\win32\dgnstuff.mak
-# and win\win32\levstuff.mak
 #        
 #
 # Optional high-quality BSD random number generation routines
@@ -271,44 +267,90 @@ DLBFLG =
 #==========================================
 #==========================================
 
-INCLDIR= /I..\include
+!IF "$(TARGET_CPU)" == ""
+TARGET_CPU=x86
+!ENDIF
+
+!IF "$(_NMAKE_VER)" == "10.00.40219.01"
+CL2013=
+!ELSE
+! IF ($(VSVER) > 2010)
+CL2013=-sdl
+! ENDIF
+!ENDIF
+
+ccommon= -c -nologo -D"_CONSOLE" -D"_CRT_NONSTDC_NO_DEPRECATE" -D"_CRT_SECURE_NO_DEPRECATE" \
+	-D"_LIB" -D"_SCL_SECURE_NO_DEPRECATE" -D"_VC80_UPGRADE=0x0600" -D"DLB" -D"_MBCS" \
+	-DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -D"NDEBUG" -D"YY_NO_UNISTD_H" -EHsc -fp:precise -Gd -GF -GS -Gy \
+	$(CL2013) -WX- -Zc:forScope -Zc:wchar_t -Zi
+cdebug= -analyze- -D"_DEBUG" -Gm -MTd -RTC1 -Od
+crelease= -analyze- -D"_MBCS" -errorReport:prompt -GL -Gm- -MT -O2 -Ot -Ox -Oy
+
+lcommon= /NOLOGO /INCREMENTAL:NO
 
 !IF "$(DEBUGINFO)" == "Y"
-CDBGFLAG=-Zi
-LDBGFLAG=/debug
-cdebug = -Zi -Od
 ldebug = /DEBUG
+cflags1=$(ccommon) $(cdebug)
+lflags1=$(lcommon) $(ldebug)
 !ELSE
-CDBGFLAG=
-LDBGFLAG=
-ldebug =
-cdebug =
+ldebug=
+cflags1=$(ccomon) $(crelease)
+lflags1=$(lcommon) $(ldebug)
 !ENDIF
 
-!IF ("$(ldebug)" != "")
-!IF ("$(ldebug)" != "/RELEASE")
-ldebug = /DEBUG
-!ENDIF
+lflags= $(lflags1)
+
+!IF "$(TARGET_CPU)" == "x86"
+cflags = $(cflags1) -D_X86_=1  -DWIN32 -D_WIN32 -W3
+scall  = -Gz
+
+!ELSEIF "$(TARGET_CPU)" == "x64"
+cflags = $(cflags1) -D_AMD64_=1 -DWIN64 -D_WIN64  -DWIN32 -D_WIN32 -W4
+scall  =
 !ENDIF
 
-!IF ("$(cdebug)" != "")
-!IF ("$(cdebug)" != "-Ox -DNDEBUG")
-cdebug = -Zi -Od
-!ENDIF
+!IF "$(_NMAKE_VER)" == "10.00.40219.01"
+cflags = $(cflags:-W4=-W3)
 !ENDIF
 
-cflags2 = $(cflags:-W4=-W3)
-#More verbose below
-#cflags2 = $(cflags) -wd4131
-#cflags2 = $(cflags:-W4=-Wall)
+#More verbose warning output options below
+#cflags = $(cflags:-W4=-wd4131
+#cflags = $(cflags:-W4=-Wall)
+#cflags = $(cflags:-W3=-wd4131
+#cflags = $(cflags:-W3=-Wall)
+
+# declarations for use on Intel x86 systems
+!IF "$(TARGET_CPU)" == "x86"
+DLLENTRY = @12
+!ENDIF
+
+# declarations for use on AMD64 systems
+!IF "$(TARGET_CPU)" == "x64"
+DLLENTRY =
+!ENDIF
+
+# for Windows applications
+conlflags = $(lflags) -subsystem:console,$(EXEVER)
+guilflags = $(lflags) -subsystem:windows,$(EXEVER)
+dlllflags = $(lflags) -entry:_DllMainCRTStartup$(DLLENTRY) -dll
+
+# basic subsystem specific libraries, less the C Run-Time
+baselibs    = kernel32.lib $(optlibs) $(winsocklibs) advapi32.lib
+winlibs     = $(baselibs) user32.lib gdi32.lib comdlg32.lib winspool.lib
+
+# for Windows applications that use the C Run-Time libraries
+conlibs     = $(baselibs)
+guilibs     = $(winlibs)
+#
+
+INCLDIR= /I..\include
 
 #==========================================
 # Util builds
 #==========================================
 
-cflagsUtil = $(cdebug) $(cflags2) $(INCLDIR) \
-	     $(WINPFLAG) $(DLBFLG)
-lflagsUtil = $(ldebug) $(lflags) $(conlibs)
+cflagsUtil = $(cflags) $(INCLDIR) $(WINPFLAG) $(DLBFLG)
+lflagsUtil = $(lflags) $(conlibs)
 
 #==========================================
 # - Game build
@@ -320,15 +362,13 @@ LIBS= user32.lib winmm.lib $(ZLIB)
 
 !IF ("$(GRAPHICAL)"=="Y")
 
-cflagsGame = $(cdebug) $(cflags2) $(guiflags) $(INCLDIR) \
-	     $(WINPFLAG) $(DLBFLG)
-lflagsGame = $(ldebug) $(lflags) $(guilibs) $(GAMEPDBFILE) $(GAMEMAPFILE)
+cflagsGame = $(cflags) $(guiflags) $(INCLDIR) $(WINPFLAG) $(DLBFLG)
+lflagsGame = $(lflags) $(guilibs) $(GAMEPDBFILE) $(GAMEMAPFILE)
 
 !ELSE
 
-cflagsGame = $(cdebug) $(cflags2) $(conflags) $(INCLDIR) \
-	     $(WINPFLAG) $(DLBFLG)
-lflagsGame = $(ldebug) $(lflags) $(conlibs) $(GAMEPDBFILE) $(GAMEMAPFILE)
+cflagsGame = $(cflags) $(conflags) $(INCLDIR) $(WINPFLAG) $(DLBFLG)
+lflagsGame = $(lflags) $(conlibs) $(GAMEPDBFILE) $(GAMEMAPFILE)
 
 !ENDIF
 
@@ -429,21 +469,15 @@ U  = $(UTIL)^\
 # Utility Objects.
 #
 
-MAKESRC        = $(U)makedefs.c
+MAKESRC       = $(U)makedefs.c
 
-MAKEOBJS       = $(O)makedefs.o $(O)monst.o $(O)objects.o
+MAKEOBJS      = $(O)makedefs.o $(O)monst.o $(O)objects.o
 
-#SPLEVOBJS      = $(O)lev_yacc.o	$(O)lev_lex.o	$(O)lev_main.o \
-#		 $(O)alloc.o	$(O)decl.o	$(O)drawing.o  \
-#		 $(O)monst.o	$(O)objects.o	$(O)panic.o
-
-SPLEVOBJS      = $(O)lev_yacc.o	$(O)lev_lex.o	$(O)lev_main.o \
-		 $(O)alloc.o	$(O)decl.o	$(O)drawing.o \
-		 $(O)monst.o	$(O)objects.o	$(O)panic.o
-
-DGNCOMPOBJS    = $(O)dgn_yacc.o	$(O)dgn_lex.o	$(O)dgn_main.o \
-		 $(O)alloc.o	$(O)panic.o
+LEVCOMPOBJS   = $(O)lev_yacc.o	$(O)lev_lex.o	$(O)lev_main.o	\
+		$(O)alloc.o $(O)decl.o	$(O)drawing.o	$(O)monst.o	$(O)objects.o	$(O)panic.o
 
+DGNCOMPOBJS   = $(O)dgn_yacc.o	$(O)dgn_lex.o	$(O)dgn_main.o	\
+		$(O)alloc.o	$(O)panic.o
 
 RECOVOBJS      = $(O)recover.o
 
@@ -703,7 +737,7 @@ $(NHRES): $(MSWSYS)\console.rc $(MSWSYS)\NetHack.ico
 
 $(GAMEFILE) : $(ALLOBJ) $(NHRES) $(O)gamedir.tag $(WINDLLS)
 	@if not exist $(GAMEDIR)\*.* mkdir $(GAMEDIR)
-	@echo Linking....
+	@echo Linking $@
 	$(link) $(lflagsGame) /STACK:2048 $(LIBS) $(COMCTRL) -out:$@ @<<$(GAME).lnk
 		$(ALLOBJ:^	=^
 		) $(NHRES)
@@ -781,12 +815,14 @@ $(GAMEDIR)\nhraykey.dll : $(O)$(@B).o $(O)gamedir.tag $(O)$(@B).def
 # Makedefs Stuff
 #==========================================
 $(U)nhsizes.exe: $(O)nhsizes.o
+	@echo Linking $@
 	$(link) $(lflagsUtil) -out:$@ $(O)nhsizes.o $(O)panic.o $(O)alloc.o
 
 $(O)nhsizes.o: $(CONFIG_H) nhsizes.c
 	@$(CC) $(cflagsUtil) -Fo$@ nhsizes.c
 
 $(U)makedefs.exe:	$(MAKEOBJS)
+	@echo Linking $@
 	@$(link) $(lflagsUtil) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ $(MAKEOBJS)
 
 $(O)makedefs.o: $(CONFIG_H)	$(INCL)\monattk.h $(INCL)\monflag.h   $(INCL)\objclass.h \
@@ -794,7 +830,7 @@ $(O)makedefs.o: $(CONFIG_H)	$(INCL)\monattk.h $(INCL)\monflag.h   $(INCL)\objcla
 		 $(U)makedefs.c
 	@if not exist $(OBJ)\*.* echo creating directory $(OBJ)
 	@if not exist $(OBJ)\*.* mkdir $(OBJ)
-	$(CC) $(cflagsUtil) -Fo$@ $(U)makedefs.c
+	@$(CC) $(cflagsUtil) -Fo$@ $(U)makedefs.c
 
 #
 #  date.h should be remade every time any of the source or include
@@ -835,6 +871,7 @@ $(DAT)\bogusmon: $(DAT)\bogusmon.txt $(U)makedefs.exe
 #==========================================
 
 $(U)uudecode.exe: $(O)uudecode.o
+	@echo Linking $@
 	@$(link) $(lflagsUtil) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ $(O)uudecode.o
 
 $(O)uudecode.o: $(SSYS)\uudecode.c
@@ -890,24 +927,20 @@ $(WIN32)\splash.bmp: $(U)uudecode.exe $(WIN32)\splash.uu
 $(U)lev_yacc.c $(INCL)\lev_comp.h: $(U)lev_comp.y
 	nmake -nologo -f ..\win\win32\levstuff.mak default
 
-LEVCFLAGS=-c -nologo -DWIN32 -D_WIN32 -I$(INCL) -nologo -Z7 -Od -DDLB
-
 $(O)lev_yacc.o: $(HACK_H)   $(SP_LEV_H) $(INCL)\lev_comp.h $(U)lev_yacc.c
-	$(CC) $(LEVCFLAGS) -W0 -Fo$@ $(U)lev_yacc.c
+	@$(CC) $(cflagsUtil) -Fo$@ $(U)lev_yacc.c
 
-$(O)lev_lex.o: $(HACK_H)   $(INCL)\lev_comp.h $(SP_LEV_H) \
+$(O)lev_lex.o: $(HACK_H) $(INCL)\lev_comp.h $(SP_LEV_H) \
                $(U)lev_lex.c
-	$(CC) $(LEVCFLAGS) -W0 -Fo$@ $(U)lev_lex.c
+	@$(CC) $(cflagsUtil) -Fo$@ $(U)lev_lex.c
 
-$(O)lev_main.o:	$(U)lev_main.c $(HACK_H)   $(SP_LEV_H)
-	$(CC) $(LEVCFLAGS) -W0 -Fo$@ $(U)lev_main.c
+$(O)lev_main.o:	$(U)lev_main.c $(HACK_H) $(SP_LEV_H)
+	@$(CC) $(cflagsUtil) -Fo$@ $(U)lev_main.c
 
-$(U)levcomp.exe: $(SPLEVOBJS)
-	@echo Linking $@...
-	echo $(link)
-	echo $(lflagsUtil)
-	$(link) $(lflagsUtil) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ @<<$(@B).lnk
- 		$(SPLEVOBJS:^	=^
+$(U)levcomp.exe: $(LEVCOMPOBJS)
+	@echo Linking $@
+	@$(link) $(lflagsUtil) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ @<<$(@B).lnk
+ 		$(LEVCOMPOBJS:^	=^
 		)
 <<
 
@@ -921,17 +954,17 @@ $(U)dgn_yacc.c $(INCL)\dgn_comp.h : $(U)dgn_comp.y
 	nmake -nologo -f ..\win\win32\dgnstuff.mak default
 
 $(O)dgn_yacc.o:	$(HACK_H)   $(DGN_FILE_H) $(INCL)\dgn_comp.h $(U)dgn_yacc.c
-	@$(CC) $(LEVCFLAGS) -W0 -Fo$@ $(U)dgn_yacc.c
+	@$(CC) $(cflagsUtil) -Fo$@ $(U)dgn_yacc.c
 
 $(O)dgn_lex.o: $(HACK_H)   $(DGN_FILE_H)  $(INCL)\dgn_comp.h \
 	$(U)dgn_lex.c
-	@$(CC) $(LEVCFLAGS) -W0 -Fo$@ $(U)dgn_lex.c
+	@$(CC) $(cflagsUtil) -Fo$@ $(U)dgn_lex.c
 
 $(O)dgn_main.o:	$(HACK_H) $(U)dgn_main.c
-	@$(CC) $(LEVCFLAGS) -W0 -Fo$@ $(U)dgn_main.c
+	@$(CC) $(cflagsUtil) -Fo$@ $(U)dgn_main.c
 
 $(U)dgncomp.exe: $(DGNCOMPOBJS)
-    @echo Linking $@...
+    	@echo Linking $@
 	@$(link) $(lflagsUtil) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ @<<$(@B).lnk
 		$(DGNCOMPOBJS:^	=^
 		)
@@ -989,6 +1022,7 @@ $(INCL)\win32api.h: $(MSWSYS)\win32api.h
 #==========================================
 
 $(U)dlb_main.exe: $(DLBOBJ) $(O)dlb.o
+	@echo Linking $@
 	@$(link) $(lflagsUtil) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ @<<$(@B).lnk
 		$(O)dlb_main.o
 		$(O)dlb.o
@@ -1038,10 +1072,11 @@ nhdat:	$(U)dlb_main.exe $(DAT)\data $(DAT)\oracles $(OPTIONS_FILE) \
 #==========================================
 
 $(U)recover.exe: $(RECOVOBJS)
+	@echo Linking $@
 	$(link) $(lflagsUtil) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ $(RECOVOBJS)
 
 $(O)recover.o: $(CONFIG_H) $(U)recover.c $(INCL)\win32api.h
-	$(CC) $(cflagsUtil) -Fo$@ $(U)recover.c
+	@$(CC) $(cflagsUtil) -Fo$@ $(U)recover.c
 
 #==========================================
 #  Tile Mapping
@@ -1052,6 +1087,7 @@ $(SRC)\tile.c: $(U)tilemap.exe
 	@$(U)tilemap
 
 $(U)tilemap.exe: $(O)tilemap.o
+	@echo Linking $@
 	@$(link) $(lflagsUtil) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ $(O)tilemap.o
 
 $(O)tilemap.o: $(WSHR)\tilemap.c $(HACK_H)
@@ -1083,7 +1119,7 @@ $(O)tilete32.o: $(WSHR)\tiletext.c  $(CONFIG_H) $(TILE_H)
 #==========================================
 
 $(U)gif2txt.exe: $(GIFREADERS) $(TEXT_IO)
-    @echo Linking $@...
+    	@echo Linking $@
 	@$(link) $(lflagsUtil) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ @<<$(@B).lnk
 		$(GIFREADERS:^	=^
 		)
@@ -1092,7 +1128,7 @@ $(U)gif2txt.exe: $(GIFREADERS) $(TEXT_IO)
 <<
 
 $(U)gif2tx32.exe: $(GIFREADERS32) $(TEXT_IO32)
-    @echo Linking $@...
+    	@echo Linking $@
 	@$(link) $(lflagsUtil) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ @<<$(@B).lnk
 		$(GIFREADERS32:^	=^
 		)
@@ -1101,7 +1137,7 @@ $(U)gif2tx32.exe: $(GIFREADERS32) $(TEXT_IO32)
 <<
 
 $(U)txt2ppm.exe: $(PPMWRITERS) $(TEXT_IO)
-    @echo Linking $@...
+    	@echo Linking $@
 	@$(link) $(lflagsUtil) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ @<<$(@B).lnk
 		$(PPMWRITERS:^	=^
 		)
@@ -1123,7 +1159,7 @@ $(TILEBMP32):
 !ENDIF
 
 $(U)tile2bmp.exe: $(O)tile2bmp.o $(TEXT_IO)
-    @echo Linking $@...
+    	@echo Linking $@
 	@$(link) $(lflagsUtil) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ @<<$(@B).lnk
 		$(O)tile2bmp.o
 		$(TEXT_IO:^  =^
@@ -1131,7 +1167,7 @@ $(U)tile2bmp.exe: $(O)tile2bmp.o $(TEXT_IO)
 <<
 
 $(U)til2bm32.exe: $(O)til2bm32.o $(TEXT_IO32)
-    @echo Linking $@...
+    	@echo Linking $@
 	@$(link) $(lflagsUtil) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ @<<$(@B).lnk
 		$(O)til2bm32.o
 		$(TEXT_IO32:^  =^