nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity
8,361 Commits 2 Branches 0 Tags
16d5d3f2e55161fa4570890d2ebaa0a3dc5e35ca
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
nhmall 16d5d3f2e5 Merge branch 'NetHack-3.6.2' 2019-01-31 19:48:51 -05:00
nhmall 4de4155998 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-31 19:29:55 -05:00
nhmall ed79141463 Merge branch 'NetHack-3.6.2-beta01' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.2-beta01 2019-01-31 18:22:55 -05:00
nhmall c456b313a7 Revert "adjust sample config file when STATUS_HILITES isn't defined" 
This reverts commit 03e6c26af6.
 2019-01-31 13:03:00 -05:00
nhmall d36eaf8f99 Merge branch 'NetHack-3.6.2' 2019-01-30 23:12:15 -05:00
nhmall d9f2d0c622 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-30 23:11:49 -05:00
nhmall 6e0d55dfbc rng bit 2019-01-30 11:08:11 -05:00
nhmall 446b0e69d5 add a descriptive comment to integer.h 2019-01-30 08:30:02 -05:00
nhmall 05ec7f36a8 Merge branch 'NetHack-3.6.2' 2019-01-29 22:34:07 -05:00
nhmall 02532667a9 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-29 22:33:18 -05:00
nhmall f2071a66f7 fix a likely typo/transcription error in integer.h 2019-01-29 22:12:09 -05:00
nhmall c598da8de4 fix build 
../sys/unix/unixmain.c: In function ‘sys_random_seed’:
../sys/unix/unixmain.c:779:29: error: expected expression before ‘long’
         fread(&seed, sizeof long, 1, fptr);
 2019-01-29 20:29:56 -05:00
nhmall d32b2c8188 Merge branch 'NetHack-3.6.2-beta01' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.2-beta01 2019-01-29 20:03:21 -05:00
nhmall f7b6723053 update the long version info generated by makedefs 2019-01-29 20:01:31 -05:00
nhmall b367b4e868 Merge branch 'NetHack-3.6.2' 2019-01-29 17:23:22 -05:00
nhmall dec463d2f5 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-29 17:23:03 -05:00
nhmall ccc14a038b more window port code uses of obj_to_glyph() 2019-01-29 17:21:55 -05:00
nhmall f935331285 try fix for Qt4 using a core macro 
../win/Qt4/qt4inv.cpp:41:26: error: macro "obj_to_glyph" requires 2 arguments, but only 1 given
  glyph=obj_to_glyph(nhobj);
                          ^
../win/Qt4/qt4inv.cpp: In member function ‘void nethack_qt4::NetHackQtInvUsageWindow::drawWorn(QPainter&, obj*, int, int, bool)’:
../win/Qt4/qt4inv.cpp:41:8: error: ‘obj_to_glyph’ was not declared in this scope
  glyph=obj_to_glyph(nhobj);
        ^
 2019-01-29 17:07:00 -05:00
nhmall 97fdc3f3e4 build bits - mostly for Windows 
Allow sys/share/random.c to be included in the build
always, even if USE_ISAAC64 is defined, by making most
of its contents conditional in that case.

That avoids Makefile tinkering when going back and
forth between USE_ISAAC64 and not during testing.
 2019-01-29 11:31:41 -05:00
nhmall f80223cdb4 Merge branch 'NetHack-3.6.2' 2019-01-29 09:27:46 -05:00
nhmall 9d2764b795 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-29 09:27:17 -05:00
nhmall af42273b02 fixes36.2 update for added isaac64 prng 2019-01-29 07:38:57 -05:00
nhmall fd410148c5 Merge branch 'NetHack-3.6.2' 2019-01-29 07:27:56 -05:00
nhmall d9a2c572f5 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-29 07:22:23 -05:00
nhmall 57f03eca1b Merge branch 'alex-and-isaac' into NetHack-3.6.2-beta01 2019-01-29 07:20:17 -05:00
nhmall 54062e0ad6 include the rnd.c bits 2019-01-28 19:54:18 -05:00
nhmall 457e4b68aa merge Alex's dual rng proposal with the isaac64 rng code and adjust 
This is branched from Alex's hallu-rng-stability branch,
with two build corrections (detect.c, zap.c), and merged
with  the isaac64 branch that we have ready to go.

Alex's dual rng is supported by setting up the array
of multiple isaac64 contexts.

