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

[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:
e5b98997b5 BAGEL: Remove a useless include, add a default case, reduce the scope of to variables to avoid a useless intiialization
c879523959 BAGEL: Fix a regression in reportMeetingStatus


Commit: e5b98997b56c38c9c8af4f65b6008a14164495cc
    https://github.com/scummvm/scummvm/commit/e5b98997b56c38c9c8af4f65b6008a14164495cc
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-06-11T06:05:08+01:00

Commit Message:
BAGEL: Remove a useless include, add a default case, reduce the scope of to variables to avoid a useless intiialization

Changed paths:
    engines/bagel/boflib/gfx/text.cpp
    engines/bagel/boflib/gui/scroll_bar.cpp
    engines/bagel/dialogs/credits_dialog.h


diff --git a/engines/bagel/boflib/gfx/text.cpp b/engines/bagel/boflib/gfx/text.cpp
index 4b05189ce86..165b1ac2191 100644
--- a/engines/bagel/boflib/gfx/text.cpp
+++ b/engines/bagel/boflib/gfx/text.cpp
@@ -341,6 +341,9 @@ ErrorCode CBofText::displayTextEx(CBofBitmap *pBmp, const char *pszText, CBofRec
 		// Align left
 		_bMultiLine = true;
 		break;
+
+	default:
+		break;
 	}
 
 	// text starts relative to area for painting
diff --git a/engines/bagel/boflib/gui/scroll_bar.cpp b/engines/bagel/boflib/gui/scroll_bar.cpp
index 51dde7b8c29..3e1c475259a 100644
--- a/engines/bagel/boflib/gui/scroll_bar.cpp
+++ b/engines/bagel/boflib/gui/scroll_bar.cpp
@@ -271,8 +271,6 @@ ErrorCode CBofScrollBar::paint(CBofRect *pDirtyRect) {
 	assert(isValidObject(this));
 
 	if (!errorOccurred()) {
-		CBofRect cRect(0, 0, _cRect.width() - 1, _cRect.height() - 1);
-		CBofPoint cPoint(0, 0);
 		CBofPalette *pPalette = CBofApp::getApp()->getPalette();
 
 		//
@@ -286,20 +284,20 @@ ErrorCode CBofScrollBar::paint(CBofRect *pDirtyRect) {
 			_pBackdrop->paint(pBmp, 0, 0, nullptr, COLOR_WHITE);
 
 			if ((_nScrollState == 1) && (_pLeftBtnDn != nullptr)) {
-				cPoint = _cLeftBtnRect.topLeft();
+				CBofPoint cPoint = _cLeftBtnRect.topLeft();
 				_pLeftBtnDn->paint(pBmp, cPoint.x, cPoint.y, nullptr, COLOR_WHITE);
 
 			} else if (_pLeftBtnUp != nullptr) {
-				cPoint = _cLeftBtnRect.topLeft();
+				CBofPoint cPoint = _cLeftBtnRect.topLeft();
 				_pLeftBtnUp->paint(pBmp, cPoint.x, cPoint.y, nullptr, COLOR_WHITE);
 			}
 
 			if ((_nScrollState == 4) && (_pRightBtnDn != nullptr)) {
-				cPoint = _cRightBtnRect.topLeft();
+				CBofPoint cPoint = _cRightBtnRect.topLeft();
 				_pRightBtnDn->paint(pBmp, cPoint.x, cPoint.y, nullptr, COLOR_WHITE);
 
 			} else if (_pRightBtnUp != nullptr) {
-				cPoint = _cRightBtnRect.topLeft();
+				CBofPoint cPoint = _cRightBtnRect.topLeft();
 				_pRightBtnUp->paint(pBmp, cPoint.x, cPoint.y, nullptr, COLOR_WHITE);
 			}
 
diff --git a/engines/bagel/dialogs/credits_dialog.h b/engines/bagel/dialogs/credits_dialog.h
index 22977236e36..910fdcb79f2 100644
--- a/engines/bagel/dialogs/credits_dialog.h
+++ b/engines/bagel/dialogs/credits_dialog.h
@@ -24,7 +24,6 @@
 #define BAGEL_DIALOGS_CREDITS_DIALOG_H
 
 #include "bagel/boflib/gui/dialog.h"
-#include "bagel/boflib/gfx/text.h"
 
 namespace Bagel {
 


Commit: c879523959c806f3d97e6c07dc2a0f89da53be93
    https://github.com/scummvm/scummvm/commit/c879523959c806f3d97e6c07dc2a0f89da53be93
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-06-11T06:05:09+01:00

Commit Message:
BAGEL: Fix a regression in reportMeetingStatus

Changed paths:
    engines/bagel/spacebar/sraf_computer.cpp


diff --git a/engines/bagel/spacebar/sraf_computer.cpp b/engines/bagel/spacebar/sraf_computer.cpp
index 5e841faf2b8..8dbeddc4f94 100644
--- a/engines/bagel/spacebar/sraf_computer.cpp
+++ b/engines/bagel/spacebar/sraf_computer.cpp
@@ -3366,6 +3366,7 @@ bool SrafComputer::reportMeetingStatus(int nTeamNumber) {
 				} else {
 					pszFailureFile = kGSM5SraFemStr;
 				}
+				break;
 			}
 
 			case RAWLEY23: