diff options
Diffstat (limited to 'src/transform_system.cpp')
| -rw-r--r-- | src/transform_system.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
| diff --git a/src/transform_system.cpp b/src/transform_system.cpp index 4056f46..71b3a4f 100644 --- a/src/transform_system.cpp +++ b/src/transform_system.cpp | |||
| @@ -47,7 +47,7 @@ void TransformSystem::moveSprite(int spriteId, vec2i newLoc) { | |||
| 47 | } | 47 | } |
| 48 | } | 48 | } |
| 49 | 49 | ||
| 50 | CollisionResult TransformSystem::checkCollision(int spriteId, vec2i newLoc, Direction dir) { | 50 | CollisionResult TransformSystem::checkCollision(int spriteId, vec2i curLoc, vec2i newLoc, Direction dir) { |
| 51 | CollisionResult result; | 51 | CollisionResult result; |
| 52 | 52 | ||
| 53 | Sprite& sprite = game_.getSprite(spriteId); | 53 | Sprite& sprite = game_.getSprite(spriteId); |
| @@ -57,7 +57,7 @@ CollisionResult TransformSystem::checkCollision(int spriteId, vec2i newLoc, Dire | |||
| 57 | 57 | ||
| 58 | vec2i mapBounds = map.getMapSize() * map.getTileSize(); | 58 | vec2i mapBounds = map.getMapSize() * map.getTileSize(); |
| 59 | 59 | ||
| 60 | vec2i oldColUL = sprite.loc + sprite.collisionOffset; | 60 | vec2i oldColUL = curLoc + sprite.collisionOffset; |
| 61 | vec2i oldColDR = oldColUL + sprite.collisionSize; | 61 | vec2i oldColDR = oldColUL + sprite.collisionSize; |
| 62 | vec2i newColUL = newLoc + sprite.collisionOffset; | 62 | vec2i newColUL = newLoc + sprite.collisionOffset; |
| 63 | vec2i newColDR = newColUL + sprite.collisionSize; | 63 | vec2i newColDR = newColUL + sprite.collisionSize; |