Simplified collision detection output

It is no longer split into horizontal and vertical results. Also, the collision detection routine now does the work of calculating an adjusted position, instead of the caller (CharacterSystem) having to do it. This will be useful for #3.

1 files changed, 4 insertions, 7 deletions

@@ -5,6 +5,7 @@
 #include <set>
 #include <map>
 #include <tuple>
+#include <list>
 #include "direction.h"
 #include "system.h"
 #include "vector.h"
@@ -13,15 +14,11 @@
 
 class Game;
 
-struct AxisResult {
+struct CollisionResult {
   Direction dir;
   bool blocked = false;
-  int colliderSprite = -1;
-};
-
-struct CollisionResult {
-  AxisResult horiz;
-  AxisResult vert;
+  std::list<int> colliders;
+  vec2i adjustedLoc;
 };
 
 class TransformSystem : public System {