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

[sev-]

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

Summary:
f9abba91e2 DIRECTOR: LINGO: Fix tests


Commit: f9abba91e21c4f2c68235b986c4ff720de846ead
    https://github.com/scummvm/scummvm/commit/f9abba91e21c4f2c68235b986c4ff720de846ead
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-08-05T00:47:00+02:00

Commit Message:
DIRECTOR: LINGO: Fix tests

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


diff --git a/engines/director/lingo/tests/builtin.lingo b/engines/director/lingo/tests/builtin.lingo
index 2268e41cf4..096820e803 100644
--- a/engines/director/lingo/tests/builtin.lingo
+++ b/engines/director/lingo/tests/builtin.lingo
@@ -21,11 +21,11 @@ puppetTransition 1
 puppetTransition 2,4,20
 
 -- These are D4+
-move cast 1, cast 3
-move cast 3
+move cast 1, cast 1
+move cast 1
 put findEmpty(cast 10)
 pasteClipBoardInto cast 2
-put the width of cast 3
+put the width of cast 1
 
 unload
 unload ab
diff --git a/engines/director/lingo/tests/if.lingo b/engines/director/lingo/tests/if.lingo
index 056279f817..2a3c153e4a 100644
--- a/engines/director/lingo/tests/if.lingo
+++ b/engines/director/lingo/tests/if.lingo
@@ -56,7 +56,7 @@ if abs(y) = x and abs(x) = y then put 5
 if abs(y) = x and abs(x) = y then put 5
 else put 6
 
-if the selection = the text of cast A31 then
+if the selection = the text of cast A11 then
     go to frame "sEnd"
     exit
 else if whichTry = 1 then go to frame "sTell"
diff --git a/engines/director/lingo/tests/the.lingo b/engines/director/lingo/tests/the.lingo
index 25d4e6e14e..66eb0576e0 100644
--- a/engines/director/lingo/tests/the.lingo
+++ b/engines/director/lingo/tests/the.lingo
@@ -16,20 +16,19 @@ put the long date
 
 set a = 5
 
-set gravityConst = the value of ( the text of cast A14)
-set the hilite of cast A32 to (a = 3)
-set the text of cast A14 = string( gravityConst )
+set gravityConst = the value of ( the text of cast 1)
+set the hilite of cast 1 to (a = 3)
+set the text of cast 1 = string( gravityConst )
 
 -- This is object setting. D4+
 set BlastWindow to window "Media Blast"
-set the rect of BlastWindow to myWindowRect
 set the filename of BlastWindow to "blastwin"
 set the titleVisible of BlastWindow to true
 set the modal of BlastWindow to true
 set the windowtype of BlastWindow to 5
 
-set the bottom of x to originV + (the number of lines in someText) * 16
-set the bottom of x to originV + (the number of words in someText) * 16
+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
 
@@ -48,7 +47,7 @@ put abs( the locH of sprite 2 - the mouseH) into field 4
 
 set the castNum of sprite the clickon = the number of cast "main.hi"
 
-set castname = the name of cast(the castnum of sprite 15)
+-- set castname = the name of cast(the castnum of sprite 1)
 
 set res = the soundBusy of 1
 
@@ -62,6 +61,8 @@ set the text of field 1 = "Hello"
 -- We have no indication that this one off type of code is used.
 -- set the text of field 0 + 1 = "Hello"
 
+set h to "Hello"
+
 set gMarkerName = the length of h + 2