[Scummvm-git-logs] scummvm master -> 36da64cec064df689fb1d3a44286618fd1eb37a6

[sev-]

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

Summary:
e52e41f98b DIRECTOR: Improve debug output for bad channel references
36da64cec0 DIRECTOR: LINGO: Fix the.lingo test so it does not bail out


Commit: e52e41f98bcb4e547cae77aa534bd5ce8ba56240
    https://github.com/scummvm/scummvm/commit/e52e41f98bcb4e547cae77aa534bd5ce8ba56240
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-06-06T12:23:00+02:00

Commit Message:
DIRECTOR: Improve debug output for bad channel references

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 079d8f09b1e..f315446588e 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -729,13 +729,13 @@ Sprite *Score::getOriginalSpriteById(uint16 id) {
 	Frame *frame = _frames[_currentFrame];
 	if (id < frame->_sprites.size())
 		return frame->_sprites[id];
-	warning("Score::getOriginalSpriteById(%d): out of bounds", id);
+	warning("Score::getOriginalSpriteById(%d): out of bounds, >= %d", id, frame->_sprites.size());
 	return nullptr;
 }
 
 Channel *Score::getChannelById(uint16 id) {
 	if (id >= _channels.size()) {
-		warning("Score::getChannelById(%d): out of bounds", id);
+		warning("Score::getChannelById(%d): out of bounds, >= %d", id, _channels.size());
 		return nullptr;
 	}
 


Commit: 36da64cec064df689fb1d3a44286618fd1eb37a6
    https://github.com/scummvm/scummvm/commit/36da64cec064df689fb1d3a44286618fd1eb37a6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-06-06T12:23:00+02:00

Commit Message:
DIRECTOR: LINGO: Fix the.lingo test so it does not bail out

Changed paths:
    engines/director/lingo/tests/the.lingo


diff --git a/engines/director/lingo/tests/the.lingo b/engines/director/lingo/tests/the.lingo
index 66eb0576e02..4fcac6ab288 100644
--- a/engines/director/lingo/tests/the.lingo
+++ b/engines/director/lingo/tests/the.lingo
@@ -16,7 +16,7 @@ put the long date
 
 set a = 5
 
-set gravityConst = the value of ( the text of cast 1)
+set gravityConst = the value of ( QUOTE & the text of cast 1 & QUOTE )
 set the hilite of cast 1 to (a = 3)
 set the text of cast 1 = string( gravityConst )
 
@@ -30,22 +30,25 @@ set the windowtype of BlastWindow to 5
 set the bottom of sprite 1 to originV + (the number of lines in someText) * 16
 set the bottom of sprite 1 to originV + (the number of words in someText) * 16
 
-put the number of words of field 1 into field 5
+put the number of words of field 1 into field 2
+
+set pSprite to 1
+set pChangeH to 10
 
 set h = the locH of sprite pSprite + pChangeH
 
 set the volume of sound 1 to 255
-put the volume of sound 1 into field 11
+put the volume of sound 1 into field 1
 
 set the checkMark of menuItem "Horizontal" of menu "The Ball" to False
 
-put the number of castMembers into field 5
+put the number of castMembers into field 2
 
-put the number of menuItems of menu "sam" into field 3
+put the number of menuItems of menu "sam" into field 2
 
-put abs( the locH of sprite 2 - the mouseH) into field 4
+put abs( the locH of sprite 2 - the mouseH) into field 2
 
-set the castNum of sprite the clickon = the number of cast "main.hi"
+set the castNum of sprite the clickon = the number of cast 1
 
 -- set castname = the name of cast(the castnum of sprite 1)