From ae654356f843bb42a3c72d57b528d87aa63cf66d Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Tue, 23 Feb 2021 10:30:16 -0500 Subject: Added a clipping mode (for testing!) This allows walking through solid objects. It can be enabled and disabled using StartClipping() and StopClipping() in the debug console. It should not be used in any actual scripts. --- src/character_system.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/character_system.cpp') diff --git a/src/character_system.cpp b/src/character_system.cpp index 6e15eac..99b6929 100644 --- a/src/character_system.cpp +++ b/src/character_system.cpp @@ -117,7 +117,7 @@ void CharacterSystem::tick(double dt) { CollisionResult collision = game_.getSystem().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"); } -- cgit 1.4.1