]> granicus.if.org Git - nethack/log
nethack
9 years agoFix bz175: Pile mark is shown when potion is destroyed
Pasi Kallinen [Sun, 10 Jan 2016 16:27:34 +0000 (18:27 +0200)]
Fix bz175: Pile mark is shown when potion is destroyed

Original bug report:

> When killing something that's carrying a potion, or death-drops a potion,
> or stands on top of a potion, with a force bolt or a wand of striking,
> "you hear something shatter" or "a potion of foo shatters" but the corpse
> is inverse as if it's (still) a pile.

Unfortunately the newsym() checks for already existing glyph, and
the gbuf doesn't distinguish between object piles and single items,
so newsym doesn't mark the location for update.

This is a dirty hack to force the newsym to update the glyph.
The glyph buffering should be revisited in a future version.

9 years agoFix unreferenced variable
Pasi Kallinen [Sun, 10 Jan 2016 16:24:38 +0000 (18:24 +0200)]
Fix unreferenced variable

9 years agoEnable TIMED_DELAY for linux hints files
Pasi Kallinen [Sun, 10 Jan 2016 13:03:23 +0000 (15:03 +0200)]
Enable TIMED_DELAY for linux hints files

runmode is completely useless in TTY without this

9 years agoSmall code cleanup
Pasi Kallinen [Sun, 10 Jan 2016 12:47:06 +0000 (14:47 +0200)]
Small code cleanup

9 years agoAdd compile-time option MSGHANDLER
Pasi Kallinen [Sun, 10 Jan 2016 11:01:46 +0000 (13:01 +0200)]
Add compile-time option MSGHANDLER

This was a feature request from a blind player; he wanted to
play a sound whenever a pline message was given.

9 years agoTTY: Add compile-time option for tile data hinting
Pasi Kallinen [Sun, 10 Jan 2016 08:35:27 +0000 (10:35 +0200)]
TTY: Add compile-time option for tile data hinting

Several people have asked if 3.6.0 supports playing with tiles on
a public server. Because there's no way for the user's end to know
what that white @ is, this adds special console escape codes for
tile hinting.

The idea was originally a patch called TelnetTiles by Justin Hiltscher,
but this expanded version comes via NAO, where it's been in use for years.

This is basically an interim hack, which should go away when/if
we support actual client-server model.

9 years agoAdd missing variable init
Pasi Kallinen [Sun, 10 Jan 2016 08:09:56 +0000 (10:09 +0200)]
Add missing variable init

9 years agotribute: Mort
PatR [Sun, 10 Jan 2016 02:17:15 +0000 (18:17 -0800)]
tribute: Mort

9 years agofix #H4083 - globs preID'd as "uncursed"
PatR [Sat, 9 Jan 2016 23:28:25 +0000 (15:28 -0800)]
fix #H4083 - globs preID'd as "uncursed"

I think there was also a report about this during beta testing.
Killing an ooze, slime, or pudding left a glob of same which had its
bknown flag pre-set so was immediately shown as "uncursed" even to
non-priests.  Use another way to maximize glob mergability:  allow
globs to merge even when one has bknown set and the other doesn't.

9 years agofix #H4187 - doppelgangers posing as Riders...
PatR [Sat, 9 Jan 2016 21:57:15 +0000 (13:57 -0800)]
fix #H4187 - doppelgangers posing as Riders...

... never transform and can leave Rider corpses

Riders can't be polymorphed, and the code to prevent that was also
preventing doppelgangers in Rider form from changing shape.

Using ring of protection from shape changers effectively turned such
doppelgangers into actual Riders which would leave self-reviving
corpses.  That didn't prevent Riders from appearing on the Astral
Plane though.

9 years agoAdd extended command #kick
Pasi Kallinen [Sat, 9 Jan 2016 11:39:45 +0000 (13:39 +0200)]
Add extended command #kick

I've seen some complaints about not being able to kick with ^d
so add kick as an extended command.

Also add the missing #exploremode command to the Guidebook.

