[Refactor] #2155 mのフォルダ及びmain-win.cppについて、return (hoge); をreturn hoge; に置換した

diff --git a/src/main-win.cpp b/src/main-win.cpp
index 8f222c4..54ff333 100644 (file)
--- a/src/main-win.cpp
+++ b/src/main-win.cpp
@@ -146,7 +146,7 @@ LPCWSTR win_term_name[] = { L"Hengband", L"Term-1", L"Term-2", L"Term-3", L"Term
 static term_data data[MAX_TERM_DATA]; //!< An array of term_data's
 static bool is_main_term(term_data *td)
 {
-    return (td == &data[0]);
+    return td == &data[0];
 }
 static term_data *my_td; //!< Hack -- global "window creation" pointer
 POINT normsize; //!< Remember normal size of main window when maxmized
@@ -612,7 +612,7 @@ static bool change_bg_mode(bg_mode new_mode, bool show_error = false, bool force
         term_activate(old);
     }
 
-    return (current_bg_mode == new_mode);
+    return current_bg_mode == new_mode;
 }
 
 /*!
@@ -935,7 +935,7 @@ static errr term_xtra_win(int n, int v)
 {
     switch (n) {
     case TERM_XTRA_NOISE: {
-        return (term_xtra_win_noise());
+        return term_xtra_win_noise();
     }
     case TERM_XTRA_FRESH: {
         term_data *td = (term_data *)(Term->data);
@@ -957,25 +957,25 @@ static errr term_xtra_win(int n, int v)
         return term_xtra_win_scene(v);
     }
     case TERM_XTRA_SOUND: {
-        return (term_xtra_win_sound(v));
+        return term_xtra_win_sound(v);
     }
     case TERM_XTRA_BORED: {
-        return (term_xtra_win_event(0));
+        return term_xtra_win_event(0);
     }
     case TERM_XTRA_EVENT: {
-        return (term_xtra_win_event(v));
+        return term_xtra_win_event(v);
     }
     case TERM_XTRA_FLUSH: {
-        return (term_xtra_win_flush());
+        return term_xtra_win_flush();
     }
     case TERM_XTRA_CLEAR: {
-        return (term_xtra_win_clear());
+        return term_xtra_win_clear();
     }
     case TERM_XTRA_REACT: {
-        return (term_xtra_win_react(p_ptr));
+        return term_xtra_win_react(p_ptr);
     }
     case TERM_XTRA_DELAY: {
-        return (term_xtra_win_delay(v));
+        return term_xtra_win_delay(v);
     }
     }
 
@@ -1184,7 +1184,7 @@ static errr term_pict_win(TERM_LEN x, TERM_LEN y, int n, const TERM_COLOR *ap, c
     int i;
     HDC hdcMask = NULL;
     if (!use_graphics) {
-        return (term_wipe_win(x, y, n));
+        return term_wipe_win(x, y, n);
     }
 
     const tile_info &infGraph = graphic.get_tile_info();

diff --git a/src/main-win/main-win-bg.cpp b/src/main-win/main-win-bg.cpp
index 175057c..7db2fb6 100644 (file)
--- a/src/main-win/main-win-bg.cpp
+++ b/src/main-win/main-win-bg.cpp
@@ -33,7 +33,7 @@ bool load_bg(char* filename)
     delete_bg();
     hBG = read_graphic(filename);
 
-    return (hBG != NULL);
+    return hBG != NULL;
 }
 
 void draw_bg(HDC hdc, RECT *r)

diff --git a/src/main-win/main-win-cfg-reader.cpp b/src/main-win/main-win-cfg-reader.cpp
index 1ae05c4..3b9386f 100644 (file)
--- a/src/main-win/main-win-cfg-reader.cpp
+++ b/src/main-win/main-win-cfg-reader.cpp
@@ -26,7 +26,7 @@
  */
 static cfg_key make_cfg_key(int type, int val)
 {
-    return ((type << 16) | (val & 0xffff));
+    return (type << 16) | (val & 0xffff);
 }
 
 /*!
@@ -64,7 +64,7 @@ concptr CfgData::get_rand(int key1_type, int key2_val)
 bool CfgData::has_key(int key1_type, int key2_val)
 {
     auto ite = map->find(make_cfg_key(key1_type, key2_val));
-    return (ite != map->end());
+    return ite != map->end();
 }
 
 void CfgData::insert(int key1_type, int key2_val, cfg_values *value)

diff --git a/src/main-win/main-win-sound.cpp b/src/main-win/main-win-sound.cpp
index f4d74c3..dafe944 100644 (file)
--- a/src/main-win/main-win-sound.cpp
+++ b/src/main-win/main-win-sound.cpp
@@ -58,7 +58,7 @@ struct sound_res {
      */
     bool isDone()
     {
-        return (this->hwo == NULL || (this->wh.dwFlags & WHDR_DONE));
+        return (this->hwo == NULL) || (this->wh.dwFlags & WHDR_DONE);
     }
 
     void dispose()

