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

[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:
d2d52ad372 BAGEL: Remove two unused rectangles in CMainWindow::attach, add a default case in CNavWindow::onLButtonDown


Commit: d2d52ad3729909a57e73c89b48b014beaae7498d
    https://github.com/scummvm/scummvm/commit/d2d52ad3729909a57e73c89b48b014beaae7498d
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-06-10T21:43:06+01:00

Commit Message:
BAGEL: Remove two unused rectangles in CMainWindow::attach, add a default case in CNavWindow::onLButtonDown

Changed paths:
    engines/bagel/spacebar/main_window.cpp
    engines/bagel/spacebar/nav_window.cpp


diff --git a/engines/bagel/spacebar/main_window.cpp b/engines/bagel/spacebar/main_window.cpp
index aad46ff8280..1f2d24d4e6c 100644
--- a/engines/bagel/spacebar/main_window.cpp
+++ b/engines/bagel/spacebar/main_window.cpp
@@ -142,7 +142,6 @@ ErrorCode CMainWindow::attach() {
 		}
 
 		if (_pThudBmp && (CBagObject *)nullptr == getFGObjects(CBofString(THUD_WLD))) {
-			CBofRect r(1, tmpRect.height() - 101, 101, tmpRect.height() - 1);
 			_pThudBmp->setAssociateWnd(this);
 			insertFGObjects(_pThudBmp);
 		}
@@ -201,7 +200,6 @@ ErrorCode CMainWindow::attach() {
 		}
 
 		if ((CBagObject *)nullptr == getFGObjects(CBofString(PDA_WLD))) {
-			CBofRect r(0, 0, 300, 200);
 			_pPDABmp->setAssociateWnd(this);
 
 			// To fix pda not updating problem
diff --git a/engines/bagel/spacebar/nav_window.cpp b/engines/bagel/spacebar/nav_window.cpp
index 6b50b23958d..d541df35a3f 100644
--- a/engines/bagel/spacebar/nav_window.cpp
+++ b/engines/bagel/spacebar/nav_window.cpp
@@ -633,7 +633,7 @@ void CNavWindow::onLButtonDown(uint32 /*nFlags*/, CBofPoint *pPoint, void *) {
 	assert(pPoint != nullptr);
 
 	switch (_level) {
-	case 0: {
+	case 0:
 		if (_pPinna->ptInRect(*pPoint))
 			onPinna();
 
@@ -658,9 +658,8 @@ void CNavWindow::onLButtonDown(uint32 /*nFlags*/, CBofPoint *pPoint, void *) {
 		if (_pFruufnia->ptInRect(*pPoint))
 			onFruufnia();
 		break;
-	}//close case
 
-	case 1: {
+	case 1:
 		if (_pWilbur->ptInRect(*pPoint))
 			onWilbur();
 
@@ -689,9 +688,8 @@ void CNavWindow::onLButtonDown(uint32 /*nFlags*/, CBofPoint *pPoint, void *) {
 			onPizer();
 
 		break;
-	}//close case
 
-	case 2: {
+	case 2:
 		if (_pBackwater->ptInRect(*pPoint))
 			onBackwater();
 
@@ -717,8 +715,8 @@ void CNavWindow::onLButtonDown(uint32 /*nFlags*/, CBofPoint *pPoint, void *) {
 			onMaggotsnest();
 
 		break;
-	}
-	case 3: {
+
+	case 3:
 		if (_pPeggleboz->ptInRect(*pPoint))
 			onPeggleboz();
 
@@ -750,7 +748,9 @@ void CNavWindow::onLButtonDown(uint32 /*nFlags*/, CBofPoint *pPoint, void *) {
 			onBattlefish();
 
 		break;
-	} //close case
+
+	default:
+		break;
 	} //close switch
 
 	if (_cargo <= 0)