[Scummvm-git-logs] scummvm master -> 3734d344ac78b75d05276811684ffe109cadbe12

[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:
26e9290d27 DIRECTOR: Remove erroneous clip
3734d344ac DIRECTOR: Avoid double-deleting widgets


Commit: 26e9290d2721e46b2efc23d97fa9ff89baa6b773
    https://github.com/scummvm/scummvm/commit/26e9290d2721e46b2efc23d97fa9ff89baa6b773
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-06-10T11:41:11-04:00

Commit Message:
DIRECTOR: Remove erroneous clip

Changed paths:
    engines/director/ink.cpp


diff --git a/engines/director/ink.cpp b/engines/director/ink.cpp
index c49378a9e7..9f28e6b5f4 100644
--- a/engines/director/ink.cpp
+++ b/engines/director/ink.cpp
@@ -33,8 +33,6 @@ void Score::inkBasedBlit(Graphics::ManagedSurface *maskSurface, const Graphics::
 	t.moveTo(drawRect.left, drawRect.top);
 	bool nullMask = false;
 
-	drawRect.clip(Common::Rect(_maskSurface->w, _maskSurface->h));
-
 	maskSurface->transBlitFrom(*_maskSurface, drawRect, Common::Point(0, 0), _stageColor);
 
 	drawRect.clip(t);


Commit: 3734d344ac78b75d05276811684ffe109cadbe12
    https://github.com/scummvm/scummvm/commit/3734d344ac78b75d05276811684ffe109cadbe12
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-06-10T11:41:11-04:00

Commit Message:
DIRECTOR: Avoid double-deleting widgets

Changed paths:
    engines/director/cast.cpp
    engines/director/cast.h


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index be44a9d725..899605e75b 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -43,11 +43,6 @@ Cast::Cast() {
 	_modified = true;
 }
 
-Cast::~Cast() {
-	if (_widget)
-		delete _widget;
-}
-
 void Cast::createWidget() {
 	if (_widget)
 		error("TextCast::createWidget: Attempted to create widget twice");
diff --git a/engines/director/cast.h b/engines/director/cast.h
index eacd588979..1080b0ce8e 100644
--- a/engines/director/cast.h
+++ b/engines/director/cast.h
@@ -53,7 +53,7 @@ class SNDDecoder;
 class Cast {
 public:
 	Cast();
-	virtual ~Cast();
+	virtual ~Cast() {};
 	virtual bool isEditable() { return false; }
 	virtual bool setEditable(bool editable) { return false; }
 	virtual bool isModified() { return _modified; }