I stuck with Alex's approach of passing the rng function
name around as the parameter (rng or rn2_on_display_rng)
for the new additional parameter needed for
set_random(), init_random(), reseed_random(),
and init_isaac64().
 2019-01-28 19:43:55 -05:00
nhmall 819ee796f2 Merge branch 'countermeasures' into alex-and-isaac 2019-01-28 18:37:50 -05:00
nhmall b84ff772cc Merge branch 'NetHack-3.6.2' 2019-01-28 16:36:46 -05:00
nhmall 542019d31e Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-28 16:36:23 -05:00
nhmall 3108b18ea5 Merge branch 'countermeasures' of https://rodney.nethack.org:20040/git/NHsource into countermeasures 2019-01-28 09:45:31 -05:00
nhmall f53d02f0bb Windows build bit 2019-01-28 09:44:35 -05:00
nhmall 22f8d864e2 ntconf.h ensure Rand is always something 
order of preference:
USE_ISAAC64
RANDOM
C routine
 2019-01-28 10:32:57 +01:00
nhmall c1327142b5 detect DEV_RANDOM fopen failure and fall back, noting it in paniclog 2019-01-28 10:32:57 +01:00
nhmall 0aa4d62a2c detect rng seed strength at runtime based on algorithm not compile time based on platform features 2019-01-28 10:32:57 +01:00
nhmall 0a430cab11 every platform provides sys_random_seed() and SYS_RANDOM_SEED goes away 2019-01-28 10:32:57 +01:00
nhmall 3f609bf9ad define Rand() in isaac4 config 
Rand() was typically defined to random() or to rand().

gcc seems to provide a random() to link to on linux
when sys/share/random.c is linked in, but other platforms
such as Windows got an undefined refence to random()
when RANDOM wasn't defined.

The only direct use seems to be in get_rnd_txt() these
days, in rumors.c

Under the USE_ISAAC64 config, neither srandom()
nor srand() are being invoked to seed those routines,
and it really should be using isaac64 when USE_ISAAC64
is defined anyway.
 2019-01-28 10:02:09 +01:00
nhmall 6c114640f5 some system-specific adjustments for RNG routines 
move some system-specific seed-related stuff from hacklib.c to
a system-specific source file and #define SYS_RANDOM_SEED to
utilize it during build.

Windows changes for random seed generation using
crypto next gen (CNG) api routines.

Corresponding vms changes due to disentangling of VMS and
unix when the unix seed bits got moved (untested).
 2019-01-28 10:02:08 +01:00
nhmall 1083971228 Merge branch 'NetHack-3.6.2-beta01' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.2-beta01 2019-01-27 19:22:28 -05:00
nhmall f57693a47e simplify and correctly locate fixes entry 2019-01-27 19:16:55 -05:00
nhmall d9b11e791c domove_ variables did not need to be in saved context 2019-01-27 15:12:55 -05:00
nhmall 96f1d0e207 Merge branch 'NetHack-3.6.2' 2019-01-27 12:39:52 -05:00
nhmall fd92ecf74a Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-27 12:08:05 -05:00
nhmall 55fdfb9200 domove_core() out of domove(); assess domove_core() results 
new domove_core() assessment results

potentially smudge engravings

Proceed to wipe engraving after domove_core() now, but only under
all of the following conditions:
    - you can reach the floor
    - preceding domove_core() move attempt was marked as
      having succeeded in domove_core()
    - there is actually an engraving there to impact at
      your original spot, or your new spot, or both
 2019-01-27 11:55:23 -05:00
