Effects: Use the filename for the cache, not the bitmap pointer

The pointer can be reused by a new bitmap and cause wrong animations. Fix EasyRPG#3256
Ghabry · Aug 28, 2024 · e2f18ec · e2f18ec
1 parent 3a367bb
commit e2f18ec
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/liblcf-version b/lib/liblcf-version
diff --git a/src/cache.cpp b/src/cache.cpp
@@ -82,7 +82,7 @@ namespace {
 	std::unordered_map<tile_key_type, std::weak_ptr<Bitmap>> cache_tiles;
 
 	// rect, flip_x, flip_y, tone, blend
-	using effect_key_type = std::tuple<Bitmap*, Rect, bool, bool, Tone, Color>;
+	using effect_key_type = std::tuple<std::string, Rect, bool, bool, Tone, Color>;
 	std::map<effect_key_type, std::weak_ptr<Bitmap>> cache_effects;
 
 	std::string system_name;
@@ -454,7 +454,7 @@ BitmapRef Cache::Tile(StringView filename, int tile_id) {
 
 BitmapRef Cache::SpriteEffect(const BitmapRef& src_bitmap, const Rect& rect, bool flip_x, bool flip_y, const Tone& tone, const Color& blend) {
 	const effect_key_type key {
-		src_bitmap.get(),
+		src_bitmap->GetFilename(),
 		rect,
 		flip_x,
 		flip_y,