[refactor] gccの-Wswitch警告の対策

enumのメンバが全て列挙されていないswitchに対する警告。
全て列挙できるものは全て列挙し、それがが適さないものは
default:句を追加する。

diff --git a/src/artifact/random-art-generator.cpp b/src/artifact/random-art-generator.cpp
index dddb191..9ecc291 100644 (file)
--- a/src/artifact/random-art-generator.cpp
+++ b/src/artifact/random-art-generator.cpp
@@ -143,6 +143,9 @@ static void set_artifact_bias(player_type *player_ptr, object_type *o_ptr, int *
             o_ptr->artifact_bias = BIAS_ROGUE;
         
         break;
+
+    case MAX_CLASS:
+        break;
     }
 }
 

diff --git a/src/cmd-action/cmd-pet.cpp b/src/cmd-action/cmd-pet.cpp
index c8d6151..a8b6ef0 100644 (file)
--- a/src/cmd-action/cmd-pet.cpp
+++ b/src/cmd-action/cmd-pet.cpp
@@ -531,6 +531,9 @@ void do_cmd_pet(player_type *creature_ptr)
                     powers[num++] = PET_TWO_HANDS;
                 }
                 break;
+
+            default:
+                break;
             }
         }
     }

diff --git a/src/cmd-item/cmd-equipment.cpp b/src/cmd-item/cmd-equipment.cpp
index d526683..66fdfcb 100644 (file)
--- a/src/cmd-item/cmd-equipment.cpp
+++ b/src/cmd-item/cmd-equipment.cpp
@@ -168,6 +168,9 @@ void do_cmd_wield(player_type *creature_ptr)
 
         creature_ptr->select_ring_slot = FALSE;
         break;
+
+    default:
+        break;
     }
 
     if (object_is_cursed(&creature_ptr->inventory_list[slot])) {

diff --git a/src/combat/shoot.cpp b/src/combat/shoot.cpp
index 0fcdcf3..5f158fc 100644 (file)
--- a/src/combat/shoot.cpp
+++ b/src/combat/shoot.cpp
@@ -322,6 +322,9 @@ static MULTIPLY calc_shot_damage_with_slay(player_type *sniper_ptr, object_type
         }
         break;
     }
+
+    default:
+        break;
     }
 
     /* Sniper */

diff --git a/src/combat/slaying.cpp b/src/combat/slaying.cpp
index a9bcc7a..cdb5ee7 100644 (file)
--- a/src/combat/slaying.cpp
+++ b/src/combat/slaying.cpp
@@ -194,6 +194,9 @@ HIT_POINT calc_attack_damage_with_slay(player_type *attacker_ptr, object_type *o
             mult = 150;
         break;
     }
+
+    default:
+        break;
     }
 
     if (mult > 150)

diff --git a/src/flavor/flavor-describer.cpp b/src/flavor/flavor-describer.cpp
index a5777b0..b9bb049 100644 (file)
--- a/src/flavor/flavor-describer.cpp
+++ b/src/flavor/flavor-describer.cpp
@@ -180,6 +180,9 @@ static void describe_tval(player_type *player_ptr, flavor_type *flavor_ptr)
     case TV_BOW:
         describe_bow(player_ptr, flavor_ptr);
         break;
+
+    default:
+        break;
     }
 }
 

diff --git a/src/flavor/object-flavor.cpp b/src/flavor/object-flavor.cpp
index d6b1720..53dd59e 100644 (file)
--- a/src/flavor/object-flavor.cpp
+++ b/src/flavor/object-flavor.cpp
@@ -85,6 +85,9 @@ static bool object_easy_know(int i)
     case TV_SCROLL:
     case TV_ROD:
         return TRUE;
+
+    default:
+        break;
     }
 
     return FALSE;
@@ -289,4 +292,4 @@ void strip_name(char *buf, KIND_OBJECT_IDX k_idx)
     }
 
     *t = '\0';
-}
\ No newline at end of file
+}