9 years agoUpdate fixes
Pasi Kallinen [Sat, 9 Jan 2016 11:16:43 +0000 (13:16 +0200)]
Update fixes

9 years agoFix bz258: Covetous monsters malfunction when there are no upstairs
Pasi Kallinen [Sat, 9 Jan 2016 10:06:50 +0000 (12:06 +0200)]
Fix bz258: Covetous monsters malfunction when there are no upstairs

Make the monsters pick downstairs/ladders if the branch builds up
(like Sokoban), otherwise try upstairs/ladders.

9 years agoFix bz62: Pets walk into poison clouds
Pasi Kallinen [Sat, 9 Jan 2016 00:19:29 +0000 (02:19 +0200)]
Fix bz62: Pets walk into poison clouds

Makes monsters who would be damaged by the poison cloud
not walk into it

9 years agoTTY: Add menu_overlay option
Pasi Kallinen [Fri, 8 Jan 2016 20:17:37 +0000 (22:17 +0200)]
TTY: Add menu_overlay option

This was a request from a blind player.  It's hard to find
the left edge of the menu when it's drawn on the map, so
clear the screen and align menus to the left edge of the screen
when this option is turned off.

Originally this was called the window edge patch.

9 years agointegrate 'msgtype' option and Norep()
PatR [Fri, 8 Jan 2016 08:38:34 +0000 (00:38 -0800)]
integrate 'msgtype' option and Norep()

Allow 'msgtype=show' for messages that nethack uses Norep() for.
I don't know whether anyone will ever want to do that, but if felt
strange to have two different message suppression mechanisms that
were completely disconnected from each other.

For a user with no msgtype filter, there'll be no difference in
behavior.

9 years agoUse plain ASCII for the database
Pasi Kallinen [Fri, 8 Jan 2016 05:55:56 +0000 (07:55 +0200)]
Use plain ASCII for the database

9 years agoAdd some new database entries
Pasi Kallinen [Thu, 7 Jan 2016 20:38:33 +0000 (22:38 +0200)]
Add some new database entries

9 years agotypo spotted
nhmall [Thu, 7 Jan 2016 12:46:20 +0000 (07:46 -0500)]
typo spotted

9 years agofix #H4181 - strange death messages
PatR [Thu, 7 Jan 2016 09:53:06 +0000 (01:53 -0800)]
fix #H4181 - strange death messages

"Petrified by <foo>, while getting stoned." -- multi_reason "while
getting stoned" explains why no last-second recovery could be made,
but doesn't explain how the petrification happened, so suppress it.

"Died of starvation, while fainted from lack of food." -- nethack
does not display this; presumeably the IRC death notices for NAO are
generated from xlogfile entries.  Change 'while fainted from lack of
food' to 'while fainted' at time of death if reason for death is
starvation.  The longer version is accurate but sounds fairly silly.

When starvation is set in motion, set it up before checking whether
the initial faint triggers falling on a wielded cockatrice corpse, so
that fainting isn't applied after recovery in case of life-saving.

9 years agoMerge branch 'NetHack-3.6.0' of https://rodney.nethack.org:20040/git/NHsource into...
nhmall [Thu, 7 Jan 2016 02:04:37 +0000 (21:04 -0500)]
Merge branch 'NetHack-3.6.0' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.0

9 years agovault Deaf bits
nhmall [Thu, 7 Jan 2016 02:04:05 +0000 (21:04 -0500)]
vault Deaf bits

9 years agofix #4138 - 'text bug' for freezing moat
PatR [Thu, 7 Jan 2016 01:57:39 +0000 (17:57 -0800)]
fix #4138 - 'text bug' for freezing moat

Freezing a moat--unlike other types of water--substitutes the type
of water (because that isn't "moat" for Medusa's level) in the freeze
message but was doing so after changing the affected terrain to ICE,
yielding "The ice is bridged with ice."

