breathless vs breathless()
Avoid having a variable with the same name as a function-like macro in case the latter eventually gets turned into an actual function.
This commit is contained in:
@@ -550,15 +550,15 @@ static NEARDATA const char *const region_texts[] = {
|
||||
staticfn void
|
||||
region_dialogue(void)
|
||||
{
|
||||
boolean breathless, in_poison_gas_cloud;
|
||||
boolean no_need_to_breathe, in_poison_gas_cloud;
|
||||
long r = (HMagical_breathing & TIMEOUT), i = r / 2L;
|
||||
|
||||
/* might have poly'd into non-breather or moved out of gas cloud */
|
||||
HMagical_breathing &= ~TIMEOUT;
|
||||
breathless = breathless(&mons[u.umonnum]);
|
||||
no_need_to_breathe = Breathless;
|
||||
in_poison_gas_cloud = region_danger();
|
||||
HMagical_breathing |= r;
|
||||
if (breathless || !in_poison_gas_cloud)
|
||||
if (no_need_to_breathe || !in_poison_gas_cloud)
|
||||
return;
|
||||
|
||||
if ((r % 2L) && i > 0L && i <= SIZE(region_texts))
|
||||
|
||||
Reference in New Issue
Block a user