[Scummvm-git-logs] scummvm master -> 635fc51aa059c08acf48953dc2176de501d16b30

[dreammaster]

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

Summary:
635fc51aa0 BAGEL: Further gcc warning fixes


Commit: 635fc51aa059c08acf48953dc2176de501d16b30
    https://github.com/scummvm/scummvm/commit/635fc51aa059c08acf48953dc2176de501d16b30
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-09-17T04:29:04-07:00

Commit Message:
BAGEL: Further gcc warning fixes

Changed paths:
    engines/bagel/hodjnpodj/dfa/optdlg.cpp
    engines/bagel/hodjnpodj/life/grid.cpp
    engines/bagel/hodjnpodj/life/grid.h
    engines/bagel/hodjnpodj/metagame/gtl/gtlmve.cpp


diff --git a/engines/bagel/hodjnpodj/dfa/optdlg.cpp b/engines/bagel/hodjnpodj/dfa/optdlg.cpp
index 66f5f1463f9..89086e90983 100644
--- a/engines/bagel/hodjnpodj/dfa/optdlg.cpp
+++ b/engines/bagel/hodjnpodj/dfa/optdlg.cpp
@@ -384,8 +384,7 @@ void CDFAOptDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar*
 			if (newAmnt < BEAVERTIMEMIN)
 				newAmnt = BEAVERTIMEMIN;
 		} else {
-			if (newAmnt < GAMETIMEMIN)
-				newAmnt = GAMETIMEMIN;
+			newAmnt = MAX<int>(newAmnt, GAMETIMEMIN);
 		}
 		break;
 	case SB_LINERIGHT:
diff --git a/engines/bagel/hodjnpodj/life/grid.cpp b/engines/bagel/hodjnpodj/life/grid.cpp
index d03c74c86f2..62d0417e26f 100644
--- a/engines/bagel/hodjnpodj/life/grid.cpp
+++ b/engines/bagel/hodjnpodj/life/grid.cpp
@@ -74,7 +74,7 @@ bool colony::operator!=(const colony& c) {
 	return !(*this == c);
 }
 
-void colony::evolve(colony clny) {
+void colony::evolve(const colony &clny) {
 	int r, c;           // for local cell check
 	int neighbors;      // # of neighbors in local area
 	int pos_r, pos_c; // will step across every part of board
diff --git a/engines/bagel/hodjnpodj/life/grid.h b/engines/bagel/hodjnpodj/life/grid.h
index a14b814630e..c7cec2d3c68 100644
--- a/engines/bagel/hodjnpodj/life/grid.h
+++ b/engines/bagel/hodjnpodj/life/grid.h
@@ -44,10 +44,12 @@ public:
 
 	//creator
 	colony(int r, int c);
+	colony(const colony &) = default;
+
 	//destroy construct
 	~colony();
 	//copy operator
-	colony &operator=(const colony& c);
+	colony &operator=(const colony &c);
 	//equality operators: assuming equal dims
 	bool operator==(const colony &c);
 	bool operator!=(const colony &c);
@@ -62,7 +64,7 @@ public:
 	int islife(int r, int c) {
 		return grid[r][c];
 	};
-	void evolve(colony c);
+	void evolve(const colony &c);
 	void flip(int r, int c);
 	//void print();
 public:
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlmve.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtlmve.cpp
index 7e6f32e7f13..096d21f432c 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlmve.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlmve.cpp
@@ -1581,7 +1581,7 @@ bool CGtlData::InitInterface(int iCode, bool & bExitDll)
 					            m_xpCurXodj->m_pGenStore,
 					            ENC_NARRATION, m_xpCurXodj->m_iFurlongs,
 					            nPSector, nOSector,
-					            m_xpCurXodj->m_bHodj ? lpMetaGameStruct->m_bTraps : lpMetaGameStruct->m_bTraps);
+					            lpMetaGameStruct->m_bTraps);
 				}
 			}