Skip to content
This repository has been archived by the owner on May 6, 2024. It is now read-only.

Use cmap_to_glyph(S_stone) as "unset" glyph, not 0 (which is also PM_GIANT_ANT). #179

Merged
merged 2 commits into from
Jun 23, 2021
Merged

Use cmap_to_glyph(S_stone) as "unset" glyph, not 0 (which is also PM_GIANT_ANT). #179

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f4fa82
Use NO_GLYPH as "unset" glyph, not 0 (which is also PM_GIANT_ANT).
Jun 23, 2021
f59a02f
Use cmap_to_glyph(S_stone) (on my machine, 2359) instead of NO_GLYPH.
Jun 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions win/rl/winrl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ NetHackRL::NetHackRL(int &argc, char **argv) : glyphs_()
// (done in tty_init_nhwindows before this NetHackRL object got created).
assert(BASE_WINDOW == 0);
windows_.emplace_back(new rl_window({ NHW_BASE }));
glyphs_.fill(NO_GLYPH);
}

void
Expand Down Expand Up @@ -269,9 +270,9 @@ NetHackRL::fill_obs(nle_obs *obs)
// observations.
obs->in_normal_game = false;
if (obs->glyphs)
std::memset(obs->glyphs, 0, sizeof(int16_t) * glyphs_.size());
std::fill_n(obs->glyphs, glyphs_.size(), NO_GLYPH);
if (obs->chars)
std::memset(obs->chars, 0, chars_.size());
std::memset(obs->chars, 0, chars_.size()); /* Or fill with ' '? */
if (obs->colors)
std::memset(obs->colors, 0, colors_.size());
if (obs->specials)
Expand Down Expand Up @@ -595,7 +596,7 @@ NetHackRL::clear_nhwindow_method(winid wid)
rl_win->strings.clear();

if (wid == WIN_MAP) {
glyphs_.fill(0);
glyphs_.fill(NO_GLYPH);
chars_.fill(' ');
colors_.fill(0);
specials_.fill(0);
Expand Down