fix Resource include

[space.git] / src / world / Universe.h

diff --git a/src/world/Universe.h b/src/world/Universe.h
index 740592690fb86935f68fccb92eaadd9527fcda1d..807c1cd18fe16444f214abe749afcf601ac587ea 100644 (file)
--- a/src/world/Universe.h
+++ b/src/world/Universe.h
@@ -1,10 +1,12 @@
 #ifndef SPACE_UNIVERSE_H_
 #define SPACE_UNIVERSE_H_
 
-#include "../entity/Entity.h"
-#include "../math/Vector.h"
+#include "Resource.h"
+#include "../entity/Ship.h"
+#include "../graphics/Vector.h"
 
 #include <list>
+#include <vector>
 
 
 namespace space {
@@ -67,14 +69,18 @@ public:
        Area AreaAt(Vector<int> coords) const { return Area(*this, coords); }
 
 public:
-       Entity *AddEntity(const Entity &);
-       const std::list<Entity> &Entities() const { return entities; }
+       Ship *AddShip(const Ship &);
+       const std::list<Ship> &Ships() const { return ships; }
+
+       int AddResource(const Resource &);
+       const Resource &GetResource(int id) const { return resources[id]; }
 
 public:
        void Update(float deltaT);
 
 private:
-       std::list<Entity> entities;
+       std::list<Ship> ships;
+       std::vector<Resource> resources;
 
 };