9 years agoMerge branch 'NetHack-3.6.0' of https://rodney.nethack.org:20040/git/NHsource into...
nhmall [Thu, 7 Jan 2016 01:21:29 +0000 (20:21 -0500)]
Merge branch 'NetHack-3.6.0' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.0

9 years agogetpos() for objects
PatR [Thu, 7 Jan 2016 00:47:30 +0000 (16:47 -0800)]
getpos() for objects

Extend the 'm' and 'M' functionality (move cursor to nearest monster
or farthest monster, respectively, then to next nearest/next farthest
when used successively) to 'o' and 'O' for objects.

'M' was picking the wrong monster (nearest) on first use; now fixed.
Hero is now included in the monster list, and will be the last one
reached if you cycle all the way through in either direction.  (Makes
it easier to tell that you have actually been all the way through.
Unfortunately, objects don't have any seen-'em-all indicator.  Perhaps
the hero's coordinates should go on that list too?)

9 years agoget_count() cleanup
PatR [Wed, 6 Jan 2016 23:37:46 +0000 (15:37 -0800)]
get_count() cleanup

Fix several warnings.  Accept ASCII RUBOUT (aka DELETE) in addition
to backspace.  [Should use erase_char (and add support for kill_char)
but that means pushing get_count() into the interface code.]  Guard
against user causing the count to wrap if someone ever adds a call to
get_count() which doesn't specifying a maximum value.

9 years agoMake getpos monster targeting use glyph lookup
Pasi Kallinen [Wed, 6 Jan 2016 19:42:45 +0000 (21:42 +0200)]
Make getpos monster targeting use glyph lookup

9 years agoFix possible lev_comp segfault when map was too tall
Pasi Kallinen [Wed, 6 Jan 2016 17:48:46 +0000 (19:48 +0200)]
Fix possible lev_comp segfault when map was too tall

9 years agoMake the raven medusa level shortsighted
Pasi Kallinen [Wed, 6 Jan 2016 16:54:21 +0000 (18:54 +0200)]
Make the raven medusa level shortsighted

This prevents all of the ravens mobbing the player immediately.

Change via Dynahack by Tung Nguyen

9 years agoAllow knife and stiletto as possible tin opening tools
Pasi Kallinen [Wed, 6 Jan 2016 16:40:41 +0000 (18:40 +0200)]
Allow knife and stiletto as possible tin opening tools

Via Dynahack, original idea from K-mod by Karadoc.

9 years agoFix weight of containers in lev_comp
Pasi Kallinen [Wed, 6 Jan 2016 16:25:17 +0000 (18:25 +0200)]
Fix weight of containers in lev_comp

9 years agoFix the mtrack memset
Pasi Kallinen [Wed, 6 Jan 2016 16:15:04 +0000 (18:15 +0200)]
Fix the mtrack memset

9 years agoMake vault guard accept names starting with number
Pasi Kallinen [Wed, 6 Jan 2016 15:28:41 +0000 (17:28 +0200)]
Make vault guard accept names starting with number

Fix via Dynahack by Tung Nguyen

9 years agoUse define for iron ball weight increment
Pasi Kallinen [Wed, 6 Jan 2016 14:23:48 +0000 (16:23 +0200)]
Use define for iron ball weight increment

9 years agoPoison breath leaves a trail of poison gas clouds
Pasi Kallinen [Wed, 6 Jan 2016 14:05:40 +0000 (16:05 +0200)]
Poison breath leaves a trail of poison gas clouds

Original patch by L

9 years agoAllow dissolving iron bars with potion of acid
Pasi Kallinen [Wed, 6 Jan 2016 13:33:36 +0000 (15:33 +0200)]
Allow dissolving iron bars with potion of acid

Force-fight iron bars with wielded potion of acid to dissolve them

This change comes via UnNetHack by Patric Mueller.

9 years agoZapping wand of opening at yourself, unlock carried boxes
Pasi Kallinen [Wed, 6 Jan 2016 12:17:11 +0000 (14:17 +0200)]
Zapping wand of opening at yourself, unlock carried boxes

9 years agoAllow picking a used inventory letter from menu when #adjusting
Pasi Kallinen [Wed, 6 Jan 2016 12:05:24 +0000 (14:05 +0200)]
Allow picking a used inventory letter from menu when #adjusting

9 years agoUnify getting a count into single function
Pasi Kallinen [Wed, 6 Jan 2016 11:50:16 +0000 (13:50 +0200)]
Unify getting a count into single function

9 years agoFix bz66: Count number cannot be backspaced
Pasi Kallinen [Wed, 6 Jan 2016 09:50:07 +0000 (11:50 +0200)]
Fix bz66: Count number cannot be backspaced

... or at least partially fix it - ^H does now backspace.
I can't be bothered to dive into the (n)curses raw-mode stuff.

9 years agotribute: Equal Rites revisited
PatR [Wed, 6 Jan 2016 08:45:46 +0000 (00:45 -0800)]
tribute: Equal Rites revisited

The number of passages felt a little light, so split one of the
long-ish ones into two.  The punchline that now ends the first one was
being watered down by continuing the text, and an interesting bit that
was left out can be added to finish the second part.  They both lose
some context but I think they work ok separately.

9 years agoprovisional fix for bz239 - '[tty] Enter key...'
PatR [Wed, 6 Jan 2016 08:07:54 +0000 (00:07 -0800)]
provisional fix for bz239 - '[tty] Enter key...'

'... inconsistency in character creation menus'.

During role selection, the final 'is this ok?' menu has 'yes'
preselected so accepted <return> or <enter> to answer yes.  The
pick-role, pick-race, &c menus prior to getting to that stage didn't
have a default, so using <enter> meant nothing was chosen, and choosing
nothing was treated as a request to quit.  This changes that so it's a
request for 'random' instead.

'Provisional fix' because it ought to do this by making 'random' be a
pre-selected menu entry so that the default choice is visible.  But
that takes more effort than I'm inclined to expend on this.

9 years agofix getpos() m,M to move to next monster
PatR [Wed, 6 Jan 2016 07:19:14 +0000 (23:19 -0800)]
fix getpos() m,M to move to next monster

Fixing a couple of warnings led to discovery of a couple of real bugs.
Warnings:
1) -Wshadow warning for 'dist2' variable blocking access to dist2()
   function.
