From fb58cb31804da7e5e40fc861927060a183962441 Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Wed, 10 Feb 2021 11:22:16 -0500
Subject: When changing map, place whole party at the warp

---
 src/game.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index 861e8ee..530068c 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -27,25 +27,27 @@ void Game::loadMap(std::string filename, std::string warpPoint) {
 
   map_ = std::make_unique<Map>(filename);
 
+  vec2i warpLoc = map_->getWarpPoint(warpPoint);
+
   int lucasSprite = emplaceSprite("lucas");
-  getSystem<TransformSystem>().initSprite(lucasSprite, map_->getWarpPoint(warpPoint));
+  getSystem<TransformSystem>().initSprite(lucasSprite, warpLoc);
   getSystem<TransformSystem>().setUpCollision(lucasSprite, {-8, -8}, {12, 8}, true);
   getSystem<AnimationSystem>().initSprite(lucasSprite, "../res/sprites/lucas_anim.txt");
   getSprite(lucasSprite).controllable = true;
   getSystem<CharacterSystem>().initSprite(lucasSprite);
 
   int kumaSprite = emplaceSprite("kuma");
-  getSystem<TransformSystem>().initSprite(kumaSprite, {32, 32});
+  getSystem<TransformSystem>().initSprite(kumaSprite, warpLoc);
   getSystem<AnimationSystem>().initSprite(kumaSprite, "../res/sprites/kuma_anim.txt");
   getSystem<CharacterSystem>().addSpriteToParty(lucasSprite, kumaSprite);
 
   int dusterSprite = emplaceSprite("duster");
-  getSystem<TransformSystem>().initSprite(dusterSprite, {32, 32});
+  getSystem<TransformSystem>().initSprite(dusterSprite, warpLoc);
   getSystem<AnimationSystem>().initSprite(dusterSprite, "../res/sprites/duster_anim.txt");
   getSystem<CharacterSystem>().addSpriteToParty(lucasSprite, dusterSprite);
 
   int boneySprite = emplaceSprite("boney");
-  getSystem<TransformSystem>().initSprite(boneySprite, {32, 32});
+  getSystem<TransformSystem>().initSprite(boneySprite, warpLoc);
   getSystem<AnimationSystem>().initSprite(boneySprite, "../res/sprites/boney_anim.txt");
   getSystem<CharacterSystem>().addSpriteToParty(lucasSprite, boneySprite);
 
-- 
cgit 1.4.1