Commit Graph
100 Commits
Author SHA1 Message Date
nhmall bba7a6b44c fix Makefile build for Windows after recent changes
New code in nttty.c had a dependency on gdi32.lib. Previously
that was only being linked in for the gui build when using the
Makefile.

Move the reference into the base libraries if both tty and gui
depend on it now.
2017-10-28 09:53:27 -04:00
nhmall cadd123dc8 Merge branch 'NetHack-3.6.0' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.0 2017-10-04 19:58:42 -04:00
nhmall aac1d21255 reference the added file sys/msdos/vesa.h in Files 2017-10-04 19:57:31 -04:00
nhmall c60db38725 missed file in vesa inclusion back in 2016 2017-10-04 19:55:40 -04:00
nhmall 429288cac9 first build in a long while, clear up a warning
..\src\options.c(4005) : warning C4113: 'int (__cdecl *)()' differs in parameter lists from 'int (__cdecl *)(void)'
2017-10-04 12:21:05 -04:00
nhmall e3d2dfc7fb fix post-3.6.0 shopkeeper message when deaf 2016-03-07 18:21:25 -05:00
nhmall 730adeebef cut and paste error 2016-03-07 08:46:57 -05:00
nhmall 87f4aca12e add giftiles.c to Files 2016-03-07 08:41:39 -05:00
nhmall 40f2994ba7 giftiles.c 2016-03-07 08:40:03 -05:00
nhmall 4aec98ce9c missed a file MSDOS 2016-03-07 08:36:24 -05:00
nhmall 4c5cc04e1d Merge branch 'NetHack-3.6.0' 2016-03-06 09:17:08 -05:00
nhmall 83c58f009e Another file for support of Ray Chason's patch 2016-03-05 15:38:44 -05:00
nhmall 78857961d2 some of Ray Chason's MSDOS and other fixes 2016-03-05 14:44:50 -05:00
nhmall f92f43a526 cloak rumor
H4243 bz 353
This just makes the rumor wording sound a bit less absolute than it did.
2016-02-27 08:08:56 -05:00
nhmall 2b7649fb74 Merge branch 'NetHack-3.6.0' 2016-02-19 18:35:22 -05:00
nhmall 3ffed3fc2b Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2016-02-19 07:40:12 -05:00
nhmall 7debed3d06 Merge branch 'NetHack-3.6.0' 2016-02-19 07:39:51 -05:00
nhmall 63ef462185 quest text grammar bit 2016-02-18 07:50:35 -05:00
nhmall 640267f53a fix for / command to find names like "Hachi" via screen
Changes to be committed:
	modified:   doc/fixes36.1
	modified:   src/pager.c

fix bug bz54; this bug had no web ID

Report:
    For /, asking via cursor can't find special named entries like "Hachi"
    because the entry for the monster type like "dog" gets used instead.

Change:
    Instead of "More info?", when applicable it will now do:
    More info about "hachi"? [yn] (n) n
    More info about "little dog"? [yn] (n)
2016-02-14 22:23:59 -05:00
nhmall 592ae69726 another Deaf bit
Changes to be committed:
	modified:   src/engrave.c
2016-02-14 18:13:08 -05:00
nhmall 85582590ab Warning and adjacent hiders
Changes to be committed:
	modified:   include/extern.h
	modified:   src/allmain.c
	modified:   src/detect.c
	modified:   src/display.c

Bug bz22 (no corresponding web id) reported quite some time ago.

Reported:
    Warning stays on when a "lurker above" is co-located with a
    boulder, even when you are adjacent to the spot.  Even though
    you see the warning symbol and not the boulder, an attempt
    to move in that  direction tries to move the boulder, rather
    than attack the creature you know to be there.  What's more,
    you can get the
    "You hear a  monster on the other side of the boulder..."
    preventing anything from happening if there is a monster on
    the other side of the spot.  The player doesn't necessarily
    even know there is a boulder there at the time (because
    warning trumps the boulder display) so it can all be somewhat
    confusing.

