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

[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:
80d5645661 DIRECTOR: Fixed action cross reference check
322e014f39 DIRECTOR: LINGO: Fix immediate scripts execution for D2-D4
f48ab6afb8 JANITORIAL: Fix indentation


Commit: 80d564566149b2ae5731bdfcea69b04f3d69ff86
    https://github.com/scummvm/scummvm/commit/80d564566149b2ae5731bdfcea69b04f3d69ff86
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-05-03T19:09:28+02:00

Commit Message:
DIRECTOR: Fixed action cross reference check

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index c18c9f1124..d526180522 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -1090,6 +1090,11 @@ void Score::loadActions(Common::SeekableSubReadStreamEndian &stream) {
 	for (uint i = 0; i < _frames.size(); i++) {
 		if (_frames[i]->_actionId <= _actions.size())
 			scriptRefs[_frames[i]->_actionId] = true;
+
+		for (uint16 j = 0; j <= _frames[i]->_numChannels; j++) {
+			if (_frames[i]->_sprites[j]->_scriptId <= _actions.size())
+				scriptRefs[_frames[i]->_sprites[j]->_scriptId] = true;
+		}
 	}
 
 	Common::HashMap<uint16, Common::String>::iterator j;
@@ -1102,7 +1107,7 @@ void Score::loadActions(Common::SeekableSubReadStreamEndian &stream) {
 
 	for (j = _actions.begin(); j != _actions.end(); ++j) {
 		if (!scriptRefs[j->_key]) {
-			warning("Action id %d is not referenced, skipping, the code was:\n-----\n%s\n------", j->_key, j->_value.c_str());
+			warning("Action id %d is not referenced, the code is:\n-----\n%s\n------", j->_key, j->_value.c_str());
 			// continue;
 		}
 		if (!j->_value.empty()) {


Commit: 322e014f39ca381a9f493cfcc73364ac7a99ee9a
    https://github.com/scummvm/scummvm/commit/322e014f39ca381a9f493cfcc73364ac7a99ee9a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-05-03T19:09:28+02:00

Commit Message:
DIRECTOR: LINGO: Fix immediate scripts execution for D2-D4

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


diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index 3ab31be45c..477589810c 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -691,7 +691,12 @@ void Lingo::runTests() {
 void Lingo::executeImmediateScripts(Frame *frame) {
 	for (uint16 i = 0; i <= _vm->getCurrentScore()->_numChannelsDisplayed; i++) {
 		if (_vm->getCurrentScore()->_immediateActions.contains(frame->_sprites[i]->_scriptId)) {
-			g_lingo->processEvent(kEventMouseUp, kFrameScript, frame->_sprites[i]->_scriptId);
+			// From D5 only explicit event handlers are processed
+			// Before that you could specify commands which will be executed on mouse up
+			if (_vm->getVersion() < 5)
+				g_lingo->processEvent(kEventNone, kFrameScript, frame->_sprites[i]->_scriptId);
+			else
+				g_lingo->processEvent(kEventMouseUp, kFrameScript, frame->_sprites[i]->_scriptId);
 		}
 	}
 }


Commit: f48ab6afb8359e3f3d3140e3d78b163a01022d17
    https://github.com/scummvm/scummvm/commit/f48ab6afb8359e3f3d3140e3d78b163a01022d17
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-05-03T19:10:04+02:00

Commit Message:
JANITORIAL: Fix indentation

Changed paths:
    common/language.cpp
    common/language.h


diff --git a/common/language.cpp b/common/language.cpp
index fa6b190da8..60409a0582 100644
--- a/common/language.cpp
+++ b/common/language.cpp
@@ -59,7 +59,7 @@ const LanguageDescription g_languages[] = {
 	{    "se", "sv_SE", "Swedish", SE_SWE },
 	{    "tr", "tr_TR", "Turkish", TR_TUR },
 	{    "uk", "uk_UA", "Ukrainian", UA_UKR },
-    {    "sr", "sr_SP", "Serbian", SR_SER },
+	{    "sr", "sr_SP", "Serbian", SR_SER },
 	{ nullptr, nullptr, nullptr, UNK_LANG }
 };
 
diff --git a/common/language.h b/common/language.h
index ddea1b7219..99719f60e2 100644
--- a/common/language.h
+++ b/common/language.h
@@ -64,7 +64,7 @@ enum Language {
 	SE_SWE,
 	TR_TUR,
 	UA_UKR,
-    SR_SER,
+	SR_SER,
 
 	UNK_LANG = -1	// Use default language (i.e. none specified)
 };