added autopilot that sucks

[space.git] / src / app / Application.h

diff --git a/src/app/Application.h b/src/app/Application.h
index a85269612257269349b6955fb4c85f2968cc4224..4d2dd2dbf38f6545320d7e92cf7c85e4d40306f0 100644 (file)
--- 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;
 
 };