diff --git a/src/floor/floor-object.cpp b/src/floor/floor-object.cpp
index 5390131..2503285 100644 (file)
--- a/src/floor/floor-object.cpp
+++ b/src/floor/floor-object.cpp
@@ -128,6 +128,9 @@ bool make_object(player_type *owner_ptr, object_type *j_ptr, BIT_FLAGS mode)
         if (!j_ptr->name1)
             j_ptr->number = (byte)damroll(6, 7);
     }
+
+    default:
+        break;
     }
 
     if (cheat_peek)

diff --git a/src/lore/combat-types-setter.cpp b/src/lore/combat-types-setter.cpp
index 45317ca..87f60bf 100644 (file)
--- a/src/lore/combat-types-setter.cpp
+++ b/src/lore/combat-types-setter.cpp
@@ -98,6 +98,11 @@ void set_monster_blow_method(lore_type *lore_ptr, int m)
         lore_ptr->p = _("歌う", "sing");
         lore_ptr->pc = TERM_SLATE;
         break;
+
+    case RBM_NONE:
+    case RBM_SHOOT:
+    case NB_RBM_TYPE:
+        break;
     }
 }
 
@@ -249,5 +254,9 @@ void set_monster_blow_effect(lore_type *lore_ptr, int m)
     case RBE_FLAVOR:
         // フレーバー打撃には何の効果もないので付加説明もない。
         break;
+
+    case RBE_NONE:
+    case NB_RBE_TYPE:
+        break;
     }
 }

diff --git a/src/market/building-recharger.cpp b/src/market/building-recharger.cpp
index e534eee..5759d1a 100644 (file)
--- a/src/market/building-recharger.cpp
+++ b/src/market/building-recharger.cpp
@@ -211,6 +211,9 @@ void building_recharge_all(player_type *player_ptr)
             price = MAX(10, price);
             price = (o_ptr->number * k_ptr->pval - o_ptr->pval) * price;
             break;
+
+        default:
+            break;
         }
 
         if (price > 0)
@@ -262,6 +265,9 @@ void building_recharge_all(player_type *player_ptr)
 
             o_ptr->ident &= ~(IDENT_EMPTY);
             break;
+
+        default:
+            break;
         }
     }
 

diff --git a/src/melee/melee-switcher.cpp b/src/melee/melee-switcher.cpp
index 1421c06..3c766ca 100644 (file)
--- a/src/melee/melee-switcher.cpp
+++ b/src/melee/melee-switcher.cpp
@@ -137,6 +137,11 @@ void describe_melee_method(player_type *subject_ptr, mam_type *mam_ptr)
         mam_ptr->touched = FALSE;
         break;
     }
+
+    case RBM_NONE:
+    case RBM_SHOOT:
+    case NB_RBM_TYPE:
+        break;
     }
 }
 

diff --git a/src/mind/mind-mindcrafter.cpp b/src/mind/mind-mindcrafter.cpp
index 22d0451..3ecdf3e 100644 (file)
--- a/src/mind/mind-mindcrafter.cpp
+++ b/src/mind/mind-mindcrafter.cpp
@@ -113,6 +113,9 @@ bool psychometry(player_type *caster_ptr)
     case TV_FIGURINE:
         okay = TRUE;
         break;
+
+    default:
+        break;
     }
 
     autopick_alter_item(caster_ptr, item, (bool)(okay && destroy_feeling));

diff --git a/src/mind/mind-weaponsmith.cpp b/src/mind/mind-weaponsmith.cpp
index 0f657bd..c6d7390 100644 (file)
--- a/src/mind/mind-weaponsmith.cpp
+++ b/src/mind/mind-weaponsmith.cpp
@@ -26,6 +26,9 @@ bool item_tester_hook_melee_ammo(player_type *player_ptr, object_type *o_ptr)
         if (o_ptr->sval != SV_POISON_NEEDLE)
             return TRUE;
     }
+
+    default:
+        break;
     }
 
     return FALSE;

diff --git a/src/monster-attack/monster-attack-describer.cpp b/src/monster-attack/monster-attack-describer.cpp
index f9c7344..66d8420 100644 (file)
--- a/src/monster-attack/monster-attack-describer.cpp
+++ b/src/monster-attack/monster-attack-describer.cpp
@@ -239,5 +239,10 @@ void describe_monster_attack_method(monap_type *monap_ptr)
         monster_attack_show(monap_ptr);
         break;
     }
