[Scummvm-git-logs] scummvm master -> f8e81c3110883837ada6445a3e83db6f1101d628

[npjg]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
67f534232c MEDIASTATION: Add virtual keywords and overrides for bitmaps/headers
f8e81c3110 MEDIASTATION: Clear hashmap upon Boot destruction


Commit: 67f534232c72d5c8d61e579a96f4681714fdddac
    https://github.com/scummvm/scummvm/commit/67f534232c72d5c8d61e579a96f4681714fdddac
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2025-02-22T22:21:34-05:00

Commit Message:
MEDIASTATION: Add virtual keywords and overrides for bitmaps/headers

Changed paths:
    engines/mediastation/assets/movie.h
    engines/mediastation/assets/sprite.h
    engines/mediastation/bitmap.h


diff --git a/engines/mediastation/assets/movie.h b/engines/mediastation/assets/movie.h
index 749d051d63d..52647d9ffa3 100644
--- a/engines/mediastation/assets/movie.h
+++ b/engines/mediastation/assets/movie.h
@@ -63,7 +63,7 @@ public:
 class MovieFrame : public Bitmap {
 public:
 	MovieFrame(Chunk &chunk, MovieFrameHeader *header);
-	~MovieFrame();
+	virtual ~MovieFrame() override;
 
 	void setFooter(MovieFrameFooter *footer);
 	uint32 left();
diff --git a/engines/mediastation/assets/sprite.h b/engines/mediastation/assets/sprite.h
index e24a50d6943..9156a5919fe 100644
--- a/engines/mediastation/assets/sprite.h
+++ b/engines/mediastation/assets/sprite.h
@@ -37,7 +37,7 @@ namespace MediaStation {
 class SpriteFrameHeader : public BitmapHeader {
 public:
 	SpriteFrameHeader(Chunk &chunk);
-	~SpriteFrameHeader();
+	virtual ~SpriteFrameHeader() override;
 
 	uint _index;
 	Common::Point *_boundingBox;
@@ -46,7 +46,7 @@ public:
 class SpriteFrame : public Bitmap {
 public:
 	SpriteFrame(Chunk &chunk, SpriteFrameHeader *header);
-	~SpriteFrame();
+	virtual ~SpriteFrame() override;
 
 	uint32 left();
 	uint32 top();
diff --git a/engines/mediastation/bitmap.h b/engines/mediastation/bitmap.h
index f6079fd0918..0691ba8a539 100644
--- a/engines/mediastation/bitmap.h
+++ b/engines/mediastation/bitmap.h
@@ -40,7 +40,7 @@ enum BitmapCompressionType {
 class BitmapHeader {
 public:
 	BitmapHeader(Chunk &chunk);
-	~BitmapHeader();
+	virtual ~BitmapHeader();
 
 	bool isCompressed();
 
@@ -54,7 +54,7 @@ public:
 	BitmapHeader *_bitmapHeader = nullptr;
 
 	Bitmap(Chunk &chunk, BitmapHeader *bitmapHeader);
-	~Bitmap();
+	virtual ~Bitmap();
 
 	uint16 width();
 	uint16 height();


Commit: f8e81c3110883837ada6445a3e83db6f1101d628
    https://github.com/scummvm/scummvm/commit/f8e81c3110883837ada6445a3e83db6f1101d628
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2025-02-22T22:21:34-05:00

Commit Message:
MEDIASTATION: Clear hashmap upon Boot destruction

Changed paths:
    engines/mediastation/boot.cpp


diff --git a/engines/mediastation/boot.cpp b/engines/mediastation/boot.cpp
index 0f95a25389b..26058fb09c3 100644
--- a/engines/mediastation/boot.cpp
+++ b/engines/mediastation/boot.cpp
@@ -465,6 +465,11 @@ Boot::~Boot() {
 		delete unknownDeclaration;
 	}
 	_unknownDeclarations.clear();
+
+	for (auto it = _fileDeclarations.begin(); it != _fileDeclarations.end(); ++it) {
+		delete it->_value;
+	}
+	_fileDeclarations.clear();
 }
 #pragma endregion