Commit Graph

4145 Commits

Author SHA1 Message Date
Derek S. Ray
3e94fa63c7 get rid of code-analysis clutter 2015-03-15 13:44:26 -04:00
nhmall
00efbc5f8c cmd line Makefile should work on VS2010 and up 2015-03-14 12:29:27 -04:00
nhmall
285eea5bf2 one Makefile for all VS versions 2015-03-11 08:43:17 -04: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
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
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
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
Sean Hunt
a3b1cb8432 Remove the 'nul' variable. 2015-02-18 23:51:31 -05:00
Sean Hunt
72c2ae233d Clean up lava messages a little.
This change has two parts.

First, the Book of the Dead now has a special message in lava. This was
originally added by Steve Melenchuk (aka Grunt) as a precaution against the Book
burning up. While I'm pretty sure that the Book can't burn up in the current
codepath, the message is a nice touch and it doesn't help to add a safety check.

Second, always print the inventory destruction messages. The reason for this is
fairly subtle, but relates to the timing. By not printing the messages when
dying, the visible effect to the player is that if they have lifesaving, the
items burn up before they die, but if they do not, they burn up after they
die---the fact that they do burn up is visible in the dump or bonesfile.
2015-02-18 23:24:41 -05:00
Sean Hunt
ad4f3fc0fe Clean up the lava code a little. 2015-02-18 23:19:23 -05:00
Sean Hunt
d34bc6fd73 Destroy water walking boots on lava first.
This avoids a player being left standing on lava if their boots are burned up and
they survive the damage.

This change is originally due to Steve Melenchuk, fixed up by Derrick Sund.
2015-02-18 23:05:37 -05:00
Sean Hunt
ca6bbf8bc3 Fix warning with verbalize1 2015-02-18 21:48:34 -05:00
Pasi Kallinen
2bf54fd893 Fix the X11 hints file. 2015-02-17 16:54:38 +02:00
keni
bbfb2a4623 Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-02-16 08:58:20 -05:00
keni
5dda2afd32 Fix bug: NHtext adds a space to a substitution value.
Add support for debugging from the command line.
2015-02-16 08:53:52 -05:00
Sean Hunt
7e93cadc1c Replace && with & in blindness timeout check.
Caught by clang.
2015-02-16 00:24:05 -05:00
Sean Hunt
862d32c2ec Fix a few compiler (clang) warnings. 2015-02-16 00:23:48 -05:00
Derek S. Ray
d34bab1509 more win32-specific pieces 2015-02-15 14:45:36 -05:00
keni
3266234ecc Convert mdgrep from cvs to git. 2015-02-13 20:32:09 -05:00
keni
b7ea921ea0 Set up mdgrep for git instead of cvs. 2015-02-13 17:54:15 -05:00
keni
aed830f493 Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-02-13 17:37:36 -05:00
keni
b87b568f72 Typo 2015-02-13 17:37:06 -05:00
Pasi Kallinen
a55bef240c Typofix. 2015-02-13 22:32:33 +02:00
Derek
f5089838c1 Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-02-13 13:29:23 -05:00
Derek
bae3c6088f Exclude all the Win32 build artifacts (Studio and otherwise)
Squashed commit of the following:

