From 0cb03efd7c438ee8fc5d9444e0c8e60a8eeb7f16 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Mon, 20 Jun 2016 22:49:05 +0200 Subject: Remove redundant parens from RFn_* in expressions --- src/monster1.cc | 310 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 155 insertions(+), 155 deletions(-) (limited to 'src/monster1.cc') diff --git a/src/monster1.cc b/src/monster1.cc index b1570382..0c94fb5a 100644 --- a/src/monster1.cc +++ b/src/monster1.cc @@ -73,17 +73,17 @@ static void roff_aux(std::shared_ptr r_ptr) /* Extract a gender (if applicable) */ int msex = 0; - if (flags1 & (RF1_FEMALE)) + if (flags1 & RF1_FEMALE) { msex = 2; } - else if (flags1 & (RF1_MALE)) + else if (flags1 & RF1_MALE) { msex = 1; } /* Treat uniques differently */ - if (flags1 & (RF1_UNIQUE)) + if (flags1 & RF1_UNIQUE) { if (r_ptr->max_num == 0) { @@ -218,7 +218,7 @@ static void roff_aux(std::shared_ptr r_ptr) } /* The code above includes "attack speed" */ - if (flags1 & (RF1_NEVER_MOVE)) + if (flags1 & RF1_NEVER_MOVE) { /* Introduce */ if (old) @@ -246,7 +246,7 @@ static void roff_aux(std::shared_ptr r_ptr) /* Describe experience if known */ { /* Introduction */ - if (flags1 & (RF1_UNIQUE)) + if (flags1 & RF1_UNIQUE) { text_out("Killing this"); } @@ -256,21 +256,21 @@ static void roff_aux(std::shared_ptr r_ptr) } /* Describe the "quality" */ - if (flags2 & (RF2_ELDRITCH_HORROR)) text_out_c(TERM_VIOLET, " sanity-blasting"); - if (flags3 & (RF3_ANIMAL)) text_out_c(TERM_VIOLET, " natural"); - if (flags3 & (RF3_EVIL)) text_out_c(TERM_VIOLET, " evil"); - if (flags3 & (RF3_GOOD)) text_out_c(TERM_VIOLET, " good"); - if (flags3 & (RF3_UNDEAD)) text_out_c(TERM_VIOLET, " undead"); + if (flags2 & RF2_ELDRITCH_HORROR) text_out_c(TERM_VIOLET, " sanity-blasting"); + if (flags3 & RF3_ANIMAL) text_out_c(TERM_VIOLET, " natural"); + if (flags3 & RF3_EVIL) text_out_c(TERM_VIOLET, " evil"); + if (flags3 & RF3_GOOD) text_out_c(TERM_VIOLET, " good"); + if (flags3 & RF3_UNDEAD) text_out_c(TERM_VIOLET, " undead"); /* Describe the "race" */ - if (flags3 & (RF3_DRAGON)) text_out_c(TERM_VIOLET, " dragon"); - else if (flags3 & (RF3_DEMON)) text_out_c(TERM_VIOLET, " demon"); - else if (flags3 & (RF3_GIANT)) text_out_c(TERM_VIOLET, " giant"); - else if (flags3 & (RF3_TROLL)) text_out_c(TERM_VIOLET, " troll"); - else if (flags3 & (RF3_ORC)) text_out_c(TERM_VIOLET, " orc"); - else if (flags3 & (RF3_THUNDERLORD))text_out_c(TERM_VIOLET, " Thunderlord"); - else if (flags7 & (RF7_SPIDER)) text_out_c(TERM_VIOLET, " spider"); - else if (flags7 & (RF7_NAZGUL)) text_out_c(TERM_VIOLET, " Nazgul"); + if (flags3 & RF3_DRAGON) text_out_c(TERM_VIOLET, " dragon"); + else if (flags3 & RF3_DEMON) text_out_c(TERM_VIOLET, " demon"); + else if (flags3 & RF3_GIANT) text_out_c(TERM_VIOLET, " giant"); + else if (flags3 & RF3_TROLL) text_out_c(TERM_VIOLET, " troll"); + else if (flags3 & RF3_ORC) text_out_c(TERM_VIOLET, " orc"); + else if (flags3 & RF3_THUNDERLORD)text_out_c(TERM_VIOLET, " Thunderlord"); + else if (flags7 & RF7_SPIDER) text_out_c(TERM_VIOLET, " spider"); + else if (flags7 & RF7_NAZGUL) text_out_c(TERM_VIOLET, " Nazgul"); else text_out(" creature"); /* Group some variables */ @@ -311,26 +311,26 @@ static void roff_aux(std::shared_ptr r_ptr) } } - if ((flags2 & (RF2_AURA_FIRE)) && (flags2 & (RF2_AURA_ELEC))) + if ((flags2 & RF2_AURA_FIRE) && (flags2 & RF2_AURA_ELEC)) { text_out(format("%^s is surrounded by ", wd_he[msex])); text_out_c(TERM_VIOLET, "flames and electricity"); text_out(". "); } - else if (flags2 & (RF2_AURA_FIRE)) + else if (flags2 & RF2_AURA_FIRE) { text_out(format("%^s is surrounded by ", wd_he[msex])); text_out_c(TERM_ORANGE, "flames"); text_out(". "); } - else if (flags2 & (RF2_AURA_ELEC)) + else if (flags2 & RF2_AURA_ELEC) { text_out(format("%^s is surrounded by ", wd_he[msex])); text_out_c(TERM_L_BLUE, "electricity"); text_out(". "); } - if (flags2 & (RF2_REFLECTING)) + if (flags2 & RF2_REFLECTING) { text_out(format("%^s ", wd_he[msex])); text_out_c(TERM_L_UMBER, "reflects"); @@ -339,14 +339,14 @@ static void roff_aux(std::shared_ptr r_ptr) /* Describe escorts */ - if ((flags1 & (RF1_ESCORT)) || (flags1 & (RF1_ESCORTS))) + if ((flags1 & RF1_ESCORT) || (flags1 & RF1_ESCORTS)) { text_out(format("%^s usually appears with escorts. ", wd_he[msex])); } /* Describe friends */ - else if ((flags1 & (RF1_FRIEND)) || (flags1 & (RF1_FRIENDS))) + else if ((flags1 & RF1_FRIEND) || (flags1 & RF1_FRIENDS)) { text_out(format("%^s usually appears in groups. ", wd_he[msex])); @@ -355,8 +355,8 @@ static void roff_aux(std::shared_ptr r_ptr) /* Collect inate attacks */ vn = 0; - if (flags4 & (RF4_SHRIEK)) vp[vn++] = "shriek for help"; - if (flags4 & (RF4_ROCKET)) vp[vn++] = "shoot a rocket"; + if (flags4 & RF4_SHRIEK) vp[vn++] = "shriek for help"; + if (flags4 & RF4_ROCKET) vp[vn++] = "shoot a rocket"; if (flags4 & (RF4_ARROW_1)) vp[vn++] = "fire an arrow"; if (flags4 & (RF4_ARROW_2)) vp[vn++] = "fire arrows"; if (flags4 & (RF4_ARROW_3)) vp[vn++] = "fire a missile"; @@ -387,28 +387,28 @@ static void roff_aux(std::shared_ptr r_ptr) /* Collect breaths */ vn = 0; - if (flags4 & (RF4_BR_ACID)) vp[vn++] = "acid"; - if (flags4 & (RF4_BR_ELEC)) vp[vn++] = "lightning"; - if (flags4 & (RF4_BR_FIRE)) vp[vn++] = "fire"; - if (flags4 & (RF4_BR_COLD)) vp[vn++] = "frost"; - if (flags4 & (RF4_BR_POIS)) vp[vn++] = "poison"; - if (flags4 & (RF4_BR_NETH)) vp[vn++] = "nether"; - if (flags4 & (RF4_BR_LITE)) vp[vn++] = "light"; - if (flags4 & (RF4_BR_DARK)) vp[vn++] = "darkness"; - if (flags4 & (RF4_BR_CONF)) vp[vn++] = "confusion"; - if (flags4 & (RF4_BR_SOUN)) vp[vn++] = "sound"; - if (flags4 & (RF4_BR_CHAO)) vp[vn++] = "chaos"; - if (flags4 & (RF4_BR_DISE)) vp[vn++] = "disenchantment"; - if (flags4 & (RF4_BR_NEXU)) vp[vn++] = "nexus"; - if (flags4 & (RF4_BR_TIME)) vp[vn++] = "time"; - if (flags4 & (RF4_BR_INER)) vp[vn++] = "inertia"; - if (flags4 & (RF4_BR_GRAV)) vp[vn++] = "gravity"; - if (flags4 & (RF4_BR_SHAR)) vp[vn++] = "shards"; - if (flags4 & (RF4_BR_PLAS)) vp[vn++] = "plasma"; - if (flags4 & (RF4_BR_WALL)) vp[vn++] = "force"; - if (flags4 & (RF4_BR_MANA)) vp[vn++] = "mana"; - if (flags4 & (RF4_BR_NUKE)) vp[vn++] = "toxic waste"; - if (flags4 & (RF4_BR_DISI)) vp[vn++] = "disintegration"; + if (flags4 & RF4_BR_ACID) vp[vn++] = "acid"; + if (flags4 & RF4_BR_ELEC) vp[vn++] = "lightning"; + if (flags4 & RF4_BR_FIRE) vp[vn++] = "fire"; + if (flags4 & RF4_BR_COLD) vp[vn++] = "frost"; + if (flags4 & RF4_BR_POIS) vp[vn++] = "poison"; + if (flags4 & RF4_BR_NETH) vp[vn++] = "nether"; + if (flags4 & RF4_BR_LITE) vp[vn++] = "light"; + if (flags4 & RF4_BR_DARK) vp[vn++] = "darkness"; + if (flags4 & RF4_BR_CONF) vp[vn++] = "confusion"; + if (flags4 & RF4_BR_SOUN) vp[vn++] = "sound"; + if (flags4 & RF4_BR_CHAO) vp[vn++] = "chaos"; + if (flags4 & RF4_BR_DISE) vp[vn++] = "disenchantment"; + if (flags4 & RF4_BR_NEXU) vp[vn++] = "nexus"; + if (flags4 & RF4_BR_TIME) vp[vn++] = "time"; + if (flags4 & RF4_BR_INER) vp[vn++] = "inertia"; + if (flags4 & RF4_BR_GRAV) vp[vn++] = "gravity"; + if (flags4 & RF4_BR_SHAR) vp[vn++] = "shards"; + if (flags4 & RF4_BR_PLAS) vp[vn++] = "plasma"; + if (flags4 & RF4_BR_WALL) vp[vn++] = "force"; + if (flags4 & RF4_BR_MANA) vp[vn++] = "mana"; + if (flags4 & RF4_BR_NUKE) vp[vn++] = "toxic waste"; + if (flags4 & RF4_BR_DISI) vp[vn++] = "disintegration"; /* Describe breaths */ if (vn) @@ -435,73 +435,73 @@ static void roff_aux(std::shared_ptr r_ptr) /* Collect spells */ vn = 0; - if (flags5 & (RF5_BA_ACID)) vp[vn++] = "produce acid balls"; - if (flags5 & (RF5_BA_ELEC)) vp[vn++] = "produce lightning balls"; - if (flags5 & (RF5_BA_FIRE)) vp[vn++] = "produce fire balls"; - if (flags5 & (RF5_BA_COLD)) vp[vn++] = "produce frost balls"; - if (flags5 & (RF5_BA_POIS)) vp[vn++] = "produce poison balls"; - if (flags5 & (RF5_BA_NETH)) vp[vn++] = "produce nether balls"; - if (flags5 & (RF5_BA_WATE)) vp[vn++] = "produce water balls"; - if (flags4 & (RF4_BA_NUKE)) vp[vn++] = "produce balls of radiation"; - if (flags5 & (RF5_BA_MANA)) vp[vn++] = "invoke mana storms"; - if (flags5 & (RF5_BA_DARK)) vp[vn++] = "invoke darkness storms"; - if (flags4 & (RF4_BA_CHAO)) vp[vn++] = "invoke raw chaos"; - if (flags6 & (RF6_HAND_DOOM)) vp[vn++] = "invoke the Hand of Doom"; - if (flags5 & (RF5_DRAIN_MANA)) vp[vn++] = "drain mana"; - if (flags5 & (RF5_MIND_BLAST)) vp[vn++] = "cause mind blasting"; - if (flags5 & (RF5_BRAIN_SMASH)) vp[vn++] = "cause brain smashing"; + if (flags5 & RF5_BA_ACID) vp[vn++] = "produce acid balls"; + if (flags5 & RF5_BA_ELEC) vp[vn++] = "produce lightning balls"; + if (flags5 & RF5_BA_FIRE) vp[vn++] = "produce fire balls"; + if (flags5 & RF5_BA_COLD) vp[vn++] = "produce frost balls"; + if (flags5 & RF5_BA_POIS) vp[vn++] = "produce poison balls"; + if (flags5 & RF5_BA_NETH) vp[vn++] = "produce nether balls"; + if (flags5 & RF5_BA_WATE) vp[vn++] = "produce water balls"; + if (flags4 & RF4_BA_NUKE) vp[vn++] = "produce balls of radiation"; + if (flags5 & RF5_BA_MANA) vp[vn++] = "invoke mana storms"; + if (flags5 & RF5_BA_DARK) vp[vn++] = "invoke darkness storms"; + if (flags4 & RF4_BA_CHAO) vp[vn++] = "invoke raw chaos"; + if (flags6 & RF6_HAND_DOOM) vp[vn++] = "invoke the Hand of Doom"; + if (flags5 & RF5_DRAIN_MANA) vp[vn++] = "drain mana"; + if (flags5 & RF5_MIND_BLAST) vp[vn++] = "cause mind blasting"; + if (flags5 & RF5_BRAIN_SMASH) vp[vn++] = "cause brain smashing"; if (flags5 & (RF5_CAUSE_1)) vp[vn++] = "cause light wounds and cursing"; if (flags5 & (RF5_CAUSE_2)) vp[vn++] = "cause serious wounds and cursing"; if (flags5 & (RF5_CAUSE_3)) vp[vn++] = "cause critical wounds and cursing"; if (flags5 & (RF5_CAUSE_4)) vp[vn++] = "cause mortal wounds"; - if (flags5 & (RF5_BO_ACID)) vp[vn++] = "produce acid bolts"; - if (flags5 & (RF5_BO_ELEC)) vp[vn++] = "produce lightning bolts"; - if (flags5 & (RF5_BO_FIRE)) vp[vn++] = "produce fire bolts"; - if (flags5 & (RF5_BO_COLD)) vp[vn++] = "produce frost bolts"; - if (flags5 & (RF5_BO_POIS)) vp[vn++] = "produce poison bolts"; - if (flags5 & (RF5_BO_NETH)) vp[vn++] = "produce nether bolts"; - if (flags5 & (RF5_BO_WATE)) vp[vn++] = "produce water bolts"; - if (flags5 & (RF5_BO_MANA)) vp[vn++] = "produce mana bolts"; - if (flags5 & (RF5_BO_PLAS)) vp[vn++] = "produce plasma bolts"; - if (flags5 & (RF5_BO_ICEE)) vp[vn++] = "produce ice bolts"; - if (flags5 & (RF5_MISSILE)) vp[vn++] = "produce magic missiles"; - if (flags5 & (RF5_SCARE)) vp[vn++] = "terrify"; - if (flags5 & (RF5_BLIND)) vp[vn++] = "blind"; - if (flags5 & (RF5_CONF)) vp[vn++] = "confuse"; - if (flags5 & (RF5_SLOW)) vp[vn++] = "slow"; - if (flags5 & (RF5_HOLD)) vp[vn++] = "paralyze"; - if (flags6 & (RF6_HASTE)) vp[vn++] = "haste-self"; - if (flags6 & (RF6_HEAL)) vp[vn++] = "heal-self"; - if (flags6 & (RF6_BLINK)) vp[vn++] = "blink-self"; - if (flags6 & (RF6_TPORT)) vp[vn++] = "teleport-self"; - if (flags6 & (RF6_S_BUG)) vp[vn++] = "summon software bugs"; - if (flags6 & (RF6_S_RNG)) vp[vn++] = "summon RNG"; - if (flags6 & (RF6_TELE_TO)) vp[vn++] = "teleport to"; - if (flags6 & (RF6_TELE_AWAY)) vp[vn++] = "teleport away"; - if (flags6 & (RF6_TELE_LEVEL)) vp[vn++] = "teleport level"; - if (flags6 & (RF6_S_THUNDERLORD)) vp[vn++] = "summon a Thunderlord"; - if (flags6 & (RF6_DARKNESS)) vp[vn++] = "create darkness"; - if (flags6 & (RF6_TRAPS)) vp[vn++] = "create traps"; - if (flags6 & (RF6_FORGET)) vp[vn++] = "cause amnesia"; - if (flags6 & (RF6_RAISE_DEAD)) vp[vn++] = "raise dead"; - if (flags6 & (RF6_S_MONSTER)) vp[vn++] = "summon a monster"; - if (flags6 & (RF6_S_MONSTERS)) vp[vn++] = "summon monsters"; - if (flags6 & (RF6_S_KIN)) vp[vn++] = "summon aid"; - if (flags6 & (RF6_S_ANT)) vp[vn++] = "summon ants"; - if (flags6 & (RF6_S_SPIDER)) vp[vn++] = "summon spiders"; - if (flags6 & (RF6_S_HOUND)) vp[vn++] = "summon hounds"; - if (flags6 & (RF6_S_HYDRA)) vp[vn++] = "summon hydras"; - if (flags6 & (RF6_S_ANGEL)) vp[vn++] = "summon an angel"; - if (flags6 & (RF6_S_DEMON)) vp[vn++] = "summon a demon"; - if (flags6 & (RF6_S_UNDEAD)) vp[vn++] = "summon an undead"; - if (flags6 & (RF6_S_DRAGON)) vp[vn++] = "summon a dragon"; - if (flags4 & (RF4_S_ANIMAL)) vp[vn++] = "summon animal"; - if (flags6 & (RF6_S_ANIMALS)) vp[vn++] = "summon animals"; - if (flags6 & (RF6_S_HI_UNDEAD)) vp[vn++] = "summon Greater Undead"; - if (flags6 & (RF6_S_HI_DRAGON)) vp[vn++] = "summon Ancient Dragons"; - if (flags6 & (RF6_S_HI_DEMON)) vp[vn++] = "summon Greater Demons"; - if (flags6 & (RF6_S_WRAITH)) vp[vn++] = "summon Ringwraith"; - if (flags6 & (RF6_S_UNIQUE)) vp[vn++] = "summon Unique Monsters"; + if (flags5 & RF5_BO_ACID) vp[vn++] = "produce acid bolts"; + if (flags5 & RF5_BO_ELEC) vp[vn++] = "produce lightning bolts"; + if (flags5 & RF5_BO_FIRE) vp[vn++] = "produce fire bolts"; + if (flags5 & RF5_BO_COLD) vp[vn++] = "produce frost bolts"; + if (flags5 & RF5_BO_POIS) vp[vn++] = "produce poison bolts"; + if (flags5 & RF5_BO_NETH) vp[vn++] = "produce nether bolts"; + if (flags5 & RF5_BO_WATE) vp[vn++] = "produce water bolts"; + if (flags5 & RF5_BO_MANA) vp[vn++] = "produce mana bolts"; + if (flags5 & RF5_BO_PLAS) vp[vn++] = "produce plasma bolts"; + if (flags5 & RF5_BO_ICEE) vp[vn++] = "produce ice bolts"; + if (flags5 & RF5_MISSILE) vp[vn++] = "produce magic missiles"; + if (flags5 & RF5_SCARE) vp[vn++] = "terrify"; + if (flags5 & RF5_BLIND) vp[vn++] = "blind"; + if (flags5 & RF5_CONF) vp[vn++] = "confuse"; + if (flags5 & RF5_SLOW) vp[vn++] = "slow"; + if (flags5 & RF5_HOLD) vp[vn++] = "paralyze"; + if (flags6 & RF6_HASTE) vp[vn++] = "haste-self"; + if (flags6 & RF6_HEAL) vp[vn++] = "heal-self"; + if (flags6 & RF6_BLINK) vp[vn++] = "blink-self"; + if (flags6 & RF6_TPORT) vp[vn++] = "teleport-self"; + if (flags6 & RF6_S_BUG) vp[vn++] = "summon software bugs"; + if (flags6 & RF6_S_RNG) vp[vn++] = "summon RNG"; + if (flags6 & RF6_TELE_TO) vp[vn++] = "teleport to"; + if (flags6 & RF6_TELE_AWAY) vp[vn++] = "teleport away"; + if (flags6 & RF6_TELE_LEVEL) vp[vn++] = "teleport level"; + if (flags6 & RF6_S_THUNDERLORD) vp[vn++] = "summon a Thunderlord"; + if (flags6 & RF6_DARKNESS) vp[vn++] = "create darkness"; + if (flags6 & RF6_TRAPS) vp[vn++] = "create traps"; + if (flags6 & RF6_FORGET) vp[vn++] = "cause amnesia"; + if (flags6 & RF6_RAISE_DEAD) vp[vn++] = "raise dead"; + if (flags6 & RF6_S_MONSTER) vp[vn++] = "summon a monster"; + if (flags6 & RF6_S_MONSTERS) vp[vn++] = "summon monsters"; + if (flags6 & RF6_S_KIN) vp[vn++] = "summon aid"; + if (flags6 & RF6_S_ANT) vp[vn++] = "summon ants"; + if (flags6 & RF6_S_SPIDER) vp[vn++] = "summon spiders"; + if (flags6 & RF6_S_HOUND) vp[vn++] = "summon hounds"; + if (flags6 & RF6_S_HYDRA) vp[vn++] = "summon hydras"; + if (flags6 & RF6_S_ANGEL) vp[vn++] = "summon an angel"; + if (flags6 & RF6_S_DEMON) vp[vn++] = "summon a demon"; + if (flags6 & RF6_S_UNDEAD) vp[vn++] = "summon an undead"; + if (flags6 & RF6_S_DRAGON) vp[vn++] = "summon a dragon"; + if (flags4 & RF4_S_ANIMAL) vp[vn++] = "summon animal"; + if (flags6 & RF6_S_ANIMALS) vp[vn++] = "summon animals"; + if (flags6 & RF6_S_HI_UNDEAD) vp[vn++] = "summon Greater Undead"; + if (flags6 & RF6_S_HI_DRAGON) vp[vn++] = "summon Ancient Dragons"; + if (flags6 & RF6_S_HI_DEMON) vp[vn++] = "summon Greater Demons"; + if (flags6 & RF6_S_WRAITH) vp[vn++] = "summon Ringwraith"; + if (flags6 & RF6_S_UNIQUE) vp[vn++] = "summon Unique Monsters"; /* Describe spells */ if (vn) @@ -523,7 +523,7 @@ static void roff_aux(std::shared_ptr r_ptr) text_out(" magical, casting spells"); /* Adverb */ - if (flags2 & (RF2_SMART)) text_out_c(TERM_YELLOW, " intelligently"); + if (flags2 & RF2_SMART) text_out_c(TERM_YELLOW, " intelligently"); /* Scan */ for (n = 0; n < vn; n++) @@ -563,7 +563,7 @@ static void roff_aux(std::shared_ptr r_ptr) text_out_c(TERM_L_GREEN, format("%d", r_ptr->ac)); /* Maximized hitpoints */ - if (flags1 & (RF1_FORCE_MAXHP)) + if (flags1 & RF1_FORCE_MAXHP) { text_out(" and a life rating of "); text_out_c(TERM_L_GREEN, format("%d", r_ptr->hdice * r_ptr->hside)); @@ -583,15 +583,15 @@ static void roff_aux(std::shared_ptr r_ptr) /* Collect special abilities. */ vn = 0; - if (flags2 & (RF2_OPEN_DOOR)) vp[vn++] = "open doors"; - if (flags2 & (RF2_BASH_DOOR)) vp[vn++] = "bash down doors"; - if (flags2 & (RF2_PASS_WALL)) vp[vn++] = "pass through walls"; - if (flags2 & (RF2_KILL_WALL)) vp[vn++] = "bore through walls"; - if (flags2 & (RF2_MOVE_BODY)) vp[vn++] = "push past weaker monsters"; - if (flags2 & (RF2_KILL_BODY)) vp[vn++] = "destroy weaker monsters"; - if (flags2 & (RF2_TAKE_ITEM)) vp[vn++] = "pick up objects"; - if (flags2 & (RF2_KILL_ITEM)) vp[vn++] = "destroy objects"; - if (flags9 & (RF9_HAS_LITE)) vp[vn++] = "illuminate the dungeon"; + if (flags2 & RF2_OPEN_DOOR) vp[vn++] = "open doors"; + if (flags2 & RF2_BASH_DOOR) vp[vn++] = "bash down doors"; + if (flags2 & RF2_PASS_WALL) vp[vn++] = "pass through walls"; + if (flags2 & RF2_KILL_WALL) vp[vn++] = "bore through walls"; + if (flags2 & RF2_MOVE_BODY) vp[vn++] = "push past weaker monsters"; + if (flags2 & RF2_KILL_BODY) vp[vn++] = "destroy weaker monsters"; + if (flags2 & RF2_TAKE_ITEM) vp[vn++] = "pick up objects"; + if (flags2 & RF2_KILL_ITEM) vp[vn++] = "destroy objects"; + if (flags9 & RF9_HAS_LITE) vp[vn++] = "illuminate the dungeon"; /* Describe special abilities. */ if (vn) @@ -617,31 +617,31 @@ static void roff_aux(std::shared_ptr r_ptr) /* Describe special abilities. */ - if (flags2 & (RF2_INVISIBLE)) + if (flags2 & RF2_INVISIBLE) { text_out_c(TERM_GREEN, format("%^s is invisible. ", wd_he[msex])); } - if (flags2 & (RF2_COLD_BLOOD)) + if (flags2 & RF2_COLD_BLOOD) { text_out(format("%^s is cold blooded. ", wd_he[msex])); } - if (flags2 & (RF2_EMPTY_MIND)) + if (flags2 & RF2_EMPTY_MIND) { text_out(format("%^s is not detected by telepathy. ", wd_he[msex])); } - if (flags2 & (RF2_WEIRD_MIND)) + if (flags2 & RF2_WEIRD_MIND) { text_out(format("%^s is rarely detected by telepathy. ", wd_he[msex])); } - if (flags4 & (RF4_MULTIPLY)) + if (flags4 & RF4_MULTIPLY) { text_out_c(TERM_L_UMBER, format("%^s breeds explosively. ", wd_he[msex])); } - if (flags2 & (RF2_REGENERATE)) + if (flags2 & RF2_REGENERATE) { text_out_c(TERM_L_WHITE, format("%^s regenerates quickly. ", wd_he[msex])); } - if (r_ptr->flags7 & (RF7_MORTAL)) + if (r_ptr->flags7 & RF7_MORTAL) { text_out_c(TERM_RED, format("%^s is a mortal being. ", wd_he[msex])); } @@ -653,37 +653,37 @@ static void roff_aux(std::shared_ptr r_ptr) /* Collect susceptibilities */ vn = 0; - if (flags3 & (RF3_HURT_ROCK)) + if (flags3 & RF3_HURT_ROCK) { vp[vn++] = "rock remover"; color[vn - 1] = TERM_UMBER; } - if (flags3 & (RF3_HURT_LITE)) + if (flags3 & RF3_HURT_LITE) { vp[vn++] = "bright light"; color[vn - 1] = TERM_YELLOW; } - if (flags3 & (RF3_SUSCEP_FIRE)) + if (flags3 & RF3_SUSCEP_FIRE) { vp[vn++] = "fire"; color[vn - 1] = TERM_RED; } - if (flags3 & (RF3_SUSCEP_COLD)) + if (flags3 & RF3_SUSCEP_COLD) { vp[vn++] = "cold"; color[vn - 1] = TERM_L_WHITE; } - if (flags9 & (RF9_SUSCEP_ACID)) + if (flags9 & RF9_SUSCEP_ACID) { vp[vn++] = "acid"; color[vn - 1] = TERM_GREEN; } - if (flags9 & (RF9_SUSCEP_ELEC)) + if (flags9 & RF9_SUSCEP_ELEC) { vp[vn++] = "lightning"; color[vn - 1] = TERM_L_BLUE; } - if (flags9 & (RF9_SUSCEP_POIS)) + if (flags9 & RF9_SUSCEP_POIS) { vp[vn++] = "poison"; color[vn - 1] = TERM_L_GREEN; @@ -714,27 +714,27 @@ static void roff_aux(std::shared_ptr r_ptr) /* Collect immunities */ vn = 0; - if (flags3 & (RF3_IM_ACID)) + if (flags3 & RF3_IM_ACID) { vp[vn++] = "acid"; color[vn - 1] = TERM_L_GREEN; } - if (flags3 & (RF3_IM_ELEC)) + if (flags3 & RF3_IM_ELEC) { vp[vn++] = "lightning"; color[vn - 1] = TERM_L_BLUE; } - if (flags3 & (RF3_IM_FIRE)) + if (flags3 & RF3_IM_FIRE) { vp[vn++] = "fire"; color[vn - 1] = TERM_L_RED; } - if (flags3 & (RF3_IM_COLD)) + if (flags3 & RF3_IM_COLD) { vp[vn++] = "cold"; color[vn - 1] = TERM_L_BLUE; } - if (flags3 & (RF3_IM_POIS)) + if (flags3 & RF3_IM_POIS) { vp[vn++] = "poison"; color[vn - 1] = TERM_L_GREEN; @@ -765,12 +765,12 @@ static void roff_aux(std::shared_ptr r_ptr) /* Collect resistances */ vn = 0; - if (flags3 & (RF3_RES_NETH)) vp[vn++] = "nether"; - if (flags3 & (RF3_RES_WATE)) vp[vn++] = "water"; - if (flags3 & (RF3_RES_PLAS)) vp[vn++] = "plasma"; - if (flags3 & (RF3_RES_NEXU)) vp[vn++] = "nexus"; - if (flags3 & (RF3_RES_DISE)) vp[vn++] = "disenchantment"; - if (flags3 & (RF3_RES_TELE)) vp[vn++] = "teleportation"; + if (flags3 & RF3_RES_NETH) vp[vn++] = "nether"; + if (flags3 & RF3_RES_WATE) vp[vn++] = "water"; + if (flags3 & RF3_RES_PLAS) vp[vn++] = "plasma"; + if (flags3 & RF3_RES_NEXU) vp[vn++] = "nexus"; + if (flags3 & RF3_RES_DISE) vp[vn++] = "disenchantment"; + if (flags3 & RF3_RES_TELE) vp[vn++] = "teleportation"; /* Describe resistances */ if (vn) @@ -797,10 +797,10 @@ static void roff_aux(std::shared_ptr r_ptr) /* Collect non-effects */ vn = 0; - if (flags3 & (RF3_NO_STUN)) vp[vn++] = "stunned"; - if (flags3 & (RF3_NO_FEAR)) vp[vn++] = "frightened"; - if (flags3 & (RF3_NO_CONF)) vp[vn++] = "confused"; - if (flags3 & (RF3_NO_SLEEP)) vp[vn++] = "slept"; + if (flags3 & RF3_NO_STUN) vp[vn++] = "stunned"; + if (flags3 & RF3_NO_FEAR) vp[vn++] = "frightened"; + if (flags3 & RF3_NO_CONF) vp[vn++] = "confused"; + if (flags3 & RF3_NO_SLEEP) vp[vn++] = "slept"; /* Describe non-effects */ if (vn) @@ -924,13 +924,13 @@ static void roff_aux(std::shared_ptr r_ptr) /* Great */ - if (flags1 & (RF1_DROP_GREAT)) + if (flags1 & RF1_DROP_GREAT) { p = " exceptional"; } /* Good (no "n" needed) */ - else if (flags1 & (RF1_DROP_GOOD)) + else if (flags1 & RF1_DROP_GOOD) { p = " good"; sin = FALSE; @@ -1240,7 +1240,7 @@ static void roff_aux(std::shared_ptr r_ptr) } /* Notice lack of attacks */ - else if (flags1 & (RF1_NEVER_BLOW)) + else if (flags1 & RF1_NEVER_BLOW) { text_out(format("%^s has no physical attacks. ", wd_he[msex])); } @@ -1272,7 +1272,7 @@ static void roff_name(int r_idx, int ego) const byte a2 = r_ptr->x_attr; /* A title (use "The" for non-uniques) */ - if (!(r_ptr->flags1 & (RF1_UNIQUE))) + if (!(r_ptr->flags1 & RF1_UNIQUE)) { Term_addstr( -1, TERM_WHITE, "The "); } -- cgit v1.2.3