force based movement

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

diff --git a/src/app/Application.h b/src/app/Application.h
index 61c3f45a5ab7e8ebe3ed740643e7097e17ee1246..7e3d91bc8b1ff7e9cb4c43d4ff6d438bf9b71f77 100644 (file)
--- a/src/app/Application.h
+++ b/src/app/Application.h
@@ -3,21 +3,21 @@
 
 #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,14 +34,14 @@ private:
        void Render();
 
 private:
-       InitScreen &screen;
+       Canvas &canvas;
 
        Universe univ;
 
        Moveable<float> focus;
        Camera cam;
 
-       Entity *controlled;
+       Ship *controlled;
        Vector<int> control;
 
        Uint32 last;