From 08d259cf41db805ada7c39a39ffe9dcec4f0c230 Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Sat, 27 Dec 2014 22:20:04 -0500
Subject: Set fallback content if resolving content vector requires everything

---
 src/nodedef.h | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'src/nodedef.h')

diff --git a/src/nodedef.h b/src/nodedef.h
index 0c779ddcc..1be764121 100644
--- a/src/nodedef.h
+++ b/src/nodedef.h
@@ -285,6 +285,26 @@ struct ContentFeatures
 class NodeResolver;
 class INodeDefManager;
 
+struct NodeListInfo {
+	NodeListInfo(u32 len)
+	{
+		length       = len;
+		all_required = false;
+		c_fallback   = CONTENT_IGNORE;
+	}
+
+	NodeListInfo(u32 len, content_t fallback)
+	{
+		length       = len;
+		all_required = true;
+		c_fallback   = fallback;
+	}
+
+	u32 length;
+	bool all_required;
+	content_t c_fallback;
+};
+
 struct NodeResolveInfo {
 	NodeResolveInfo(NodeResolver *nr)
 	{
@@ -292,7 +312,7 @@ struct NodeResolveInfo {
 	}
 
 	std::list<std::string> nodenames;
-	std::list<size_t> nodename_sizes;
+	std::list<NodeListInfo> nodelistinfo;
 	NodeResolver *resolver;
 };
 
-- 
cgit v1.2.3