Commit Graph
4768 Commits
Author SHA1 Message Date
karnov 0822995557 Reformat and passage for The Truth 2015-04-06 19:03:38 -04:00
Derek S. Ray 61ffe9028d re-fix wintty.c; disable warnings on sp_lev.c
don't ask me why wintty.c was actually compiling before.
also, make studio shut up about all the long-to-short stuff.
2015-04-06 18:56:30 -04:00
keni 5cff7e59aa nhsub: handle some more cases 2015-04-06 17:48:48 -04:00
nhmall 06227ec0d3 Merge branch 'master' into nhmall-booktribute 2015-04-06 17:47:11 -04:00
Derek S. Ray aac78fe62e Fix up errors from mass manual conflict resolution 2015-04-06 17:18:48 -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
keni a5d6c1dd7a Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-04-06 08:11:17 -04:00
Pasi Kallinen 3ab441b1a1 Quick band-aid to prevent PRNG prediction
This is originally Derek's change from Spork, but sniping it
so we can mark this done for now, and can move on with the
nextversion.

Better solution is to use something like the ISAAC PRNG, which
cannot be predicted.
2015-04-06 09:30:39 +03:00
Derek S. Ray b4142b5894 Merge branch 'master' into win32-x64-working
* master: (354 commits)
  Add missing protos
  a warning bout lc_error
  Add S_poisoncloud to Guidebooks
  ...

Conflicts:
	.gitattributes
	dat/.gitattributes
	doc/.gitattributes
	doc/Guidebook.mn
	include/config.h
	include/decl.h
	include/extern.h
	include/flag.h
	include/hack.h
	include/ntconf.h
	include/sys.h
	include/wceconf.h
	src/apply.c
	src/attrib.c
	src/bones.c
	src/botl.c
	src/dbridge.c
	src/dig.c
	src/do.c
	src/do_name.c
	src/dog.c
	src/dungeon.c
	src/eat.c
	src/end.c
	src/files.c
	src/fountain.c
	src/hack.c
	src/invent.c
	src/light.c
	src/makemon.c
	src/mhitu.c
	src/mklev.c
	src/mkmaze.c
	src/mkobj.c
	src/mkroom.c
	src/mon.c
	src/objnam.c
	src/options.c
	src/pager.c
	src/pickup.c
	src/potion.c
	src/pray.c
	src/questpgr.c
	src/read.c
	src/restore.c
	src/rnd.c
	src/role.c
	src/rumors.c
	src/save.c
	src/shk.c
	src/sit.c
	src/sp_lev.c
	src/sys.c
	src/teleport.c
	src/trap.c
	src/u_init.c
	src/uhitm.c
	src/wield.c
	src/worn.c
	src/zap.c
	sys/amiga/.gitattributes
	sys/mac/.gitattributes
	sys/msdos/.gitattributes
	sys/msdos/pctiles.c
	sys/msdos/vidvga.c
	sys/os2/.gitattributes
	sys/share/.gitattributes
	sys/share/pcmain.c
	sys/unix/.gitattributes
	sys/unix/hints/.gitattributes
	sys/unix/sysconf
	sys/unix/unixmain.c
	sys/vms/.gitattributes
	sys/wince/.gitattributes
	sys/wince/mhstatus.c
	sys/winnt/.gitattributes
	sys/winnt/Makefile.msc
	sys/winnt/nhsetup.bat
	util/lev_comp.l
	util/makedefs.c
	win/X11/winmenu.c
	win/X11/winstat.c
	win/gnome/gnstatus.c
	win/share/tilemap.c
	win/tty/termcap.c
	win/tty/topl.c
	win/tty/wintty.c
