Merge branch 'NetHack-3.6.2'

This commit is contained in:
nhmall
2019-01-29 17:23:22 -05:00
7 changed files with 13 additions and 9 deletions

View File

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

View File

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

View File

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

View File

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

View File

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