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

1 files changed, 29 insertions, 0 deletions

diff --git a/src/alloc.hpp b/src/alloc.hpp
new file mode 100644
index 00000000..1d4ce815
--- /dev/null
+++ b/src/alloc.hpp
@@ -0,0 +1,29 @@
+#pragma once
+
+#include "h-basic.h"
+#include "alloc_entry.hpp"
+
+#include <vector>
+
+/**
+ * Allocations of object kinds and monster races.
+ */
+struct Alloc {
+
+	/*
+	 * The entries in the "kind allocator table"
+	 */
+	std::vector<alloc_entry> kind_table;
+
+	/*
+	 * The flag to tell if kind_table contains valid entries
+	 * for normal (i.e. kind_is_legal) object allocation
+	 */
+	bool kind_table_valid = false;
+
+	/*
+	 * The entries in the "race allocator table"
+	 */
+	std::vector<alloc_entry> race_table;
+
+};