1 files changed, 13 insertions, 0 deletions

@@ -34,12 +34,19 @@ void InputSystem::tick(double dt) {
           game_.getSystem<MessageSystem>().advanceText();
         } else {
           // Otherwise, check if there is a sprite in front of the player.
+          bool inFrontOfSomething = false;
+          bool activated = false;
+
           for (int spriteId : game_.getSprites()) {
             Sprite& sprite = game_.getSprite(spriteId);
             if (sprite.controllable) {
               vec2i checkLoc = sprite.loc + (unitVecInDirection(sprite.dir) * MOVEMENT_SPEED);
               CollisionResult collision = game_.getSystem<TransformSystem>().checkCollision(spriteId, checkLoc, sprite.dir);
 
+              if (collision.horiz.blocked || collision.vert.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) {
@@ -48,6 +55,7 @@ void InputSystem::tick(double dt) {
                 Sprite& collider = game_.getSprite(collision.horiz.colliderSprite);
                 if (collider.interactionScript != "") {
                   game_.getSystem<ScriptSystem>().runScript(collider.interactionScript);
+                  activated = true;
                 }
               } else if (collision.vert.colliderSprite != -1) {
                 game_.getSystem<AnimationSystem>().setSpriteDirection(collision.vert.colliderSprite, oppositeDirection(sprite.dir));
@@ -55,10 +63,15 @@ void InputSystem::tick(double dt) {
                 Sprite& collider = game_.getSprite(collision.vert.colliderSprite);
                 if (collider.interactionScript != "") {
                   game_.getSystem<ScriptSystem>().runScript(collider.interactionScript);
+                  activated = true;
                 }
               }
             }
           }
+
+          if (inFrontOfSomething && !activated) {
+            game_.getSystem<ScriptSystem>().runScript("default");
+          }
         }
       }
     } else if (e.type == SDL_KEYUP && (e.key.keysym.sym == SDLK_LSHIFT || e.key.keysym.sym == SDLK_RSHIFT)) {