Commit Graph

4190 Commits

Author SHA1 Message Date
Pasi Kallinen
63e7d97148 Change command X to twoweapon toggle
Explore mode is now an extended command #exploremode.
There's no sense that a command used max. once per game, and
in normal games not at all, takes up a key. So, analogous to
the 'x' command (swap weapons), 'X' now toggles two-weapon
combat.
2015-03-17 18:47:20 +02:00
Pasi Kallinen
504048c0a8 Comment typofix 2015-03-17 18:47:20 +02:00
Pasi Kallinen
c4c81480ca Use a menu to loot multiple containers
When looting a location with multiple containers, show a menu for user
to pick the containers to loot instead of asking a yes/no question for
each container.
2015-03-17 18:47:19 +02:00
Pasi Kallinen
c92c8ab9d1 Define for generic usernames which prompt for name
Instead of hard-coding the "play", "player", etc. usernames
which will prompt the user for their name, allow defining
the names in config.h
2015-03-17 18:47:19 +02:00
nhmall
0b231571bc fix a segfault in mapglyph reported by Pasi earlier today
Changes to be committed:
	modified:   src/pager.c

Steps to reproduce the reported segfault:
Use / command, answer n, press space and enter

In do_look() variable glyph is only set to a proper
value if using the screen (from_screen) or the
mouse (clicklook).

On the code path that triggered the segfault,
glyph was being passed to mapglyph with a random
arbitrary value.

If glyph had been initialized at the start of
do_look(), it would have prevented the segfault,
but would have always displayed a giant ant or
something silly instead of the correct thing.

Don't use glyph except under
from_screen || clicklook.
2015-03-17 18:47:19 +02:00
Pasi Kallinen
dd0a28c7b1 TTY: Prevent accidental escapes from string entries
On NAO, one of the major complaints was accidental escaping
from wishing prompt when using cursor keys.  The users were
trying to go "back" on the entry to fix a typo, but lost
the wish instead.

This prevents escaping out of a text prompt if there is any
text entered into the prompt; pressing escape clears the prompt.
2015-03-17 18:47:18 +02:00
Pasi Kallinen
bb2351b83f TTY: Do not cut off statuslines at 80 characters
Show as much of the status line as possible, instead of chopping
it at COLNO - this prevents possible game-influencing status
effects (Ill, Burdened, etc) from being hidden.
2015-03-17 18:47:18 +02:00
Pasi Kallinen
66a1f0ced4 Implement fcntl(2) file locking
If you run a server, then you know of the somewhat annoying perm_lock
errors that creep up, requiring your attention before anyone else can
start a game.

This patch properly implements fcntl(2) locking on systems that can
handle it (*nix systems), that results in the lock being automatically
released on program termination, whether abnormal or not.

Original patch by Drew Streib, update by Edoardo Spadolini
2015-03-17 18:47:17 +02:00
Pasi Kallinen
7fa05c6311 You_hear already checks deafness 2015-03-17 18:47:16 +02:00
Pasi Kallinen
7d8d8ad1f5 Add database entry for land mine 2015-03-17 18:47:16 +02:00
Pasi Kallinen
587d1678f7 Add database entry for fedora 2015-03-17 18:47:15 +02:00
Pasi Kallinen
cf66f8bceb Make shuriken entry also match throwing star. 2015-03-17 18:47:15 +02:00
Pasi Kallinen
aeb3b49549 Fix shuriken attribution 2015-03-17 18:47:15 +02:00
Pasi Kallinen
f0114b2ead Add database entry for shuriken 2015-03-17 18:47:15 +02:00
Pasi Kallinen
08eebb58e1 Fix data.base entries
-"bat" overrode later "combat" entry.
 -"gelatinous cube" and "jack boot" have their own entries.
 -"vampire bat" matched twice; use the bat entry.
 -dagger attribution started with spaces instead of tabs.
2015-03-17 18:47:15 +02:00
nhmall
c6e85f2c27 Fix some README mistakes that Janet spotted 2015-03-17 18:47:15 +02:00
nhmall
dcd3299723 Updated README
On 3/1/2015 10:37 AM, coppro wrote:
> >>          Sun SPARC based machine running SunOS 4.x, Solaris 2.x, or
> Solaris 7
>
> By release time, I should have access to a BSD flavour installed on a SPARC
> machine. Would out be helpful for me to do cursory tests?

On 3/1/2015 10:41 AM, lorimer wrote:
> I have access to a Borland environment too, so I'll be
> borrowing that at some point.  [Just not soon.]