+
+    case RBM_NONE:
+    case RBM_SHOOT:
+    case NB_RBM_TYPE:
+        break;
     }
 }

diff --git a/src/monster-attack/monster-attack-switcher.cpp b/src/monster-attack/monster-attack-switcher.cpp
index 64061f1..72b5b03 100644 (file)
--- a/src/monster-attack/monster-attack-switcher.cpp
+++ b/src/monster-attack/monster-attack-switcher.cpp
@@ -478,5 +478,8 @@ void switch_monster_blow_to_player(player_type *target_ptr, monap_type *monap_pt
         monap_ptr->obvious = TRUE;
         monap_ptr->damage = 0;
         break;
+
+    case NB_RBE_TYPE:
+        break;
     }
 }

diff --git a/src/object-enchant/apply-magic-accessory.cpp b/src/object-enchant/apply-magic-accessory.cpp
index 2643565..444806c 100644 (file)
--- a/src/object-enchant/apply-magic-accessory.cpp
+++ b/src/object-enchant/apply-magic-accessory.cpp
@@ -684,5 +684,8 @@ void apply_magic_accessary(player_type *owner_ptr, object_type *o_ptr, DEPTH lev
 
         break;
     }
+
+    default:
+        break;
     }
 }

diff --git a/src/object-enchant/apply-magic-armor.cpp b/src/object-enchant/apply-magic-armor.cpp
index e77707f..982750f 100644 (file)
--- a/src/object-enchant/apply-magic-armor.cpp
+++ b/src/object-enchant/apply-magic-armor.cpp
@@ -462,5 +462,8 @@ void apply_magic_armor(player_type *owner_ptr, object_type *o_ptr, DEPTH level,
 
         break;
     }
+
+    default:
+        break;
     }
 }

diff --git a/src/object-enchant/apply-magic-others.cpp b/src/object-enchant/apply-magic-others.cpp
index 1b57e5a..d364799 100644 (file)
--- a/src/object-enchant/apply-magic-others.cpp
+++ b/src/object-enchant/apply-magic-others.cpp
@@ -217,5 +217,8 @@ void apply_magic_others(player_type *owner_ptr, object_type *o_ptr, int power)
 
         break;
     }
+
+    default:
+        break;
     }
-}
\ No newline at end of file
+}

diff --git a/src/object-enchant/apply-magic-weapon.cpp b/src/object-enchant/apply-magic-weapon.cpp
index 9da78e7..986afeb 100644 (file)
--- a/src/object-enchant/apply-magic-weapon.cpp
+++ b/src/object-enchant/apply-magic-weapon.cpp
@@ -257,5 +257,8 @@ void apply_magic_weapon(player_type *owner_ptr, object_type *o_ptr, DEPTH level,
 
         break;
     }
+
+    default:
+        break;
     }
 }

diff --git a/src/object-hook/hook-bow.cpp b/src/object-hook/hook-bow.cpp
index 6d0047e..f9a7bc2 100644 (file)
--- a/src/object-hook/hook-bow.cpp
+++ b/src/object-hook/hook-bow.cpp
@@ -36,6 +36,9 @@ bool item_tester_hook_ammo(player_type *player_ptr, object_type *o_ptr)
     case TV_BOLT: {
         return TRUE;
     }
+
+    default:
+        break;
     }
 
     return FALSE;

diff --git a/src/object-hook/hook-weapon.cpp b/src/object-hook/hook-weapon.cpp
index 70c999e..f2e2a7a 100644 (file)
--- a/src/object-hook/hook-weapon.cpp
+++ b/src/object-hook/hook-weapon.cpp
@@ -27,6 +27,9 @@ bool item_tester_hook_orthodox_melee_weapons(player_type *player_ptr, object_typ
         if (o_ptr->sval != SV_POISON_NEEDLE)
             return TRUE;
     }
+
+    default:
+        break;
     }
 
     return FALSE;