diff --git a/src/main/scene-table-monster.cpp b/src/main/scene-table-monster.cpp
index 3425f29..1b421de 100644 (file)
--- a/src/main/scene-table-monster.cpp
+++ b/src/main/scene-table-monster.cpp
@@ -36,7 +36,7 @@ inline static bool is_unique(monster_race *ap_r_ptr)
 
 inline static bool is_unknown_monster(monster_race *ap_r_ptr)
 {
-    return (ap_r_ptr->r_tkills == 0);
+    return ap_r_ptr->r_tkills == 0;
 }
 
 void clear_scene_target_monster()
@@ -70,7 +70,7 @@ void set_temp_mute_scene_monster(int sec)
  */
 inline static bool can_mute_scene_monster()
 {
-    return (scene_target_monster.mute_until > time(nullptr));
+    return scene_target_monster.mute_until > time(nullptr);
 }
 
 /*!
@@ -101,7 +101,7 @@ static bool is_high_rate(PlayerType *player_ptr, MONSTER_IDX m_idx1, MONSTER_IDX
 
     /* Unknown monsters first */
     if ((ap_r_ptr1->r_tkills == 0) != (ap_r_ptr2->r_tkills == 0))
-        return (ap_r_ptr1->r_tkills == 0);
+        return ap_r_ptr1->r_tkills == 0;
 
     /* Higher level monsters first (if known) */
     if (ap_r_ptr1->r_tkills && ap_r_ptr2->r_tkills && ap_r_ptr1->level != ap_r_ptr2->level)

diff --git a/src/market/building-craft-fix.cpp b/src/market/building-craft-fix.cpp
index 2d059ac..e66105f 100644 (file)
--- a/src/market/building-craft-fix.cpp
+++ b/src/market/building-craft-fix.cpp
@@ -267,7 +267,7 @@ static PRICE repair_broken_weapon_aux(PlayerType *player_ptr, PRICE bcost)
 
     player_ptr->update |= PU_BONUS;
     handle_stuff(player_ptr);