Change:
    - Split off a section of the search0() code for monsters into
      a separately callable function, arbitrarily named mfind0(),
      which takes a special arg for this particular scenario.
    - If you have Warning and you get adjacent to an unseen hider
      such as a lurker above with the Warning glyph still displayed,
      a specific search is carried out for the obviously present monster.
    - The boulder concerns in the original report should become moot
      after this.
2016-02-14 17:45:20 -05:00
nhmall 57a71bc13d grammar bit 2016-02-13 17:48:34 -05:00
nhmall 5bb3e01424 improve Deaf messaging for minetown watch and shops
Changes to be committed:
	modified:   doc/fixes36.1
	modified:   src/fountain.c
	modified:   src/monmove.c
	modified:   src/shk.c

Fix for H4242, bz352
2016-02-13 17:29:15 -05:00
nhmall ff9682b549 macro symbols instead of numbers for maintenance 2016-02-03 07:27:12 -05:00
nhmall 12aafa778c Merge branch 'NetHack-3.6.0' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.0 2016-02-03 06:26:07 -05:00
nhmall 7ac64a976b the old strcmpi in utility complaint again 2016-02-03 06:25:13 -05:00
nhmall b49359ddef more other tile name fix-ups
Changes to be committed:
	modified:   win/share/other.txt
2016-02-02 21:19:29 -05:00
nhmall 207ad50ae8 tile names in other.txt
Changes to be committed:
	modified:   win/share/other.txt
	modified:   win/share/tilemap.c
	modified:   win/share/tiletext.c

On 2/2/2016 7:27 AM, paxed wrote:
> https://www.reddit.com/r/nethack/comments/43n8i2/can_anyone_tell_me_what_these_zigzag_tiles_are/
>
> Looks like the tiles in question have been labeled as "wall" since
> 3.4.3 at least
>

Put better labels on the 'other' tileset and accept those
labels in the tile processing utilities.
2016-02-02 21:00:26 -05:00
nhmall 309ad50f61 Merge branch 'NetHack-3.6.0' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.0 2016-02-01 21:58:28 -05:00
nhmall 297d4d11e7 ensure raw_printf has visible output
Changes to be committed:
	modified:   sys/winnt/nttty.c
2016-02-01 21:57:35 -05:00
nhmall 5774804524 typo bit nttty.c 2016-01-31 18:16:13 -05:00
nhmall 37b79d68cd some updates to nttty.c
Changes to be committed:
	modified:   sys/winnt/nttty.c

better attribute support
more functional inverse support
2016-01-31 18:08:03 -05:00
nhmall eee6a87b85 fixes bit 2016-01-16 06:27:05 -05:00
nhmall 2a0c69700f win32gui menu color attribute fix
from Alex Kompel...
2016-01-14 23:02:09 -05:00
nhmall 52b8139a4b Merge branch 'win32-guitty' into NetHack-3.6.0 2016-01-14 19:07:48 -05:00
nhmall c756e8beb7 Merge branch 'NetHack-3.6.0' 2016-01-14 06:43:42 -05:00
nhmall fc9cf8cf89 update fixes36.1 2016-01-13 00:12:31 -05:00
nhmall 32a4859e5b show deafness indicator on status line
May as well show a deafness indicator.
2016-01-12 23:43:28 -05:00
nhmall 7e52c605a9 Merge branch 'NetHack-3.6.0' into win32-guitty 2016-01-11 18:35:50 -05:00
nhmall 8aa0d9e2cc typo spotted 2016-01-07 07:46:20 -05:00
nhmall 89a1db6480 Merge branch 'NetHack-3.6.0' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.0 2016-01-06 21:04:37 -05:00
nhmall b48673425e vault Deaf bits 2016-01-06 21:04:05 -05:00
nhmall 3516f1b8db Merge branch 'NetHack-3.6.0' into win32-guitty 2016-01-06 20:59:50 -05:00
nhmall a2e16cd9e6 Merge branch 'NetHack-3.6.0' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.0 2016-01-06 20:21:29 -05:00
nhmall 09cbefb179 Merge branch 'NetHack-3.6.0' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.0 2016-01-05 17:32:59 -05:00
nhmall 5eb9b0827c Deaf bits for vault 2016-01-04 21:52:32 -05:00
nhmall 30525d6961 Merge branch 'NetHack-3.6.0' 2016-01-03 20:02:55 -05:00
nhmall 3198c3bf79 shk segfault diagnostic workaround but not fix
Changes to be committed:
	modified:   src/shk.c
