Merge branch 'master' into dgit/siddebian/2.4.0-ah-1archive/debian/2.4.0-ah-1

1 files changed, 12 insertions, 8 deletions

diff --git a/src/town_type.hpp b/src/town_type.hpp
index f8458c60..0b903138 100644
--- a/src/town_type.hpp
+++ b/src/town_type.hpp
@@ -1,21 +1,25 @@
 #pragma once
 
 #include "h-basic.h"
+#include "seed.hpp"
 #include "store_type_fwd.hpp"
 
+#include <vector>
+
 /**
  * Town descriptor.
  */
 struct town_type
 {
-	cptr name;
-	u32b seed; /* Seed for RNG */
-	store_type *store;      /* The stores [max_st_idx] */
-	byte numstores;
+	cptr name = nullptr;
+
+	seed_t seed = seed_t::system();  /* Seed for RNG */
+
+	std::vector<store_type> store;           /* The stores [max_st_idx] */
+
+	byte flags = 0;                          /* Town flags */
 
-	byte flags;             /* Town flags */
-	/* Left this for the sake of compatibility */
-	bool_ stocked;           /* Is the town actualy stocked ? */
+	bool_ stocked = FALSE;                   /* Is the town actualy stocked ? */
 
-	bool_ destroyed;         /* Is the town destroyed? */
+	bool_ destroyed = FALSE;                 /* Is the town destroyed? */
 };