X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FApplication.h;h=4d2dd2dbf38f6545320d7e92cf7c85e4d40306f0;hb=ffd31714f3edb64ebe16b65878750c6cc5c7e884;hp=61c3f45a5ab7e8ebe3ed740643e7097e17ee1246;hpb=3f4f8a92f64df08119a40da4d196b3e92ecdc637;p=space.git

diff --git a/src/app/Application.h b/src/app/Application.h
index 61c3f45..4d2dd2d 100644
--- a/src/app/Application.h
+++ b/src/app/Application.h
@@ -1,23 +1,24 @@
 #ifndef SPACE_APPLICATION_H_
 #define SPACE_APPLICATION_H_
 
+#include "../ai/Autopilot.h"
 #include "../graphics/Camera.h"
 #include "../graphics/Moveable.h"
-#include "../math/Vector.h"
+#include "../graphics/Vector.h"
 #include "../world/Universe.h"
 
-#include <SDL/SDL.h>
+#include <SDL.h>
 
 
 namespace space {
 
-class InitScreen;
-class Entity;
+class Canvas;
+class Ship;
 
 class Application {
 
 public:
-	explicit Application(InitScreen &);
+	explicit Application(Canvas &);
 
 public:
 	void Run();
@@ -34,18 +35,22 @@ private:
 	void Render();
 
 private:
-	InitScreen &screen;
+	Canvas &canvas;
 
 	Universe univ;
 
 	Moveable<float> focus;
 	Camera cam;
 
-	Entity *controlled;
+	Ship *controlled;
 	Vector<int> control;
 
+	Autopilot autopilot;
+	bool apEnabled;;
+
 	Uint32 last;
 	bool running;
+	bool paused;
 
 };