Commit Graph
100 Commits
Author SHA1 Message Date
nhmall f692db8581 Merge branch 'master' into win32-x64-working 2015-05-04 17:56:35 -04:00
nhmall 636edf2b08 Merge branch 'master' into win32-x64-working
Conflicts:
	src/dig.c
	src/mkobj.c

 Changes to be committed:
	modified:   src/dig.c
	modified:   src/mkobj.c
2015-05-03 20:53:04 -04:00
nhmall 8ebf5b1759 Merge branch 'master' into win32-x64-working 2015-05-03 09:01:46 -04:00
nhmall 5dfc98bc6a Merge branch 'master' into win32-x64-working 2015-05-02 18:18:36 -04:00
nhmall 02de9d1313 commit the latest update for wiz_identify
git add mistake on my part
2015-05-02 18:16:11 -04:00
nhmall be643386c5 permanent wiz_identify correction
wiz_identify (^I) is supposed to bring up the inventory list
with the items identified, in contrast to the regular (I)
inventory, but only for that inventory display.

It is intended that if you then hit ^I again while at that
wiz_identify inventory menu, you'll trigger permanent
identification of itemsand any other key is supposed to
leave them as they were.

In tty however, <space> was doing the same thing as the
second ^I, and permanently identifying everything.
So, for those that like to <space> through menus (like
me) this makes it work as originally intended and
requires a deliberate second ^I at the menu to permanently
identify. (It might also allow trigger permanent ID if you hit
underscore, but nobody "underscores" through menus,
so that's ok.)
2015-05-02 18:04:20 -04:00
nhmall 2394009339 Merge branch 'master' into win32-x64-working 2015-05-02 15:06:19 -04:00
nhmall bfd2a66ba0 Merge branch 'master' into win32-x64-working 2015-05-02 14:53:04 -04:00
nhmall 9e48d40496 Merge branch 'master' into win32-x64-working 2015-05-02 14:04:17 -04:00
nhmall 77dd76ed17 Merge branch 'master' into win32-x64-working
Resolved Conflicts:
	src/cmd.c
	src/mkobj.c

 All conflicts fixed but you are still merging.

 Changes to be committed:
	modified:   dat/Priest.des
	modified:   dat/Rogue.des
	modified:   dat/Valkyrie.des
	modified:   dat/Wizard.des
	modified:   dat/gehennom.des
	modified:   src/cmd.c
	modified:   src/mkobj.c
	modified:   src/steal.c
	modified:   sys/share/lev_yacc.c
	modified:   util/lev_comp.y
2015-05-02 13:53:08 -04:00
nhmall 088e0471f1 Merge branch 'master' into win32-x64-working 2015-05-01 18:36:39 -04:00
nhmall d29ee35ae8 fixes entry for previous bubble fix
Changes to be committed:
	modified:   doc/fixes35.0
2015-05-01 18:34:06 -04:00
nhmall 573c9dc98f Merge branch 'AlexK-misc' 2015-05-01 18:24:59 -04:00
nhmall bd68a6c80c Merge branch 'master' into win32-x64-working
Resolved Conflicts:
	src/mkobj.c
	src/mon.c
	src/options.c

 Changes to be committed:
	modified:   DEVEL/hooksdir/nhsub
	modified:   src/invent.c
	modified:   src/mkobj.c
	modified:   src/mon.c
	modified:   src/options.c
2015-05-01 08:22:36 -04:00
nhmall 67a53a2aa3 another ball & chain tweak
checking if uball is OBJ_FREE was inappropriate, because
sometimes it is in inventory.
2015-05-01 07:39:53 -04:00
nhmall 85c9a61efd Merge branch 'master' into win32-x64-working 2015-04-30 08:29:21 -04:00
nhmall c25ea3d851 can't use BALL_IN_MON after u.uswallow set to 0
u.uswallow is set to 0 a couple of lines above so
the test will never be TRUE.
2015-04-30 08:26:46 -04:00
nhmall 353417c642 Merge branch 'master' into win32-x64-working
Conflicts:
	src/mon.c
	src/options.c
	src/pickup.c
	src/zap.c

 Changes to be committed:
	modified:   doc/Guidebook.mn
	modified:   doc/Guidebook.tex
	modified:   doc/fixes35.0
	modified:   include/color.h
	modified:   include/extern.h
	modified:   include/mondata.h
	modified:   src/ball.c
	modified:   src/dbridge.c
	modified:   src/dig.c
	modified:   src/display.c
	modified:   src/dokick.c
	modified:   src/dungeon.c
	modified:   src/fountain.c
	modified:   src/invent.c
	modified:   src/mkmaze.c
	modified:   src/mkobj.c
	modified:   src/mon.c
	modified:   src/monmove.c
	modified:   src/mthrowu.c
	modified:   src/options.c
	modified:   src/pickup.c
	modified:   src/sit.c
2015-04-30 06:39:44 -04:00
nhmall fcfab90907 fix a panic and infinite recursion
Changes to be committed:
	modified:   src/ball.c
	modified:   src/display.c
	modified:   src/mon.c
2015-04-29 23:53:31 -04:00
nhmall 97a5bdfb17 comment rearranged
Requested by Sean for some work he's doing for reindent.
2015-04-29 20:54:11 -04:00
nhmall 3924b01e73 trade a segfault for a panic
Changes to be committed:
	modified:   src/invent.c
	modified:   src/options.c

Apparently we need this based on Pasi's segfault. We just
don't yet know why we need them.

Also fix a warning:
..\src\options.c(1282) : warning C4101: 'tmp' : unreferenced local variable
2015-04-27 23:42:06 -04:00
nhmall ea21088d2a Merge branch 'AlexK-misc' into win32-x64-working 2015-04-26 18:08:50 -04:00
nhmall fa238fad65 Merge branch 'master' into win32-x64-working 2015-04-26 08:39:18 -04:00
nhmall 8624709c0d comment termination bit 2015-04-25 15:49:14 -04:00
nhmall 07c5467434 checkfile protection from caller
Changes to be committed:
	modified:   src/pager.c
2015-04-25 10:51:07 -04:00
nhmall a717d06ce4 Merge branch 'master' into win32-x64-working
Conflicts:
	src/end.c
	src/files.c
	src/options.c
2015-04-25 08:58:59 -04:00
nhmall 3d5415b33a Merge branch 'master' into win32-x64-working 2015-04-24 22:40:46 -04:00
nhmall ed2e70b506 Merge branch 'master' into win32-x64-working 2015-04-24 11:50:34 -04:00
nhmall 65e699b646 fix an observed stack corruption
Changes to be committed:
	modified:   src/pager.c
2015-04-24 11:23:07 -04:00
nhmall 5a87938c7d Merge branch 'master' into win32-x64-working
Conflicts:
	src/restore.c
	src/save.c
2015-04-23 07:03:45 -04:00
nhmall 67e7565ee2 Merge branch 'master' into win32-x64-working
Conflicts:
	src/sp_lev.c
2015-04-22 22:33:22 -04:00
nhmall 03dc59b763 put back resource file 2015-04-22 22:05:23 -04:00
nhmall 89c862b15a fix typo in typo fix 2015-04-22 21:44:04 -04:00
nhmall f7b5d2f751 tiles weren't being copied to the binary directory
Changes to be committed:
	modified:   win/win32/vs2013/NetHackW.vcxproj
2015-04-22 20:28:46 -04:00
nhmall 68a68e167a merge fallout from previous night 2015-04-22 20:05:27 -04:00
nhmall 98e691aa1d visual studio build fix
Changes to be committed:
	modified:   win/win32/vs2013/NetHack.vcxproj
	modified:   win/win32/vs2013/NetHackW.vcxproj
2015-04-22 19:56:05 -04:00
nhmall c78d09a7d4 Merge branch 'master' into win32-x64-working
Conflicts:
	include/extern.h
	src/do.c
	src/mon.c

 Changes to be committed:
	modified:   include/extern.h
	modified:   src/ball.c
	modified:   src/do.c
	modified:   src/eat.c
	modified:   src/hack.c
	modified:   src/invent.c
	modified:   src/lock.c
	modified:   src/mon.c
	modified:   src/pickup.c
	modified:   src/pline.c
	modified:   src/save.c
	modified:   src/sp_lev.c
	modified:   src/steed.c
	modified:   src/trap.c
	modified:   src/uhitm.c
2015-04-22 08:08:50 -04:00
nhmall 3238303dc8 replace a couple of Makefile bits that shouldn't have been removed
Changes to be committed:
	modified:   sys/winnt/Makefile.gcc
	modified:   sys/winnt/Makefile.msc
2015-04-22 00:30:03 -04:00
nhmall aaca36a6d5 build both tty NetHack.exe and gui NetHackW.exe
Changes to be committed:
	modified:   include/config.h
	modified:   include/extern.h
	modified:   include/flag.h
	modified:   include/global.h
	modified:   include/ntconf.h
	modified:   include/wintty.h
	modified:   src/cmd.c
	modified:   src/files.c
	modified:   src/options.c
	modified:   sys/share/pcmain.c
	modified:   sys/share/pcsys.c
	modified:   sys/share/pcunix.c
	modified:   sys/winnt/Makefile.gcc
	modified:   sys/winnt/Makefile.msc
	modified:   sys/winnt/nttty.c
	new file:   sys/winnt/stubs.c
	modified:   sys/winnt/winnt.c
	modified:   util/makedefs.c
	modified:   win/tty/wintty.c

Adjust the code and the command line Makefile so that
you no longer have to choose whether to build the tty
version NetHack.exe, or the gui version NetHackW.exe.

Both will now be built in a single 'nmake install' pass.
2015-04-22 00:07:46 -04:00
nhmall 9b63abf2b0 Merge branch 'master' into win32-x64-working 2015-04-21 17:52:40 -04:00
nhmall 3969eb2af1 Merge branch 'master' into win32-x64-working
Conflicts:
	src/mon.c

 Changes to be committed:
	modified:   DEVEL/Developer.txt
	modified:   dat/endgame.des
	modified:   include/patchlevel.h
	modified:   include/you.h
	modified:   src/mon.c
	modified:   src/sounds.c
	modified:   src/spell.c
	modified:   src/vault.c
	modified:   win/share/tiletext.c
2015-04-21 06:39:52 -04:00
nhmall 09920871f2 invalid escape
Changes to be committed:
	modified:   win/share/tiletext.c
2015-04-19 18:56:49 -04:00
nhmall 4f86d74592 Merge branch 'master' into win32-x64-working 2015-04-19 17:18:43 -04:00
nhmall 0827c0df9d Update the tile RGB values and mappings
Changes to be committed:
	modified:   win/share/monsters.txt
	modified:   win/share/objects.txt
	modified:   win/share/other.txt
	modified:   win/share/tile2bmp.c
	modified:   win/share/tiletext.c
2015-04-19 17:17:03 -04:00
nhmall 0147b40ec7 Makefile bit
NMAKE : fatal error U1073: don't know how to make 'tile.c'
2015-04-19 13:51:47 -04:00
nhmall 59afa8f570 Merge branch 'master' into win32-x64-working 2015-04-19 13:47:09 -04:00
nhmall 56c4475c20 extend the tty statue patch to tiles
Changes to be committed:
	modified:   doc/fixes35.0
	modified:   win/share/gifread.c
	modified:   win/share/monsters.txt
	modified:   win/share/objects.txt
	modified:   win/share/other.txt
	modified:   win/share/tile2bmp.c
	modified:   win/share/tilemap.c

The tty code already had the statue patch included, where
statues are represented by stone versions similar in
appearance to their monster likeness.

This extends it to tiles.

A new pass through the monsters.txt file is done
in tile2bmp to include new modified tiles to the output
file that are gray-scaled versions for mapping to the
NetHack statue glyphs.
2015-04-19 13:31:59 -04:00
nhmall 0918e65801 Merge branch 'master' into win32-x64-working 2015-04-18 17:47:14 -04:00
nhmall 0fdcea70c6 suggested booktribute mods
Changes to be committed:
	modified:   include/extern.h
	modified:   src/files.c
	modified:   src/objects.c
	modified:   src/spell.c

- charge a little more.
- no free read in the bookstore.
2015-04-18 17:45:27 -04:00
nhmall e5058c9a24 Merge branch 'master' into win32-x64-working 2015-04-18 15:33:50 -04:00
nhmall 78b012a680 prevent a couple of reported array index segfaults
Changes to be committed:
	modified:   src/hack.c
	modified:   src/pager.c

Don't use glyph_to_cmap as an array index into
the defsyms[] array unless it really is a cmap.

Recent situation: glyph_to_cmap will return
NO_GLYPH for the unknown monster glyph 'I', which
is not a valid index for the defsyms[] array.
2015-04-18 15:29:37 -04:00
nhmall 884b4482a8 Merge branch 'master' into win32-x64-working 2015-04-17 06:34:48 -04:00
nhmall 2c1e82ee6e Merge branch 'master' into win32-x64-working 2015-04-17 00:47:58 -04:00
nhmall e1155aca6f add an initializer 2015-04-17 00:46:54 -04:00
nhmall 63291b3f98 Merge branch 'master' into win32-x64-working 2015-04-17 00:34:43 -04:00
nhmall f6bf9f9999 protect against bad dates
A recent fault on mingw32 revealed that faulty
code which passes a bad or out-of-range date
value could have game-fatal consequences.
Add some protection.
2015-04-17 00:31:22 -04:00
nhmall d52c6a208d date verification 2015-04-17 00:12:53 -04:00
nhmall 1354215b97 Makefile bit 2015-04-14 20:45:18 -04:00
nhmall 0c769146ba gcc Makefile updates for recent file additions 2015-04-14 20:24:52 -04:00
nhmall 1e388fc1b9 update Makefile.gcc
Changes to be committed:
	modified:   sys/winnt/Makefile.gcc
2015-04-14 20:18:19 -04:00
nhmall e8667b36a1 win32 perm inventory fix (from Alex) 2015-04-14 18:31:00 -04:00
nhmall 3d3ee78a0b Merge branch 'master' into win32-x64-working
Conflicts:
	src/files.c
	src/potion.c
	sys/winnt/Makefile.msc

 Changes to be committed:
	modified:   .gitignore
	modified:   DEVEL/hooksdir/nhsub
	modified:   dat/.gitignore
	modified:   dat/opthelp
	modified:   doc/Guidebook.mn
	modified:   doc/Guidebook.tex
	modified:   doc/fixes35.0
	modified:   include/context.h
	modified:   include/decl.h
	modified:   include/extern.h
	modified:   include/flag.h
	modified:   include/hack.h
	modified:   include/patchlevel.h
	modified:   src/apply.c
	modified:   src/attrib.c
	modified:   src/decl.c
	modified:   src/do.c
	modified:   src/do_name.c
	modified:   src/dothrow.c
	modified:   src/eat.c
	modified:   src/files.c
	modified:   src/hack.c
	modified:   src/invent.c
	modified:   src/lock.c
	modified:   src/mklev.c
	modified:   src/mondata.c
	modified:   src/monmove.c
	modified:   src/music.c
	modified:   src/options.c
	modified:   src/potion.c
	modified:   src/pray.c
	modified:   src/sit.c
	modified:   src/sp_lev.c
	modified:   src/uhitm.c
	modified:   sys/share/posixregex.c
	modified:   sys/winnt/Makefile.msc
	modified:   util/.gitignore
	modified:   win/win32/vs2010/NetHackW.vcxproj
2015-04-14 18:23:48 -04:00
nhmall 6e62d56367 fix Makefile build in branch 2015-04-12 20:27:21 -04:00
nhmall ed783b9940 yet more integration bits (thanks to my typo) 2015-04-12 16:48:06 -04:00
nhmall 636da9887b more regex integration bits 2015-04-12 13:27:36 -04:00
nhmall 5dd00aca54 Makefile bit following merge 2015-04-12 12:16:59 -04:00
nhmall 7e781d4013 Merge branch 'master' into win32-x64-working
Conflicts:
	include/config.h
	src/options.c
2015-04-12 11:58:14 -04:00
nhmall a66224f9dc Add some new files to top level Files 2015-04-12 11:46:56 -04:00
nhmall 5905a17242 visual studio mods for tribute, sysconf
Changes to be committed:
	modified:   win/win32/mhmenu.h
	modified:   win/win32/vs2013/NetHack.vcxproj
	modified:   win/win32/vs2013/NetHackW.vcxproj
	modified:   win/win32/vs2013/dlb_main.vcxproj
2015-04-12 10:58:13 -04:00
nhmall 83a7513c13 Merge branch 'master' into win32-x64-working
Conflicts:
	src/do_name.c
	src/trap.c
	src/zap.c
	win/X11/winmenu.c
2015-04-12 10:35:00 -04:00
nhmall 7da3ed32e1 tribute post-merge smoothing
Changes to be committed:
	modified:   src/mon.c
	modified:   win/share/objects.txt
2015-04-12 10:31:26 -04:00
nhmall 11560933cc Merge branch 'master' into nhmall-booktribute
Conflicts:
	doc/fixes35.0
	include/extern.h
	src/mkobj.c
	src/mon.c
	src/objnam.c
	win/share/objects.txt
2015-04-12 10:02:17 -04:00
nhmall a7b4309cc1 Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-04-12 08:58:16 -04:00
nhmall ea96cdd547 More Guidebook
Changes to be committed:
	modified:   doc/Guidebook.mn
	modified:   doc/Guidebook.tex
2015-04-12 08:57:41 -04:00
nhmall c03a37c440 Merge branch 'master' into win32-x64-working
Conflicts:
	include/extern.h
2015-04-12 00:35:57 -04:00
nhmall be5fa68bde Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-04-12 00:34:06 -04:00
nhmall 816589e626 windows team update 2015-04-12 00:33:30 -04:00
nhmall 2cfa05cde1 Merge branch 'master' into win32-x64-working
Conflicts:
	include/config.h
	include/extern.h
	src/do.c
	src/files.c
	src/hack.c
	src/mkobj.c
	src/mon.c
	src/objnam.c
	src/vision.c
	sys/share/pcmain.c
	win/share/other.txt
	win/share/renumtiles.pl
2015-04-12 00:15:40 -04:00
nhmall 1a8cfeaef3 Files correction 2015-04-11 21:07:02 -04:00
nhmall 2f4e7b601d text file error corrections
Changes to be committed:
	modified:   DEVEL/code_features.txt
	modified:   Files
	modified:   dat/history

On 4/11/2015 6:45 PM, Dion Nicolaas wrote:
> Errors in text files:
> - DEVEL/code_features.txt, line 10: 'alterting' should be 'alerting'

fixed

> - dat/history: Is it intentional that I'm no longer mentioned as
> maintaining the Windows port? I am for 3.4, but not for 3.6.

fixed

> - Files: The Files file is incomplete. Notably, the new files in dat/
> are missing (bogusmon.txt, engrave.txt, epitaph.txt),

fixed

> the DEVEL directory, doc/Guidebook.*

> - Some files in Files have the wrong case: NetHack.sln,
> NetHackW.vcxproj. I know it doesn't matter on windows but it looks wrong.

fixed
2015-04-11 21:02:11 -04:00
nhmall 7e098c0c4e Merge branch 'master' into nhmall-booktribute 2015-04-10 12:15:14 -04:00
nhmall 684e507143 attempt to fix Makefile issue with tribute 2015-04-06 23:16:14 -04:00
nhmall 6ffafd71de Merge branch 'nhmall-booktribute' of https://rodney.nethack.org:20040/git/NHsource into nhmall-booktribute 2015-04-06 22:41:00 -04:00
nhmall 49b45bdbf5 function definitition to match prototype const 2015-04-06 22:38:01 -04:00
nhmall 06227ec0d3 Merge branch 'master' into nhmall-booktribute 2015-04-06 17:47:11 -04:00
nhmall 13185adad2 Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-04-06 16:18:44 -04:00
nhmall 4494b328f0 replace 3 files and add 1 prototype
Changes to be committed:
	modified:   include/extern.h
	modified:   src/apply.c
	modified:   src/sys.c
	modified:   win/tty/wintty.c

The 3 files appeared to be missing sections. The erronoeous
versions have been emailed to the win32 team to determine
their fate.

Adds a missing prototype also.
2015-04-06 10:41:10 -04:00
nhmall 3d6fabf730 nhclose
Changes to be committed:
	modified:   include/extern.h
	modified:   src/bones.c
	modified:   src/do.c
	modified:   src/files.c
	modified:   src/music.c
	modified:   src/restore.c
	modified:   src/save.c
	modified:   sys/share/pcmain.c
	modified:   sys/share/pcsys.c
	modified:   sys/share/pcunix.c

In order to get level file locking correctly again post 3.4.3
with the newer compilers for windows, I had to funnel close()
calls to an intercepting routine.

I had two choices:

1. Surround every close() in at least 9 source files with messy:
	#ifdef WIN32
		nhclose(fd);
	#else
		close(fd);
	#endif

OR

2. Replace every close() with nhclose() and
   deal with the special code in the nhclose()
   version for windows, while just calling
   close() for other platforms (in files.c).

   It is also possible, although not done in this commit,
   to
	#define nhclose(fd) close(fd)
   in a header file for non-windows, rather than funnel
   though a real nhclose() function in files.c.
2015-04-06 10:12:10 -04:00
nhmall b7ad4a8a2a Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-04-05 09:34:00 -04:00
nhmall 660534389e a warning bout lc_error
lev_comp.l(310) : warning C4013: 'lc_error' undefined; assuming extern returning int
2015-04-05 09:26:01 -04:00
nhmall 1e74df8b08 Changes to be committed:
modified:   src/shknam.c
	modified:   src/trap.c
	modified:   src/zap.c

While polymorph was clearing the name because poly_obj
actually creates a brand new obj and copies field values
over, water_damage does not so the name persisted on
the blank spellbook. In this case, that isn't really
appropriate. Clear the name.

Ensure that cancellation has no effect on these
ordinary books.

Make the second-hand bookstore an option for holding
the book tribute item too.
2015-04-05 00:20:42 -04:00
nhmall 8b6736c57b update passage count on title line for The Colour of Magic 2015-04-05 00:08:34 -04:00
nhmall a8261cd10a correct something spotted in email diff 2015-04-04 21:38:43 -04:00
nhmall b383cc6a2c update book tribute
Changes to be committed:
	modified:   doc/fixes35.0
	modified:   include/extern.h
	modified:   src/do_name.c
	modified:   src/objnam.c

This pretty much completes the code portion of the book tribute.
- The book will appear in the rare books shop.
- When you read the book, a random passage is drawn for a
  tribute file (suggested by Mike).
- The book cannot be renamed because it already has a
  name (observed/suggested by Sean).

The data file (dat/tribute) has a few test passages, but needs to be
filled out. Sean and Mike Stephenson have indicated that
possibly they may be able to help contribute to that. Ideally,
there should be at least one passage from each of the books.
2015-04-04 21:20:34 -04:00
nhmall 5432ba7f44 Merge branch 'master' into nhmall-booktribute 2015-04-04 08:31:14 -04:00
nhmall fff3b12de0 Merge branch 'nhmall-booktribute' of https://rodney.nethack.org:20040/git/NHsource into nhmall-booktribute 2015-04-04 08:22:05 -04:00
nhmall 7a3e7aaf64 missed a conflict 2015-04-02 19:24:10 -04:00
nhmall c43e8f9d31 Merge branch 'master' into nhmall-booktribute
Conflicts:
	include/context.h
2015-04-02 19:19:50 -04:00
nhmall 8fb23b4a41 non-Unix build was broken today
Changes to be committed:
	modified:   src/cmd.c

../src/cmd.c(515) : warning C4013: 'check_user_string' undefined; assuming extern returning int)
link error - cmd.o : error LNK2019:
unresolved external symbol _check_user_string referenced in function _enter_explore_mode
2015-03-31 19:07:25 -04:00
nhmall 6ab783b05b cmdline Makefile updates 2015-03-29 21:00:50 -04:00