[Scummvm-git-logs] scummvm master -> 6c543ea22f213b576761d50ba109d799c8da4568

[mduggan]

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:
6c543ea22f DGDS: Fix variable shadow warning


Commit: 6c543ea22f213b576761d50ba109d799c8da4568
    https://github.com/scummvm/scummvm/commit/6c543ea22f213b576761d50ba109d799c8da4568
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2024-07-10T08:52:23+10:00

Commit Message:
DGDS: Fix variable shadow warning

Changed paths:
    engines/dgds/scene.cpp


diff --git a/engines/dgds/scene.cpp b/engines/dgds/scene.cpp
index f17bb21cae0..292c694c91d 100644
--- a/engines/dgds/scene.cpp
+++ b/engines/dgds/scene.cpp
@@ -770,9 +770,9 @@ bool Scene::runBeamishOp(const SceneOp &op) {
 	DgdsEngine *engine = static_cast<DgdsEngine *>(g_engine);
 	if (op._opCode & 0x8000) {
 		uint16 opcode = op._opCode & 0x7fff;
-		for (const ConditionalSceneOp &op : _conditionalOps) {
-			if (op._opCode == opcode && checkConditions(op._conditionList)) {
-				if (!runOps(op._opList))
+		for (const ConditionalSceneOp &cop : _conditionalOps) {
+			if (cop._opCode == opcode && checkConditions(cop._conditionList)) {
+				if (!runOps(cop._opList))
 					return false;
 			}
 		}
@@ -951,7 +951,6 @@ bool SDSScene::parse(Common::SeekableReadStream *stream) {
 	}
 	if (isVersionOver(" 1.223")) {
 		readConditionalSceneOpList(stream, _conditionalOps);
-		warning("TODO: SDSScene::parse read another list here for version %s", _version.c_str());
 	}
 
 	return !stream->err();