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

realign macro continuation after g to g? expansion

Browse Source
This commit is contained in:
nhmall
2022-12-07 11:24:17 -05:00
parent 68f9ef8aa6
commit 8120b74051
4 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/botl.c
+6 -6
View File
@@ -676,11 +676,11 @@ static const char *cache_nomovemsg = NULL, *cache_multi_reason = NULL;
do { \ do { \
boolean clear_cache = FALSE, refresh_cache = FALSE; \ boolean clear_cache = FALSE, refresh_cache = FALSE; \
\ \
if (gm.multi < 0) { \ if (gm.multi < 0) { \
if (gn.nomovemsg || gm.multi_reason) { \ if (gn.nomovemsg || gm.multi_reason) { \
if (cache_nomovemsg != gn.nomovemsg) \ if (cache_nomovemsg != gn.nomovemsg) \
refresh_cache = TRUE; \ refresh_cache = TRUE; \
if (cache_multi_reason != gm.multi_reason) \ if (cache_multi_reason != gm.multi_reason) \
refresh_cache = TRUE; \ refresh_cache = TRUE; \
} else { \ } else { \
clear_cache = TRUE; \ clear_cache = TRUE; \
@@ -693,8 +693,8 @@ do { \
cache_multi_reason = (const char *) 0; \ cache_multi_reason = (const char *) 0; \
} \ } \
if (refresh_cache) { \ if (refresh_cache) { \
cache_nomovemsg = gn.nomovemsg; \ cache_nomovemsg = gn.nomovemsg; \
cache_multi_reason = gm.multi_reason; \ cache_multi_reason = gm.multi_reason; \
} \ } \
if (clear_cache || refresh_cache) { \ if (clear_cache || refresh_cache) { \
cache_reslt[0] = cache_avail[0] = FALSE; \ cache_reslt[0] = cache_avail[0] = FALSE; \
src/display.c
+7 -7
View File
@@ -1814,14 +1814,14 @@ show_glyph(coordxy x, coordxy y, int glyph)
* Reset the changed glyph borders so that none of the 3rd screen has * Reset the changed glyph borders so that none of the 3rd screen has
* changed. * changed.
*/ */
#define reset_glyph_bbox() \ #define reset_glyph_bbox() \
{ \ { \
int i; \ int i; \
\ \
for (i = 0; i < ROWNO; i++) { \ for (i = 0; i < ROWNO; i++) { \
gg.gbuf_start[i] = COLNO - 1; \ gg.gbuf_start[i] = COLNO - 1; \
gg.gbuf_stop[i] = 0; \ gg.gbuf_stop[i] = 0; \
} \ } \
} }
static gbuf_entry nul_gbuf = { static gbuf_entry nul_gbuf = {
@@ -2410,7 +2410,7 @@ int wallcolors[sokoban_walls + 1] = {
#endif #endif
#if 0 #if 0
#define is_objpile(x, y) \ #define is_objpile(x, y) \
(!Hallucination && gl.level.objects[(x)][(y)] \ (!Hallucination && gl.level.objects[(x)][(y)] \
&& gl.level.objects[(x)][(y)]->nexthere) && gl.level.objects[(x)][(y)]->nexthere)
#endif #endif
src/mon.c
+6 -6
View File
@@ -475,13 +475,13 @@ pm_to_cham(int mndx)
} }
/* for deciding whether corpse will carry along full monster data */ /* for deciding whether corpse will carry along full monster data */
#define KEEPTRAITS(mon) \ #define KEEPTRAITS(mon) \
((mon)->isshk || (mon)->mtame || unique_corpstat((mon)->data) \ ((mon)->isshk || (mon)->mtame || unique_corpstat((mon)->data) \
|| is_reviver((mon)->data) \ || is_reviver((mon)->data) \
/* normally quest leader will be unique, */ \ /* normally quest leader will be unique, */ \
/* but he or she might have been polymorphed */ \ /* but he or she might have been polymorphed */ \
|| (mon)->m_id == gq.quest_status.leader_m_id \ || (mon)->m_id == gq.quest_status.leader_m_id \
/* special cancellation handling for these */ \ /* special cancellation handling for these */ \
|| (dmgtype((mon)->data, AD_SEDU) || dmgtype((mon)->data, AD_SSEX))) || (dmgtype((mon)->data, AD_SEDU) || dmgtype((mon)->data, AD_SSEX)))
/* Creates a monster corpse, a "special" corpse, or nothing if it doesn't /* Creates a monster corpse, a "special" corpse, or nothing if it doesn't
src/mthrowu.c
+16 -16
View File
@@ -523,22 +523,22 @@ ucatchgem(
} }
#define MT_FLIGHTCHECK(pre,forcehit) \ #define MT_FLIGHTCHECK(pre,forcehit) \
(/* missile hits edge of screen */ \ (/* missile hits edge of screen */ \
!isok(gb.bhitpos.x + dx, gb.bhitpos.y + dy) \ !isok(gb.bhitpos.x + dx, gb.bhitpos.y + dy) \
/* missile hits the wall */ \ /* missile hits the wall */ \
|| IS_ROCK(levl[gb.bhitpos.x + dx][gb.bhitpos.y + dy].typ) \ || IS_ROCK(levl[gb.bhitpos.x + dx][gb.bhitpos.y + dy].typ) \
/* missile hit closed door */ \ /* missile hit closed door */ \
|| closed_door(gb.bhitpos.x + dx, gb.bhitpos.y + dy) \ || closed_door(gb.bhitpos.x + dx, gb.bhitpos.y + dy) \
/* missile might hit iron bars */ \ /* missile might hit iron bars */ \
/* the random chance for small objects hitting bars is */ \ /* the random chance for small objects hitting bars is */ \
/* skipped when reaching them at point blank range */ \ /* skipped when reaching them at point blank range */ \
|| (levl[gb.bhitpos.x + dx][gb.bhitpos.y + dy].typ == IRONBARS \ || (levl[gb.bhitpos.x + dx][gb.bhitpos.y + dy].typ == IRONBARS \
&& hits_bars(&singleobj, \ && hits_bars(&singleobj, \
gb.bhitpos.x, gb.bhitpos.y, \ gb.bhitpos.x, gb.bhitpos.y, \
gb.bhitpos.x + dx, gb.bhitpos.y + dy, \ gb.bhitpos.x + dx, gb.bhitpos.y + dy, \
((pre) ? 0 : forcehit), 0)) \ ((pre) ? 0 : forcehit), 0)) \
/* Thrown objects "sink" */ \ /* Thrown objects "sink" */ \
|| (!(pre) && IS_SINK(levl[gb.bhitpos.x][gb.bhitpos.y].typ)) \ || (!(pre) && IS_SINK(levl[gb.bhitpos.x][gb.bhitpos.y].typ)) \
) )
void void