content-pack resources support

src/engine.h

@@ -8,13 +8,15 @@
 #include "typedefs.h"
 #include "settings.h"
 
+#include "assets/Assets.h"
 #include "content/Content.h"
 #include "content/ContentPack.h"
+#include "files/engine_paths.h"
 
-class Assets;
 class Level;
 class Screen;
 class EnginePaths;
+class ResPaths;
 
 namespace gui {
 	class GUI;
@@ -26,12 +28,13 @@ public:
 };
 
 class Engine {
-	Assets* assets;
+	std::unique_ptr<Assets> assets = nullptr;
 	std::shared_ptr<Screen> screen = nullptr;
     std::vector<ContentPack> contentPacks;
 	EngineSettings& settings;
 	std::unique_ptr<Content> content = nullptr;
 	EnginePaths* paths;
+    std::unique_ptr<ResPaths> resPaths = nullptr;
 
 	uint64_t frame = 0;
 	double lastTime = 0.0;
@@ -54,6 +57,7 @@ public:
 	const Content* getContent() const;
     std::vector<ContentPack>& getContentPacks();
 	void setLanguage(std::string locale);
+    void loadContent();
 };
 
 #endif // SRC_ENGINE_H_