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, 14 insertions, 5 deletions

@@ -35,6 +35,16 @@ Renderer::Renderer() {
 }
 
 texture_ptr Renderer::renderMapLayer(const Map& map, int layer) {
+  if (cachedTilesetName_ != map.getTilesetFilename()) {
+    surface_ptr pfs(IMG_Load(map.getTilesetFilename().c_str()));
+    if (!pfs) {
+      throw img_error();
+    }
+
+    tilesetTex_ = texture_ptr(SDL_CreateTextureFromSurface(ren_.get(), pfs.get()));
+    cachedTilesetName_ = map.getTilesetFilename();
+  }
+
   vec2i mapBounds = map.getMapSize() * map.getTileSize();
 
   texture_ptr canvas(
@@ -77,7 +87,7 @@ texture_ptr Renderer::renderMapLayer(const Map& map, int layer) {
       } else if (tile.flipVertical) {
         flip = SDL_FLIP_VERTICAL;
       }
-      SDL_RenderCopyEx(ren_.get(), textures_[map.getTilesetTextureId()].get(), &srcRect, &destRect, 0, nullptr, flip);
+      SDL_RenderCopyEx(ren_.get(), tilesetTex_.get(), &srcRect, &destRect, 0, nullptr, flip);
     }
   }
 
@@ -85,10 +95,9 @@ texture_ptr Renderer::renderMapLayer(const Map& map, int layer) {
 }
 
 void Renderer::render(Game& game) {
-  if (!renLay1_) {
+  if (cachedMapName_ != game.getMap().getName()) {
+    cachedMapName_ = game.getMap().getName();
     renLay1_ = renderMapLayer(game.getMap(), 0);
-  }
-  if (!renLay0_) {
     renLay0_ = renderMapLayer(game.getMap(), 1);
   }
 
@@ -118,7 +127,7 @@ void Renderer::render(Game& game) {
       const SpriteFrame& frame = sprite.frames.at(sprite.animations.at(sprite.animationId).at(sprite.animationFrame));
       const SDL_Rect& src = frame.srcRect;
       SDL_Rect dest { sprite.loc.x() - frame.center.x(), sprite.loc.y() - frame.center.y(), frame.size.w(), frame.size.h() };
-      SDL_RenderCopy(ren_.get(), textures_.at(sprite.textureId).get(), &src, &dest);
+      SDL_RenderCopy(ren_.get(), textures_.at(loadImageFromFile(sprite.spritesheet)).get(), &src, &dest);
     }
   }