made chunk neighbor linkage a little safer

[blank.git] / src / world / World.hpp

diff --git a/src/world/World.hpp b/src/world/World.hpp
index 7f38942ea2e4d9b4389dc97e2a430a1458951ff3..9ec4cb2faf7fae204c53672e0b1f6e800a09e9dc 100644 (file)
--- a/src/world/World.hpp
+++ b/src/world/World.hpp
@@ -8,6 +8,7 @@
 #include "../model/shapes.hpp"
 
 #include <list>
+#include <vector>
 #include <glm/glm.hpp>
 
 
@@ -15,6 +16,7 @@ namespace blank {
 
 class BlockLighting;
 class DirectionalLighting;
+class WorldCollision;
 
 class World {
 
@@ -44,7 +46,8 @@ public:
                float &dist,
                glm::vec3 &normal);
 
-       bool Intersection(const Entity &e);
+       bool Intersection(const Entity &e, std::vector<WorldCollision> &);
+       void Resolve(Entity &e, std::vector<WorldCollision> &);
 
        BlockTypeRegistry &BlockTypes() { return blockType; }