summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/init2.cc6
-rw-r--r--src/wilderness_map.hpp9
2 files changed, 6 insertions, 9 deletions
diff --git a/src/init2.cc b/src/init2.cc
index 1a8ca839..fca7473a 100644
--- a/src/init2.cc
+++ b/src/init2.cc
@@ -728,15 +728,13 @@ void create_stores_stock(int t)
*/
static errr init_wilderness(void)
{
- int i;
-
/* Allocate the wilderness (two-dimension array) */
wild_map = make_array<wilderness_map *>(max_wild_y);
/* Init the other pointers */
- for (i = 0; i < max_wild_y; i++)
+ for (std::size_t i = 0; i < max_wild_y; i++)
{
- wild_map[i] = make_array<wilderness_map>(max_wild_x);
+ wild_map[i] = new wilderness_map[max_wild_x];
}
/* No encounter right now */
diff --git a/src/wilderness_map.hpp b/src/wilderness_map.hpp
index 41e873bd..e1d795f5 100644
--- a/src/wilderness_map.hpp
+++ b/src/wilderness_map.hpp
@@ -7,9 +7,8 @@
*/
struct wilderness_map
{
- int feat; /* Wilderness feature */
- u32b seed; /* Seed for the RNG */
- u16b entrance; /* Entrance for dungeons */
-
- bool_ known; /* Is it seen by the player ? */
+ int feat = 0; /* Wilderness feature */
+ u32b seed = 0; /* Seed for the RNG */
+ u16b entrance = 0; /* Entrance for dungeons */
+ bool_ known = FALSE; /* Is it seen by the player ? */
};