-    return (cost);
+    return cost;
 }
 
 /*!

diff --git a/src/mind/mind-elementalist.cpp b/src/mind/mind-elementalist.cpp
index 8040623..2ee9f1e 100644 (file)
--- a/src/mind/mind-elementalist.cpp
+++ b/src/mind/mind-elementalist.cpp
@@ -1066,7 +1066,7 @@ bool has_element_resist(PlayerType *player_ptr, ElementRealmType realm, PLAYER_L
         return false;
 
     auto prealm = i2enum<ElementRealmType>(player_ptr->element);
-    return (prealm == realm && player_ptr->lev >= lev);
+    return (prealm == realm) && (player_ptr->lev >= lev);
 }
 
 /*!
@@ -1187,7 +1187,7 @@ static int get_element_realm(PlayerType *player_ptr, int is, int n)
     }
 
     display_realm_cursor(cs, n, TERM_YELLOW);
-    return (cs + 1);
+    return cs + 1;
 }
 
 /*!

diff --git a/src/mind/mind-sniper.cpp b/src/mind/mind-sniper.cpp
index fa33d4f..064e2d5 100644 (file)
--- a/src/mind/mind-sniper.cpp
+++ b/src/mind/mind-sniper.cpp
@@ -184,7 +184,7 @@ int boost_concentration_damage(PlayerType *player_ptr, int tdam)
 
     tdam = tdam * (10 + sniper_concent) / 10;
 
-    return (tdam);
+    return tdam;
 }
 
 /*!
@@ -515,7 +515,7 @@ MULTIPLY calc_snipe_damage_with_slay(PlayerType *player_ptr, MULTIPLY mult, mons
         break;
     }
 
-    return (mult);
+    return mult;
 }
 
 /*!
@@ -594,7 +594,7 @@ static bool cast_sniper_spell(PlayerType *player_ptr, int spell)
     command_cmd = 'f';
     do_cmd_fire(player_ptr, snipe_type);
 
-    return (player_ptr->is_fired);
+    return player_ptr->is_fired;
 }
 
 /*!

diff --git a/src/mind/monk-attack.cpp b/src/mind/monk-attack.cpp
index e076b61..0488d70 100644 (file)
--- a/src/mind/monk-attack.cpp
+++ b/src/mind/monk-attack.cpp
@@ -74,7 +74,7 @@ static int calc_max_blow_selection_times(PlayerType *player_ptr)
 {
     PlayerClass pc(player_ptr);
     if (pc.monk_stance_is(MonkStanceType::BYAKKO))
-        return (player_ptr->lev < 3 ? 1 : player_ptr->lev / 3);
+        return player_ptr->lev < 3 ? 1 : player_ptr->lev / 3;
 
     if (pc.monk_stance_is(MonkStanceType::SUZAKU))
         return 1;

diff --git a/src/monster-floor/monster-direction.cpp b/src/monster-floor/monster-direction.cpp
index 44584ee..69e99d4 100644 (file)
--- a/src/monster-floor/monster-direction.cpp
+++ b/src/monster-floor/monster-direction.cpp
@@ -44,7 +44,7 @@ static bool decide_pet_approch_direction(PlayerType *player_ptr, monster_type *m
         return true;
     }
 
-    return (r_ptr->aaf < t_ptr->cdis);
+    return r_ptr->aaf < t_ptr->cdis;
 }
 
 /*!

diff --git a/src/monster-floor/monster-sweep-grid.cpp b/src/monster-floor/monster-sweep-grid.cpp
index c44337b..2752199 100644 (file)
--- a/src/monster-floor/monster-sweep-grid.cpp
+++ b/src/monster-floor/monster-sweep-grid.cpp
@@ -95,7 +95,7 @@ bool MonsterSweepGrid::mon_will_run()
     auto *m_ptr = &this->player_ptr->current_floor_ptr->m_list[this->m_idx];
     auto *r_ptr = &r_info[m_ptr->r_idx];
     if (is_pet(m_ptr)) {
-        return ((this->player_ptr->pet_follow_distance < 0) && (m_ptr->cdis <= (0 - this->player_ptr->pet_follow_distance)));
+        return (this->player_ptr->pet_follow_distance < 0) && (m_ptr->cdis <= (0 - this->player_ptr->pet_follow_distance));
     }
 
     if (m_ptr->cdis > MAX_SIGHT + 5) {

diff --git a/src/monster-floor/one-monster-placer.cpp b/src/monster-floor/one-monster-placer.cpp
index 6d6c2d3..5b1cb62 100644 (file)
--- a/src/monster-floor/one-monster-placer.cpp
+++ b/src/monster-floor/one-monster-placer.cpp
@@ -71,7 +71,8 @@ static bool monster_hook_tanuki(PlayerType *player_ptr, MONRACE_IDX r_idx)
         if (r_ptr->blow[i].method == RaceBlowMethodType::EXPLODE)
             return false;
 
-    return (*(get_monster_hook(player_ptr)))(player_ptr, r_idx);
+    auto hook_pf = get_monster_hook(player_ptr);
+    return (*hook_pf)(player_ptr, r_idx);
 }
 
 /*!

diff --git a/src/monster-race/monster-race-hook.cpp b/src/monster-race/monster-race-hook.cpp
index 2f152b5..4ccd592 100644 (file)
--- a/src/monster-race/monster-race-hook.cpp
+++ b/src/monster-race/monster-race-hook.cpp
@@ -132,7 +132,7 @@ bool mon_hook_dungeon(PlayerType *player_ptr, MONRACE_IDX r_idx)
     dungeon_type *d_ptr = &d_info[player_ptr->dungeon_idx];
 
     if (any_bits(r_ptr->flags8, RF8_WILD_ONLY))
-        return (any_bits(d_ptr->mflags8, RF8_WILD_MOUNTAIN) && any_bits(r_ptr->flags8, RF8_WILD_MOUNTAIN));
+        return any_bits(d_ptr->mflags8, RF8_WILD_MOUNTAIN) && any_bits(r_ptr->flags8, RF8_WILD_MOUNTAIN);
 
     bool land = none_bits(r_ptr->flags7, RF7_AQUATIC);
     return none_bits(d_ptr->mflags8, RF8_WILD_MOUNTAIN | RF8_WILD_VOLCANO) || (any_bits(d_ptr->mflags8, RF8_WILD_MOUNTAIN) && (land || any_bits(r_ptr->flags8, RF8_WILD_MOUNTAIN))) || (any_bits(d_ptr->mflags8, RF8_WILD_VOLCANO) && (land || any_bits(r_ptr->flags8, RF8_WILD_VOLCANO)));
@@ -359,7 +359,7 @@ bool vault_aux_simple(PlayerType *player_ptr, MONRACE_IDX r_idx)
     /* Unused */
     (void)player_ptr;
 
