Map changing!

Also removed some dependencies on the Renderer. More changes need to be made. Fading to black before the change would be good. And making sure the characters are facing the right direction. Maybe that code shouldn't live in Game, either. Later we also want to combine the tilesets for these two maps (and any others that are on Tanetane).

1 files changed, 1 insertions, 42 deletions

@@ -22,48 +22,7 @@ void loop(Renderer& renderer) {
   game.emplaceSystem<MessageSystem>();
   game.emplaceSystem<ScriptSystem>();
 
-  auto map = std::make_unique<Map>("../res/maps/map1.tmx", renderer);
-  game.setMap(std::move(map));
-
-  int lucasSprite = game.emplaceSprite("lucas");
-  game.getSystem<TransformSystem>().initSprite(lucasSprite, game.getMap().getWarpPoint("spawn"));
-  game.getSystem<TransformSystem>().setUpCollision(lucasSprite, {-8, -8}, {12, 8}, true);
-  game.getSystem<AnimationSystem>().initSprite(lucasSprite, "../res/sprites/lucas_anim.txt", renderer);
-  game.getSprite(lucasSprite).controllable = true;
-  game.getSystem<CharacterSystem>().initSprite(lucasSprite);
-
-  int kumaSprite = game.emplaceSprite("kuma");
-  game.getSystem<TransformSystem>().initSprite(kumaSprite, {32, 32});
-  game.getSystem<AnimationSystem>().initSprite(kumaSprite, "../res/sprites/kuma_anim.txt", renderer);
-  game.getSystem<CharacterSystem>().addSpriteToParty(lucasSprite, kumaSprite);
-
-  int dusterSprite = game.emplaceSprite("duster");
-  game.getSystem<TransformSystem>().initSprite(dusterSprite, {32, 32});
-  game.getSystem<AnimationSystem>().initSprite(dusterSprite, "../res/sprites/duster_anim.txt", renderer);
-  game.getSystem<CharacterSystem>().addSpriteToParty(lucasSprite, dusterSprite);
-
-  int boneySprite = game.emplaceSprite("boney");
-  game.getSystem<TransformSystem>().initSprite(boneySprite, {32, 32});
-  game.getSystem<AnimationSystem>().initSprite(boneySprite, "../res/sprites/boney_anim.txt", renderer);
-  game.getSystem<CharacterSystem>().addSpriteToParty(lucasSprite, boneySprite);
-
-  for (const Prototype& p : game.getMap().getPrototypes()) {
-    int spriteId = game.emplaceSprite(p.name);
-    game.getSystem<TransformSystem>().initSprite(spriteId, p.pos);
-    game.getSystem<TransformSystem>().setUpCollision(spriteId, p.collisionOffset, p.collisionSize, true);
-    game.getSystem<AnimationSystem>().initSprite(spriteId, p.animationFilename, renderer);
-    game.getSprite(spriteId).interactionScript = p.interactionScript;
-  }
-
-  for (const Trigger& t : game.getMap().getTriggers()) {
-    int spriteId = game.emplaceSprite(t.name);
-    game.getSystem<TransformSystem>().initSprite(spriteId, t.pos);
-    game.getSystem<TransformSystem>().setUpCollision(spriteId, {0, 0}, t.size, false);
-    game.getSprite(spriteId).walkthroughScript = t.script;
-  }
-
-  game.getSystem<CameraSystem>().setFollowingSprite(lucasSprite);
-  game.getSystem<CameraSystem>().unlockCamera();
+  game.loadMap("../res/maps/map1.tmx", "spawn");
 
   renderer.render(game);