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

Another getpos cmap followup

Browse Source 
Hot on the heels of my previous commit, here's a way to do it without
any assumptions about the order of defsyms.
This commit is contained in:
Michael Meyer
2022-07-16 12:32:45 -04:00
committed by PatR
parent e9fb226dbf
commit 47a35ba8a7
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/do_name.c
View File

@@ -926,12 +926,11 @@ getpos(coord *ccp, boolean force, const char *goal)
int pass, lo_x, lo_y, hi_x, hi_y, k = 0;
(void) memset((genericptr_t) matching, 0, sizeof matching);
/* start the loop one past the block of doors, walls, etc,
because we aren't interested in trying to match them */
for (sidx = S_hcdoor + 1; sidx < MAXPCHARS; sidx++) {
/* some additional cmap types that should be skipped */
if (sidx == S_room || sidx == S_darkroom
|| sidx == S_corr || sidx == S_litcorr)
for (sidx = 0; sidx < MAXPCHARS; sidx++) {
/* don't even try to match some terrain: walls, room... */
if (is_cmap_wall(sidx) || is_cmap_room(sidx)
|| is_cmap_corr(sidx) || is_cmap_door(sidx)
|| sidx == S_ndoor)
continue;
if (c == defsyms[sidx].sym
|| c == (int) g.showsyms[sidx]