nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2

Browse Source
This commit is contained in:
nhmall
2019-01-29 17:23:03 -05:00
parent 9d2764b795 ccc14a038b
commit dec463d2f5
7 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sys/share/random.c
View File

@@ -38,6 +38,8 @@
#include "hack.h" #include "hack.h"
#if defined(USE_ISAAC64) && !defined(RANDOM)
#else
#ifdef LIBC_SCCS #ifdef LIBC_SCCS
#ifndef lint #ifndef lint
static char sccsid[] = "@(#)random.c 5.5 (Berkeley) 7/6/88"; static char sccsid[] = "@(#)random.c 5.5 (Berkeley) 7/6/88";
@@ -377,3 +379,7 @@ random()
} }
return (i); return (i);
} }
#endif /* else defined(USE_ISAAC64) && !defined(RANDOM) */

8
sys/winnt/Makefile.msc
View File

@@ -129,13 +129,9 @@ OBJ = o
# (see pcconf.h). Set to nothing if not used. # (see pcconf.h). Set to nothing if not used.
# #
RANDOM = $(OBJ)\isaac64.o RANDOM = $(OBJ)\random.o
#RANDOM = $(OBJ)\random.o
#RANDOM = #RANDOM =
BCRYPT=
! IF ("$(RANDOM)"=="$(OBJ)\isaac64.o")
BCRYPT=bcrypt.lib BCRYPT=bcrypt.lib
! ENDIF
WINPFLAG= -DTILES -DMSWIN_GRAPHICS -DWIN32CON WINPFLAG= -DTILES -DMSWIN_GRAPHICS -DWIN32CON
# To store all the level files, # To store all the level files,
@@ -223,7 +219,7 @@ VOBJ10 = $(O)mail.o $(O)makemon.o $(O)mapglyph.o $(O)mcastu.o
VOBJ11 = $(O)mhitm.o $(O)mhitu.o $(O)minion.o $(O)mklev.o VOBJ11 = $(O)mhitm.o $(O)mhitu.o $(O)minion.o $(O)mklev.o
VOBJ12 = $(O)mkmap.o $(O)mkmaze.o $(O)mkobj.o $(O)mkroom.o VOBJ12 = $(O)mkmap.o $(O)mkmaze.o $(O)mkobj.o $(O)mkroom.o
VOBJ13 = $(O)mon.o $(O)mondata.o $(O)monmove.o $(O)monst.o VOBJ13 = $(O)mon.o $(O)mondata.o $(O)monmove.o $(O)monst.o
VOBJ14 = $(O)mplayer.o $(O)mthrowu.o $(O)muse.o VOBJ14 = $(O)mplayer.o $(O)mthrowu.o $(O)muse.o $(O)isaac64.o
VOBJ15 = $(O)music.o $(O)o_init.o $(O)objects.o $(O)objnam.o VOBJ15 = $(O)music.o $(O)o_init.o $(O)objects.o $(O)objnam.o
VOBJ16 = $(O)options.o $(O)pager.o $(O)pickup.o $(O)pline.o VOBJ16 = $(O)options.o $(O)pager.o $(O)pickup.o $(O)pline.o
VOBJ17 = $(O)polyself.o $(O)potion.o $(O)pray.o $(O)priest.o VOBJ17 = $(O)polyself.o $(O)potion.o $(O)pray.o $(O)priest.o

2
win/Qt/qt_win.cpp
View File

@@ -3461,7 +3461,7 @@ void NetHackQtInvUsageWindow::drawWorn(QPainter& painter, obj* nhobj, int x, int
{ {
short int glyph; short int glyph;
if (nhobj) if (nhobj)
glyph=obj_to_glyph(nhobj); glyph=obj_to_glyph(nhobj, rn2_on_display_rng);
else if (canbe) else if (canbe)
glyph=cmap_to_glyph(S_room); glyph=cmap_to_glyph(S_room);
else else

2
win/Qt4/qt4inv.cpp
View File

@@ -38,7 +38,7 @@ void NetHackQtInvUsageWindow::drawWorn(QPainter& painter, obj* nhobj, int x, int
{ {
short int glyph; short int glyph;
if (nhobj) if (nhobj)
glyph=obj_to_glyph(nhobj); glyph=obj_to_glyph(nhobj, rn2_on_display_rng);
else if (canbe) else if (canbe)
glyph=cmap_to_glyph(S_room); glyph=cmap_to_glyph(S_room);
else else

2
win/gnome/gnworn.c
View File

@@ -75,7 +75,7 @@ image_of_worn_object(struct obj *o)
GdkImlibImage *im; GdkImlibImage *im;
if (o) if (o)
glyph = obj_to_glyph(o); glyph = obj_to_glyph(o, rn2_on_display_rng);
else else
glyph = cmap_to_glyph(S_stone); glyph = cmap_to_glyph(S_stone);

1
win/win32/vs2017/NetHack.vcxproj
View File

@@ -152,6 +152,7 @@
<ClCompile Include="$(SrcDir)zap.c" /> <ClCompile Include="$(SrcDir)zap.c" />
<ClCompile Include="$(SysShareDir)cppregex.cpp" /> <ClCompile Include="$(SysShareDir)cppregex.cpp" />
<ClCompile Include="$(SysShareDir)nhlan.c" /> <ClCompile Include="$(SysShareDir)nhlan.c" />
<ClCompile Include="$(SysShareDir)random.c" />
<ClCompile Include="$(SysWinntDir)ntsound.c" /> <ClCompile Include="$(SysWinntDir)ntsound.c" />
<ClCompile Include="$(SysWinntDir)nttty.c" /> <ClCompile Include="$(SysWinntDir)nttty.c" />
<ClCompile Include="$(SysWinntDir)stubs.c"> <ClCompile Include="$(SysWinntDir)stubs.c">

1
win/win32/vs2017/NetHackW.vcxproj
View File

@@ -147,6 +147,7 @@
<ClCompile Include="$(SrcDir)zap.c" /> <ClCompile Include="$(SrcDir)zap.c" />
<ClCompile Include="$(SysShareDir)cppregex.cpp" /> <ClCompile Include="$(SysShareDir)cppregex.cpp" />
<ClCompile Include="$(SysShareDir)nhlan.c" /> <ClCompile Include="$(SysShareDir)nhlan.c" />
<ClCompile Include="$(SysShareDir)random.c" />
<ClCompile Include="$(SysWinntDir)ntsound.c" /> <ClCompile Include="$(SysWinntDir)ntsound.c" />
<ClCompile Include="$(SysWinntDir)stubs.c"> <ClCompile Include="$(SysWinntDir)stubs.c">
<PreprocessorDefinitions>TTYSTUB;</PreprocessorDefinitions> <PreprocessorDefinitions>TTYSTUB;</PreprocessorDefinitions>