2) Declaration not at top of block not allowed for C89/C90 (let alone
   for pre-ANSI).
Bugs:
3) there might be 0 visible monsters, in which case the code prior to
   qsort will call alloc(0).  I think ANSI requires malloc(0) to return
   a unique pointer which can be freed, but pre-ANSI malloc might
   return Null to satisfy it, leading to panic from nethack's alloc().
4) visible monsters in direct line with hero horizontally or vertically
   were unintentionally skipped when collecting monster locations.

I think looking at monsters is the wrong way to implement this.  It
should be scanning the map for monster glyphs instead.  (Coin toss as
to whether it should also treat statues-shown-as-monsters as if they
were monsters while doing this.  I'm leaning towards yes.  And what
about warning glyphs and instances of the remembered-invisible monster
glyph?  They aren't interesting to look at but they might provide a
shortcut to positioning the cursor near something else.)

Using '^' to move to next trap moves from hero's position to end of
hero's line, then columns 1 to N of next line, and so on to bottom
right, then top left columns 1 to N, second line 1 to N, on down to
hero's line.  Having 'm' traverse monsters from nearest to farthest
feels like a noticeable inconsistency between the two.  Especially if
you move the cursor with direction or topology keystrokes prior to 'm'.

9 years agoOnly requiver pickup_thrown ammo and throwing weapons
Pasi Kallinen [Wed, 6 Jan 2016 02:58:37 +0000 (04:58 +0200)]
Only requiver pickup_thrown ammo and throwing weapons

9 years agoRedraw map when hilite_pile is toggled
Pasi Kallinen [Wed, 6 Jan 2016 02:41:57 +0000 (04:41 +0200)]
Redraw map when hilite_pile is toggled

