Commit Graph

6176 Commits

Author SHA1 Message Date
keni
774e6c2f6f Switch NHtext from "git branch" to "git symbolic-ref" to avoid corner cases. 2015-03-01 20:26:29 -05:00
nhmall
a609bda996 catch up fixes with some recent changes; also add 'community patch' section 2015-03-01 09:28:09 -05:00
Pasi Kallinen
d7c9abe0f8 Remove useless dungeon.def mangling 2015-03-01 14:33:03 +02:00
Pasi Kallinen
6c4c53bfd2 Remove mention of compile-time AUTOPICKUP_EXCEPTIONS 2015-03-01 12:03:51 +02:00
Pasi Kallinen
7cbd2fd592 Remove last mention of EXP_ON_BOTL 2015-03-01 10:26:24 +02:00
Pasi Kallinen
7754afd9fa Remove last mention of DUNGEON_OVERVIEW 2015-03-01 10:16:00 +02:00
Derek S. Ray
6ebb7db138 fix build order for nhdefkey, add to nhsetup
also minor cosmetics; clean up two warnings in Release mode,
turn off multi-processor, and fix /Oi /Oi- discrepancy
2015-02-28 22:56:03 -05:00
keni
91b96e2331 Change NHtext to double the speed of "git checkout" 2015-02-28 17:52:19 -05:00
nhmall
4794329e89 Ensure nethack.exe gets copied to binary folder after it is built 2015-02-28 13:17:55 -05:00
nhmall
5411039780 more work on getting nethack.exe to build along with nethackw.exe via VS 2015-02-28 11:44:08 -05:00
nhmall
1b980f34ac adjust project dependencies to ensure makedefs builds before nethack.exe 2015-02-28 00:52:00 -05:00
nhmall
796f6f85d0 VS 2013 build of NetHack.exe and also fix level file locking 2015-02-28 00:37:05 -05:00
Derek S. Ray
528e8b34e0 fix (hopefully) last few warnings; fix Release too
VS2013 _really_ doesn't like having shared directories for
any sort of intermediate files, and will generate a nice little
pile of useless warnings as a result.
2015-02-27 23:08:20 -05:00
Derek S. Ray
335bdeb042 clean up all the miscellaneous warnings
shared-intermediate-directory fixed
linker weirdness fixed
2015-02-27 22:26:59 -05:00
Derek S. Ray
b1a7bbbbdb pull in the recent unconditionals merge from master 2015-02-27 21:25:00 -05:00
Pasi Kallinen
b7537e0fbf Add new parameters to makedefs: --debug and --make
"makedefs --debug --make q" is equivalent to "makedefs -q" with
DEBUG defined.
2015-02-27 19:34:34 -05:00
Derek S. Ray
4dddb97301 remove and transfer INVISIBLE_OBJECTS to branch 2015-02-27 19:34:32 -05:00
Derek S. Ray
5ee52039ca Remove unused size from questpgr.c 2015-02-27 19:34:31 -05:00
Sean Hunt
17ea9ff9ab Fix some warnings on the unconditionals branch. 2015-02-27 19:34:31 -05:00
Sean Hunt
a3faa93403 Remove experimental Unicode support.
This reverts commit 7f0f43e6f9 and some related
subsequent commits.

This compiles, but I have not done extensive testing.

Conflicts:
	include/config.h
	include/decl.h
	include/extern.h
	include/global.h
	include/tradstdc.h
	include/wintty.h
	src/drawing.c
	src/files.c
	src/hacklib.c
	src/mapglyph.c
	src/options.c
	sys/winnt/nttty.c
	win/tty/getline.c
	win/tty/topl.c
	win/tty/wintty.c
