Commit Graph
4534 Commits
Author SHA1 Message Date
Sean Hunt 951de70b36 Do not clean tribute file on Unix. 2015-04-07 20:44:54 -04:00
Sean Hunt 05c284b2e8 Add quotes for Eric and Moving Pictures. 2015-04-07 12:48:55 -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
karnov 0f246b70d3 Adding quotes for The Light fantastic 2015-04-06 21:46:51 -04:00
karnov 0822995557 Reformat and passage for The Truth 2015-04-06 19:03:38 -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 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
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
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
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
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
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
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
Pasi Kallinen 5bbde14a39 Generate oracle monsters after subroom 2015-04-01 19:02:52 +03:00
Pasi Kallinen a883d3c78b Generate minetown guards after subrooms 2015-04-01 19:00:56 +03:00
Pasi Kallinen f3bbd833c0 Fix mazes not getting stocked 2015-04-01 18:30:35 +03:00
Pasi Kallinen 97fe3214c7 Remove unused code 2015-04-01 18:24:15 +03:00
Pasi Kallinen 7d94548951 Doors must be linked afterwards 2015-04-01 17:39:51 +03:00
Pasi Kallinen fa4dda377d Move isqrt into hacklib, other minor fixage 2015-04-01 16:38:56 +03:00
Pasi Kallinen 323b8b4038 Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource into paxed-new_lev_comp
Conflicts:
	src/trap.c
	sys/winnt/Makefile.msc
2015-04-01 16:09:53 +03:00