1 files changed, 5 insertions, 13 deletions

@@ -87,25 +87,17 @@ void InputSystem::tick(double dt) {
               vec2i checkLoc = sprite.loc + (unitVecInDirection(sprite.dir) * LUCAS_MOVEMENT_SPEED);
               CollisionResult collision = game_.getSystem<TransformSystem>().checkCollision(spriteId, sprite.loc, checkLoc, sprite.dir);
 
-              if (collision.horiz.blocked || collision.vert.blocked) {
+              if (collision.blocked) {
                 inFrontOfSomething = true;
               }
 
               // If there is a sprite to be interacted with, rotate that sprite so it is facing the player.
               // Then, run its interaction script if present.
-              if (collision.horiz.colliderSprite != -1) {
-                game_.getSystem<AnimationSystem>().setSpriteDirection(collision.horiz.colliderSprite, oppositeDirection(sprite.dir));
+              for (int colliderSpriteId : collision.colliders) {
+                game_.getSystem<AnimationSystem>().setSpriteDirection(colliderSpriteId, oppositeDirection(sprite.dir));
 
-                Sprite& collider = game_.getSprite(collision.horiz.colliderSprite);
-                if (collider.interactionScript != "") {
-                  game_.getSystem<ScriptSystem>().runScript(game_.getMap().getName(), collider.interactionScript);
-                  activated = true;
-                }
-              } else if (collision.vert.colliderSprite != -1) {
-                game_.getSystem<AnimationSystem>().setSpriteDirection(collision.vert.colliderSprite, oppositeDirection(sprite.dir));
-
-                Sprite& collider = game_.getSprite(collision.vert.colliderSprite);
-                if (collider.interactionScript != "") {
+                Sprite& collider = game_.getSprite(colliderSpriteId);
+                if (!collider.interactionScript.empty()) {
                   game_.getSystem<ScriptSystem>().runScript(game_.getMap().getName(), collider.interactionScript);
                   activated = true;
                 }