diff options
Diffstat (limited to 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index df0bfff..587ae15 100644 --- a/src/main.cpp +++ b/src/main.cpp | |||
@@ -1,14 +1,17 @@ | |||
1 | #include <iostream> | 1 | #include <iostream> |
2 | #include <memory> | ||
2 | #include "renderer.h" | 3 | #include "renderer.h" |
3 | #include "game.h" | 4 | #include "game.h" |
4 | #include "party.h" | 5 | #include "party.h" |
5 | #include "timer.h" | 6 | #include "timer.h" |
7 | #include "map.h" | ||
6 | 8 | ||
7 | void loop(Renderer& renderer) { | 9 | void loop(Renderer& renderer) { |
8 | Game game; | 10 | Game game; |
9 | Input keystate; | 11 | Input keystate; |
10 | 12 | ||
11 | game.loadMapFromFile("../res/map1.json"); | 13 | auto map = std::make_unique<Map>("../res/map1.tmx", renderer); |
14 | game.setMap(std::move(map)); | ||
12 | 15 | ||
13 | int lucasSprite = game.addSprite(Sprite("../res/lucas_anim.txt", renderer)); | 16 | int lucasSprite = game.addSprite(Sprite("../res/lucas_anim.txt", renderer)); |
14 | int kumaSprite = game.addSprite(Sprite("../res/kuma_anim.txt", renderer)); | 17 | int kumaSprite = game.addSprite(Sprite("../res/kuma_anim.txt", renderer)); |