diff options
Diffstat (limited to 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index 62c81f3..a350c8d 100644 --- a/src/main.cpp +++ b/src/main.cpp | |||
@@ -27,7 +27,7 @@ void loop(Renderer& renderer) { | |||
27 | 27 | ||
28 | int lucasSprite = game.emplaceSprite("lucas"); | 28 | int lucasSprite = game.emplaceSprite("lucas"); |
29 | game.getSystem<TransformSystem>().initSprite(lucasSprite, game.getMap().getWarpPoint("spawn")); | 29 | game.getSystem<TransformSystem>().initSprite(lucasSprite, game.getMap().getWarpPoint("spawn")); |
30 | game.getSystem<TransformSystem>().setUpCollision(lucasSprite, {-8, -8}, {12, 8}); | 30 | game.getSystem<TransformSystem>().setUpCollision(lucasSprite, {-8, -8}, {12, 8}, true); |
31 | game.getSystem<AnimationSystem>().initSprite(lucasSprite, "../res/sprites/lucas_anim.txt", renderer); | 31 | game.getSystem<AnimationSystem>().initSprite(lucasSprite, "../res/sprites/lucas_anim.txt", renderer); |
32 | game.getSprite(lucasSprite).controllable = true; | 32 | game.getSprite(lucasSprite).controllable = true; |
33 | game.getSystem<CharacterSystem>().initSprite(lucasSprite); | 33 | game.getSystem<CharacterSystem>().initSprite(lucasSprite); |
@@ -50,11 +50,18 @@ void loop(Renderer& renderer) { | |||
50 | for (const Prototype& p : game.getMap().getPrototypes()) { | 50 | for (const Prototype& p : game.getMap().getPrototypes()) { |
51 | int spriteId = game.emplaceSprite(p.name); | 51 | int spriteId = game.emplaceSprite(p.name); |
52 | game.getSystem<TransformSystem>().initSprite(spriteId, p.pos); | 52 | game.getSystem<TransformSystem>().initSprite(spriteId, p.pos); |
53 | game.getSystem<TransformSystem>().setUpCollision(spriteId, p.collisionOffset, p.collisionSize); | 53 | game.getSystem<TransformSystem>().setUpCollision(spriteId, p.collisionOffset, p.collisionSize, true); |
54 | game.getSystem<AnimationSystem>().initSprite(spriteId, p.animationFilename, renderer); | 54 | game.getSystem<AnimationSystem>().initSprite(spriteId, p.animationFilename, renderer); |
55 | game.getSprite(spriteId).interactionScript = p.interactionScript; | 55 | game.getSprite(spriteId).interactionScript = p.interactionScript; |
56 | } | 56 | } |
57 | 57 | ||
58 | for (const Trigger& t : game.getMap().getTriggers()) { | ||
59 | int spriteId = game.emplaceSprite(t.name); | ||
60 | game.getSystem<TransformSystem>().initSprite(spriteId, t.pos); | ||
61 | game.getSystem<TransformSystem>().setUpCollision(spriteId, {0, 0}, t.size, false); | ||
62 | game.getSprite(spriteId).walkthroughScript = t.script; | ||
63 | } | ||
64 | |||
58 | game.getSystem<CameraSystem>().setFollowingSprite(lucasSprite); | 65 | game.getSystem<CameraSystem>().setFollowingSprite(lucasSprite); |
59 | game.getSystem<CameraSystem>().unlockCamera(); | 66 | game.getSystem<CameraSystem>().unlockCamera(); |
60 | 67 | ||