merge conficts fixed

1 files changed, 20 insertions, 0 deletions

diff --git a/mwe/resource-manager/resource_converter.h b/mwe/resource-manager/resource_converter.h
new file mode 100644
index 0000000..39493c1
--- /dev/null
+++ b/mwe/resource-manager/resource_converter.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include "Image_asset.h"
+#include "map_asset.h"
+#include "tiledMap.h"
+
+#include <SDL_surface.h>
+
+class ResourceConverter {
+
+public:
+	ResourceConverter();
+	~ResourceConverter();
+
+	SDL_Surface * FromStringToImage(const Texture &);
+	TiledMap FromStringToMap(const Map &);
+
+	//TODO:
+	//convertrs a string map into a real map:
+};