Commit Graph
100 Commits
Author SHA1 Message Date
nhmall 40e7eb7e2a sync recent wording change in history 2019-05-05 14:16:49 -04:00
nhmall 79cc1aa01a Merge branch 'NetHack-3.6.2-beta01' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.2-beta01 2019-05-05 13:34:38 -04:00
nhmall c74e36a359 some updates for 3.6.2 2019-05-05 13:33:59 -04:00
nhmall 82353f1965 enum bit 2019-04-22 14:27:41 -04:00
nhmall dcf4da2150 preserve dknown field between fakeobj instances
Preserve temporary fake object's previous dknown value by storing it
as a flag value within the m_ap_type field of the posing monster, and
recalling it when it is needed.

This is intended to help eliminate observable differences in price display
between real objects and mimics posing as objects.

98% of this is just switching the code to utilize macro M_AP_TYPE(mon)
everywhere to ensure that the flag bits are stripped off when needed.
2019-04-22 14:17:18 -04:00
nhmall 558216e0c5 Guidebook.tex corrections 2019-04-10 17:22:18 -04:00
nhmall 730f9684eb vs nhsetup bit 2019-04-09 00:41:12 -04:00
nhmall 5258bb0ed4 adjust for recently released MS Visual Studio 2019
win\curses\cursstat.c(886) : error C4703: potentially uninitialized local pointer variable 'p' used
2019-04-09 00:35:02 -04:00
nhmall 804a4f1846 warning fix
..\win\curses\cursstat.c(302): warning C4101: 'colon': unreferenced local variable
2019-03-24 12:50:31 -04:00
nhmall 963cb352bc Merge branch 'NetHack-3.6.2-beta01' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.2-beta01 2019-03-13 20:04:50 -04:00
nhmall 12aedbd60f Merge branch 'NetHack-3.6.2-beta01' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.2-beta01 2019-03-13 20:04:16 -04:00
nhmall 13c0428721 even more mingw 2019-03-13 19:59:57 -04:00
nhmall acc92bcacb yet more mingw w64 build
Fix:
../sys/winnt/nhraykey.c: In function 'CheckInput':
../sys/winnt/nhraykey.c:459:37: warning: type of 'mode' defaults to 'int' [-Wimplicit-int]
 int __declspec(dllexport) __stdcall CheckInput(hConIn, ir, count, numpad,
                                     ^~~~~~~~~~
2019-03-13 19:55:43 -04:00
nhmall 80683eacaf re-comment some optional Makefile lines for sys/winnt/Makefile.gcc 2019-03-12 21:32:54 -04:00
nhmall 9604e50e3d more mingw 2019-03-12 21:30:22 -04:00
nhmall 93201e9e24 first attempt at mingw w64 build for Windows 2019-03-12 21:14:43 -04:00
nhmall 6a81d78c56 Merge branch 'NetHack-3.6.2-beta01' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.2-beta01 2019-02-26 19:53:42 -05:00
nhmall be3092bed4 some fish should lay their eggs in the water rather than on land
Generally, fish should lay their eggs in the water and
not on land, but the game was only allowing the opposite.

Eels are catadromous and lay their eggs in the Sargasso Sea,
not in the dungeon.
2019-02-26 19:49:24 -05:00
nhmall 587a51bee7 include isaac64 in xcode build 2019-02-24 14:35:49 -05:00
nhmall fb14c283c3 fix typo in comment 2019-02-22 09:00:53 -05:00
nhmall d5d4aed4e1 NetHack Windows curses port build with Jan 2019 PDCurses update
Clear up some NetHack warnings with updated PDCurses by using
-DCHTYPE_32

..\win\curses\cursinvt.c(98): warning C4244: 'function': conversion from 'attr_t' to 'int', possible loss of data
..\win\curses\cursinvt.c(101): warning C4244: 'function': conversion from 'attr_t' to 'int', possible loss of data
..\win\curses\cursinvt.c(105): warning C4244: 'function': conversion from 'attr_t' to 'int', possible loss of data
2019-02-16 14:15:35 -05:00
nhmall 684fee0f64 typo 2019-02-11 14:35:25 -05:00
nhmall 4150d0b443 use the NetHack macro NHSTDC in makedefs 2019-02-11 12:28:57 -05:00
nhmall fb5e6a7bb3 arrange platform/interface fixes alphabetically by platform in fixes36.2 2019-02-11 12:23:00 -05:00
nhmall 6675055920 Guidebook date update 2019-02-10 19:02:06 -05:00
nhmall 44b6808580 Guidebook consistency improvement 2019-02-10 18:48:50 -05:00
nhmall 2b6b4c0833 fixes entry for amiga fix
Also, a pull request 175 showed up after the earlier commit for the missing
continuation lines, so mark the pull request as closed.

closes #175
2019-02-04 20:27:18 -05:00
nhmall ba030ade7b Merge branch 'NetHack-3.6.2-beta01' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.2-beta01 2019-02-04 20:04:59 -05:00
nhmall 7042e5fdef another contributed Amiga bit, missing line continuations in Makefile 2019-02-04 20:02:53 -05:00
nhmall f38dca7cb1 variable moved to context long ago
just reported, a variable moved to context long ago
2019-02-04 18:35:17 -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 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 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 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 af42273b02 fixes36.2 update for added isaac64 prng 2019-01-29 07:38:57 -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 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 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 a6c290399b Windows warning fix 2019-01-19 11:04:26 -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 c2777860e9 incorrect header 2018-12-30 22:02:42 -05:00
nhmall 83e8033f72 remove curses date.h dependency in Windows Makefiles 2018-12-30 07:58:39 -05:00
nhmall eed7c4bdd1 nttty topten output processing
switch back to using the safe routines
after tty port exits on Windows console
tty port.

Fixes H7758
1613
2018-12-29 12:26:33 -05:00
nhmall fc504dfa89 yet more Windows Makefile
Now that the dependency lines are corrected for the
correct output files in the Makefile, it revealed a
dependency on a non-existent file.
2018-12-28 12:51:11 -05:00
nhmall be67656932 More Windows Makefile corrections 2018-12-28 12:34:41 -05:00
nhmall 1cdb9c561c Windows Makefile updates 2018-12-28 12:29:12 -05:00
nhmall a5f154d925 a couple of source spelling consistencies for /*FALLTHRU*/ 2018-12-28 10:08:56 -05:00
nhmall a2296d043f eliminate sys/share/pcsys.c from Windows build
Windows build was actually only using a single function
in there, so just add a similar function to sys/winnt/winnt.c
and eliminate the need for including sys/share/pcsys.c in
the build.
2018-12-19 06:43:00 -05:00
nhmall 95f2c9a5d6 Merge branch 'NetHack-3.6.2-beta01' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.2-beta01 2018-12-18 17:10:29 -05:00
nhmall ac1f5feb2c update .gitattributes for recent changes 2018-12-18 17:09:52 -05:00
nhmall c18fa565a2 wording adjustment to fixes entry 2018-12-18 00:24:37 -05:00
nhmall 94ac3047f0 fix OPTIONS=symset:default, roguesymset:RogueEpyx 2018-12-18 00:14:39 -05:00
nhmall 6302fe3eaf Merge branch 'NetHack-3.6.2-beta01' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.2-beta01 2018-12-16 18:55:30 -05:00
nhmall c8defa67df revert to prior behavior 2018-12-16 18:52:55 -05:00
nhmall 42d9af1b23 don't show stubs in window port valid list 2018-12-15 23:11:52 -05:00
nhmall 91092cfa89 Merge branch 'NetHack-3.6.2-beta01' into win-minor 2018-12-15 22:58:32 -05:00
nhmall e2c78002bb Merge branch 'NetHack-3.6.2-beta01' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.2-beta01 2018-12-15 22:40:07 -05:00
nhmall 9de6c25e7e clean exit on window port init failure 2018-12-15 22:36:24 -05:00
nhmall 1b1ea19e57 comment out PDCurses bt default again 2018-12-15 22:04:55 -05:00
nhmall 91ef66b052 Merge branch 'NetHack-3.6.2-beta01' into win-minor 2018-12-15 22:03:44 -05:00
nhmall 31c4eba835 Guidebook bit 2018-12-15 22:03:05 -05:00
nhmall 1b0719a8cc Makefile.msc update
Tell people where to find the latest PDCurses git
repository
2018-12-15 21:52:00 -05:00
nhmall 718c029994 Merge branch 'win-minor' into NetHack-3.6.2-beta01 2018-12-15 19:34:56 -05:00
nhmall 902f76d1fa more win32 gui fuzzer work 2018-12-15 19:31:42 -05:00
nhmall bebc92f6fb more win32 gui fuzzer work 2018-12-15 19:31:07 -05:00
nhmall be9d974c4d Makefile.msc update 2018-12-15 02:17:15 -05:00
nhmall 56051e0b9b Merge branch 'NetHack-3.6.2-beta01' into win-minor 2018-12-14 23:11:37 -05:00
nhmall 16cda0882c fix up PDCurses cursor placement for prompts 2018-12-14 23:08:41 -05:00
nhmall 1be3ad0ddc Merge branch 'NetHack-3.6.2-beta01' into win-minor 2018-12-14 17:25:24 -05:00
nhmall b71df7b144 Merge branch 'win-minor' into NetHack-3.6.2-beta01 2018-12-13 21:25:34 -05:00
nhmall bdae51503c stale dependency 2018-12-13 20:21:26 -05:00
nhmall 5e37d5b5d4 commented out by default 2018-12-13 20:11:03 -05:00
nhmall e6e2d8a257 Merge branch 'NetHack-3.6.2-beta01' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.2-beta01 2018-12-13 20:08:47 -05:00
nhmall 36d27b11bd pdcurses expected objs
Match the required curses obj's in most recent updates from
git clone https://git.code.sf.net/p/pdcurses/code pdcurses
2018-12-13 20:07:22 -05:00
nhmall f9beca06dc core code style 2018-12-13 01:36:36 -05:00
nhmall 155499fbda Merge branch 'win-minor' into NetHack-3.6.2-beta01 2018-12-12 06:40:52 -05:00
nhmall 5f21dd1308 fix apparent copy and paste error 2018-12-10 18:01:43 -05:00
nhmall ac6ab22347 typo fix 2018-12-10 17:28:43 -05:00
nhmall 2243b1bb00 trigger update 2018-12-10 17:24:32 -05:00