-    return (vault_monster_okay(player_ptr, r_idx));
+    return vault_monster_okay(player_ptr, r_idx);
 }
 
 /*!
@@ -500,7 +500,7 @@ bool vault_aux_clone(PlayerType *player_ptr, MONRACE_IDX r_idx)
     if (!vault_monster_okay(player_ptr, r_idx))
         return false;
 
-    return (r_idx == vault_aux_race);
+    return r_idx == vault_aux_race;
 }
 
 /*!
@@ -890,5 +890,5 @@ bool item_monster_okay(PlayerType *player_ptr, MONRACE_IDX r_idx)
  */
 bool vault_monster_okay(PlayerType *player_ptr, MONRACE_IDX r_idx)
 {
-    return (mon_hook_dungeon(player_ptr, r_idx) && none_bits(r_info[r_idx].flags1, RF1_UNIQUE) && none_bits(r_info[r_idx].flags7, RF7_UNIQUE2) && none_bits(r_info[r_idx].flagsr, RFR_RES_ALL) && none_bits(r_info[r_idx].flags7, RF7_AQUATIC));
+    return mon_hook_dungeon(player_ptr, r_idx) && none_bits(r_info[r_idx].flags1, RF1_UNIQUE) && none_bits(r_info[r_idx].flags7, RF7_UNIQUE2) && none_bits(r_info[r_idx].flagsr, RFR_RES_ALL) && none_bits(r_info[r_idx].flags7, RF7_AQUATIC);
 }

diff --git a/src/monster/monster-list.cpp b/src/monster/monster-list.cpp
index 3b034c9..fdc31a0 100644 (file)
--- a/src/monster/monster-list.cpp
+++ b/src/monster/monster-list.cpp
@@ -265,7 +265,8 @@ static bool monster_hook_chameleon(PlayerType *player_ptr, MONRACE_IDX r_idx)
             return false;
     }
 
