From ca5fd442b8b00fefbe4a6694105393e2ea3a4102 Mon Sep 17 00:00:00 2001 From: PatR Date: Thu, 4 Apr 2024 06:44:23 -0700 Subject: [PATCH] fix is_cmap_stairs() and is_cmap_lava() A couple of predicates in sym.h didn't cover all the relevant map symbols. is_cmap_stairs() only affects the MS-DOS position-bar. It appears that it would have been overlooking the extra stairs to the mines and to sokoban but I have no way to verify that. is_cmap_lava() affects getpos() and #lookaround. lava-wall wasn't being treated as lava. --- include/sym.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/include/sym.h b/include/sym.h index 05d566b07..44efaffe7 100644 --- a/include/sym.h +++ b/include/sym.h @@ -103,9 +103,8 @@ struct symsetentry { #define is_cmap_corr(i) ((i) >= S_corr && (i) <= S_litcorr) #define is_cmap_furniture(i) ((i) >= S_upstair && (i) <= S_fountain) #define is_cmap_water(i) ((i) == S_pool || (i) == S_water) -#define is_cmap_lava(i) ((i) == S_lava) -#define is_cmap_stairs(i) ((i) == S_upstair || (i) == S_dnstair || \ - (i) == S_upladder || (i) == S_dnladder) +#define is_cmap_lava(i) ((i) == S_lava || (i) == S_lavawall) +#define is_cmap_stairs(i) ((i) >= S_upstair && (i) <= S_brdnladder) /* misc symbol definitions */ enum misc_symbols {