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

[orgads]

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:
fc71b779a5 ALG: Fix GCC warnings on release build


Commit: fc71b779a5ab084886deebcaaf23586d320e4948
    https://github.com/scummvm/scummvm/commit/fc71b779a5ab084886deebcaaf23586d320e4948
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2025-05-15T10:32:16+03:00

Commit Message:
ALG: Fix GCC warnings on release build

* Fix Signed/unsigned comparison warnings
* Suppress false strinop-overflow warnings, since _numPlayers is either
  1 or 2, so no real overflow occurs.

Changed paths:
    engines/alg/logic/game_bountyhunter.cpp


diff --git a/engines/alg/logic/game_bountyhunter.cpp b/engines/alg/logic/game_bountyhunter.cpp
index 106c2c37d62..dabb5a1fa8d 100644
--- a/engines/alg/logic/game_bountyhunter.cpp
+++ b/engines/alg/logic/game_bountyhunter.cpp
@@ -30,6 +30,10 @@
 #include "alg/logic/game_bountyhunter.h"
 #include "alg/scene.h"
 
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic ignored "-Wstringop-overflow"
+#endif
+
 namespace Alg {
 
 GameBountyHunter::GameBountyHunter(AlgEngine *vm, const AlgGameDescription *gd) : Game(vm) {
@@ -661,6 +665,7 @@ bool GameBountyHunter::loadState() {
 	}
 	_unk_2ADA6 = inSaveFile->readByte();
 	_numPlayers = inSaveFile->readByte();
+	assert(_numPlayers <= 2);
 	delete inSaveFile;
 	_gameInProgress = true;
 	return true;
@@ -776,7 +781,7 @@ uint16 GameBountyHunter::timeForGunfight() {
 
 void GameBountyHunter::waitingForShootout(uint32 drawFrame) {
 	if (drawFrame != 0) {
-		for (int i = 0; i < _numPlayers; i++) {
+		for (uint i = 0; i < _numPlayers; i++) {
 			_firstDrawFrame = drawFrame;
 			_playerShots[i] = 0;
 			_playerGun[i] = 0;
@@ -1023,7 +1028,7 @@ void GameBountyHunter::sceneNxtscnLoseALife(Scene *scene) {
 	uint16 picked = 0;
 	int deadPlayerCount = 0;
 	(void)scene;
-	for (int i = 0; i < _numPlayers; i++) {
+	for (uint i = 0; i < _numPlayers; i++) {
 		_playerLives[i]--;
 		displayLivesLeft(i);
 		if (_playerLives[i] <= 0) {
@@ -1268,7 +1273,7 @@ void GameBountyHunter::sceneNxtscnDiedRefed(Scene *scene) {
 	uint16 picked = 0;
 	uint8 deadCount = 0;
 	(void)scene;
-	for (int i = 0; i < _numPlayers; i++) {
+	for (uint i = 0; i < _numPlayers; i++) {
 		_playerLives[i]--;
 		displayLivesLeft(i);
 		if (_playerLives[i] <= 0) {
@@ -1287,7 +1292,7 @@ void GameBountyHunter::sceneNxtscnDiedRefed(Scene *scene) {
 
 void GameBountyHunter::sceneNxtscnGiveShotgun(Scene *scene) {
 	(void)scene;
-	for (int i = 0; i < _numPlayers; i++) {
+	for (uint i = 0; i < _numPlayers; i++) {
 		_playerShots[i] = 5;
 		_playerGun[i] = 2;
 		displayShotsLeft(i);