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

[mduggan]

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:
1e4dc608ff TETRAEDGE: Remove redundant loop variable. PVS-Studio V654
c7d6a536cd TETRAEDGE: Fix crash on Syberia 2 detection


Commit: 1e4dc608ff9b3e924a79fe3a7e218c013b93a884
    https://github.com/scummvm/scummvm/commit/1e4dc608ff9b3e924a79fe3a7e218c013b93a884
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2023-03-14T09:28:10+09:00

Commit Message:
TETRAEDGE: Remove redundant loop variable. PVS-Studio V654

Changed paths:
    engines/tetraedge/game/inventory.cpp


diff --git a/engines/tetraedge/game/inventory.cpp b/engines/tetraedge/game/inventory.cpp
index fec7800fe42..bf682817226 100644
--- a/engines/tetraedge/game/inventory.cpp
+++ b/engines/tetraedge/game/inventory.cpp
@@ -364,8 +364,7 @@ void Inventory::removeObject(const Common::String &name) {
 	// Take a copy of the name to be sure as we will be deleting the object
 	const Common::String objname = name;
 	int pageNo = 0;
-	bool finished = false;
-	while (!finished) {
+	while (true) {
 		TeLayout *page = _gui.layout(Common::String::format("page%d", pageNo));
 		if (!page)
 			break;


Commit: c7d6a536cdf25aad123cc100a4967ae878aeb3d1
    https://github.com/scummvm/scummvm/commit/c7d6a536cdf25aad123cc100a4967ae878aeb3d1
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2023-03-14T09:28:31+09:00

Commit Message:
TETRAEDGE: Fix crash on Syberia 2 detection

Changed paths:
    engines/tetraedge/detection.cpp


diff --git a/engines/tetraedge/detection.cpp b/engines/tetraedge/detection.cpp
index 3f71c8d35e0..e72aa1336b2 100644
--- a/engines/tetraedge/detection.cpp
+++ b/engines/tetraedge/detection.cpp
@@ -56,13 +56,11 @@ DetectedGame TetraedgeMetaEngineDetection::toDetectedGame(const ADDetectedGame &
 	// The AdvancedDetector model only allows specifying a single supported
 	// game language. Both games support multiple languages
 	if (game.gameId == "syberia" || game.gameId == "syberia2") {
-		const Common::Language *language = getGameLanguages();
-		while (*language != Common::UNK_LANG) {
+		for (const Common::Language *language = getGameLanguages(); *language != Common::UNK_LANG; language++) {
 			// "ru" only present on syberia 1
 			if (game.gameId == "syberia2" && *language == Common::RU_RUS)
 				continue;
 			game.appendGUIOptions(Common::getGameGUIOptionsDescriptionLanguage(*language));
-			language++;
 		}
 	}