2015-04-05 23:42:15 -04:00
Derek S. Ray 07e0bc592c fire effects should burn green slime globs, too
On floor, in inventory, whatever. This probably needs to be extended to
support a much wider group of objects, but this will do to start.
2015-04-05 21:56:15 -04:00
keni 043c55a613 Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-04-05 20:57:28 -04:00
Derek S. Ray b3e2772f7b several fixes for farming changes
* don't let player wish for multiple globs
* use newsym() to clean up merged globs on floor
* food effects should match original corpse effects
* tidy up remaining crash when merging in place
2015-04-05 18:04:22 -04:00
nhmall b7ad4a8a2a Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-04-05 09:34:00 -04:00
Pasi Kallinen d8a65cd150 Add missing protos 2015-04-05 16:29:34 +03: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
Pasi Kallinen 2c8b088edf Add S_poisoncloud to Guidebooks 2015-04-05 15:15:49 +03:00
Pasi Kallinen 2643a5c311 Show stinking cloud valid positions 2015-04-05 13:51:30 +03:00
Pasi Kallinen 056565fe75 Make all elementals breathless
It makes no sense that air, fire and water elementals
would choke in stinking cloud.
2015-04-05 12:47:27 +03:00
Pasi Kallinen 71401a7db8 Add poison cloud glyph, fumaroles to fire plane.
When a gas cloud that deals damage is created, it uses
a poison cloud glyph instead of the cloud glyph.
(A bright green '#', or a bright-green recolor of the
cloud tile)

The plane of fire has random "stinking clouds", or
fumaroles, centered on lava pools.

Also make poison cloud glyph override lava, pool and
moat glyphs.
2015-04-05 12:31:55 +03: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
karnov 0270dd7a6b Passages for The Colour of Magic 2015-04-04 23:41:29 -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
keni 89b0fd5ca7 nhsub bug fixes 2015-04-04 15:43:58 -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
Sean Hunt 4e8e1889ef Add some quotes.
Please correct the formatting if need be.
2015-04-04 00:39:24 -04:00
Sean Hunt d5a2dcf8c7 Fix the Unix build. 2015-04-04 00:39:11 -04:00
Derek S. Ray 0b4383e32e clean up handling, roll everything into merged()
it should be possible to wish for globs now; also hero's
inventory, containers, ground, monster inventories will all
honor the globbiness.

basically, any way you bring two globs together (adjacent on floor,
same inventory, same bag) should cause them to merge, combining
weight and nutrition as appropriate.

20 seems low-ish on nutrition for a pudding (kelp fronds are 30!)
at first glance but this is easy enough to fix later; don't really
want players to be able to stock up on food _this_ way and accidentally
obsolete all the other food-generation methods.
2015-04-03 13:03:55 -04:00
Pasi Kallinen 68a39aeab4 Fix GCC warnings caused by new lev_comp 2015-04-03 17:40:54 +03:00
Pasi Kallinen fdc7e980ea Prevent segfaults, makemon can return null 2015-04-03 14:46:28 +03:00
Pasi Kallinen 30bce1ec6b Suggest only accessible positions for polearms and jumping 2015-04-03 12:29:58 +03:00
Pasi Kallinen 0344771b12 Silence warnings 2015-04-03 08:33:14 +03: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
Derek S. Ray e2f839efbd fix whiny compiler 2015-04-02 17:14:48 -04:00
Pasi Kallinen d0c3050d08 Update Guidebook with menucolor docs 2015-04-02 20:17:51 +03:00
Pasi Kallinen c8e781c418 Add menucolors
-Add a boolean option menucolors to toggle menu color
-Add MENUCOLOR -config file option

TODO:
-Better support for win32
-Support more windowports
-Update Guidebook
-Allow changing menucolor lines in-game
2015-04-02 20:16:25 +03:00
Pasi Kallinen 9f66b234ed Separate splev stack pops 2015-04-02 16:08:15 +03:00
Pasi Kallinen f150adf0ce Silence GCC warnings 2015-04-02 14:04:31 +03:00
Pasi Kallinen 884d9d4be5 Record in xlogfile if any bones were loaded 2015-04-02 13:06:45 +03:00
PatR 066e415c3e some lint cleanup
Mostly local variables using the same name as other things.
2015-04-01 17:29:26 -07:00
Derek S. Ray af5ed436b8 Merge branch 'master' into derek-farming
* master: (160 commits)
  Add doors correctly
  bug fixes for nhsub
  Generate oracle monsters after subroom
  Generate minetown guards after subrooms
  ...

Conflicts:
	src/do.c
	src/files.c
	src/hack.c
	src/mon.c
	src/vision.c
2015-04-01 17:40:25 -04:00
Pasi Kallinen 2a4affbf6f Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource into paxed-new_lev_comp 2015-04-01 23:03:04 +03:00
Pasi Kallinen d883da2353 Add doors correctly 2015-04-01 23:01:25 +03:00
keni bc6bd724ac Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-04-01 14:41:11 -04:00
keni 32236f7985 bug fixes for nhsub 2015-04-01 14:40:48 -04:00