9 years agoUpdate fixes entries
Pasi Kallinen [Wed, 6 Jan 2016 01:37:35 +0000 (03:37 +0200)]
Update fixes entries

9 years agoFix unmapped branch stairs on premapped levels
Pasi Kallinen [Wed, 6 Jan 2016 01:32:42 +0000 (03:32 +0200)]
Fix unmapped branch stairs on premapped levels

This happens when levelporting to the first Sokoban level in wizard mode
before visiting the level, causing the branch stairs to not appear until
the space it is in comes in sight of the player.

The issue was that levels flagged premapped would cause the special
level coder to call sokoban_detect() before fixup_special() had a chance
to place the branch stairs properly.

Fix from Dynahack by Tung Nguyen.

9 years agofix #H4179 - death reason for rotted globs
PatR [Wed, 6 Jan 2016 01:29:36 +0000 (17:29 -0800)]
fix #H4179 - death reason for rotted globs

'Poisoned by a rotted gray ooze corpse' should have been
'Poisoned by a rotted glob of gray ooze'.

eatcorpse() is called for non-corpse globs and then corpse_xname()
is called for them too to set up death reason for make_sick(), but
it didn't know anything about globs.  Now it does.  Blob size is
ignored since it's not relevant for cause of death.

9 years agoRemove double defines of hunger states
Pasi Kallinen [Wed, 6 Jan 2016 01:23:24 +0000 (03:23 +0200)]
Remove double defines of hunger states

9 years agoUse appropriate place description for drum of earthquake shake
Pasi Kallinen [Wed, 6 Jan 2016 01:17:32 +0000 (03:17 +0200)]
Use appropriate place description for drum of earthquake shake

Fix via Dynahack by Tung Nguyen

9 years agoAllow quickly moving cursor on monsters
Pasi Kallinen [Wed, 6 Jan 2016 01:04:13 +0000 (03:04 +0200)]
Allow quickly moving cursor on monsters

Original patch was mine, but this implementation took
ideas from Dynahack by Tung Nguyen

9 years agofix #H4179 - lava vs boots
PatR [Wed, 6 Jan 2016 00:17:38 +0000 (16:17 -0800)]
fix #H4179 - lava vs boots

Stepping onto lava destroyed water walking boots if they weren't
fireproof but didn't do that for other types of boots unless hero
was not fire resistant and got killed by the lava.  Burn up all
non-fireproof leather boots when stepping onto lava.

9 years agoClear mimic vision blocking after genocide
Pasi Kallinen [Tue, 5 Jan 2016 23:53:44 +0000 (01:53 +0200)]
Clear mimic vision blocking after genocide

Fix via Dynahack by Tung Nguyen

9 years agoMake mimics mimicing walls or trees also block light
Pasi Kallinen [Tue, 5 Jan 2016 23:44:18 +0000 (01:44 +0200)]
Make mimics mimicing walls or trees also block light

9 years agoNever route a travel path through boulders in Sokoban
Pasi Kallinen [Tue, 5 Jan 2016 23:04:56 +0000 (01:04 +0200)]
Never route a travel path through boulders in Sokoban

Change via Dynahack by Tung Nguyen

9 years agoRequiver pickup_thrown objects if quiver is empty
Pasi Kallinen [Tue, 5 Jan 2016 22:52:51 +0000 (00:52 +0200)]
Requiver pickup_thrown objects if quiver is empty

Change via Dynahack by Tung Nguyen

9 years agoMerge branch 'NetHack-3.6.0' of https://rodney.nethack.org:20040/git/NHsource into...
nhmall [Tue, 5 Jan 2016 22:32:59 +0000 (17:32 -0500)]
Merge branch 'NetHack-3.6.0' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.0

9 years agoAdd mtrack changes to fixes file
Pasi Kallinen [Tue, 5 Jan 2016 10:59:54 +0000 (12:59 +0200)]
Add mtrack changes to fixes file

9 years agotribute: Equal Rites
PatR [Tue, 5 Jan 2016 10:39:46 +0000 (02:39 -0800)]
tribute: Equal Rites