I didn't include the above, just in case they don't happen.
The README can, of course, be updated again once they have
been tried.
2015-03-17 18:47:15 +02:00
keni
9de92d55dc Fix NHtext when GIT_DIR is not defined. 2015-03-17 18:47:15 +02:00
Pasi Kallinen
ff7230a159 Fix TTY crashing when a location has more than 32k items 2015-03-17 18:47:14 +02:00
Sean Hunt
f8baf4bd8e Make a few fixes to code that was confusing indent 2015-03-17 18:47:14 +02:00
Pasi Kallinen
a6e89b01d2 Fix segfault when MD termcap is not defined 2015-03-17 18:47:13 +02:00
Pasi Kallinen
019b24005f Sanitize petnames and fruit to prevent escape codes 2015-03-17 18:47:13 +02:00
Sean Hunt
b4fa80ec7d Print lava item destructions only if surviving.
This partially reverts commit 72c2ae233d
in order to prevent players from using hangups during the destruction
messages to save themselves.
2015-03-17 18:47:12 +02:00
Sean Hunt
b98fd27f9d Merge fire-based erosion to common codepaths.
This finally eliminates all direct increases of `oeroded` and `oeroded2`
and moves them all to go via `erode_obj()`. They are still manipulated
directly in a few places, but not to erode objects.

This now merges the `fire_damage()` function to a common codepath, used
for items on lava and burning oil, but fire needs more work. There is
still a duplication between `destroy_item()` and `fire_damage()`; the
two codepaths should eventually be merged in some manner so that there
is only one codepath to say "an object was affected by fire". This path
might require some parameters, such as whether the fire will just erode
objects or burn them outright, but that can happen another day.
2015-03-17 18:47:10 +02:00
Sean Hunt
d58a9bb56e Fold get_wet() into water_damage().
This now ensures that dipping into water works like other sources of
water damage. There is a potentially significant gameplay change here:
dipping a container into uncursed water will wet all its contents. If
this is a problem, then we should add another parameter to water_damage
which will suppress this behaviour for dipping.
2015-03-17 18:47:08 +02:00
Sean Hunt
cd83f7e802 Rename rust_dmg() to erode_obj(). 2015-03-17 18:47:07 +02:00
Sean Hunt
04a0331ccc Eliminate erode_obj() and other erosion.
Now all erosion that isn't fire-based goes through `rust_dmg()`
2015-03-17 18:47:04 +02:00
Sean Hunt
4e05b9a1ec A lot more cleanup to rust and water. 2015-03-17 18:47:01 +02:00
Sean Hunt
5532600f1a Cover a couple of corner cases with rust_dmg(). 2015-03-17 18:47:00 +02:00
Sean Hunt
48b048f921 Remove the victim argument to rust_dmg().
The argument can be calculated from `otmp`.
2015-03-17 18:46:58 +02:00
Sean Hunt
2b1820a67b Factor out a new is_moat function.
The fact that Juiblex's swamp is MOAT but not moat is weird and should
probably be looked at at some point.
2015-03-17 18:46:57 +02:00
keni
c5bc6a5268 Manually fix botched NHDT-Branch expansions. 2015-03-17 18:46:55 +02:00
keni
140ad86ceb Switch NHtext from "git branch" to "git symbolic-ref" to avoid corner cases. 2015-03-17 18:46:54 +02:00
nhmall
4da05c9dba catch up fixes with some recent changes; also add 'community patch' section 2015-03-17 18:46:54 +02:00
Pasi Kallinen
d67ffd179a Remove useless dungeon.def mangling 2015-03-17 18:46:54 +02:00
Pasi Kallinen
a156f98de0 Remove mention of compile-time AUTOPICKUP_EXCEPTIONS 2015-03-17 18:46:53 +02:00
Pasi Kallinen
f56b880e0a Remove last mention of EXP_ON_BOTL 2015-03-17 18:46:53 +02:00
Pasi Kallinen
1b25fe74d8 Remove last mention of DUNGEON_OVERVIEW 2015-03-17 18:46:53 +02:00
keni
5b4000a2e9 Change NHtext to double the speed of "git checkout" 2015-03-17 18:46:53 +02:00
Pasi Kallinen
56279a9950 Add new parameters to makedefs: --debug and --make
"makedefs --debug --make q" is equivalent to "makedefs -q" with
DEBUG defined.
2015-03-17 18:46:52 +02:00
Derek S. Ray
66289b13ab remove and transfer INVISIBLE_OBJECTS to branch 2015-03-17 18:46:49 +02:00
Derek S. Ray
8fa8e02415 Remove unused size from questpgr.c 2015-03-17 18:46:48 +02:00
Sean Hunt
07da4a740e Fix some warnings on the unconditionals branch. 2015-03-17 18:46:48 +02:00
Sean Hunt
5fb3fea9c6 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-03-17 18:46:45 +02:00
Sean Hunt
fb46fed99d Make EXP_ON_BOTL unconditional. 2015-03-17 18:46:44 +02:00
Sean Hunt
f27d319e68 Make REDO unconditional. 2015-03-17 18:46:41 +02:00
Sean Hunt
11d11c5de3 Make LOADSYMSETS unconditional.
There are some bugs here, but this functionality should make it into the release
in some form.
2015-03-17 18:46:39 +02:00
Sean Hunt
3481ec6589 Make AUTOPICKUP_EXCEPTIONS unconditional. 2015-03-17 18:46:37 +02:00
Sean Hunt
8798197d85 Make BARGETHROUGH unconditional. 2015-03-17 18:46:35 +02:00
Sean Hunt
dcc2f8ba93 Make SEDUCE unconditional. 2015-03-17 18:46:32 +02:00