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

[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:
1b63ad834b DIRECTOR: Plug another memory leak
b86deff328 DIRECTOR: Allow D4 to have QD shapes too


Commit: 1b63ad834b7135404fc78d374a0baf89ea9bb0c6
    https://github.com/scummvm/scummvm/commit/1b63ad834b7135404fc78d374a0baf89ea9bb0c6
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-07-07T13:19:44-04:00

Commit Message:
DIRECTOR: Plug another memory leak

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 0397987811..ec89f90fdd 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -204,6 +204,7 @@ MacShape *Channel::getShape() {
 	if (g_director->getVersion() >= 3 && shape->spriteType == kCastMemberSprite) {
 		if (!_sprite->_cast) {
 			warning("Channel::getShape(): kCastMemberSprite has no cast defined");
+			delete shape;
 			return nullptr;
 		}
 


Commit: b86deff3289dcba0f3c545cda855e750c12141b1
    https://github.com/scummvm/scummvm/commit/b86deff3289dcba0f3c545cda855e750c12141b1
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-07-07T14:26:02-04:00

Commit Message:
DIRECTOR: Allow D4 to have QD shapes too

Changed paths:
    engines/director/frame.cpp


diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index 64fef1368b..d7181d6e9d 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -278,7 +278,7 @@ void Frame::readChannels(Common::ReadStreamEndian *stream) {
 			sprite._thickness = stream->readByte();
 			sprite._inkData = stream->readByte();
 
-			if (_vm->getVersion() < 4 && sprite.isQDShape()) {
+			if (sprite.isQDShape()) {
 				sprite._pattern = stream->readUint16();
 			} else {
 				sprite._castId = stream->readUint16();