2015-02-27 19:34:29 -05:00
Sean Hunt
7c09285a8c Make EXP_ON_BOTL unconditional. 2015-02-27 19:34:26 -05:00
Sean Hunt
0001534d04 Make REDO unconditional. 2015-02-27 19:33:52 -05:00
Sean Hunt
d218bedbf7 Make LOADSYMSETS unconditional.
There are some bugs here, but this functionality should make it into the release
in some form.
2015-02-27 19:33:51 -05:00
Sean Hunt
74e741bbbc Make AUTOPICKUP_EXCEPTIONS unconditional. 2015-02-27 19:33:50 -05:00
Sean Hunt
b138d380ea Make BARGETHROUGH unconditional. 2015-02-27 19:33:48 -05:00
Sean Hunt
6e9fa71b05 Make SEDUCE unconditional. 2015-02-27 19:33:48 -05:00
Pasi Kallinen
612852f7de Apply paxed's DEBUG patch to remove DEBUG/D_DEBUG.
Move debugging output into couple preprocessor defines, which
    are no-op without DEBUG.  To show debugging output from a
    certain source files, use sysconf:

    DEBUGFILES=dungeon.c questpgr.c

    Also fix couple debug lines which did not compile.

This also includes fixes due to Derek Ray to depugpline to work better
on other platforms.
2015-02-27 19:33:45 -05:00
Sean Hunt
ac108cd365 Make GOLDOBJ unconditional. 2015-02-27 19:33:40 -05:00
Sean Hunt
4f59f5c6fd Make WIZARD unconditional. 2015-02-27 19:33:22 -05:00
Sean Hunt
ad82ca80f3 Make DUNGEON_OVERVIEW unconditional. 2015-02-27 19:33:20 -05:00
Sean Hunt
1edadd1d48 Make REINCARNATION unconditional.
There is a lot of code affected by this, and Pat Rankin correctly
observes that it would be better to store roguelike as a level flag
rather than just using Is_rogue_level. A note for the future.
2015-02-27 19:33:16 -05:00
Sean Hunt
260f7ea860 Make TOURIST unconditional. 2015-02-27 19:33:12 -05:00
Sean Hunt
5ee71d2757 Make SINKS unconditional. 2015-02-27 19:33:06 -05:00
Sean Hunt
b066b7c170 Make KOPS unconditional. 2015-02-27 19:33:04 -05:00
Sean Hunt
9e65758947 Make STEED unconditional. 2015-02-27 19:33:01 -05:00
Sean Hunt
264dc66129 Make ELBERETH unconditional. 2015-02-27 19:32:53 -05:00
Derek S. Ray
7f0ff8f011 Make nhsetup smart enough to see VC2013, VC2010
Only detects Express editions for now until I can verify
what registry keys correspond to each set of full editions.
2015-02-27 18:14:10 -05:00
Derek S. Ray
f15a640120 remove old projects from root win/win32 directory 2015-02-27 16:06:47 -05:00
Derek S. Ray
2f8d6502fd Initial changes to support both VS2010 and VS2013
Mostly it's just project formats, but VS2013 does require
parallel compilation to be turned off and synchronous
PDB writes to be turned on (since we reuse intermediate
output directories).

Cleaning that up is for some time in the future.
2015-02-27 16:00:58 -05:00
nhmall
e400723863 undo a set of code reverts in last commit 2015-02-26 22:48:32 -05:00
nhmall
e1dfe9c48a Roll back the win/win32 tree to the way it was before x64 attempt 2015-02-26 22:09:31 -05:00
Derek S. Ray
18ca81d963 token .gitignore change to differentiate branch 2015-02-26 21:57:47 -05:00
keni
7d9ea49e92 Another batch of manual header var additions 2015-02-26 17:43:47 -05:00
keni
0109f9715b A batch of manual header var additions. 2015-02-26 17:10:11 -05:00
keni
b598c83767 Update .gitignore files. 2015-02-26 16:35:55 -05:00
keni
971ff1d4f3 Fix lost mode bits. 2015-02-26 09:22:52 -05:00
keni
03140969ee Bulk recovery of file CVS headers and addition of NHDT- headers. 2015-02-26 09:19:03 -05:00
keni
9480f880c4 Add .gitattribute files. 2015-02-26 08:54:12 -05:00
Pasi Kallinen
ce0665cd15 Add a missing break
Stepping on a magic trap while riding could delete the trap and
make the deleted trap hit the steed.
2015-02-20 20:26:46 +02:00
Sean Hunt
0d9ae1d293 Add fixes notes for the recent lava changes. 2015-02-20 12:59:45 -05:00