1 files changed, 2 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp
index ea8d8f4..df0bfff 100644
--- a/src/main.cpp
+++ b/src/main.cpp

@@ -8,6 +8,8 @@ void loop(Renderer& renderer) {
  Game game;
  Input keystate;
+  game.loadMapFromFile("../res/map1.json");
  int lucasSprite = game.addSprite(Sprite("../res/lucas_anim.txt", renderer));
  int kumaSprite = game.addSprite(Sprite("../res/kuma_anim.txt", renderer));
  int dusterSprite = game.addSprite(Sprite("../res/duster_anim.txt", renderer));

diff --git a/src/main.cpp b/src/main.cpp index ea8d8f4..df0bfff 100644 --- a/src/main.cpp +++ b/src/main.cpp
@@ -8,6 +8,8 @@ void loop(Renderer& renderer) {
8	Game game;	8	Game game;
9	Input keystate;	9	Input keystate;
10		10
		11	game.loadMapFromFile("../res/map1.json");
		12
11	int lucasSprite = game.addSprite(Sprite("../res/lucas_anim.txt", renderer));	13	int lucasSprite = game.addSprite(Sprite("../res/lucas_anim.txt", renderer));
12	int kumaSprite = game.addSprite(Sprite("../res/kuma_anim.txt", renderer));	14	int kumaSprite = game.addSprite(Sprite("../res/kuma_anim.txt", renderer));
13	int dusterSprite = game.addSprite(Sprite("../res/duster_anim.txt", renderer));	15	int dusterSprite = game.addSprite(Sprite("../res/duster_anim.txt", renderer));