Merge pull request hengband#3519 from Hourier/Fix-RNG-Compilation-War…

…ning 乱数ジェネレータのコピーで静的解析警告が出ていたので対処した
habu1010 · Jul 7, 2023 · 7569b1c · 7569b1c
2 parents 68ddac5 + ebbaea3
commit 7569b1c
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/floor/wild.cpp b/src/floor/wild.cpp
@@ -255,7 +255,7 @@ static void generate_wilderness_area(FloorType *floor_ptr, int terrain, uint32_t
         return;
     }
 
-    const auto state_backup = w_ptr->rng.get_state();
+    const auto rng_backup = w_ptr->rng;
     w_ptr->rng.set_state(seed);
     int table_size = sizeof(terrain_table[0]) / sizeof(int16_t);
     if (!corner) {
@@ -275,7 +275,7 @@ static void generate_wilderness_area(FloorType *floor_ptr, int terrain, uint32_t
         floor_ptr->grid_array[MAX_HGT - 2][1].feat = terrain_table[terrain][floor_ptr->grid_array[MAX_HGT - 2][1].feat];
         floor_ptr->grid_array[1][MAX_WID - 2].feat = terrain_table[terrain][floor_ptr->grid_array[1][MAX_WID - 2].feat];
         floor_ptr->grid_array[MAX_HGT - 2][MAX_WID - 2].feat = terrain_table[terrain][floor_ptr->grid_array[MAX_HGT - 2][MAX_WID - 2].feat];
-        w_ptr->rng.set_state(state_backup);
+        w_ptr->rng = rng_backup;
         return;
     }
 
@@ -295,7 +295,7 @@ static void generate_wilderness_area(FloorType *floor_ptr, int terrain, uint32_t
         }
     }
 
-    w_ptr->rng.set_state(state_backup);
+    w_ptr->rng = rng_backup;
 }
 
 /*!
@@ -379,13 +379,13 @@ static void generate_area(PlayerType *player_ptr, POSITION y, POSITION x, bool i
         return;
     }
 
-    const auto state_backup = w_ptr->rng.get_state();
+    const auto rng_backup = w_ptr->rng;
     w_ptr->rng.set_state(wilderness[y][x].seed);
     int dy = rand_range(6, floor_ptr->height - 6);
     int dx = rand_range(6, floor_ptr->width - 6);
     floor_ptr->grid_array[dy][dx].feat = feat_entrance;
     floor_ptr->grid_array[dy][dx].special = wilderness[y][x].entrance;
-    w_ptr->rng.set_state(state_backup);
+    w_ptr->rng = rng_backup;
 }
 
 /*!