[Scummvm-git-logs] scummvm master -> 4ddad9fcd53b41054b26c60d883eb572c1072869

[dreammaster]

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:
b2456f04e4 BAGEL: Fix positioning of bibble betting odds
4ddad9fcd5 BAGEL: Minor bibble area defs field renamings


Commit: b2456f04e4e8c5e56b18d77692f7f997d37dc7b1
    https://github.com/scummvm/scummvm/commit/b2456f04e4e8c5e56b18d77692f7f997d37dc7b1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-05-17T20:17:37-07:00

Commit Message:
BAGEL: Fix positioning of bibble betting odds

Changed paths:
    engines/bagel/spacebar/bibble_window.cpp
    engines/bagel/spacebar/bibble_window.h


diff --git a/engines/bagel/spacebar/bibble_window.cpp b/engines/bagel/spacebar/bibble_window.cpp
index 7d4524fa329..e346c039459 100644
--- a/engines/bagel/spacebar/bibble_window.cpp
+++ b/engines/bagel/spacebar/bibble_window.cpp
@@ -525,7 +525,7 @@ void CBibbleWindow::onPaint(CBofRect *pRect) {
 
 		CBofRect cRect;
 
-		// Update the display of all the bet areas;
+		// Update the display of all the bet areas
 		for (int i = 0; i < BIBBLE_NUM_BET_AREAS; i++) {
 			// Add bet amount text
 			char szBuf[20];
diff --git a/engines/bagel/spacebar/bibble_window.h b/engines/bagel/spacebar/bibble_window.h
index c497e117fd9..c9b651512d9 100644
--- a/engines/bagel/spacebar/bibble_window.h
+++ b/engines/bagel/spacebar/bibble_window.h
@@ -45,11 +45,11 @@ struct ST_PAYOFFS {
 };
 
 struct CBetAreaDef {
+	int _nBet;
 	int left;
 	int top;
 	int right;
 	int bottom;
-	int _nBet;
 	int _nPayOff1;
 	int _nPayOff2;
 	const char *_cAudioFile;


Commit: 4ddad9fcd53b41054b26c60d883eb572c1072869
    https://github.com/scummvm/scummvm/commit/4ddad9fcd53b41054b26c60d883eb572c1072869
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-05-17T20:21:21-07:00

Commit Message:
BAGEL: Minor bibble area defs field renamings

Changed paths:
    engines/bagel/spacebar/bibble_window.cpp
    engines/bagel/spacebar/bibble_window.h


diff --git a/engines/bagel/spacebar/bibble_window.cpp b/engines/bagel/spacebar/bibble_window.cpp
index e346c039459..d1b71ee356a 100644
--- a/engines/bagel/spacebar/bibble_window.cpp
+++ b/engines/bagel/spacebar/bibble_window.cpp
@@ -193,7 +193,7 @@ static bool g_bBibbleHack = false;
 
 
 CBetArea::CBetArea(const CBetAreaDef &def) :
-	_cRect(def.left, def.top, def.right, def.bottom), _bWon(false),
+	_cRect(def._left, def._top, def._right, def._bottom), _bWon(false),
 	_nBet(def._nBet), _nPayOff1(def._nPayOff1), _nPayOff2(def._nPayOff2),
 	_cAudioFile(def._cAudioFile), _cPayFile(def._cPayFile) {
 }
diff --git a/engines/bagel/spacebar/bibble_window.h b/engines/bagel/spacebar/bibble_window.h
index c9b651512d9..1ead873d710 100644
--- a/engines/bagel/spacebar/bibble_window.h
+++ b/engines/bagel/spacebar/bibble_window.h
@@ -46,10 +46,10 @@ struct ST_PAYOFFS {
 
 struct CBetAreaDef {
 	int _nBet;
-	int left;
-	int top;
-	int right;
-	int bottom;
+	int _left;
+	int _top;
+	int _right;
+	int _bottom;
 	int _nPayOff1;
 	int _nPayOff2;
 	const char *_cAudioFile;