commit e37c7626f035a29321c9ac12cca83a0af2132abb
commit 86ebb3e66aedb6b5a31d61d57c39cf84c12d2276
commit 6cd677c8fca4102f223fb1708d00a65c2ded6658
Author: Derek <derekray@gmail.com>
Date:   Fri Feb 13 13:24:29 2015 -0500
2015-02-13 13:26:05 -05:00
keni
b312870522 Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-02-13 11:54:28 -05:00
keni
8c7b6cd110 add another note about executable scripts 2015-02-13 11:54:04 -05:00
keni
5404e9d253 add note about making PRE file executable 2015-02-13 11:52:29 -05:00
Sean Hunt
967364b6ed +x .sh files in unix dir; ignore Makefiles 2015-02-13 11:39:37 -05:00
keni
b3c8089e55 .git* cleanup tids 2015-02-12 16:39:51 -05:00
keni
a0315f3f34 add DEVEL to the directory list 2015-02-11 20:24:14 -05:00
keni
34221670bc initial git setup 2015-02-11 19:42:57 -05:00
nethack.rankin
5cc7f32044 retouch_equipment() bypass handling
Simplify retouch_equipment (post-3.4.3.code, called when hero
changes alignment or turns into a silver-hating critter; inventory
traversal must cope with the possibility of losing object->nobj when
processing object) by switching to recently added object->bypass code.
2013-11-07 01:03:16 +00:00
nethack.rankin
e8e291b018 fix #H3039 - panic() when trying to drop destroyed items
From a bug report, dropping a lit
(burning) potion of oil while levitating can produce an explosion which can
destroy inventory.  If in the process of dropping multiple items, the ones
after the oil might be gone, resulting in use of stale pointers and possibly
triggering an "extract_nobj: object lost" panic or even a crash.  While
testing my fix, I discovered that being killed by an exploding potion of oil
could produce an "object_is_local" panic if bones are saved  (and reproduced
with unmodified 3.4.3).
2013-11-05 00:57:56 +00:00
nethack.rankin
d7a467fff1 fix #H3033 - Crash upon teleport onto a sink while equipping levitation boots
From a bug report, being teleported onto
a sink while busy putting on levitation boots triggered a crash when
Boots_on() was called (as '(*aftermv)()' on the next turn) because
'uarmf' would be null by then.  Not mentioned, but the same problem was
encountered by Boots_off() if the teleport happened while you were busy
taking boots off.  It could be fixed by having having dosinkfall() call
cancel_don() if donning(uarmf) yields true, but this patch does a little
more than that:  cancel donning/doffing of any multi-turn armor if you
fall onto a sink.  It also prevents you from falling if you end up
flying (which will have been blocked while levitating).

     The situation when putting on levitation boots has a sequencing
issue:  setworn() causes you to be flagged as levitating immediately,
but the float_up() feedback doesn't occur until Boots_on() gets called
a turn later.  Teleporting to the sink will tell you that you crash
onto the sink and and that you stop putting on boots, without having
been told that you've floated up into the air.  It's suboptimal but it
doesn't seem to actually be incorrect.
2013-10-26 21:33:47 +00:00
nethack.rankin
c9fc8fcc09 Magicbane grammar
After newsgroup discussion of C343-162, I noticed that it had fixed
the verb usage in the message for confused and/or stunned, but not in the
one for resisting.  (If a monster name ends in 's', or it has been named
"you", 3.4.3 used the wrong verb because vtense() was fooled about plural
or second person.)  No new fixes entry needed....
2013-03-17 00:17:18 +00:00
nethack.rankin
fec8981102 poly'd hero hiding feedback
When hiding as a monster, say so during the #monster command and
also list being hidden in the status section of enlightenment/^X.

     Also, prevent hiding on the floor or ceiling on the planes of air
and water.  (Didn't apply to monsters, who only hide on ROOM spots.)

     Half the change to dohide() is just revised indentation.
2013-03-16 01:44:28 +00:00
nethack.rankin
0a86304023 flying into pits
In the newsgroup recently, someone mentioned that when polymorphed into
a flying monster, he couldn't retrieve items out of pits, even with the '>'
command.  I thought that we had fixed that, but the fix apparently only
covered walk-through-wall creatures (xorns and earth elementals), not flyers
and ceiling clingers.  Now those can also deliberately enter pits via '>'.

     The fixes entry is in the new features section in order to be next to
the xorn one.  '>' at pit locations is new, but it handles something which
was missing so feels more like a bug fix than a new feature to me....
[Keni, the bug page entry C343-12 about '>' (for xorns?) is general enough
to cover this fix, so we don't need to add a new one for flyers.]
I noticed an unrelated fixes35.0 entry mentioning '>' which was duplicated;
this removes one of the copies.
2013-03-14 01:58:21 +00:00