[Scummvm-git-logs] scummvm master -> 3e5f684dcdaef5f3e2bf07539d4e4440213963ca

somaen noreply at scummvm.org
Sun Mar 26 17:55:00 UTC 2023


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:
f1b71677ec DIRECTOR: Fix a memory leak in PictureReference
3e5f684dcd DIRECTOR: Add detection for Dracula's Secret (Norwegian Bokmal)


Commit: f1b71677ecd155df5a6c4bf357ccb518fcd4a082
    https://github.com/scummvm/scummvm/commit/f1b71677ecd155df5a6c4bf357ccb518fcd4a082
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2023-03-26T19:54:23+02:00

Commit Message:
DIRECTOR: Fix a memory leak in PictureReference

Deleting forward-declared classes leads to delete not actually being
called, so moving the destructor to a file where the class is fully
declared.

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


diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index 244d71468dc..bea80135316 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -29,6 +29,7 @@
 #include "director/castmember.h"
 #include "director/frame.h"
 #include "director/movie.h"
+#include "director/picture.h"
 #include "director/score.h"
 #include "director/sprite.h"
 #include "director/window.h"
@@ -1752,4 +1753,8 @@ void Lingo::exposeXObject(const char *name, Datum obj) {
 	_globalvars[name].ignoreGlobal = true;
 }
 
+PictureReference::~PictureReference() {
+	delete _picture;
+}
+
 } // End of namespace Director
diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index 1180a1d879e..34aced959e7 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -213,9 +213,7 @@ struct MenuReference {
 
 struct PictureReference {
 	Picture *_picture = nullptr;
-	~PictureReference() {
-		delete _picture;
-	}
+	~PictureReference();
 };
 
 struct PCell {


Commit: 3e5f684dcdaef5f3e2bf07539d4e4440213963ca
    https://github.com/scummvm/scummvm/commit/3e5f684dcdaef5f3e2bf07539d4e4440213963ca
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2023-03-26T19:54:44+02:00

Commit Message:
DIRECTOR: Add detection for Dracula's Secret (Norwegian Bokmal)

Changed paths:
    engines/director/detection_tables.h


diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index 9c34bea6b2c..cfde56b399a 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -3595,6 +3595,10 @@ static const DirectorGameDescription gameDescriptions[] = {
 								   "Int_1.Dir",	 "6210e24521f440ebd600d869c473444e", 5951298, 404),
 	WINGAME2_l("draculassecret", "", "Dracula.exe", 	  "033eed030a848f54a8f1671f50c616e9", 772925,
 									 "Dracula/INT_1.DIR", "bac609d9496142c8393a68435c25660d", 9387886, Common::FR_FRA, 404),
+	MACGAME2_l("draculassecret", "", "Draculas Hemmelighet", "r:21cbec653e96e4c1bb6377d44050095e", 483490,
+									 "Int_1.Dir",			 "d:45d782f0cb6bf4023f026024e27f3fa2", 6001656, Common::NB_NOR, 404),
+	WINGAME2_l("draculassecret", "", "Dracula.exe", 	  "000d7509cd6459b35f271598ac8255f7", 800583,
+									 "Dracula/INT_1.DIR", "45d782f0cb6bf4023f026024e27f3fa2", 6001656, Common::NB_NOR, 404),
 	WINGAME2_l("draculassecret", "", "secret.exe",		  "b24fbaf90985cdb79132eda2ee5b73d2", 1132985,
 									 "Dracula/Int_1.Dir", "f2357c8e4b94e87b9d53018ecb9f1ed6", 5699816, Common::NL_NLD, 404), // original release
 	MACGAME2_l("draculassecret", "", "Secret.PPC",  "b147d31ed577b9bbd3af764f178bb71c", 57832,




More information about the Scummvm-git-logs mailing list