[Scummvm-git-logs] scummvm master -> 30cd362f066225911b85905f813e4993e1d92e13

[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:
a9b399dae4 DIRECTOR: Set the inital behavior properties
30cd362f06 ACCESS: Fix warnings


Commit: a9b399dae4c5c9ba8307ee8dcc77ae9dc871c33e
    https://github.com/scummvm/scummvm/commit/a9b399dae4c5c9ba8307ee8dcc77ae9dc871c33e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-09-23T19:06:31+02:00

Commit Message:
DIRECTOR: Set the inital behavior properties

Now the behavior code is complete, what is left is debugging

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 b86909600c9..cb9fb07b3a8 100644
--- a/engines/director/lingo/lingo-events.cpp
+++ b/engines/director/lingo/lingo-events.cpp
@@ -732,13 +732,11 @@ void Score::createScriptInstances(int frameNum) {
 						if (sprite->_behaviors[j].initializerIndex) {
 							// Evaluate the params
 							g_lingo->push(sprite->_behaviors[j].initializerParams);
-							if (debugChannelSet(2, kDebugLingoExec)) {
-								g_lingo->printStack("Stack before:", 0);
-							}
 							LB::b_value(1);
+							g_lingo->execute();
 
-							if (debugChannelSet(2, kDebugLingoExec)) {
-								g_lingo->printStack("Stack after", 0);
+							if (debugChannelSet(5, kDebugLingoExec)) {
+								g_lingo->printStack("  Parsed behavior parameters: ", 0);
 							}
 
 							if (g_lingo->_state->stack.size() == 0) {
@@ -754,6 +752,15 @@ void Score::createScriptInstances(int frameNum) {
 									sprite->_behaviors[j].initializerParams.c_str(), sprite->_behaviors[j].toString().c_str(), i + 1);
 								continue;
 							}
+
+							debugC(2, kDebugLingoExec, "   Setting %d properties", proplist.u.parr->arr.size());
+
+							for (uint k = 0; k < proplist.u.parr->arr.size(); k++) {
+								Datum key = proplist.u.parr->arr[k].p;
+								Datum val = proplist.u.parr->arr[k].v;
+
+								channel->_scriptInstanceList[j].u.obj->setProp(key.asString(), val);
+							}
 						}
 					}
 				}


Commit: 30cd362f066225911b85905f813e4993e1d92e13
    https://github.com/scummvm/scummvm/commit/30cd362f066225911b85905f813e4993e1d92e13
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-09-23T19:08:47+02:00

Commit Message:
ACCESS: Fix warnings

Changed paths:
    engines/access/martian/martian_resources.cpp


diff --git a/engines/access/martian/martian_resources.cpp b/engines/access/martian/martian_resources.cpp
index 2be75baacb7..15fa3865df7 100644
--- a/engines/access/martian/martian_resources.cpp
+++ b/engines/access/martian/martian_resources.cpp
@@ -584,63 +584,63 @@ static const uint16 DUCT_SHAPE_16_DATA[] = {
 };
 
 static const DuctShape DUCT_SHAPE_0[] = {
-	16, 8, DUCT_SHAPE_0_POINTS, DUCT_SHAPE_0_DATA
+	{ 16, 8, DUCT_SHAPE_0_POINTS, DUCT_SHAPE_0_DATA }
 };
 
 static const DuctShape DUCT_SHAPE_1[] = {
-	16, 8, DUCT_SHAPE_1_POINTS, DUCT_SHAPE_1_DATA
+	{ 16, 8, DUCT_SHAPE_1_POINTS, DUCT_SHAPE_1_DATA }
 };
 
 static const DuctShape DUCT_SHAPE_2[] = {
-	36, 23, DUCT_SHAPE_2_POINTS, DUCT_SHAPE_2_DATA
+	{ 36, 23, DUCT_SHAPE_2_POINTS, DUCT_SHAPE_2_DATA }
 };
 
 static const DuctShape DUCT_SHAPE_3[] = {
-	36, 23, DUCT_SHAPE_3_POINTS, DUCT_SHAPE_3_DATA
+	{ 36, 23, DUCT_SHAPE_3_POINTS, DUCT_SHAPE_3_DATA }
 };
 
 static const DuctShape DUCT_SHAPE_4[] = {
-	36, 23, DUCT_SHAPE_4_POINTS, DUCT_SHAPE_4_DATA
+	{ 36, 23, DUCT_SHAPE_4_POINTS, DUCT_SHAPE_4_DATA }
 };
 
 static const DuctShape DUCT_SHAPE_5_6[] = {
-	36, 23, DUCT_SHAPE_5_6_POINTS, DUCT_SHAPE_5_6_DATA
+	{ 36, 23, DUCT_SHAPE_5_6_POINTS, DUCT_SHAPE_5_6_DATA }
 };
 
 static const DuctShape DUCT_SHAPE_7[] = {
-	16, 8, DUCT_SHAPE_7_POINTS, DUCT_SHAPE_7_DATA
+	{ 16, 8, DUCT_SHAPE_7_POINTS, DUCT_SHAPE_7_DATA }
 };
 
 static const DuctShape DUCT_SHAPE_8_9[] = {
-	16, 8, DUCT_SHAPE_8_9_POINTS, DUCT_SHAPE_8_9_DATA
+	{ 16, 8, DUCT_SHAPE_8_9_POINTS, DUCT_SHAPE_8_9_DATA }
 };
 
 static const DuctShape DUCT_SHAPE_10[] = {
-	8, 4, DUCT_SHAPE_10_POINTS, DUCT_SHAPE_10_DATA
+	{ 8, 4, DUCT_SHAPE_10_POINTS, DUCT_SHAPE_10_DATA }
 };
 
 static const DuctShape DUCT_SHAPE_11[] = {
-	8, 4, DUCT_SHAPE_11_POINTS, DUCT_SHAPE_11_DATA
+	{ 8, 4, DUCT_SHAPE_11_POINTS, DUCT_SHAPE_11_DATA }
 };
 
 static const DuctShape DUCT_SHAPE_12[] = {
-	4, 1, DUCT_SHAPE_12_POINTS, DUCT_SHAPE_12_DATA
+	{ 4, 1, DUCT_SHAPE_12_POINTS, DUCT_SHAPE_12_DATA }
 };
 
 static const DuctShape DUCT_SHAPE_13[] = {
-	4, 1, DUCT_SHAPE_13_POINTS, DUCT_SHAPE_13_DATA
+	{ 4, 1, DUCT_SHAPE_13_POINTS, DUCT_SHAPE_13_DATA }
 };
 
 static const DuctShape DUCT_SHAPE_14[] = {
-	8, 2, DUCT_SHAPE_14_POINTS, DUCT_SHAPE_14_DATA
+	{ 8, 2, DUCT_SHAPE_14_POINTS, DUCT_SHAPE_14_DATA }
 };
 
 static const DuctShape DUCT_SHAPE_15[] = {
-	8, 4, DUCT_SHAPE_15_POINTS, DUCT_SHAPE_15_DATA
+	{ 8, 4, DUCT_SHAPE_15_POINTS, DUCT_SHAPE_15_DATA }
 };
 
 static const DuctShape DUCT_SHAPE_16[] = {
-	8, 4, DUCT_SHAPE_16_POINTS, DUCT_SHAPE_16_DATA
+	{ 8, 4, DUCT_SHAPE_16_POINTS, DUCT_SHAPE_16_DATA }
 };