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

[Strangerke]

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:
a6fb95b0b4 BAGEL: Initialize variable in CBagStorageDevBmp (CID 1544871), remove unused define


Commit: a6fb95b0b4bae567326392ffc75d6b80bc136621
    https://github.com/scummvm/scummvm/commit/a6fb95b0b4bae567326392ffc75d6b80bc136621
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-05-08T08:15:38+01:00

Commit Message:
BAGEL: Initialize variable in CBagStorageDevBmp (CID 1544871), remove unused define

Changed paths:
    engines/bagel/baglib/bagel.h
    engines/bagel/baglib/storage_dev_bmp.cpp


diff --git a/engines/bagel/baglib/bagel.h b/engines/bagel/baglib/bagel.h
index b6827f8061f..75ca1d94918 100644
--- a/engines/bagel/baglib/bagel.h
+++ b/engines/bagel/baglib/bagel.h
@@ -41,8 +41,7 @@ namespace Bagel {
 #define PATH_DELIMETER "/"
 #define DISK_1 1
 
-#define BAG_INSTALL_NONE 0 /* play entire game from where it was executed */
-#define BAG_INSTALL_DEFAULT BAG_INSTALL_NONE
+#define BAG_INSTALL_DEFAULT 0 /* play entire game from where it was executed */
 
 #define HOMEDIR_TOKEN "$SBARDIR" /* Change this to $HOMEDIR  */
 // THE CURRENT STORAGE DEVICE OF THE GAME
diff --git a/engines/bagel/baglib/storage_dev_bmp.cpp b/engines/bagel/baglib/storage_dev_bmp.cpp
index 45f847e5a94..901c07322d3 100644
--- a/engines/bagel/baglib/storage_dev_bmp.cpp
+++ b/engines/bagel/baglib/storage_dev_bmp.cpp
@@ -31,7 +31,8 @@ CBagStorageDevBmp::CBagStorageDevBmp(CBofWindow *pParent, const CBofRect &xRect,
 	_xSDevType = SDEV_BMP;
 	setRect(xRect);
 	_pWorkBmp = nullptr;
-
+	_nMaskColor = CBagel::getBagApp()->getChromaColor();
+	
 	CBagStorageDev::setAssociateWnd(pParent);
 
 	setVisible();       // This object is visible