-    return (*(get_monster_hook(player_ptr)))(player_ptr, r_idx);
+    auto hook_pf = get_monster_hook(player_ptr);
+    return (*hook_pf)(player_ptr, r_idx);
 }
 
 /*!

diff --git a/src/monster/monster-processor.cpp b/src/monster/monster-processor.cpp
index 921ae76..b574a53 100644 (file)
--- a/src/monster/monster-processor.cpp
+++ b/src/monster/monster-processor.cpp
@@ -208,7 +208,7 @@ bool process_stealth(PlayerType *player_ptr, MONSTER_IDX m_idx)
     if (r_ptr->level > (player_ptr->lev * player_ptr->lev / 20 + 10))
         tmp /= 3;
 
-    return (randint0(tmp) <= (r_ptr->level + 20));
+    return randint0(tmp) <= (r_ptr->level + 20);
 }
 
 /*!

diff --git a/src/mspell/mspell-learn-checker.cpp b/src/mspell/mspell-learn-checker.cpp
index 7744cb8..e38ec86 100644 (file)
--- a/src/mspell/mspell-learn-checker.cpp
+++ b/src/mspell/mspell-learn-checker.cpp
@@ -20,5 +20,5 @@ bool spell_learnable(PlayerType *player_ptr, MONSTER_IDX m_idx)
     bool seen = (!player_ptr->blind && m_ptr->ml);
 
     bool maneable = player_has_los_bold(player_ptr, m_ptr->fy, m_ptr->fx);
-    return (seen && maneable && !w_ptr->timewalk_m_idx);
+    return seen && maneable && (w_ptr->timewalk_m_idx == 0);
 }

diff --git a/src/mspell/mspell-selector.cpp b/src/mspell/mspell-selector.cpp
index 3ec52e7..fda14b0 100644 (file)
--- a/src/mspell/mspell-selector.cpp
+++ b/src/mspell/mspell-selector.cpp
@@ -302,7 +302,7 @@ MonsterAbilityType choose_attack_spell(PlayerType *player_ptr, msa_type *msa_ptr
     auto *m_ptr = &player_ptr->current_floor_ptr->m_list[msa_ptr->m_idx];
     auto *r_ptr = &r_info[m_ptr->r_idx];
     if (r_ptr->flags2 & RF2_STUPID) {
-        return (msa_ptr->mspells[randint0(msa_ptr->mspells.size())]);
+        return msa_ptr->mspells[randint0(msa_ptr->mspells.size())];
     }
 
     for (size_t i = 0; i < msa_ptr->mspells.size(); i++) {
@@ -360,7 +360,7 @@ MonsterAbilityType choose_attack_spell(PlayerType *player_ptr, msa_type *msa_ptr
     }
 
     if (!world.empty() && (randint0(100) < 15) && !w_ptr->timewalk_m_idx) {
-        return (world[randint0(world.size())]);
+        return world[randint0(world.size())];
     }
 
     if (!special.empty()) {
@@ -377,19 +377,19 @@ MonsterAbilityType choose_attack_spell(PlayerType *player_ptr, msa_type *msa_ptr
         }
 
         if (success) {
-            return (special[randint0(special.size())]);
+            return special[randint0(special.size())];
         }
     }
 
     if (m_ptr->hp < m_ptr->maxhp / 3 && one_in_(2)) {
         if (!heal.empty()) {
-            return (heal[randint0(heal.size())]);
+            return heal[randint0(heal.size())];
         }
     }
 
     if (((m_ptr->hp < m_ptr->maxhp / 3) || monster_fear_remaining(m_ptr)) && one_in_(2)) {
         if (!escape.empty()) {
-            return (escape[randint0(escape.size())]);
+            return escape[randint0(escape.size())];
         }
     }
 
@@ -417,60 +417,60 @@ MonsterAbilityType choose_attack_spell(PlayerType *player_ptr, msa_type *msa_ptr
             break;
         }
         if (success) {
-            return (special[randint0(special.size())]);
+            return special[randint0(special.size())];
         }
     }
 
     if ((distance(player_ptr->y, player_ptr->x, m_ptr->fy, m_ptr->fx) < 4) && (!attack.empty() || r_ptr->ability_flags.has(MonsterAbilityType::TRAPS)) && (randint0(100) < 75) && !w_ptr->timewalk_m_idx) {
         if (!tactic.empty()) {
-            return (tactic[randint0(tactic.size())]);
+            return tactic[randint0(tactic.size())];
         }
     }
 
     if (!summon.empty() && (randint0(100) < 40)) {
-        return (summon[randint0(summon.size())]);
+        return summon[randint0(summon.size())];
     }
 
     if (!dispel.empty() && one_in_(2)) {
         if (dispel_check(player_ptr, msa_ptr->m_idx)) {
-            return (dispel[randint0(dispel.size())]);
+            return dispel[randint0(dispel.size())];
         }
     }
 
     if (!raise.empty() && (randint0(100) < 40)) {
-        return (raise[randint0(raise.size())]);
+        return raise[randint0(raise.size())];
     }
 
     if (is_invuln(player_ptr)) {
         if (!psy_spe.empty() && (randint0(100) < 50)) {
-            return (psy_spe[randint0(psy_spe.size())]);
+            return psy_spe[randint0(psy_spe.size())];
         } else if (!attack.empty() && (randint0(100) < 40)) {
-            return (attack[randint0(attack.size())]);
+            return attack[randint0(attack.size())];
         }
     } else if (!attack.empty() && (randint0(100) < 85)) {
-        return (attack[randint0(attack.size())]);
+        return attack[randint0(attack.size())];
     }
 
     if (!tactic.empty() && (randint0(100) < 50) && !w_ptr->timewalk_m_idx) {
-        return (tactic[randint0(tactic.size())]);
+        return tactic[randint0(tactic.size())];
     }
 
     if (!invul.empty() && !m_ptr->mtimed[MTIMED_INVULNER] && (randint0(100) < 50)) {
-        return (invul[randint0(invul.size())]);
+        return invul[randint0(invul.size())];
     }
 
     if ((m_ptr->hp < m_ptr->maxhp * 3 / 4) && (randint0(100) < 25)) {
         if (!heal.empty()) {
-            return (heal[randint0(heal.size())]);
+            return heal[randint0(heal.size())];
         }
     }
 
     if (!haste.empty() && (randint0(100) < 20) && !monster_fast_remaining(m_ptr)) {
-        return (haste[randint0(haste.size())]);
+        return haste[randint0(haste.size())];
     }
 
     if (!annoy.empty() && (randint0(100) < 80)) {
-        return (annoy[randint0(annoy.size())]);
+        return annoy[randint0(annoy.size())];
     }
 
     return MonsterAbilityType::MAX;

diff --git a/src/mspell/smart-mspell-util.cpp b/src/mspell/smart-mspell-util.cpp
index a751602..c711eb1 100644 (file)
--- a/src/mspell/smart-mspell-util.cpp
+++ b/src/mspell/smart-mspell-util.cpp
@@ -29,5 +29,5 @@ bool int_outof(monster_race *r_ptr, PERCENTAGE prob)
     if (r_ptr->behavior_flags.has_not(MonsterBehaviorType::SMART))
         prob = prob / 2;
 
-    return (randint0(100) < prob);
+    return randint0(100) < prob;
 }

diff --git a/src/mutation/mutation-calculator.cpp b/src/mutation/mutation-calculator.cpp
index 27e4f27..900a4ef 100644 (file)
--- a/src/mutation/mutation-calculator.cpp
+++ b/src/mutation/mutation-calculator.cpp
@@ -52,5 +52,5 @@ int calc_mutant_regenerate_mod(PlayerType *player_ptr)
     if (regen < 10)
         regen = 10;
 
-    return (regen);
+    return regen;
 }