9 years agoMake (level) teleporting clear monster movement tracking
Pasi Kallinen [Tue, 5 Jan 2016 10:32:18 +0000 (12:32 +0200)]
Make (level) teleporting clear monster movement tracking

9 years agoFix bz276,H4172: Fleeing monsters don't actually flee
Pasi Kallinen [Tue, 5 Jan 2016 10:09:40 +0000 (12:09 +0200)]
Fix bz276,H4172: Fleeing monsters don't actually flee

This fix comes via DynaHack by Tung Nguyen.

9 years agoFix bz270, H4166: Finding a secret corridor shows it unlit with lit_corridor
Pasi Kallinen [Tue, 5 Jan 2016 08:00:27 +0000 (10:00 +0200)]
Fix bz270, H4166: Finding a secret corridor shows it unlit with lit_corridor

Also #terrain command with dark_room on showed lit room floor on places with
objects or traps. We don't want to show dark room symbol anyway, because
the dark room symbols are only for line-of-sight, and #terrain should
override that...

9 years agoCapitalize Linux in guidebook
Pasi Kallinen [Tue, 5 Jan 2016 07:11:42 +0000 (09:11 +0200)]
Capitalize Linux in guidebook

9 years agoFinish splitting wallification into two
Pasi Kallinen [Tue, 5 Jan 2016 05:42:28 +0000 (07:42 +0200)]
Finish splitting wallification into two

9 years agoDeaf bits for vault
nhmall [Tue, 5 Jan 2016 02:52:32 +0000 (21:52 -0500)]
Deaf bits for vault

9 years agotribute catch-up
PatR [Tue, 5 Jan 2016 01:30:05 +0000 (17:30 -0800)]
tribute catch-up

9 years agotribute: The Light Fantastic
PatR [Tue, 5 Jan 2016 01:19:56 +0000 (17:19 -0800)]
tribute: The Light Fantastic

9 years agobuild fix for ck_server_admin_msg()
PatR [Tue, 5 Jan 2016 00:51:24 +0000 (16:51 -0800)]
build fix for ck_server_admin_msg()

ck_server_admin_msg() is only available for '#if (UNIX && MAIL)' but
moveloop() tried to call it unconditionally.  Call if from the UNIX
edition of ckmailstatus() instead.

9 years agoAdd the compile-time options to fixes-file
Pasi Kallinen [Mon, 4 Jan 2016 21:19:49 +0000 (23:19 +0200)]
Add the compile-time options to fixes-file

9 years agoAdd server admin messaging functionality
Pasi Kallinen [Mon, 4 Jan 2016 21:04:56 +0000 (23:04 +0200)]
Add server admin messaging functionality

It's occasionally important for public servers to notify
all the players. Sending a mail is not reliable, as not everyone
wants to break conduct, or have mail on.

This adds a compile-time defined filename, which NetHack
will monitor. The contents of the file are in the same
format as SIMPLE_MAIL: "sender:message" on one line.

9 years agoAdd SIMPLE_MAIL compile-time option for public servers
Pasi Kallinen [Mon, 4 Jan 2016 17:52:34 +0000 (19:52 +0200)]
Add SIMPLE_MAIL compile-time option for public servers

9 years agoAdd an alternative paniclog format as compile-time option
Pasi Kallinen [Mon, 4 Jan 2016 16:05:16 +0000 (18:05 +0200)]
Add an alternative paniclog format as compile-time option

9 years agofix reformatting typo in monmove.c
PatR [Mon, 4 Jan 2016 00:22:22 +0000 (16:22 -0800)]
fix reformatting typo in monmove.c

Fix the vault guard error in dochug() discovered by Alex K.  The
behavior of a vault guard ignoring Conflict when confronting the
hero in the vault and escorting him through the temporary corridor
isn't affected.  3.4.3 already behaved that way.  (I didn't track
the cause of that down so don't know whether it's intentional.)

