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

[Strangerke]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
062b09c83e BAGEL: Remove useless null check before delete
5cbd53bb32 BAGEL: Replace a switch by an if/else in SrafComputer
ab9e9b2a37 BAGEL: Change some more function definitions when it doesn't match the one in declaration


Commit: 062b09c83e3e8e30f37a4313033e2f1f4f8e1a74
    https://github.com/scummvm/scummvm/commit/062b09c83e3e8e30f37a4313033e2f1f4f8e1a74
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-06-04T22:23:50+01:00

Commit Message:
BAGEL: Remove useless null check before delete

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


diff --git a/engines/bagel/spacebar/filter.cpp b/engines/bagel/spacebar/filter.cpp
index 526e92bac04..ef73d6ee844 100644
--- a/engines/bagel/spacebar/filter.cpp
+++ b/engines/bagel/spacebar/filter.cpp
@@ -348,8 +348,7 @@ static bool VildroidFilter(CBofBitmap *pBmp, CBofRect *pRect) {
 				break;
 			}
 			case 1: {
-				if (pChipBmp != nullptr)
-					delete pChipBmp;
+				delete pChipBmp;
 
 				char szCString[256];
 				CBofString cString(szCString, 256);
@@ -391,8 +390,7 @@ static bool VildroidFilter(CBofBitmap *pBmp, CBofRect *pRect) {
 				break;
 			}
 			case 2: {
-				if (pChipBmp != nullptr)
-					delete pChipBmp;
+				delete pChipBmp;
 
 				char szCString[256];
 				CBofString cString(szCString, 256);


Commit: 5cbd53bb32f24ed53c68d1ad972e0655b89e66f9
    https://github.com/scummvm/scummvm/commit/5cbd53bb32f24ed53c68d1ad972e0655b89e66f9
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-06-04T22:23:50+01:00

Commit Message:
BAGEL: Replace a switch by an if/else in SrafComputer

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 b952bfb947f..5e0d1c8a8d0 100644
--- a/engines/bagel/spacebar/sraf_computer.cpp
+++ b/engines/bagel/spacebar/sraf_computer.cpp
@@ -2803,13 +2803,10 @@ void SrafComputer::onListDispatchTeam() {
 			nListToCheck = kSellersList;            // List to check
 			nPreceedingHeaders = 0;                 // No headers above this guy
 
-			switch (nElementIndex) {
-			case -1:
+			if (nElementIndex == -1) {
 				bDeleteAll = true;
 				nrecalcVal = 0;         // Collapse list
-				break;
-
-			default:
+			} else {
 				nElementIndex -= nPreceedingHeaders;    // Account for headers
 
 				// Account for those guys out on meetings that we have not displayed
@@ -3381,7 +3378,6 @@ bool SrafComputer::reportMeetingStatus(int nTeamNumber) {
 				} else {
 					pszFailureFile = kGSM5SraFemStr;
 				}
-				break;
 			}
 
 			case RAWLEY23:


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

Commit Message:
BAGEL: Change some more function definitions when it doesn't match the one in declaration

Changed paths:
    engines/bagel/spacebar/filter.h
    engines/bagel/spacebar/nav_window.h


diff --git a/engines/bagel/spacebar/filter.h b/engines/bagel/spacebar/filter.h
index 8552534b28f..51eb746821e 100644
--- a/engines/bagel/spacebar/filter.h
+++ b/engines/bagel/spacebar/filter.h
@@ -42,7 +42,7 @@ void triInitFilters(CBofBitmap *pBmp);
 void lightningInitFilters();
 void destroyFilters();
 
-bool doFilters(const uint16 nFilterId, CBofBitmap *pBmp, CBofRect *viewRect);
+bool doFilters(const uint16 nFilterId, CBofBitmap *pBmp, CBofRect *pRect);
 
 } // namespace SpaceBar
 } // namespace Bagel
diff --git a/engines/bagel/spacebar/nav_window.h b/engines/bagel/spacebar/nav_window.h
index b5c8b6a7855..b3fe8b5b7ca 100644
--- a/engines/bagel/spacebar/nav_window.h
+++ b/engines/bagel/spacebar/nav_window.h
@@ -56,7 +56,7 @@ public:
 	ErrorCode attach() override;
 	ErrorCode detach() override;
 
-	void onBofButton(CBofObject *pButton, int nState) override;
+	void onBofButton(CBofObject *pObject, int nState) override;
 
 protected:
 	void pause();