X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FApplication.hpp;h=9644794c1e7d54a9ff5bade9b0c9a0f9c155a5d5;hb=745729c1935276e6f49d108a0a465214aa93c3cb;hp=a8e0f2d00f3fdafda8df72d5533e4f86cbfe7c3c;hpb=5d2da8a07411ad6417d6ed8d1be997189cf5ce89;p=blank.git

diff --git a/src/app/Application.hpp b/src/app/Application.hpp
index a8e0f2d..9644794 100644
--- a/src/app/Application.hpp
+++ b/src/app/Application.hpp
@@ -3,8 +3,8 @@
 
 #include "Assets.hpp"
 #include "FrameCounter.hpp"
-#include "init.hpp"
-#include "RandomWalk.hpp"
+#include "../ai/RandomWalk.hpp"
+#include "../audio/Audio.hpp"
 #include "../graphics/Viewport.hpp"
 #include "../ui/Interface.hpp"
 #include "../world/World.hpp"
@@ -14,6 +14,8 @@
 
 namespace blank {
 
+class Window;
+
 class Application {
 
 public:
@@ -26,7 +28,8 @@ public:
 		World::Config world = World::Config();
 	};
 
-	explicit Application(const Config &);
+	Application(Window &, const Config &);
+	~Application();
 
 	Application(const Application &) = delete;
 	Application &operator =(const Application &) = delete;
@@ -54,9 +57,10 @@ public:
 	static Entity &MakeTestEntity(World &);
 
 private:
-	Init init;
+	Window &window;
 	Viewport viewport;
 	Assets assets;
+	Audio audio;
 	FrameCounter counter;
 
 	World world;