Added lightning sprite to mailbox event

Sprites can be destroyed now, which really just means that their index is removed from the list of active sprites. The actual memory is not freed until all sprites are deleted on map change.

Sprite layers are introduced. All sprites by default are on layer 0 (Normal) which renders them in between the lower and upper map layers. There is also a layer 1 (Above) that renders above the upper map layer, and the sprite for the lightning strike uses this layer in order to not be hidden by the trees.

Fixed a bug where waiting for the end of a non-looping animation would trip the flag immediately upon the final frame activating, instead of waiting the length of the last frame.

1 files changed, 8 insertions, 4 deletions

@@ -8,6 +8,8 @@
 #include "direction.h"
 #include "system.h"
 #include "vector.h"
+#include "sprite.h"
+#include "consts.h"
 
 class Game;
 
@@ -29,26 +31,28 @@ public:
 
   TransformSystem(Game& game) : game_(game) {}
 
-  void initSprite(int spriteId, vec2i loc);
+  void initSprite(int spriteId, vec2i loc, SpriteLayer layer = SpriteLayer::Normal);
 
   void setUpCollision(int spriteId, vec2i offset, vec2i size, bool solid);
 
   void moveSprite(int spriteId, vec2i newLoc);
 
-  auto getSpritesByY() const {
-    return spritesByY_ | ranges::views::transform([] (const std::tuple<int, int>& val) {
+  auto getSpritesByY(SpriteLayer layer) const {
+    return spritesByY_[static_cast<size_t>(layer)] | ranges::views::transform([] (const std::tuple<int, int>& val) {
       return std::get<1>(val);
     });
   }
 
   CollisionResult checkCollision(int spriteId, vec2i newLoc, Direction dir);
 
+  void destroySprite(int spriteId) override;
+
   void clearSpriteCache() override;
 
 private:
 
   Game& game_;
-  std::set<std::tuple<int, int>> spritesByY_;
+  std::set<std::tuple<int, int>> spritesByY_[NUM_SPRITE_LAYERS];
 
   struct Collidable {
     int lower;