1 files changed, 28 insertions, 21 deletions

diff --git a/core/vmap.h b/core/vmap.h
index 8636c02997..ce0ddc4ec6 100644
--- a/core/vmap.h
+++ b/core/vmap.h
@@ -31,8 +31,8 @@
 #ifndef VMAP_H
 #define VMAP_H
 
+#include "cowdata.h"
 #include "typedefs.h"
-#include "vector.h"
 
 template <class T, class V>
 class VMap {
@@ -51,17 +51,17 @@ class VMap {
 		}
 	};
 
-	Vector<_Pair> _data;
+	CowData<_Pair> _cowdata;
 
 	_FORCE_INLINE_ int _find(const T &p_val, bool &r_exact) const {
 
 		r_exact = false;
-		if (_data.empty())
+		if (_cowdata.empty())
 			return 0;
 
 		int low = 0;
-		int high = _data.size() - 1;
-		const _Pair *a = &_data[0];
+		int high = _cowdata.size() - 1;
+		const _Pair *a = _cowdata.ptr();
 		int middle = 0;
 
 #if DEBUG_ENABLED
@@ -89,13 +89,13 @@ class VMap {
 
 	_FORCE_INLINE_ int _find_exact(const T &p_val) const {
 
-		if (_data.empty())
+		if (_cowdata.empty())
 			return -1;
 
 		int low = 0;
-		int high = _data.size() - 1;
+		int high = _cowdata.size() - 1;
 		int middle;
-		const _Pair *a = &_data[0];
+		const _Pair *a = _cowdata.ptr();
 
 		while (low <= high) {
 			middle = (low + high) / 2;
@@ -118,10 +118,10 @@ public:
 		bool exact;
 		int pos = _find(p_key, exact);
 		if (exact) {
-			_data[pos].value = p_val;
+			_cowdata.get_m(pos).value = p_val;
 			return pos;
 		}
-		_data.insert(pos, _Pair(p_key, p_val));
+		_cowdata.insert(pos, _Pair(p_key, p_val));
 		return pos;
 	}
 
@@ -135,7 +135,7 @@ public:
 		int pos = _find_exact(p_val);
 		if (pos < 0)
 			return;
-		_data.remove(pos);
+		_cowdata.remove(pos);
 	}
 
 	int find(const T &p_val) const {
@@ -149,37 +149,37 @@ public:
 		return _find(p_val, exact);
 	}
 
-	_FORCE_INLINE_ int size() const { return _data.size(); }
-	_FORCE_INLINE_ bool empty() const { return _data.empty(); }
+	_FORCE_INLINE_ int size() const { return _cowdata.size(); }
+	_FORCE_INLINE_ bool empty() const { return _cowdata.empty(); }
 
 	const _Pair *get_array() const {
 
-		return _data.ptr();
+		return _cowdata.ptr();
 	}
 
 	_Pair *get_array() {
 
-		return _data.ptr();
+		return _cowdata.ptrw();
 	}
 
 	const V &getv(int p_index) const {
 
-		return _data[p_index].value;
+		return _cowdata.get(p_index).value;
 	}
 
 	V &getv(int p_index) {
 
-		return _data[p_index].value;
+		return _cowdata.get_m(p_index).value;
 	}
 
 	const T &getk(int p_index) const {
 
-		return _data[p_index].key;
+		return _cowdata.get(p_index).key;
 	}
 
 	T &getk(int p_index) {
 
-		return _data[p_index].key;
+		return _cowdata.get_m(p_index).key;
 	}
 
 	inline const V &operator[](const T &p_key) const {
@@ -188,7 +188,7 @@ public:
 
 		CRASH_COND(pos < 0);
 
-		return _data[pos].value;
+		return _cowdata.get(pos).value;
 	}
 
 	inline V &operator[](const T &p_key) {
@@ -199,7 +199,14 @@ public:
 			pos = insert(p_key, val);
 		}
 
-		return _data[pos].value;
+		return _cowdata.get_m(pos).value;
+	}
+
+	_FORCE_INLINE_ VMap(){};
+	_FORCE_INLINE_ VMap(const VMap &p_from) { _cowdata._ref(p_from._cowdata); }
+	inline VMap &operator=(const VMap &p_from) {
+		_cowdata._ref(p_from._cowdata);
+		return *this;
 	}
 };
 #endif // VMAP_H