summary refs log tree commit diff stats
path: root/src/game.cpp
diff options
context:
space:
mode:
authorKelly Rauchenberger <fefferburbia@gmail.com>2021-02-10 19:57:23 -0500
committerKelly Rauchenberger <fefferburbia@gmail.com>2021-02-10 19:57:23 -0500
commit05ee221cd31a782b699cc6d62e0d275364cfd7cc (patch)
tree4ee6c769fd65ae38edc117f02e98455b43bfd677 /src/game.cpp
parent213203fbe3352e084c8875acfbf435a948824c08 (diff)
downloadtanetane-05ee221cd31a782b699cc6d62e0d275364cfd7cc.tar.gz
tanetane-05ee221cd31a782b699cc6d62e0d275364cfd7cc.tar.bz2
tanetane-05ee221cd31a782b699cc6d62e0d275364cfd7cc.zip
Player is no longer controllable during map transitions
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game.cpp b/src/game.cpp index 4d44a63..8b6ef8f 100644 --- a/src/game.cpp +++ b/src/game.cpp
@@ -34,7 +34,7 @@ void Game::loadMap(std::string filename, std::string warpPoint, Direction dir) {
34 getSystem<TransformSystem>().setUpCollision(lucasSprite, {-8, -8}, {12, 8}, true); 34 getSystem<TransformSystem>().setUpCollision(lucasSprite, {-8, -8}, {12, 8}, true);
35 getSystem<AnimationSystem>().initSprite(lucasSprite, "../res/sprites/lucas_anim.txt"); 35 getSystem<AnimationSystem>().initSprite(lucasSprite, "../res/sprites/lucas_anim.txt");
36 getSystem<AnimationSystem>().setSpriteDirection(lucasSprite, dir); 36 getSystem<AnimationSystem>().setSpriteDirection(lucasSprite, dir);
37 getSprite(lucasSprite).controllable = true; 37 getSprite(lucasSprite).player = true;
38 getSystem<CharacterSystem>().initSprite(lucasSprite); 38 getSystem<CharacterSystem>().initSprite(lucasSprite);
39 39
40 int kumaSprite = emplaceSprite("kuma"); 40 int kumaSprite = emplaceSprite("kuma");