[Fix] #41061 clangの警告修正ミスに対応． / Respond to clang warning correction mistakes.

[hengband/hengband.git] / src / floor / wild.c

diff --git a/src/floor/wild.c b/src/floor/wild.c
index 3a0e855..c546a42 100644 (file)
--- a/src/floor/wild.c
+++ b/src/floor/wild.c
@@ -2,10 +2,10 @@
  * @brief 荒野マップの生成とルール管理 / Wilderness generation
  * @date 2014/02/13
  * @author
- * Copyright (c) 1989 James E. Wilson, Robert A. Koeneke\n
- * This software may be copied and distributed for educational, research, and\n
- * not for profit purposes provided that this copyright and statement are\n
- * included in all such copies.\n
+ * Copyright (c) 1989 James E. Wilson, Robert A. Koeneke
+ * This software may be copied and distributed for educational, research, and
+ * not for profit purposes provided that this copyright and statement are
+ * included in all such copies.
  * 2013 Deskull rearranged comment for Doxygen.
  */
 
@@ -353,7 +353,7 @@ static void generate_area(player_type *player_ptr, POSITION y, POSITION x, bool
     }
 
     bool is_winner = wilderness[y][x].entrance > 0;
-    is_winner &= !wilderness[y][x].town != 0;
+    is_winner &= (wilderness[y][x].town == 0);
     bool is_wild_winner = (d_info[wilderness[y][x].entrance].flags1 & DF1_WINNER) == 0;
     is_winner &= ((current_world_ptr->total_winner != 0) || is_wild_winner);
     if (!is_winner)
@@ -608,7 +608,7 @@ void wilderness_gen_small(player_type *creature_ptr)
 }
 
 typedef struct wilderness_grid {
-    int terrain; /* Terrain type */
+    wt_type terrain; /* Terrain type */
     TOWN_IDX town; /* Town number */
     DEPTH level; /* Level of the wilderness */
     byte road; /* Road */