[Scummvm-git-logs] scummvm master -> 02bdad4e35a1aa0a2bd264ca9a55a001b447ceaa

[sev-]

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

Summary:
1a766b7b62 DIRECTOR: LINGO: Hid some VOID variable warnings into debug "lingoexec"
ab2362f796 DIRECTOR: LINGO: Do not recreate Text widgets when their properties are changed
02bdad4e35 DIRECTOR: mciwait is actually D3.1+


Commit: 1a766b7b62626d5e8baaceed563364300dc23bf6
    https://github.com/scummvm/scummvm/commit/1a766b7b62626d5e8baaceed563364300dc23bf6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-02-17T13:37:51+01:00

Commit Message:
DIRECTOR: LINGO: Hid some VOID variable warnings into debug "lingoexec"

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


diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index cb6d7794e26..9af2bd5dd73 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -1575,7 +1575,7 @@ Datum Lingo::varFetch(const Datum &var, bool silent) {
 			}
 
 			if (!silent)
-				warning("varFetch: variable %s not found", name.c_str());
+				debugC(1, kDebugLingoExec, "varFetch: variable %s not found", name.c_str());
 			return result;
 		}
 		break;
@@ -1586,7 +1586,7 @@ Datum Lingo::varFetch(const Datum &var, bool silent) {
 			if (_globalvars.contains(name)) {
 				return _globalvars[name];
 			}
-			warning("varFetch: global variable %s not defined", name.c_str());
+			debugC(1, kDebugLingoExec, "varFetch: global variable %s not defined", name.c_str());
 			return result;
 		}
 		break;
@@ -1597,7 +1597,7 @@ Datum Lingo::varFetch(const Datum &var, bool silent) {
 			if (_state->localVars && _state->localVars->contains(name)) {
 				return (*_state->localVars)[name];
 			}
-			warning("varFetch: local variable %s not defined", name.c_str());
+			debugC(1, kDebugLingoExec, "varFetch: local variable %s not defined", name.c_str());
 			return result;
 		}
 		break;


Commit: ab2362f796175313c85821b71854a0286a693691
    https://github.com/scummvm/scummvm/commit/ab2362f796175313c85821b71854a0286a693691
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-02-17T13:37:51+01:00

Commit Message:
DIRECTOR: LINGO: Do not recreate Text widgets when their properties are changed

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


diff --git a/engines/director/lingo/lingo-object.cpp b/engines/director/lingo/lingo-object.cpp
index 25f270a2464..f6cc62d6be6 100644
--- a/engines/director/lingo/lingo-object.cpp
+++ b/engines/director/lingo/lingo-object.cpp
@@ -1072,7 +1072,8 @@ bool TextCastMember::setField(int field, const Datum &d) {
 		}
 		if (toEdit) {
 			Common::Rect bbox = toEdit->getBbox();
-			toEdit->_widget = createWidget(bbox, toEdit, toEdit->_sprite->_spriteType);
+			if (!toEdit->_widget)
+				toEdit->_widget = createWidget(bbox, toEdit, toEdit->_sprite->_spriteType);
 		}
 	}
 
@@ -1128,8 +1129,6 @@ bool TextCastMember::setField(int field, const Datum &d) {
 		((Graphics::MacText *)toEdit->_widget)->enforceTextFont((uint16) g_director->_wm->_fontMan->getFontIdByName(d.asString()));
 		_ptext = ((Graphics::MacText *)toEdit->_widget)->getPlainText();
 		_ftext = ((Graphics::MacText *)toEdit->_widget)->getTextChunk(0, 0, -1, -1, true);
-		_modified = true;
-		toEdit->_widget->removeWidget(_widget);
 		return true;
 	case kTheTextHeight:
 		_lineSpacing = d.asInt();
@@ -1143,8 +1142,6 @@ bool TextCastMember::setField(int field, const Datum &d) {
 		((Graphics::MacText *)toEdit->_widget)->setTextSize(d.asInt());
 		_ptext = ((Graphics::MacText *)toEdit->_widget)->getPlainText();
 		_ftext = ((Graphics::MacText *)toEdit->_widget)->getTextChunk(0, 0, -1, -1, true);
-		_modified = true;
-		toEdit->_widget->removeWidget(_widget);
 		return true;
 	case kTheTextStyle:
 		if (!toEdit) {
@@ -1157,8 +1154,6 @@ bool TextCastMember::setField(int field, const Datum &d) {
 		}
 		_ptext = ((Graphics::MacText *)toEdit->_widget)->getPlainText();
 		_ftext = ((Graphics::MacText *)toEdit->_widget)->getTextChunk(0, 0, -1, -1, true);
-		_modified = true;
-		toEdit->_widget->removeWidget(_widget);
 		return true;
 	default:
 		break;


Commit: 02bdad4e35a1aa0a2bd264ca9a55a001b447ceaa
    https://github.com/scummvm/scummvm/commit/02bdad4e35a1aa0a2bd264ca9a55a001b447ceaa
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-02-17T13:37:51+01:00

Commit Message:
DIRECTOR: mciwait is actually D3.1+

Used in msworks

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


diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index eba024306a3..0b93d56f72e 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -201,7 +201,7 @@ static BuiltinProto builtins[] = {
 	// Sound
 	{ "beep",	 		LB::b_beep,			0, 1, 200, CBLTIN },	// D2
 	{ "mci",	 		LB::b_mci,			1, 1, 300, CBLTIN },	//		D3.1 c
-	{ "mciwait",		LB::b_mciwait,		1, 1, 400, CBLTIN },	//			D4 c
+	{ "mciwait",		LB::b_mciwait,		1, 1, 300, CBLTIN },	//		D3.1 c
 	{ "sound",			LB::b_sound,		2, 3, 300, CBLTIN },	//		D3 c
 	{ "soundBusy",		LB::b_soundBusy,	1, 1, 300, FBLTIN },	//		D3 f
 	// Constants