nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'master' into derek-farming

Browse Source 
* master: (49 commits)
  Fix 'fetch' syntax, include sparkly 'git log' trick
  Show object symbols in menu headings
  Fix a memory leak on termination.
  ...

Conflicts:
	include/obj.h
	src/do.c
	src/files.c
	src/hack.c
	src/invent.c
	src/mkobj.c
	src/mon.c
	src/objnam.c
This commit is contained in:
Derek S. Ray
2015-03-25 17:23:59 -04:00
parent 5ccae41702 12ca92aa42
commit 335c7fc003
85 changed files with 2536 additions and 835 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/objnam.c
View File

@@ -1693,7 +1693,7 @@ static struct sing_plur one_off[] = {
static const char *const as_is[] = {
/* makesingular() leaves these plural due to how they're used */
"boots", "shoes",
"gloves", "lenses", "scales",
"gloves", "lenses", "scales", "eyes",
"gauntlets",
"iron bars",
/* both singular and plural are spelled the same */