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, 18 insertions, 29 deletions

@@ -154,46 +154,35 @@ void CharacterSystem::tick(double dt) {
 
         // Check collision.
         CollisionResult collision = game_.getSystem<TransformSystem>().checkCollision(spriteId, sprite.loc, pLoc, sprite.movementDir);
-        bool blocked = collision.horiz.blocked || collision.vert.blocked;
-        int colliderSpriteId = (collision.horiz.colliderSprite == -1) ? collision.vert.colliderSprite : collision.horiz.colliderSprite;
 
-        if (collision.horiz.blocked && !sprite.clipping) {
-          pLoc.x() = sprite.loc.x();//(newColPosDR * map.getTileSize() - (collisionBox / 2)).x() - 1;
-        } else if (collision.horiz.colliderSprite != -1) {
-          Sprite& collider = game_.getSprite(collision.horiz.colliderSprite);
-
-          if (collider.walkthroughScript != "") {
-            game_.getSystem<ScriptSystem>().runScript(game_.getMap().getName(), collider.walkthroughScript);
-          }
+        if (!(collision.blocked && sprite.clipping)) {
+          pLoc = collision.adjustedLoc;
         }
 
-        if (collision.vert.blocked && !sprite.clipping) {
-          pLoc.y() = sprite.loc.y();//(newColPosDR * map.getTileSize() - (collisionBox / 2)).x() - 1;
-        } else if (collision.vert.colliderSprite != -1) {
-          Sprite& collider = game_.getSprite(collision.vert.colliderSprite);
+        for (int colliderSpriteId : collision.colliders) {
+          Sprite& collider = game_.getSprite(colliderSpriteId);
 
-          if (collider.walkthroughScript != "") {
+          if (!collider.walkthroughScript.empty()) {
             game_.getSystem<ScriptSystem>().runScript(game_.getMap().getName(), collider.walkthroughScript);
           }
-        }
 
-        if (blocked && sprite.characterState == CharacterState::Running && !sprite.clipping) {
-          stopRunning(spriteId);
-          game_.getMixer().playSound("../res/sfx/bump.wav");
-        }
+          if (!sprite.bumpPlayerScript.empty()) {
+            bool bumpedPlayer = collider.player;
 
-        if (colliderSpriteId != -1 && !sprite.bumpPlayerScript.empty()) {
-          Sprite& collider = game_.getSprite(colliderSpriteId);
-          bool bumpedPlayer = collider.player;
+            if (!bumpedPlayer && collider.leaderId != -1) {
+              Sprite& colliderLeader = game_.getSprite(collider.leaderId);
+              bumpedPlayer = colliderLeader.player;
+            }
 
-          if (!bumpedPlayer && collider.leaderId != -1) {
-            Sprite& colliderLeader = game_.getSprite(collider.leaderId);
-            bumpedPlayer = colliderLeader.player;
+            if (bumpedPlayer) {
+              game_.getSystem<ScriptSystem>().runScript(game_.getMap().getName(), sprite.bumpPlayerScript);
+            }
           }
+        }
 
-          if (bumpedPlayer) {
-            game_.getSystem<ScriptSystem>().runScript(game_.getMap().getName(), sprite.bumpPlayerScript);
-          }
+        if (collision.blocked && sprite.characterState == CharacterState::Running && !sprite.clipping) {
+          stopRunning(spriteId);
+          game_.getMixer().playSound("../res/sfx/bump.wav");
         }
 
         // Move everything