From 28f026329813b6271229c512c0d4ced1e2a26ea4 Mon Sep 17 00:00:00 2001
From: Ivan Savenko <saven.ivan@gmail.com>
Date: Wed, 8 Aug 2012 10:17:46 +0000
Subject: [PATCH] - compile fixes - filesystem tweaks

---
 Global.h                         | 1 +
 config/filesystem.json           | 4 ++--
 lib/Filesystem/CResourceLoader.h | 8 ++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Global.h b/Global.h
index ba17bdc77..59a539206 100644
--- a/Global.h
+++ b/Global.h
@@ -75,6 +75,7 @@
 #include <boost/range/algorithm.hpp>
 #include <boost/thread.hpp>
 #include <boost/unordered_set.hpp>
+#include <boost/unordered_map.hpp>
 #include <boost/variant.hpp>
 
 #ifdef ANDROID
diff --git a/config/filesystem.json b/config/filesystem.json
index 5ec63e5d9..e24413a23 100644
--- a/config/filesystem.json
+++ b/config/filesystem.json
@@ -27,7 +27,7 @@
 			{"type" : "file", "path" : "ALL/Data/Heroes3-cd2.snd"},
 			{"type" : "file", "path" : "ALL/Data/Heroes3.snd"},
 			//WoG have overriden sounds with .82m extension in Data
-			{"type" : "dir",  "path" : "ALL/Data"}
+			{"type" : "dir",  "path" : "ALL/Data", "depth": 0}
 		],
 		"MUSIC/":
 		[
@@ -36,7 +36,7 @@
 		"VIDEO/":
 		[
 			{"type" : "file", "path" : "ALL/Data/H3ab_ahd.vid"},
-			{"type" : "file", "path" : "ALL/Data/H3ab_ahd.vid"},
+			{"type" : "file", "path" : "ALL/Data/video.vid"},
 			// Location of video files in linux release
 			{"type" : "dir",  "path" : "ALL/Data/Video"}
 		],
diff --git a/lib/Filesystem/CResourceLoader.h b/lib/Filesystem/CResourceLoader.h
index b1ffb6e2d..f85baf644 100644
--- a/lib/Filesystem/CResourceLoader.h
+++ b/lib/Filesystem/CResourceLoader.h
@@ -80,6 +80,14 @@ public:
 
 	}
 
+	/**
+	 * Copy Ctor. Required by clang (or this is standard?) if move constructor is present
+	 */
+	ResourceID(const ResourceID & other)
+	    : name(other.getName()), type(other.getType())
+	{
+	}
+
 	/**
 	 * Ctor. Can be used to create indentifier for resource loading using one parameter
 	 *