OSDN Git Service

[Refactor] ローカル変数 have 記述を has に修正. / Rename have to has keyword in local variables.
authordeskull <deskull@users.sourceforge.jp>
Wed, 26 Aug 2020 16:58:16 +0000 (01:58 +0900)
committerdeskull <deskull@users.sourceforge.jp>
Wed, 26 Aug 2020 16:58:16 +0000 (01:58 +0900)
src/floor/floor-streams.c
src/floor/wild.c

index 4c6fa0d..6062cb0 100644 (file)
@@ -284,7 +284,7 @@ void build_streamer(player_type *player_ptr, FEAT_IDX feat, int chance)
 
     feature_type *streamer_ptr = &f_info[feat];
     bool streamer_is_wall = has_flag(streamer_ptr->flags, FF_WALL) && !has_flag(streamer_ptr->flags, FF_PERMANENT);
-    bool streamer_may_have_gold = has_flag(streamer_ptr->flags, FF_MAY_HAVE_GOLD);
+    bool streamer_may_has_gold = has_flag(streamer_ptr->flags, FF_MAY_HAVE_GOLD);
 
     /* Hack -- Choose starting point */
     floor_type *floor_ptr = player_ptr->current_floor_ptr;
@@ -367,7 +367,7 @@ void build_streamer(player_type *player_ptr, FEAT_IDX feat, int chance)
             /* Paranoia: Clear mimic field */
             g_ptr->mimic = 0;
 
-            if (streamer_may_have_gold) {
+            if (streamer_may_has_gold) {
                 /* Hack -- Add some known treasure */
                 if (one_in_(chance)) {
                     cave_alter_feat(player_ptr, ty, tx, FF_MAY_HAVE_GOLD);
index 1e570a3..3a0e855 100644 (file)
@@ -867,14 +867,14 @@ bool change_wild_mode(player_type *creature_ptr, bool encount)
         return TRUE;
     }
 
-    bool have_pet = FALSE;
+    bool has_pet = FALSE;
     for (int i = 1; i < creature_ptr->current_floor_ptr->m_max; i++) {
         monster_type *m_ptr = &creature_ptr->current_floor_ptr->m_list[i];
         if (!monster_is_valid(m_ptr))
             continue;
 
         if (is_pet(m_ptr) && i != creature_ptr->riding)
-            have_pet = TRUE;
+            has_pet = TRUE;
 
         if (monster_csleep_remaining(m_ptr) || (m_ptr->cdis > MAX_SIGHT) || !is_hostile(m_ptr))
             continue;
@@ -884,7 +884,7 @@ bool change_wild_mode(player_type *creature_ptr, bool encount)
         return FALSE;
     }
 
-    if (have_pet) {
+    if (has_pet) {
         concptr msg = _("ペットを置いて広域マップに入りますか?", "Do you leave your pets behind? ");
         if (!get_check_strict(creature_ptr, msg, CHECK_OKAY_CANCEL)) {
             free_turn(creature_ptr);