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

@@ -2,10 +2,11 @@
 #include "game.h"
 #include "map.h"
 
-void TransformSystem::initSprite(int spriteId, vec2i loc) {
+void TransformSystem::initSprite(int spriteId, vec2i loc, SpriteLayer layer) {
   Sprite& sprite = game_.getSprite(spriteId);
   sprite.loc = loc;
-  spritesByY_.emplace(loc.y(), spriteId);
+  sprite.layer = layer;
+  spritesByY_[static_cast<size_t>(layer)].emplace(loc.y(), spriteId);
 }
 
 void TransformSystem::setUpCollision(int spriteId, vec2i offset, vec2i size, bool solid) {
@@ -26,11 +27,11 @@ void TransformSystem::moveSprite(int spriteId, vec2i newLoc) {
 
   bool changedY = (sprite.loc.y() != newLoc.y());
   if (changedY) {
-    spritesByY_.erase(std::make_tuple(sprite.loc.y(), spriteId));
+    spritesByY_[static_cast<size_t>(sprite.layer)].erase(std::make_tuple(sprite.loc.y(), spriteId));
   }
   sprite.loc = newLoc;
   if (changedY) {
-    spritesByY_.emplace(newLoc.y(), spriteId);
+    spritesByY_[static_cast<size_t>(sprite.layer)].emplace(newLoc.y(), spriteId);
   }
   if (sprite.collidable) {
     addCollidable(spriteId);
@@ -216,8 +217,19 @@ void TransformSystem::removeCollidable(int spriteId) {
   downCollidables_.erase({ colUL.y(), spriteId });
 }
 
+void TransformSystem::destroySprite(int spriteId) {
+  Sprite& sprite = game_.getSprite(spriteId);
+  spritesByY_[static_cast<size_t>(sprite.layer)].erase(std::make_tuple(sprite.loc.y(), spriteId));
+
+  if (sprite.collidable) {
+    removeCollidable(spriteId);
+  }
+}
+
 void TransformSystem::clearSpriteCache() {
-  spritesByY_.clear();
+  for (auto& layer : spritesByY_) {
+    layer.clear();
+  }
   leftCollidables_.clear();
   rightCollidables_.clear();
   upCollidables_.clear();