1 files changed, 3 insertions, 3 deletions

@@ -117,7 +117,7 @@ void CharacterSystem::tick(double dt) {
         CollisionResult collision = game_.getSystem<TransformSystem>().checkCollision(spriteId, pLoc, sprite.dir);
         bool blocked = collision.horiz.blocked || collision.vert.blocked;
 
-        if (collision.horiz.blocked) {
+        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);
@@ -127,7 +127,7 @@ void CharacterSystem::tick(double dt) {
           }
         }
 
-        if (collision.vert.blocked) {
+        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);
@@ -137,7 +137,7 @@ void CharacterSystem::tick(double dt) {
           }
         }
 
-        if (blocked && sprite.characterState == CharacterState::Running) {
+        if (blocked && sprite.characterState == CharacterState::Running && !sprite.clipping) {
           stopRunning(spriteId);
           game_.getMixer().playSound("../res/sfx/bump.wav");
         }