[Scummvm-git-logs] scummvm master -> 12a00a210bcd5710860b95af334f6fe1335b51e1

Strangerke noreply at scummvm.org
Sun Jun 9 06:27:35 UTC 2024


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:
12a00a210b BAGEL: Fix regression in onListDispatchTeam introduced in 5cbd53bb32f24ed53c68d1ad972e0655b89e66f9


Commit: 12a00a210bcd5710860b95af334f6fe1335b51e1
    https://github.com/scummvm/scummvm/commit/12a00a210bcd5710860b95af334f6fe1335b51e1
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-06-09T07:27:27+01:00

Commit Message:
BAGEL: Fix regression in onListDispatchTeam introduced in 5cbd53bb32f24ed53c68d1ad972e0655b89e66f9

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 57f3080e493..96a3a81d8fa 100644
--- a/engines/bagel/spacebar/sraf_computer.cpp
+++ b/engines/bagel/spacebar/sraf_computer.cpp
@@ -2800,14 +2800,16 @@ void SrafComputer::onListDispatchTeam() {
 			break;
 
 		case mSellersExpanded:
-			nListToCheck = kSellersList;            // List to check
-			nPreceedingHeaders = 0;                 // No headers above this guy
+			nListToCheck = kSellersList;
+			// No headers above this guy
+			nPreceedingHeaders = 0;
 
 			if (nElementIndex == -1) {
 				bDeleteAll = true;
-				nrecalcVal = 0;         // Collapse list
+				// Collapse list
+				nrecalcVal = 0;
 			} else {
-				nElementIndex -= nPreceedingHeaders;    // Account for headers
+				nElementIndex -= nPreceedingHeaders; // Account for headers
 
 				// Account for those guys out on meetings that we have not displayed
 				// recalc first...
@@ -2816,21 +2818,21 @@ void SrafComputer::onListDispatchTeam() {
 				if (nElementIndex >= NUM_SELLERS) {
 					if (nElementIndex == (NUM_SELLERS - nPreceedingHeaders)) {
 						bDeleteAll = true;
-						nrecalcVal = mBuyersExpanded;       // collapse list, expand buyers
+						// collapse list, expand buyers
+						nrecalcVal = mBuyersExpanded;
 					}
 
 					if (nElementIndex == (NUM_SELLERS + 1 - nPreceedingHeaders)) {
 						bDeleteAll = true;
-						nrecalcVal = mOthersExpanded;       // collapse list, expand others
+						// collapse list, expand others
+						nrecalcVal = mOthersExpanded;
 					}
-					break;
-				}
-
-				if (cMeetBio.ptInRect(cPoint)) {        // If so, bring up biography.
+				} else if (cMeetBio.ptInRect(cPoint)) {
+					// If so, bring up biography.
 					sStr = buildSrafDir(g_stSellerNames[nElementIndex]._pszSellerBio);
 					displayTextScreen(sStr);
 				} else if (cMeetMember.ptInRect(cPoint)) {
-					// If so, put a checkmark in that column.
+					// If so, put a check mark in that column.
 
 					// Uncheck any member we already have checked, this is a singular operation
 					nMeetMember = getMeetMember(nListToCheck);




More information about the Scummvm-git-logs mailing list