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

[sev-]

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

Summary:
a61245cca7 JANITORIAL: DIRECTOR: use uint for loop variables
f9ab6963f0 JANITORIAL: DIRECTOR: rename variables to avoid shadowing


Commit: a61245cca7be8fbd5327379ef48c303f58629688
    https://github.com/scummvm/scummvm/commit/a61245cca7be8fbd5327379ef48c303f58629688
Author: Michael (michael_kuerbis at web.de)
Date: 2025-09-28T22:26:22+02:00

Commit Message:
JANITORIAL: DIRECTOR: use uint for loop variables

Changed paths:
    engines/director/lingo/lingo-builtins.cpp
    engines/director/lingo/lingo-events.cpp


diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index 141460e5922..a830f0a0ea9 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -1677,7 +1677,7 @@ void LB::b_xtra(int nargs) {
 		}
 	} else {
 		Common::String name = d.asString();
-		for (int i = 0; i < g_lingo->_openXtras.size(); i++) {
+		for (uint i = 0; i < g_lingo->_openXtras.size(); i++) {
 			if (name.equalsIgnoreCase(g_lingo->_openXtras[i])) {
 				Datum var = g_lingo->_openXtraObjects[i];
 				g_lingo->push(var);
diff --git a/engines/director/lingo/lingo-events.cpp b/engines/director/lingo/lingo-events.cpp
index b06882f2a88..b997c88e99b 100644
--- a/engines/director/lingo/lingo-events.cpp
+++ b/engines/director/lingo/lingo-events.cpp
@@ -544,7 +544,7 @@ void Movie::queueEvent(Common::Queue<LingoEvent> &queue, LEvent event, int targe
 						// Generate event for each behavior, and pass through for all but the last one.
 						// This is to allow multiple behaviors on a single sprite to each have a
 						// chance to handle the event.
-						for (int i = 0; i < sprite->_behaviors.size(); i++) {
+						for (uint i = 0; i < sprite->_behaviors.size(); i++) {
 							bool passThrough = (i != sprite->_behaviors.size() - 1);
 							queue.push(LingoEvent(event, eventId, kSpriteHandler, passThrough, pos, channelId, i));
 						}
@@ -611,7 +611,7 @@ void Movie::processEvent(LEvent event, int targetId) {
 void Movie::broadcastEvent(LEvent event) {
 	Common::Queue<LingoEvent> queue;
 
-	for (int i = 1; i < _score->_channels.size(); i++) {
+	for (uint i = 1; i < _score->_channels.size(); i++) {
 		if (_score->_channels[i] && _score->_channels[i]->_sprite && _score->_channels[i]->_sprite->_behaviors.size()) {
 			queueEvent(queue, event, i);
 		}


Commit: f9ab6963f082c1c3a46b56708e45d9e85f760622
    https://github.com/scummvm/scummvm/commit/f9ab6963f082c1c3a46b56708e45d9e85f760622
Author: Michael (michael_kuerbis at web.de)
Date: 2025-09-28T22:26:22+02:00

Commit Message:
JANITORIAL: DIRECTOR: rename variables to avoid shadowing

Changed paths:
    engines/director/lingo/lingo-events.cpp


diff --git a/engines/director/lingo/lingo-events.cpp b/engines/director/lingo/lingo-events.cpp
index b997c88e99b..96930947124 100644
--- a/engines/director/lingo/lingo-events.cpp
+++ b/engines/director/lingo/lingo-events.cpp
@@ -774,9 +774,9 @@ Datum Score::createScriptInstance(BehaviorElement *behavior) {
 	// Instantiate the behavior
 	g_lingo->push(_movie->getScriptContext(kScoreScript, behavior->memberID));
 	LC::call("new", 1, true);
-	Datum inst = g_lingo->pop();
+	Datum instance = g_lingo->pop();
 
-	if (inst.type != OBJECT) {
+	if (instance.type != OBJECT) {
 		warning("Score::createScriptInstance(): Could not instantiate behavior %s", behavior->toString().c_str());
 		return Datum();
 	}
@@ -785,7 +785,7 @@ Datum Score::createScriptInstance(BehaviorElement *behavior) {
 
 	// No initializer, we are done
 	if (behavior->initializerIndex == 0)
-		return inst;
+		return instance;
 
 	// Evaluate the params
 	g_lingo->push(behavior->initializerParams);
@@ -799,7 +799,7 @@ Datum Score::createScriptInstance(BehaviorElement *behavior) {
 	if (g_lingo->_state->stack.size() == 0) {
 		warning("Score::createScriptInstance(): Could not evaluate initializer params '%s' for behavior %s",
 			behavior->initializerParams.c_str(), behavior->toString().c_str());
-		return inst;
+		return instance;
 	}
 
 	Datum proplist = _lingo->pop();
@@ -807,7 +807,7 @@ Datum Score::createScriptInstance(BehaviorElement *behavior) {
 	if (proplist.type != PARRAY) {
 		warning("Score::createScriptInstance(): Could not evaluate initializer params '%s' for behavior %s",
 			behavior->initializerParams.c_str(), behavior->toString().c_str());
-		return inst;
+		return instance;
 	}
 
 	debugC(2, kDebugLingoExec, "   Setting %d properties", proplist.u.parr->arr.size());
@@ -816,10 +816,10 @@ Datum Score::createScriptInstance(BehaviorElement *behavior) {
 		Datum key = proplist.u.parr->arr[k].p;
 		Datum val = proplist.u.parr->arr[k].v;
 
-		inst.u.obj->setProp(key.asString(), val);
+		instance.u.obj->setProp(key.asString(), val);
 	}
 
-	return inst;
+	return instance;
 }
 
 
@@ -861,14 +861,14 @@ void Score::createScriptInstances(int frameNum) {
 			i + 1, sprite->_behaviors.size(), channel->_startFrame, channel->_endFrame);
 
 		for (uint j = 0; j < sprite->_behaviors.size(); j++) {
-			Datum inst = createScriptInstance(&sprite->_behaviors[j]);
+			Datum instance = createScriptInstance(&sprite->_behaviors[j]);
 
-			if (inst.type != OBJECT) {
+			if (instance.type != OBJECT) {
 				warning("Score::createScriptInstances(): Could not instantiate behavior %s", sprite->_behaviors[j].toString().c_str());
 				continue;
 			}
 
-			channel->_scriptInstanceList.push_back(inst);
+			channel->_scriptInstanceList.push_back(instance);
 		}
 
 		bool prevDis = _disableGoPlayUpdateStage;