9 years agoshk segfault diagnostic workaround but not fix
nhmall [Sun, 3 Jan 2016 16:33:03 +0000 (11:33 -0500)]
shk segfault diagnostic workaround but not fix

 Changes to be committed:
modified:   src/shk.c

9 years agomake some mextra guard macros available
nhmall [Sun, 3 Jan 2016 15:48:47 +0000 (10:48 -0500)]
make some mextra guard macros available

 Changes to be committed:
modified:   doc/fixes36.1
modified:   include/mextra.h

9 years agoFix bz241, H4143: LoS still blocked after mimic hit by force bolt
Pasi Kallinen [Sun, 3 Jan 2016 14:26:25 +0000 (16:26 +0200)]
Fix bz241, H4143: LoS still blocked after mimic hit by force bolt

9 years agofix #H4153 - killed by kicking something weird
PatR [Sun, 3 Jan 2016 08:36:31 +0000 (00:36 -0800)]
fix #H4153 - killed by kicking something weird

Steps to make sure 'kickedobj' didn't end up as a stale pointer
prevented it from being around to format the reason for death when
a kicking attempt was fatal.

9 years agoSplit wallification into two by function
Pasi Kallinen [Sat, 2 Jan 2016 22:36:36 +0000 (00:36 +0200)]
Split wallification into two by function

9 years agoMove and reorder ap exc, menucolor and msgtype entries in options
Pasi Kallinen [Sat, 2 Jan 2016 11:40:47 +0000 (13:40 +0200)]
Move and reorder ap exc, menucolor and msgtype entries in options

Move autopickup exception, menucolor, and message type entries
in the options menu under "Other settings" -header, and reorders
them into alphabetical order.

Also use enums instead of hardcoded values.

9 years agoFiles update
nhmall [Sat, 2 Jan 2016 03:04:15 +0000 (22:04 -0500)]
Files update

9 years agowindows visual studio 2013 build updates
nhmall [Sat, 2 Jan 2016 03:01:25 +0000 (22:01 -0500)]
windows visual studio 2013 build updates

9 years agoMerge branch 'NetHack-3.6.0' of https://rodney.nethack.org:20040/git/NHsource into...
nhmall [Sat, 2 Jan 2016 01:37:12 +0000 (20:37 -0500)]
Merge branch 'NetHack-3.6.0' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.0

9 years agoSYSCF_FILE corrections for windows
nhmall [Sat, 2 Jan 2016 01:33:14 +0000 (20:33 -0500)]
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).

9 years agoAllow scrolling X11 extended cmd menu with cursors
Pasi Kallinen [Fri, 1 Jan 2016 22:47:10 +0000 (00:47 +0200)]
Allow scrolling X11 extended cmd menu with cursors

9 years agowizweight optional
nhmall [Fri, 1 Jan 2016 21:17:46 +0000 (16:17 -0500)]
wizweight optional

 Changes to be committed:
modified:   include/flag.h
modified:   include/hack.h
modified:   src/objnam.c
modified:   src/options.c

9 years agoEnable scroll bar in X11 menu windows
Pasi Kallinen [Fri, 1 Jan 2016 19:24:55 +0000 (21:24 +0200)]
Enable scroll bar in X11 menu windows

9 years agoimprove messaging on vampire bat to fog cloud transition in Vlad's
nhmall [Fri, 1 Jan 2016 16:17:57 +0000 (11:17 -0500)]
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

9 years agowindows: fix undefined reference in release build
nhmall [Fri, 1 Jan 2016 01:26:47 +0000 (20:26 -0500)]
windows: fix undefined reference in release build

 Changes to be committed:
modified:   win/win32/mswproc.c

9 years agowindows: PDB files in Debug and Release
nhmall [Fri, 1 Jan 2016 01:16:48 +0000 (20:16 -0500)]
windows: PDB files in Debug and Release

9 years agotribute: The Colour of Magic
PatR [Thu, 31 Dec 2015 23:07:06 +0000 (15:07 -0800)]
tribute: The Colour of Magic