2016-01-03 11:33:03 -05:00
nhmall c4d45d6960 make some mextra guard macros available
Changes to be committed:
	modified:   doc/fixes36.1
	modified:   include/mextra.h
2016-01-03 10:48:47 -05:00
nhmall e462de3ce5 Merge branch 'NetHack-3.6.0' 2016-01-01 22:08:23 -05:00
nhmall 8da7375c21 Files update 2016-01-01 22:04:15 -05:00
nhmall 14ce76a159 windows visual studio 2013 build updates 2016-01-01 22:01:25 -05:00
nhmall adcb7dc202 Merge branch 'NetHack-3.6.0' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.0 2016-01-01 20:37:12 -05:00
nhmall 61148f05bb SYSCF_FILE corrections for windows
Changes to be committed:
	modified:   src/files.c
	modified:   sys/share/pcmain.c

Related to #H4170, bz274

The current startup code seeks out the SYSCONFPREFIX using:
	envp = nh_getenv("COMMONPROGRAMFILES");
which is fine and usually translates to something like
"C:\\Program Files (x86)\\Common Files\\
NetHack then tacks on the NetHack subfolder to the path
"C:\\Program Files (x86)\\Common Files\\NetHack\\"

That should always be the definitive location.

However, in the event that there is no SYSCF_FILE actually
located at that system-wide spot (and ONLY in that event),
fall back to a secondary location of HACKDIR for locating
the SYSCF_FILE.

Also, there's some explicit tweaking added for the Microsoft
visual studio compiler debug execution to all a debug
session to correctly locate things. By default, on a
visual studio build, the executables are linked down in
subfolders of the build directory (Release, or Debug,
depending on visual studio build configuration options).
2016-01-01 20:33:14 -05:00
nhmall c70d466325 wizweight optional
Changes to be committed:
	modified:   include/flag.h
	modified:   include/hack.h
	modified:   src/objnam.c
	modified:   src/options.c
2016-01-01 16:17:46 -05:00
nhmall fce9f1131d improve messaging on vampire bat to fog cloud transition in Vlad's
Bug 271 - #H4167: vampires being fog clouds show up as bats on telepathy

A bug reporter wrote:
> In top level of Vlad's, the vampires hiding as fog clouds in the closets show
> up on telepathy as B, when far-looked as vampire bat.  once the door opens they
> are fog clouds.
>
> I currently have telepathy from the PYEC.

The vampire /was/ shapeshifted into a vampire bat, but once the secret door
was revealed, it shifted into a fog cloud in order to pass under the door.

If you were to blast the door with a wand of striking from a distance,
you would have encountered the vampire bat.

This clarifies the situation through better messaging.

--------
Original debug call stack trace:
     NetHack.exe!newcham(monst * mtmp, permonst * mdat, char polyspot, char msg) Line 3140
     NetHack.exe!vamp_shift(monst * mon, permonst * ptr) Line 1598
     NetHack.exe!m_move(monst * mtmp, int after) Line 1219
     NetHack.exe!dochug(monst * mtmp) Line 566
     NetHack.exe!dochugw(monst * mtmp) Line 100
     NetHack.exe!movemon(...) Line 707
     NetHack.exe!moveloop(char resuming) Line 105
     NetHack.exe!main(int argc, char * * argv) Line 105
