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

[aquadran]

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:
c3ff8c12f7 WINTERMUTE: Cleanup


Commit: c3ff8c12f735f03934bf10f5cba6504a491cf1e0
    https://github.com/scummvm/scummvm/commit/c3ff8c12f735f03934bf10f5cba6504a491cf1e0
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2025-08-10T20:57:18+02:00

Commit Message:
WINTERMUTE: Cleanup

Changed paths:
    engines/wintermute/ad/ad_scene.cpp


diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
index 97317f887ff..03f34875923 100644
--- a/engines/wintermute/ad/ad_scene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -359,7 +359,7 @@ uint32 AdScene::getAlphaAt(int x, int y, bool colorCheck) {
 	}
 
 	if (_mainLayer) {
-		for (int i = _mainLayer->_nodes.getSize() - 1; i >= 0; i--) {
+		for (int32 i = (int32)_mainLayer->_nodes.getSize() - 1; i >= 0; i--) {
 			AdSceneNode *node = _mainLayer->_nodes[i];
 			if (node->_type == OBJECT_REGION && node->_region->_active && (colorCheck || !node->_region->isBlocked()) && node->_region->pointInRegion(x, y)) {
 				if (!node->_region->isBlocked()) {
@@ -2966,7 +2966,7 @@ bool AdScene::sortRotLevels() {
 	bool changed;
 	do {
 		changed = false;
-		for (uint32 i = 0; i < _rotLevels.getSize() - 1; i++) {
+		for (int32 i = 0; i < (int32)_rotLevels.getSize() - 1; i++) {
 			if (_rotLevels[i]->_posX > _rotLevels[i + 1]->_posX) {
 				AdRotLevel *rl = _rotLevels[i];
 				_rotLevels[i] = _rotLevels[i + 1];
@@ -2983,14 +2983,14 @@ bool AdScene::sortRotLevels() {
 
 
 //////////////////////////////////////////////////////////////////////////
-float AdScene::getScaleAt(int Y) {
+float AdScene::getScaleAt(int y) {
 	AdScaleLevel *prev = nullptr;
 	AdScaleLevel *next = nullptr;
 
 	for (uint32 i = 0; i < _scaleLevels.getSize(); i++) {
 		/* AdScaleLevel *xxx = _scaleLevels[i];*/
 		/* int j = _scaleLevels.size(); */
-		if (_scaleLevels[i]->_posY < Y) {
+		if (_scaleLevels[i]->_posY < y) {
 			prev = _scaleLevels[i];
 		} else {
 			next = _scaleLevels[i];
@@ -3004,9 +3004,9 @@ float AdScene::getScaleAt(int Y) {
 
 	int delta_y = next->_posY - prev->_posY;
 	float delta_scale = next->getScale() - prev->getScale();
-	Y -= prev->_posY;
+	y -= prev->_posY;
 
-	float percent = (float)Y / ((float)delta_y / 100.0f);
+	float percent = (float)y / ((float)delta_y / 100.0f);
 	return prev->getScale() + delta_scale / 100 * percent;
 }
 
@@ -3617,7 +3617,7 @@ BaseObject *AdScene::getNextAccessObject(BaseObject *currObject) {
 		if (currObject != nullptr) {
 			for (uint32 i = 0; i < objects.getSize(); i++) {
 				if (objects[i] == currObject) {
-					if (i < objects.getSize() - 1) {
+					if (i < (int32)objects.getSize() - 1) {
 						return objects[i + 1];
 					} else {
 						break;
@@ -3639,7 +3639,7 @@ BaseObject *AdScene::getPrevAccessObject(BaseObject *currObject) {
 		return nullptr;
 	} else {
 		if (currObject != nullptr) {
-			for (int i = objects.getSize() - 1; i >= 0; i--) {
+			for (int32 i = (int32)objects.getSize() - 1; i >= 0; i--) {
 				if (objects[i] == currObject) {
 					if (i > 0) {
 						return objects[i - 1];