[Scummvm-git-logs] scummvm master -> 0981f20652d076ba5b00f8c9809c1a4fb8125372

[npjg]

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

Summary:
0981f20652 MEDIASTATION: Make sprites play at correct rate


Commit: 0981f20652d076ba5b00f8c9809c1a4fb8125372
    https://github.com/scummvm/scummvm/commit/0981f20652d076ba5b00f8c9809c1a4fb8125372
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2025-02-22T22:35:59-05:00

Commit Message:
MEDIASTATION: Make sprites play at correct rate

Changed paths:
    engines/mediastation/assetheader.cpp
    engines/mediastation/assetheader.h
    engines/mediastation/assets/sprite.cpp


diff --git a/engines/mediastation/assetheader.cpp b/engines/mediastation/assetheader.cpp
index f653888b621..1a1510b41db 100644
--- a/engines/mediastation/assetheader.cpp
+++ b/engines/mediastation/assetheader.cpp
@@ -228,7 +228,7 @@ void AssetHeader::readSection(AssetHeaderSectionType sectionType, Chunk& chunk)
 	}
 
 	case kAssetHeaderFrameRate: {
-		_frameRate = Datum(chunk).u.i;
+		_frameRate = static_cast<uint32>(Datum(chunk, kDatumTypeFloat64_2).u.f);
 		break;
 	}
 
diff --git a/engines/mediastation/assetheader.h b/engines/mediastation/assetheader.h
index 858deba039e..9d184948d2f 100644
--- a/engines/mediastation/assetheader.h
+++ b/engines/mediastation/assetheader.h
@@ -177,7 +177,7 @@ public:
 	bool _transparency = false;
 	bool _hasOwnSubfile = false;
 	uint32 _cursorResourceId = 0;
-	uint32 _frameRate = 10; // This is the default for sprites, which are the only ones that use this field.
+	uint32 _frameRate = 0;
 	uint32 _loadType = 0;
 	uint32 _rate = 0;
 	bool _editable = 0;
diff --git a/engines/mediastation/assets/sprite.cpp b/engines/mediastation/assets/sprite.cpp
index c423c1581c8..c924b257f61 100644
--- a/engines/mediastation/assets/sprite.cpp
+++ b/engines/mediastation/assets/sprite.cpp
@@ -71,12 +71,6 @@ Sprite::Sprite(AssetHeader *header) : Asset(header) {
 		setActive();
 		_isShowing = true;
 	}
-
-	if (_header->_frameRate == 0) {
-		// It seems that the frame rate is 10 if it's not set in the asset
-		// header, or even if it's set to zero.
-		_header->_frameRate = 10;
-	}
 }
 
 Sprite::~Sprite() {