nhmall befa1d94e9 Merge branch 'NetHack-3.6.2' 2019-01-25 21:08:03 -05:00
nhmall 5e165df44e Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-25 21:07:40 -05:00
nhmall e3365c21d4 Merge branch 'NetHack-3.6.2' 2019-01-24 07:55:47 -05:00
nhmall 186ed77d40 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-24 07:55:27 -05:00
nhmall 314ae68c2b merge NetHack-3.6.2 into master part 2 2019-01-23 00:53:35 -05:00
nhmall 66a5010070 Merge branch 'NetHack-3.6.2' 2019-01-23 00:42:41 -05:00
nhmall 434bb08bef Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-23 00:38:47 -05:00
nhmall cd3f66dcfc Merge branch 'NetHack-3.6.2' 2019-01-22 06:12:18 -05:00
nhmall cd43f4b462 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-22 06:12:00 -05:00
nhmall 00f2feb83d Merge branch 'NetHack-3.6.2' 2019-01-21 06:47:42 -05:00
nhmall b5504c27e0 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-21 06:47:20 -05:00
nhmall a6c290399b Windows warning fix 2019-01-19 11:04:26 -05:00
nhmall 28ac8090f9 Merge branch 'NetHack-3.6.2' 2019-01-18 18:51:12 -05:00
nhmall affe4a1bc5 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-18 18:50:51 -05:00
nhmall 53cedcfc2f merge NetHack-3.6.2 into master part 2 2019-01-16 20:09:41 -05:00
nhmall 0bb98b4155 Merge branch 'NetHack-3.6.2' 2019-01-16 20:04:59 -05:00
nhmall f05ce051e3 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-16 20:04:03 -05:00
nhmall e6f550dc79 Merge branch 'NetHack-3.6.2' 2019-01-14 21:20:42 -05:00
nhmall 60129c524a Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-14 21:20:24 -05:00
nhmall b629085b42 Merge branch 'NetHack-3.6.2' 2019-01-14 21:09:45 -05:00
nhmall e741157671 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-14 21:09:27 -05:00
nhmall c93e9b31dc merge NetHack-3.6.2 part2 2019-01-14 18:22:02 -05:00
nhmall 98acd55fcc Merge branch 'NetHack-3.6.2' 2019-01-14 18:16:19 -05:00
nhmall c71c64144d Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-14 18:09:26 -05:00
nhmall 090aa4a96d Merge branch 'NetHack-3.6.2' 2019-01-12 21:22:03 -05:00
nhmall 7e511d50c2 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-12 21:21:42 -05:00
nhmall 034ce7e8bd Merge branch 'NetHack-3.6.2' 2019-01-12 01:09:17 -05:00
nhmall 135b7c5c04 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-12 01:08:58 -05:00
nhmall 47171cbcdc Merge branch 'NetHack-3.6.2' 2019-01-10 22:46:00 -05:00
nhmall da1d62f9a1 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-10 22:45:41 -05:00
nhmall cbcb1ea7eb Merge branch 'NetHack-3.6.2' 2019-01-10 09:42:38 -05:00
nhmall 9641864861 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-10 09:26:27 -05:00
nhmall d4a469a7a6 Merge branch 'NetHack-3.6.2' 2019-01-09 09:22:46 -05:00
nhmall 580a6ab9c1 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-09 09:22:29 -05:00
nhmall 58f2218c4e Merge branch 'NetHack-3.6.2' 2019-01-09 07:24:18 -05:00
nhmall 624aee7749 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-09 06:21:59 -05:00
nhmall 7eee5f3a1d Merge branch 'NetHack-3.6.2' 2019-01-08 18:30:31 -05:00
nhmall dba8ce7c07 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-08 18:30:04 -05:00
nhmall 6408023786 Merge branch 'NetHack-3.6.2' 2019-01-07 18:13:45 -05:00
nhmall 4f11a122c9 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-07 18:13:22 -05:00
nhmall 269c9a2696 Merge branch 'NetHack-3.6.2' 2019-01-06 10:56:06 -05:00
nhmall 2e80de0646 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-06 10:55:37 -05:00
nhmall ba67274dbf Merge branch 'NetHack-3.6.2' 2019-01-05 10:28:34 -05:00
nhmall a95d0bd359 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-05 10:23:24 -05:00
nhmall 1086be1027 merge 2 2019-01-04 23:19:58 -05:00
nhmall ebabf16ad0 Merge branch 'NetHack-3.6.2' 2019-01-04 23:08:49 -05:00
nhmall a318908944 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-04 22:45:19 -05:00
nhmall 68920fdff0 Merge branch 'NetHack-3.6.2' 2019-01-03 11:18:02 -05:00
nhmall d0e1545657 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-03 11:17:33 -05:00
nhmall f0defb1111 Merge branch 'NetHack-3.6.2' 2019-01-01 19:51:41 -05:00
nhmall 4010f4d91d Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-01 19:51:05 -05:00
nhmall 194fd65a4b Merge branch 'cron-NetHack-3.6.2-beta01' into NetHack-3.6.2-beta01 2019-01-01 19:50:17 -05:00
nhmall ed2f2cc575 README update 2019-01-01 17:56:21 -05:00
nhmall cb25676c43 update for 2019 2019-01-01 11:48:30 -05:00
nhmall be5998b6e4 Merge branch 'NetHack-3.6.2' 2019-01-01 08:37:25 -05:00
nhmall d60cd7200e Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-01-01 08:37:01 -05:00