From a475b843e7d37f128ce30140d193f0312aa70c9c Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Tue, 2 Feb 2021 15:36:09 -0500
Subject: Using tmxlite instead of Tileson

---
 src/main.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/main.cpp')

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 @@
 #include <iostream>
+#include <memory>
 #include "renderer.h"
 #include "game.h"
 #include "party.h"
 #include "timer.h"
+#include "map.h"
 
 void loop(Renderer& renderer) {
   Game game;
   Input keystate;
 
-  game.loadMapFromFile("../res/map1.json");
+  auto map = std::make_unique<Map>("../res/map1.tmx", renderer);
+  game.setMap(std::move(map));
 
   int lucasSprite = game.addSprite(Sprite("../res/lucas_anim.txt", renderer));
   int kumaSprite = game.addSprite(Sprite("../res/kuma_anim.txt", renderer));
-- 
cgit 1.4.1