diff --git a/src/object/object-broken.cpp b/src/object/object-broken.cpp
index e830705..8d59320 100644 (file)
--- a/src/object/object-broken.cpp
+++ b/src/object/object-broken.cpp
@@ -68,6 +68,9 @@ bool hates_acid(object_type *o_ptr)
        {
                return TRUE;
        }
+
+       default:
+               break;
        }
 
        return FALSE;
@@ -89,6 +92,9 @@ bool hates_elec(object_type *o_ptr)
        {
                return TRUE;
        }
+
+       default:
+            break;
        }
 
        return FALSE;
@@ -153,6 +159,9 @@ bool hates_fire(object_type *o_ptr)
        {
                return TRUE;
        }
+
+       default:
+               break;
        }
 
        return FALSE;
@@ -175,6 +184,9 @@ bool hates_cold(object_type *o_ptr)
        {
                return TRUE;
        }
+
+       default:
+               break;
        }
 
        return FALSE;

diff --git a/src/object/object-info.cpp b/src/object/object-info.cpp
index f4375a8..e386cdf 100644 (file)
--- a/src/object/object-info.cpp
+++ b/src/object/object-info.cpp
@@ -257,6 +257,9 @@ s16b wield_slot(player_type *owner_ptr, object_type *o_ptr)
     case TV_BOOTS: {
         return (INVEN_FEET);
     }
+
+    default:
+        break;
     }
 
     return -1;

diff --git a/src/object/object-value.cpp b/src/object/object-value.cpp
index a674356..f01a523 100644 (file)
--- a/src/object/object-value.cpp
+++ b/src/object/object-value.cpp
@@ -60,6 +60,9 @@ static PRICE object_value_base(object_type *o_ptr)
             return 1000L;
         else
             return ((r_info[o_ptr->pval].level) * 50L + 1000);
+
+    default:
+        break;
     }
 
     return (0L);
@@ -220,6 +223,9 @@ PRICE object_value_real(player_type *player_ptr, object_type *o_ptr)
         if (has_flag(flgs, TR_SPEED))
             value += (o_ptr->pval * 10000L);
         break;
+
+    default:
+        break;
     }
 
     switch (o_ptr->tval) {
@@ -310,6 +316,9 @@ PRICE object_value_real(player_type *player_ptr, object_type *o_ptr)
             value = 0L;
         break;
     }
+
+    default:
+        break;
     }
 
     if (value < 0)

diff --git a/src/object/warning.cpp b/src/object/warning.cpp
index 2771ee7..1652ddb 100644 (file)
--- a/src/object/warning.cpp
+++ b/src/object/warning.cpp
@@ -319,6 +319,9 @@ static int blow_damcalc(monster_type *m_ptr, player_type *target_ptr, monster_bl
         dam = 0;
         check_wraith_form = FALSE;
         break;
+
+    default:
+        break;
     }
 
     if (check_wraith_form && target_ptr->wraith_form) {

diff --git a/src/perception/identification.cpp b/src/perception/identification.cpp
index 7a5dd14..fc91036 100644 (file)
--- a/src/perception/identification.cpp
+++ b/src/perception/identification.cpp
@@ -676,6 +676,9 @@ bool screen_object(player_type *player_ptr, object_type *o_ptr, BIT_FLAGS mode)
             }
 
             break;
+
+        default:
+            break;
         }
     }
 

diff --git a/src/perception/simple-perception.cpp b/src/perception/simple-perception.cpp
index 785ea4b..275dd1b 100644 (file)
--- a/src/perception/simple-perception.cpp
+++ b/src/perception/simple-perception.cpp
@@ -82,6 +82,9 @@ static void sense_inventory_aux(player_type *creature_ptr, INVENTORY_IDX slot, b
             feel = FEEL_TERRIBLE;
             break;
         }
+
+        default:
+            break;
         }
     }
 
@@ -238,6 +241,9 @@ void sense_inventory1(player_type *creature_ptr)
         heavy = TRUE;
         break;
     }
