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

sev- noreply at scummvm.org
Sat Jul 9 20:14:45 UTC 2022


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:
c9b9544fcd DIRECTOR: Prevent changing of spriteType for QDShapes


Commit: c9b9544fcda88416f2e504a9ee59ba3796e2059f
    https://github.com/scummvm/scummvm/commit/c9b9544fcda88416f2e504a9ee59ba3796e2059f
Author: Pragyansh Chaturvedi (r41k0u) (pragyanshchaturvedi18 at gmail.com)
Date: 2022-07-09T22:14:43+02:00

Commit Message:
DIRECTOR: Prevent changing of spriteType for QDShapes

Changed paths:
    engines/director/sprite.cpp


diff --git a/engines/director/sprite.cpp b/engines/director/sprite.cpp
index b4830509b33..e9c5887067e 100644
--- a/engines/director/sprite.cpp
+++ b/engines/director/sprite.cpp
@@ -459,7 +459,8 @@ void Sprite::setCast(CastMemberID memberID) {
 
 	_castId = memberID;
 	_cast = _movie->getCastMember(_castId);
-	if (g_director->getVersion() >= 400)
+	//As QDShapes don't have an associated cast, we must not change their _SpriteType.
+	if (g_director->getVersion() >= 400 && !isQDShape())
 		_spriteType = kCastMemberSprite;
 
 	if (_cast) {




More information about the Scummvm-git-logs mailing list