2016-01-01 11:17:57 -05:00
nhmall 4bd3ba78d8 Merge branch 'NetHack-3.6.0' 2015-12-31 20:27:39 -05:00
nhmall 9a5340a3bf windows: fix undefined reference in release build
Changes to be committed:
	modified:   win/win32/mswproc.c
2015-12-31 20:26:47 -05:00
nhmall 4566b2903f windows: PDB files in Debug and Release 2015-12-31 20:16:48 -05:00
nhmall fa8b81e0b5 Merge branch 'NetHack-3.6.0' 2015-12-31 18:50:09 -05:00
nhmall 050e49c19c Merge branch 'NetHack-3.6.0' 2015-12-31 18:46:20 -05:00
nhmall fff3425de4 Happy New Year 2016
Changes to be committed:
	modified:   include/patchlevel.h
2015-12-31 17:26:25 -05:00
nhmall 5964438e8f use explicit int sizes in win/share/tile2bin.c
64-bit longs caused tile2bin to write an invalid bmp file.
2015-12-29 21:21:05 -05:00
nhmall 5226484bab remove extraneous bit from cut and paste 2015-12-26 19:35:58 -05:00
nhmall a156a4a3a5 meant to be part of previous commit
Changes to be committed:
	modified:   src/trap.c
2015-12-26 19:27:15 -05:00
nhmall 6117eddc62 one statue from single vampire via cockatrice corpse
Changes to be committed:
	modified:   doc/fixes36.1
	modified:   include/extern.h
	modified:   src/mon.c

Fixes H4148 (bz246) and H4150 (bz248)

comments:
I wielded a c-corpse against a shapeshifting vampire bat (checked with a
stethoscope, it said "shapeshifter".) The bat turned to stone and spawned a
vampire.  I hit the vampire and it also turned to stone, so I had two statues
from one monster (vampire bat and vampire.)  Not sure if this is a bug or a
feature...

comments:
Engulfed by a fog cloud that was actually a Vampire,
and got the message: "You break out of the vampire!"
2015-12-26 19:08:08 -05:00
nhmall 59a18d0b68 Merge branch 'NetHack-3.6.0' 2015-12-24 16:54:35 -05:00
nhmall b2818da4af Merge branch 'NetHack-3.6.0' 2015-12-18 21:58:59 -05:00
nhmall a5c63af579 objected to 2015-12-18 20:55:24 -05:00
nhmall c69e116438 fixes update for database change
sceptre of might dat/database change fixes entry
2015-12-18 19:47:18 -05:00
nhmall d6710ad1cc sceptre of might database entry update 2015-12-18 19:41:54 -05:00
nhmall 5ee09d66d6 blind pronunciation of scroll formula not a literacy violation
bug bz25, no web id, devteam email received on 1/3/2006 6:15 AM:
> Reading a scroll while blind shouldn't violate illiterate conduct
2015-12-18 19:02:19 -05:00
nhmall 97974e9968 make corpse visible if stethoscope told you about it
Bug bz14, no web id.

Steps to reproduce:
- have a stethoscope handy.
- place an amulet in a doorway and move one square outside the room's door.
- create and lead an invisible stalker to be on top of amulet, with you
  just outside the room beside the door square.
- zap the stalker asleep with a wand of sleep.
- put on a blindfold.
- quaff a potion of object detection.
- amulet shows in the doorway.
- save the game and keep the savefile for ease of returning to this point.

