diff options
author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2021-02-27 17:40:26 -0500 |
---|---|---|
committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2021-02-27 17:40:26 -0500 |
commit | e03683852cac9b31ca846fcf13ff53abf99232c7 (patch) | |
tree | 4f18e4f6d033547f8bf9210ff8466406ed6dbd49 /src/character_system.cpp | |
parent | 4be70b7d55493cdc2d5e909d5101e70a16bee6f1 (diff) | |
download | tanetane-e03683852cac9b31ca846fcf13ff53abf99232c7.tar.gz tanetane-e03683852cac9b31ca846fcf13ff53abf99232c7.tar.bz2 tanetane-e03683852cac9b31ca846fcf13ff53abf99232c7.zip |
Added A* pathfinding
Diffstat (limited to 'src/character_system.cpp')
-rw-r--r-- | src/character_system.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/character_system.cpp b/src/character_system.cpp index 9b91716..53debb2 100644 --- a/src/character_system.cpp +++ b/src/character_system.cpp | |||
@@ -150,7 +150,7 @@ void CharacterSystem::tick(double dt) { | |||
150 | pLoc += (unitVecInDirection(sprite.movementDir) * speed); | 150 | pLoc += (unitVecInDirection(sprite.movementDir) * speed); |
151 | 151 | ||
152 | // Check collision. | 152 | // Check collision. |
153 | CollisionResult collision = game_.getSystem<TransformSystem>().checkCollision(spriteId, pLoc, sprite.movementDir); | 153 | CollisionResult collision = game_.getSystem<TransformSystem>().checkCollision(spriteId, sprite.loc, pLoc, sprite.movementDir); |
154 | bool blocked = collision.horiz.blocked || collision.vert.blocked; | 154 | bool blocked = collision.horiz.blocked || collision.vert.blocked; |
155 | 155 | ||
156 | if (collision.horiz.blocked && !sprite.clipping) { | 156 | if (collision.horiz.blocked && !sprite.clipping) { |