+
+    case MAX_CLASS:
+        break;
     }
 
     if (compare_virtue(creature_ptr, V_KNOWLEDGE, 100, VIRTUE_LARGE))
@@ -273,6 +279,9 @@ void sense_inventory1(player_type *creature_ptr)
             okay = TRUE;
             break;
         }
+
+        default:
+            break;
         }
 
         if (!okay)
@@ -356,6 +365,9 @@ void sense_inventory2(player_type *creature_ptr)
 
         break;
     }
+
+    case MAX_CLASS:
+        break;
     }
 
     for (INVENTORY_IDX i = 0; i < INVEN_TOTAL; i++) {
@@ -372,6 +384,9 @@ void sense_inventory2(player_type *creature_ptr)
             okay = TRUE;
             break;
         }
+
+        default:
+            break;
         }
 
         if (!okay)

diff --git a/src/player-info/avatar.cpp b/src/player-info/avatar.cpp
index ad1258e..459a2de 100644 (file)
--- a/src/player-info/avatar.cpp
+++ b/src/player-info/avatar.cpp
@@ -325,6 +325,9 @@ void get_virtues(player_type *creature_ptr)
         creature_ptr->vir_types[i++] = V_FAITH;
         creature_ptr->vir_types[i++] = V_UNLIFE;
         break;
+
+    case MAX_CLASS:
+        break;
     };
 
     /* Get one virtue based on race */
@@ -401,6 +404,8 @@ void get_virtues(player_type *creature_ptr)
     case RACE_BEASTMAN:
         creature_ptr->vir_types[i++] = V_CHANCE;
         break;
+    case MAX_RACES:
+        break;
     }
 
     /* Get a virtue for realms */

diff --git a/src/player-info/class-ability-info.cpp b/src/player-info/class-ability-info.cpp
index dc3cad3..905cbbe 100644 (file)
--- a/src/player-info/class-ability-info.cpp
+++ b/src/player-info/class-ability-info.cpp
@@ -164,5 +164,11 @@ void set_class_ability_info(player_type *creature_ptr, self_info_type *self_ptr)
             self_ptr->info[self_ptr->line++] = _("あなたは素早く移動することができる。(消費なし)", "You can walk extremely fast (cost 0).");
 
         break;
+
+    case CLASS_ARCHER:
+    case CLASS_BARD:
+    case CLASS_SNIPER:
+    case MAX_CLASS:
+        break;
     }
 }

diff --git a/src/player/eldritch-horror.cpp b/src/player/eldritch-horror.cpp
index 2a756c8..46bbe4a 100644 (file)
--- a/src/player/eldritch-horror.cpp
+++ b/src/player/eldritch-horror.cpp
@@ -196,6 +196,9 @@ void sanity_blast(player_type *creature_ptr, monster_type *m_ptr, bool necro)
                 if (saving_throw(10 + creature_ptr->lev))
                     return;
                 break;
+
+            default:
+                break;
             }
         } else {
             if (mimic_info[creature_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_DEMON) {
@@ -328,4 +331,4 @@ void sanity_blast(player_type *creature_ptr, monster_type *m_ptr, bool necro)
 
     creature_ptr->update |= PU_BONUS;
     handle_stuff(creature_ptr);
-}
\ No newline at end of file
+}

diff --git a/src/player/player-status-flags.cpp b/src/player/player-status-flags.cpp
index 8495582..5669860 100644 (file)
--- a/src/player/player-status-flags.cpp
+++ b/src/player/player-status-flags.cpp
@@ -395,6 +395,9 @@ BIT_FLAGS get_player_flags(player_type *creature_ptr, tr_type tr_flag)
     case TR_DARK_SOURCE:
     case TR_SUPPORTIVE:
         return check_equipment_flags(creature_ptr, tr_flag);
+
+    case TR_FLAG_MAX:
+        break;
     }
     return 0;
 }
@@ -1834,6 +1837,9 @@ BIT_FLAGS has_resist_fear(player_type *creature_ptr)
     case CLASS_NINJA:
         result |= FLAG_CAUSE_CLASS;
         break;
