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

[Strangerke]

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:
fbcdea6edb BAGEL: Remove useless null check prior to delete, initialize _guessText in CDevDlg constructor (CIC 1544856)
f18ebe60f9 BAGEL: Remove unused class member from CBagLinkObject (fixing also CIC 1544862)


Commit: fbcdea6edb0f7529a03a7659f8935634ae490954
    https://github.com/scummvm/scummvm/commit/fbcdea6edb0f7529a03a7659f8935634ae490954
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-05-06T22:04:10+01:00

Commit Message:
BAGEL: Remove useless null check prior to delete, initialize _guessText in CDevDlg constructor (CIC 1544856)

Changed paths:
    engines/bagel/baglib/dev_dlg.cpp


diff --git a/engines/bagel/baglib/dev_dlg.cpp b/engines/bagel/baglib/dev_dlg.cpp
index 7a5875590c7..364d9bb9a98 100644
--- a/engines/bagel/baglib/dev_dlg.cpp
+++ b/engines/bagel/baglib/dev_dlg.cpp
@@ -31,6 +31,7 @@ namespace Bagel {
 
 CDevDlg::CDevDlg(int nButtonX, int buttonY) {
 	_titleText = nullptr;
+	_guessText = nullptr;
 	_buttonX = nButtonX;
 	_buttonY = buttonY;
 	_achGuess[0] = '\0';
@@ -39,10 +40,8 @@ CDevDlg::CDevDlg(int nButtonX, int buttonY) {
 }
 
 CDevDlg::~CDevDlg() {
-	if (_titleText != nullptr) {
-		delete _titleText;
-		_titleText = nullptr;
-	}
+	delete _titleText;
+	_titleText = nullptr;
 }
 
 ErrorCode CDevDlg::create(const char *bmp, CBofWindow *wnd, CBofPalette *pal, CBofRect *rect, bool useExtraFl) {


Commit: f18ebe60f95fb8d7d0a19d275273ffd563b0d2c9
    https://github.com/scummvm/scummvm/commit/f18ebe60f95fb8d7d0a19d275273ffd563b0d2c9
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-05-06T22:04:10+01:00

Commit Message:
BAGEL: Remove unused class member from CBagLinkObject (fixing also CIC 1544862)

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


diff --git a/engines/bagel/baglib/link_object.cpp b/engines/bagel/baglib/link_object.cpp
index 8d3240988dc..422a2639403 100644
--- a/engines/bagel/baglib/link_object.cpp
+++ b/engines/bagel/baglib/link_object.cpp
@@ -33,6 +33,7 @@ CBagLinkObject::CBagLinkObject() {
 	_destLocation = CBofPoint(0, 0);
 	_srcLocation = CBofPoint(-1, -1);
 	_fade = 0;
+	
 	setVisible(false);
 	CBagObject::setOverCursor(5);
 }
diff --git a/engines/bagel/baglib/link_object.h b/engines/bagel/baglib/link_object.h
index 92126411e4c..b4867e2cdfa 100644
--- a/engines/bagel/baglib/link_object.h
+++ b/engines/bagel/baglib/link_object.h
@@ -32,14 +32,13 @@ namespace Bagel {
  */
 class CBagLinkObject : public CBagObject {
 public:
-	enum LINK_TYPE { LINK = 0, CLOSEUP = 1 };
+	enum LinkType { LINK = 0, CLOSEUP = 1 };
 
 private:
 	CBofSize _size;
-	int _outline;
 	CBofPoint _destLocation;
 	CBofPoint _srcLocation;
-	LINK_TYPE _linkType;
+	LinkType _linkType;
 	int _fade;
 
 public:
@@ -72,9 +71,6 @@ public:
 	void setSrcLoc(CBofPoint loc) {
 		_srcLocation = loc;
 	}
-	void setOutline(int color) {
-		_outline = color;
-	}
 };
 
 } // namespace Bagel