X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Fapp%2FApplication.h;h=4d2dd2dbf38f6545320d7e92cf7c85e4d40306f0;hb=1cb5ed22d7772abe6f9893be90f26f46dbde39f7;hp=a85269612257269349b6955fb4c85f2968cc4224;hpb=96ab5904b059e00e78b26a6527790c8dc951e324;p=space.git

diff --git a/src/app/Application.h b/src/app/Application.h
index a852696..4d2dd2d 100644
--- a/src/app/Application.h
+++ b/src/app/Application.h
@@ -1,22 +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 Canvas;
+class Ship;
 
 class Application {
 
 public:
-	explicit Application(InitScreen &);
+	explicit Application(Canvas &);
 
 public:
 	void Run();
@@ -30,20 +32,25 @@ private:
 
 	void Update(int delta_ms);
 
-	Vector<float> FocusVel() const;
-
 	void Render();
 
 private:
-	InitScreen &screen;
+	Canvas &canvas;
 
 	Universe univ;
 
 	Moveable<float> focus;
 	Camera cam;
 
+	Ship *controlled;
+	Vector<int> control;
+
+	Autopilot autopilot;
+	bool apEnabled;;
+
 	Uint32 last;
 	bool running;
+	bool paused;
 
 };