9 years agoHappy New Year 2016
nhmall [Thu, 31 Dec 2015 22:26:25 +0000 (17:26 -0500)]
Happy New Year 2016

 Changes to be committed:
modified:   include/patchlevel.h

9 years agofix bz265 - accessibility fix for reluctant pet
PatR [Thu, 31 Dec 2015 07:38:11 +0000 (23:38 -0800)]
fix bz265 - accessibility fix for reluctant pet

Requested by a blind player.  The message "Fido moves only reluctantly"
didn't convey enough information to be useful.  Describe the reason why
the move is reluctant:  "Fido steps reluctantly over <some object>."

If there is a pile, it will describe the top item rather than whichever
cursed item the pet doesn't want to step on.

9 years agoAnother tiny formatting fix
Pasi Kallinen [Wed, 30 Dec 2015 15:41:48 +0000 (17:41 +0200)]
Another tiny formatting fix

9 years agoTiny formatting fix
Pasi Kallinen [Wed, 30 Dec 2015 15:29:44 +0000 (17:29 +0200)]
Tiny formatting fix

9 years agofix #H4147 - "unlockable chest" desc is misleading
PatR [Wed, 30 Dec 2015 10:33:42 +0000 (02:33 -0800)]
fix #H4147 - "unlockable chest" desc is misleading

Change "unlockable" to "broken" so that it won't be misunderstood to
mean "capable of being unlocked".  The accompanying suggestion to omit
"broken" unless/until a lock or unlock attempt is made is no good since
the main reason for describing the broken lock is to avoid unnecessary
attempts to lock or unlock a container that the hero knows to be broken
but the player may have forgotten.

I also changed remote look-at for objects to use distant_name(doname)
instead of distant_name(xname) so that qualifiers like "empty" and
"broken" will show up on chests you've investigated before but aren't
standing on now.  Monster type for corpse also gets shown, instead of
just 'food (corpse)'.  Other remote items will become more verbose,
but only those that the hero has already seen up close.

9 years agouse explicit int sizes in win/share/tile2bin.c
nhmall [Wed, 30 Dec 2015 02:21:05 +0000 (21:21 -0500)]
use explicit int sizes in win/share/tile2bin.c

64-bit longs caused tile2bin to write an invalid bmp file.

9 years agofix 'doterrain menu bug'
PatR [Tue, 29 Dec 2015 23:09:50 +0000 (15:09 -0800)]
fix 'doterrain menu bug'

From a report sent directly to devteam:  the #terrain command had the
same bug as the '`' command (which was one of the very first ones
reported):  impossible("add_menu called before start_menu").  Only X11
notices.

9 years agofix 'blind sink behavior'
PatR [Tue, 29 Dec 2015 01:32:31 +0000 (17:32 -0800)]
fix 'blind sink behavior'

Reported directly to devteam:  teleporting or polymorphing a sink when
dropping the relevant ring into it was suppressed if the hero couldn't
see it happen.

Being unable to see the sink transform or vanish shouldn't stop that
from happening.  Since the hero is known to not be levitating (because
of the sink), it can be assumed that he can feel the transformation or
vanishment (is that a real word?), so use the same messages regardless
of blindness.

9 years agooccupation vs running
PatR [Mon, 28 Dec 2015 23:10:22 +0000 (15:10 -0800)]
occupation vs running

Noticed while testing a potential change to running while confused:
when confusion timed out, I kept running even though I was headed in
the wrong direction.  Timeout calls stop_occupation() but running is
not an occupation.

Make stop_occupation() also stop counted activity under control of
the player (ie, multi > 0).  Some places in the code use both
stop_occuation() and nomul(0), some just use one or the other.  But
most of those probably intend for both.

9 years agoforce TIMED_DELAY for OSX
PatR [Mon, 28 Dec 2015 22:35:23 +0000 (14:35 -0800)]
force TIMED_DELAY for OSX

Outputing extra characters to induce a delay is useless on OSX, so set
TIMED_DELAY by default instead of relying on user to do it.