1 files changed, 21 insertions, 13 deletions

@@ -94,6 +94,21 @@ texture_ptr Renderer::renderMapLayer(const Map& map, int layer) {
   return canvas;
 }
 
+void Renderer::renderSprite(const Sprite& sprite) {
+  if (sprite.isAnimated) {
+    if (sprite.hasShadow) {
+      int shadowTexId = loadImageFromFile("../res/shadow.png");
+      const SDL_Rect shadowDest { sprite.loc.x() - 8, sprite.loc.y() - 8, 16, 8 };
+      SDL_RenderCopy(ren_.get(), textures_.at(shadowTexId).get(), nullptr, &shadowDest);
+    }
+
+    const SpriteFrame& frame = sprite.frames.at(sprite.animations.at(sprite.animationId).frameIndices.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(loadImageFromFile(sprite.spritesheet)).get(), &src, &dest);
+  }
+}
+
 void Renderer::render(Game& game) {
   if (cachedMapName_ != game.getMap().getName()) {
     cachedMapName_ = game.getMap().getName();
@@ -122,23 +137,16 @@ void Renderer::render(Game& game) {
 
   SDL_RenderCopy(ren_.get(), renLay1_.get(), nullptr, nullptr);
 
-  int shadowTexId = loadImageFromFile("../res/shadow.png");
-  for (const Sprite& sprite : game.getSystem<TransformSystem>().getSpritesByY() | game.spriteView()) {
-    if (sprite.isAnimated) {
-      if (sprite.hasShadow) {
-        const SDL_Rect shadowDest { sprite.loc.x() - 8, sprite.loc.y() - 8, 16, 8 };
-        SDL_RenderCopy(ren_.get(), textures_.at(shadowTexId).get(), nullptr, &shadowDest);
-      }
-
-      const SpriteFrame& frame = sprite.frames.at(sprite.animations.at(sprite.animationId).frameIndices.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(loadImageFromFile(sprite.spritesheet)).get(), &src, &dest);
-    }
+  for (const Sprite& sprite : game.getSystem<TransformSystem>().getSpritesByY(SpriteLayer::Normal) | game.spriteView()) {
+    renderSprite(sprite);
   }
 
   SDL_RenderCopy(ren_.get(), renLay0_.get(), nullptr, nullptr);
 
+  for (const Sprite& sprite : game.getSystem<TransformSystem>().getSpritesByY(SpriteLayer::Above) | game.spriteView()) {
+    renderSprite(sprite);
+  }
+
   SDL_Rect cameraField {
     game.getSystem<CameraSystem>().getCameraPosition().x(),
     game.getSystem<CameraSystem>().getCameraPosition().y(),