[Scummvm-git-logs] scummvm master -> 77706c3c9bc008c5fa4ea2655ac47f394ef770ff

aquadran noreply at scummvm.org
Sun Jul 13 16:40:07 UTC 2025


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:
77706c3c9b WINTERMUTE: Fixed previous commit build.


Commit: 77706c3c9bc008c5fa4ea2655ac47f394ef770ff
    https://github.com/scummvm/scummvm/commit/77706c3c9bc008c5fa4ea2655ac47f394ef770ff
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2025-07-13T18:40:02+02:00

Commit Message:
WINTERMUTE: Fixed previous commit build.

Changed paths:
    engines/wintermute/ad/ad_actor.cpp
    engines/wintermute/ad/ad_entity.cpp
    engines/wintermute/ad/ad_talk_holder.cpp


diff --git a/engines/wintermute/ad/ad_actor.cpp b/engines/wintermute/ad/ad_actor.cpp
index 27fe37e4a49..ef995d42b33 100644
--- a/engines/wintermute/ad/ad_actor.cpp
+++ b/engines/wintermute/ad/ad_actor.cpp
@@ -1055,7 +1055,7 @@ bool AdActor::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
 			if (anim != nullptr) {
 				BaseSprite *item = anim->getSprite((TDirection)dir);
 				if (item != nullptr) {
-					for (uint32 i = 0; i < item->_frames.size(); i++) {
+					for (uint32 i = 0; i < item->_frames.getSize(); i++) {
 						BaseFrame *frame = item->_frames[i];
 						if (frame != nullptr) {
 							frame->_delay = speedWalk;
diff --git a/engines/wintermute/ad/ad_entity.cpp b/engines/wintermute/ad/ad_entity.cpp
index 1859f0b32f1..06678f31ddb 100644
--- a/engines/wintermute/ad/ad_entity.cpp
+++ b/engines/wintermute/ad/ad_entity.cpp
@@ -860,12 +860,12 @@ bool AdEntity::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
 			return STATUS_OK;
 		}
 
-		for (uint32 i = 0; i < ((AdGame *)_gameRef)->_scene->_layers.size(); i++) {
+		for (uint32 i = 0; i < ((AdGame *)_gameRef)->_scene->_layers.getSize(); i++) {
 			AdLayer *layer = ((AdGame *)_gameRef)->_scene->_layers[i];
-			for (uint32 j = 0; j < layer->_nodes.size(); j++) {
+			for (uint32 j = 0; j < layer->_nodes.getSize(); j++) {
 				if (layer->_nodes[j]->_type == OBJECT_ENTITY && this == layer->_nodes[j]->_entity) {
 					// found source layer and index, looking for target node
-					for (uint32 k = 0; k < layer->_nodes.size(); k++) {
+					for (uint32 k = 0; k < layer->_nodes.getSize(); k++) {
 						if (layer->_nodes[k]->_type == OBJECT_ENTITY && strcmp(layer->_nodes[k]->_entity->getName(), nodeName) == 0) {
 							// update target index, depending on method name and comparison of index values
 							if (j < k && strcmp(name, "SetBeforeEntity") == 0) {
@@ -903,9 +903,9 @@ bool AdEntity::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
 	else if (strcmp(name, "GetLayer") == 0 || strcmp(name, "GetIndex") == 0) {
 		stack->correctParams(0);
 
-		for (uint32 i = 0; i < ((AdGame *)_gameRef)->_scene->_layers.size(); i++) {
+		for (uint32 i = 0; i < ((AdGame *)_gameRef)->_scene->_layers.getSize(); i++) {
 			AdLayer *layer = ((AdGame *)_gameRef)->_scene->_layers[i];
-			for (uint32 j = 0; j < layer->_nodes.size(); j++) {
+			for (uint32 j = 0; j < layer->_nodes.getSize(); j++) {
 				if (layer->_nodes[j]->_type == OBJECT_ENTITY && this == layer->_nodes[j]->_entity) {
 					if (strcmp(name, "GetLayer") == 0) {
 						stack->pushNative(layer, true);
diff --git a/engines/wintermute/ad/ad_talk_holder.cpp b/engines/wintermute/ad/ad_talk_holder.cpp
index c4a49c3a570..400e783c734 100644
--- a/engines/wintermute/ad/ad_talk_holder.cpp
+++ b/engines/wintermute/ad/ad_talk_holder.cpp
@@ -254,7 +254,7 @@ bool AdTalkHolder::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisS
 		BaseScriptable *arr;
 		stack->pushInt(0);
 		arr = makeSXArray(_gameRef, stack);
-		for (uint32 i = 0; i < sprites.size(); i++) {
+		for (uint32 i = 0; i < sprites.getSize(); i++) {
 			stack->pushString(sprites[i]->getFilename());
 			((SXArray *)arr)->push(stack->pop());
 		}




More information about the Scummvm-git-logs mailing list