Bug 1 observed (remember that you're blind due to blindfold):
- zap a wand of death at the stalker that you know to be on top of
the amulet, but that the game gives no indication of.
- if the stalker left a corpse, and you apply a stethoscope to the
  doorway, the game tells you that "You determine that that unfortunate
  being is dead" yet no being or corpse is displayed, still just the amulet.

Fix that by calling map_object(corpse, TRUE) in its_dead() under these circumstances.

The circumstances in the original report were also reproduced, specifically:
If a stethoscope finds an unseen monster on a square with an
object-detected object while blind, after killing the monster, the
object isn't remembered.

That remains unfixed because the I (invis monster glyph) aleady overwrote the
detected object glyph, so it is a much tougher situation.
2015-12-18 18:24:13 -05:00
nhmall ec166df636 handle escape from new wizmode menu appropriately 2015-12-18 16:23:05 -05:00
nhmall 2eddec8287 fix typo in last patch to yelp() 2015-12-18 13:00:35 -05:00
nhmall 2765790b24 Merge branch 'NetHack-3.6.0' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.0
Conflicts:
	doc/fixes36.1
2015-12-18 12:56:38 -05:00
nhmall 7019a7da77 fix H4101: can hear pets while deaf
This is a fix for H4101, bz192.

add non-audio (felt) outcome to yelp()

This also add #wizintrinsic command because testing this was a pain
without a simple, straightforward way to go deaf that didn't time-out
before the situation being tested recurred.
2015-12-18 12:50:25 -05:00
nhmall 3e597b6882 Fix bug C343-20 wrong level shown at death
Changes to be committed:
	modified:   doc/fixes36.1
	modified:   src/ball.c

I looked up the original bug report that led to bug page C343-20
"When dying immediately on entering a level, the map may show you dying on the previous level."

It was received public report U891:
> When one is being punished and goes down a staircase and dies because the
> ball and chain fell on their head, one gets the message about their death
> while the old level is still being displayed. I wasn't sure whether this
> was a bug or not because on one hand it wouldn't make much sense to
> generate a new level if the character is going to die anyway. However,
> that being said it does make a difference if the character is about to go
> down into a level where one cannot leave bones files, ie medusa or the
> first level of the mines (if i remember correctly). So, if your character
> dies from this does the bones file get left on the level you were on
> (which is still displayed at the time of death) or the level you died as
> soon as you got to (but was never displayed)? Thanks!

Pat had remarked in response: "So this is just a display issue; game play works as intended
(for the program; I imagine you weren't planning to get killed."

A debug trace in wizard mode 3.6.1 beta shows that the relevant code path is this:
NetHack.exe!done(int how) Line 908
NetHack.exe!losehp(int n, const char * knam, char k_format) Line 2678
NetHack.exe!drag_down(...) Line 823
NetHack.exe!goto_level(d_level * newlevel, char at_stairs, char falling, char portal) Line 1316
NetHack.exe!next_level(char at_stairs) Line 1157
NetHack.exe!dodown(...) Line 954
NetHack.exe!rhack(char * cmd) Line 3416
NetHack.exe!moveloop(char resuming) Line 464
NetHack.exe!main(int argc, char * * argv) Line 104

This patch clears the display for the situation in drag_down(),
so the old level is not shown.
2015-12-17 20:27:42 -05:00
nhmall 967e19ff7f Merge branch 'NetHack-3.6.0' 2015-12-17 08:45:19 -05:00
nhmall bc83f28e46 compatibility macro correction
3.6.0 went out with editlevel at 2, not 0
2015-12-16 17:59:10 -05:00
nhmall fa092f5fe9 housekeeping for 3.6.1
Changes to be committed:
	modified:   Files
	modified:   README
	modified:   dat/history
	modified:   doc/Guidebook.mn
	modified:   doc/Guidebook.tex
	modified:   include/global.h
	modified:   include/obj.h
	modified:   include/patchlevel.h
	modified:   src/invent.c
	modified:   src/objnam.c
	modified:   src/shknam.c
	modified:   src/sounds.c
	modified:   src/spell.c
	modified:   sys/winnt/Install.nt
	modified:   sys/winnt/nethack.def
	modified:   win/macosx/NetHackGuidebook.applescript
	modified:   win/macosx/NetHackTerm.applescript
	modified:   win/win32/mswproc.c
2015-12-16 17:52:34 -05:00
nhmall d17fcf3e13 document symset:default
Changes to be committed:
	modified:   doc/Guidebook.mn
	modified:   doc/Guidebook.tex
2015-12-15 08:50:39 -05:00
nhmall 6f6f74e8d2 slightly change quickmimic() sense wording
Changes to be committed:
	modified:   doc/fixes36.1
	modified:   src/dogmove.c

A bug reporter wrote:
> comments:
> "You sense a little dog appear where Poes was!"
>
> seems strange to me, perhaps it should be "appearing", or the hero shouldn't
> notice at all if it's out of sight.
>
> Not sure it was out of sight, anyway, because I saw the d from the shop
> doorway.
>

Change the wording to:
"You sense that a little dog has appeared where Poes was!"
2015-12-13 21:45:08 -05:00
nhmall a1583244d6 a couple of false rumors 2015-12-13 13:34:47 -05:00
nhmall 085d364903 Merge branch 'NetHack-3.6.0' 2015-12-12 17:15:16 -05:00
nhmall 215060219d fix windows bugs H4030 and H4045 (123 and 138)
Changes to be committed:
	modified:   sys/share/pcmain.c
	modified:   sys/winnt/nttty.c
	modified:   sys/winnt/stubs.c

Bug 123 Report 4030:
Minor thing I've noticed - if I quit the game, at the "Hit <Enter> to end."
prompt, if I close the window rather than pressing Enter, I get the following:

Bug 138  - #H4045:
 "nethack -s" leads to "-s is not supported for the Graphical Interface".
 That's wrong.
 (The Graphical Interface comes with "nethackw".)
2015-12-11 23:08:01 -05:00
nhmall 6e6f446526 Merge branch 'NetHack-3.6.0' 2015-12-10 19:18:31 -05:00
nhmall 1b0fb561d4 revert fixes36.0 2015-12-10 19:10:26 -05:00
nhmall a0910d8f4e Merge branch 'NetHack-3.6.0'
Conflicts:
	doc/fixes36.1

	- resolved
2015-12-10 13:13:23 -05:00
nhmall ec94b94aff roll back doc/fixes36.0 to released version 2015-12-10 10:55:06 -05:00
nhmall 367e92d642 reset fixes36.0 2015-12-10 10:54:00 -05:00
nhmall 375a2c28f1 fixes updates for win32gui
Changes to be committed:
	modified:   doc/fixes36.0
	modified:   doc/fixes36.1
	modified:   win/win32/mhsplash.c
	modified:   win/win32/mswproc.c
2015-12-10 07:51:33 -05:00
nhmall 155cd67053 Merge branch 'NetHack-3.6.0'
Conflicts:
	sys/share/lev_lex.c

 Changes to be committed:
	modified:   doc/nethack.6
	modified:   doc/nethack.txt
	modified:   doc/recover.6
	modified:   doc/recover.txt
	modified:   src/read.c
	modified:   sys/share/dgn_lex.c
	modified:   sys/share/lev_lex.c
	modified:   sys/unix/Makefile.top
2015-12-09 06:28:23 -05:00
nhmall 932ab127fe Merge branch 'NetHack-3.6.0' 2015-12-08 17:41:46 -05:00
nhmall 7f2f15c702 dat/data.base update from master
Changes to be committed:
	modified:   dat/data.base
2015-12-08 17:39:46 -05:00
nhmall 692f15c43d Merge branch 'NetHack-3.6.0' 2015-12-07 07:10:34 -05:00
nhmall 585e9f1b35 fix a 'program in disorder' in tt_oname
Changes to be committed:
	modified:   win/win32/winhack.c

sys_early_init was never called for win32 GUI. That was causing "rnd(0) -
program in disorder" in tt_oname.
2015-12-07 06:48:05 -05:00
nhmall b5144a84ca Merge branch 'NetHack-3.6.0' 2015-12-06 20:44:42 -05:00
nhmall a1af46ab7c another Files update
Might as well add Keni's change since Pat added a VMS change.
2015-12-06 20:38:02 -05:00
nhmall 7a43346b10 Merge branch 'NetHack-3.6.0' 2015-12-06 20:01:27 -05:00