[Scummvm-git-logs] scummvm master -> 4be0d0a53834e18e789286b8e78fd7a5744b5313

[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:
4be0d0a538 DIRECTOR: LINGO: More Lingo test fixes


Commit: 4be0d0a53834e18e789286b8e78fd7a5744b5313
    https://github.com/scummvm/scummvm/commit/4be0d0a53834e18e789286b8e78fd7a5744b5313
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-08-05T01:04:40+02:00

Commit Message:
DIRECTOR: LINGO: More Lingo test fixes

Changed paths:
    engines/director/lingo/tests/if.lingo
    engines/director/lingo/tests/reference.lingo


diff --git a/engines/director/lingo/tests/if.lingo b/engines/director/lingo/tests/if.lingo
index 2a3c153e4a..460e6dec14 100644
--- a/engines/director/lingo/tests/if.lingo
+++ b/engines/director/lingo/tests/if.lingo
@@ -56,14 +56,14 @@ 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 A11 then
+if the selection = the text of cast 1 then
     go to frame "sEnd"
     exit
 else if whichTry = 1 then go to frame "sTell"
 else if whichTry = 2 then go to frame "sShow"
 else if whichTry = 3 then go to frame "sDo"
 
-if the selection = the text of cast A31 then
+if the selection = the text of cast 1 then
     go to frame "sEnd"
     exit
 else if whichTry = 1 then
@@ -74,10 +74,10 @@ else if whichTry = 2 then
 else if whichTry = 3 then go to frame "sDo"
 else put 6
 
-if the selection = the text of cast A31 then go to frame "sEnd"
+if the selection = the text of cast 1 then go to frame "sEnd"
 else put 7
 
-if the selection = the text of cast A31 then go to frame "sEnd"
+if the selection = the text of cast 1 then go to frame "sEnd"
 else if whichTry = 1 then
 	go to frame "sTell"
 else if whichTry = 2 then
@@ -89,7 +89,7 @@ else
 	put 7
 end if
 
-if the selection = the text of cast A31 then go to frame "sEnd"
+if the selection = the text of cast 1 then go to frame "sEnd"
 else if whichTry = 1 then
 	go to frame "sTell"
 else if whichTry = 2 then
@@ -104,7 +104,7 @@ else
   put "The cursor is OUTSIDE the square." into field "Cursor Status"
 end if
 
-if the selection = the text of cast A31 then
+if the selection = the text of cast 1 then
     if whichTry = 3 then
 		go to frame "sDo"
 	end if
@@ -129,12 +129,12 @@ else if whichTry = 2 then
 else if whichTry = 3 then go to frame "sDo"
 else put 6
 
-if the selection = the text of cast A31 then go to frame "sEnd"
+if the selection = the text of cast 1 then go to frame "sEnd"
 
 when keyDown then if the key = RETURN then checkField
 when keyDown then if the key = QUOTE then checkField
 
-  if the mouseH > ((the right of sprite 15) - 20) then HidePopUp
+  if the mouseH > ((the right of sprite 15) - 20) then beep
   else if ((the mouseH > ((the left of sprite 15) + 30)) and Â
            (the mouseH < ((the left of sprite 15) + 73)) and Â
            (the mouseV > ((the top  of sprite 15) + 20)) and Â
diff --git a/engines/director/lingo/tests/reference.lingo b/engines/director/lingo/tests/reference.lingo
index a0e06f2682..075dae6832 100644
--- a/engines/director/lingo/tests/reference.lingo
+++ b/engines/director/lingo/tests/reference.lingo
@@ -11,8 +11,7 @@ put "asdf" into field 1
 put "lorem ipsum" into cast 1
 
 -- the property of reference
-put the text of cast "castname"
-put the visible of window "windowname"
+put the text of cast 1
 put line 1 to 5 of field the number of cast "MasterList" into field the number of cast "InventoryList"
 
 -- the loaded of cast
@@ -35,10 +34,11 @@ scummvmAssertError set test to cast "fake"
 set theWindow = Window(mNew,#noGrowDoc,"Window " & windowNumber)
 
 -- other weird stuff with reference name
-put window("test")
-set window = 1
-put window
-window("test")
-window "test"
-window cast
+-- FIXME: We need to find a way of clean execution of these
+--put window("test")
+--set window = 1
+--put window
+--window("test")
+--window "test"
+--window cast
 put cast cast