+
+    default:
+        break;
     }
 
     if (creature_ptr->mimic_form == MIMIC_DEMON_LORD) {

diff --git a/src/player/player-status-resist.cpp b/src/player/player-status-resist.cpp
index 3fdf3e8..ead1598 100644 (file)
--- a/src/player/player-status-resist.cpp
+++ b/src/player/player-status-resist.cpp
@@ -219,6 +219,9 @@ PERCENTAGE calc_deathray_damage_rate(player_type *creature_ptr, rate_calc_type_m
     case RACE_SPECTRE:
         return 0;
         break;
+
+    default:
+        break;
     }
 
     return 100;

diff --git a/src/player/player-status.cpp b/src/player/player-status.cpp
index c1c315b..91cc577 100644 (file)
--- a/src/player/player-status.cpp
+++ b/src/player/player-status.cpp
@@ -520,6 +520,9 @@ static void update_alignment(player_type *creature_ptr)
         case RACE_BALROG:
             creature_ptr->align -= 200;
             break;
+
+        default:
+            break;
         }
     }
 
@@ -1986,6 +1989,9 @@ static bool is_riding_two_hands(player_type *creature_ptr)
             if ((empty_hands(creature_ptr, FALSE) != EMPTY_HAND_NONE) && !has_melee_weapon(creature_ptr, INVEN_MAIN_HAND)
                 && !has_melee_weapon(creature_ptr, INVEN_SUB_HAND))
                 return TRUE;
+
+        default:
+            break;
         }
     }
 
@@ -2300,6 +2306,10 @@ static s16b calc_to_hit(player_type *creature_ptr, INVENTORY_IDX slot, bool is_r
             /* fall through */
         case MELEE_TYPE_BAREHAND_TWO:
             hit += (creature_ptr->skill_exp[GINOU_SUDE] - WEAPON_EXP_BEGINNER) / 200;
+            break;
+
+        default:
+            break;
         }
 
         if ((is_martial_arts_mode(creature_ptr) && empty_hands(creature_ptr, FALSE) == (EMPTY_HAND_MAIN | EMPTY_HAND_SUB))

diff --git a/src/racial/racial-draconian.cpp b/src/racial/racial-draconian.cpp
index 026a59e..a217a84 100644 (file)
--- a/src/racial/racial-draconian.cpp
+++ b/src/racial/racial-draconian.cpp
@@ -107,6 +107,9 @@ static void decide_breath_kind(player_type *creature_ptr, int *breath_type, conc
         }
 
         break;
+
+    default:
+        break;
     }
 }
 

diff --git a/src/realm/realm-hex.cpp b/src/realm/realm-hex.cpp
index 3449824..71dd5d9 100644 (file)
--- a/src/realm/realm-hex.cpp
+++ b/src/realm/realm-hex.cpp
@@ -79,6 +79,9 @@ static bool item_tester_hook_weapon_except_bow(player_type *player_ptr, object_t
     case TV_DIGGING: {
         return TRUE;
     }
+
+    default:
+        break;
     }
 
     return FALSE;

diff --git a/src/util/object-sort.cpp b/src/util/object-sort.cpp
index 82281cc..e752f1d 100644 (file)
--- a/src/util/object-sort.cpp
+++ b/src/util/object-sort.cpp
@@ -104,6 +104,9 @@ bool object_sort_comp(player_type *player_ptr, object_type *o_ptr, s32b o_value,
         if (o_ptr->pval > j_ptr->pval)
             return FALSE;
         break;
+
+    default:
+        break;
     }
 
     return o_value > object_value(player_ptr, j_ptr);

diff --git a/src/wizard/wizard-spoiler.cpp b/src/wizard/wizard-spoiler.cpp
index 5eed9de..6102e7f 100644 (file)
--- a/src/wizard/wizard-spoiler.cpp
+++ b/src/wizard/wizard-spoiler.cpp
@@ -248,6 +248,8 @@ void exe_output_spoilers(void)
         case SPOILER_OUTPUT_SUCCESS:
             msg_print("Successfully created a spoiler file.");
             break;
+        case SPOILER_OUTPUT_CANCEL:
+            break;
         }
         msg_erase();
     }