[Scummvm-git-logs] scummvm master -> d62648804631b190c359656dbd8f43b02d31b3fa
sev-
noreply at scummvm.org
Fri Oct 3 14:00:20 UTC 2025
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
389d3b0e64 DIRECTOR: LINGO: Added real keyword list extract from D4
887621bf53 DIRECTOR: LINGO: Further work on d4-d5 keyword differences
d626488046 WAGE: Cover string/string equality test in scripts
Commit: 389d3b0e6443c7204b1c26c576bc9ff0a44cc98e
https://github.com/scummvm/scummvm/commit/389d3b0e6443c7204b1c26c576bc9ff0a44cc98e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-10-03T16:00:11+02:00
Commit Message:
DIRECTOR: LINGO: Added real keyword list extract from D4
Changed paths:
A engines/director/lingo/docs/d4-keywords.txt
diff --git a/engines/director/lingo/docs/d4-keywords.txt b/engines/director/lingo/docs/d4-keywords.txt
new file mode 100644
index 00000000000..650ea06b429
--- /dev/null
+++ b/engines/director/lingo/docs/d4-keywords.txt
@@ -0,0 +1,505 @@
+,*
+,
+(
+)
+[
+]
+:
+-
++
+not
+*
+/
+mod
+contains
+starts
+and
+or
+=
+<
+<>
+<=
+>
+>=
+&
+&&
+then
+else
+the
+char
+word
+item
+line
+#
+true
+false
+return
+enter
+tab
+backSpace
+quote
+empty
+field
+sprite
+put
+go
+play
+to
+if
+into
+before
+after
+idle
+startMovie
+stopMovie
+stepMovie
+mouseUp
+mouseDown
+done
+frame
+method
+of
+me
+off
+macro
+factory
+while
+repeat
+end
+with
+movie
+type
+castNum
+top
+left
+width
+height
+linesize
+ink
+keyDown
+within
+intersects
+nosound
+byFrame
+click
+clickStop
+loop
+noUpdate
+sync
+tempo
+whatfits
+mnew
+mname
+mdescribe
+matframe
+right
+bottom
+locV
+locH
+pattern
+transition
+palette
+sound
+editableText
+moveableSprite
+pause
+timeout
+label
+puppet
+immediate
+forecolor
+backcolor
+stretch
+cursor
+text
+hilite
+cast
+mverb
+mdispose
+mget
+mput
+super
+noflush
+xcmdglue
+midiStart
+midiStop
+midiContinue
+midiBeat
+midiSong
+midiSongpointer
+constraint
+mPerform
+mActivate
+mUpdate
+mIdle
+mMouseDown
+mMouseUp
+mKeyDown
+mStartUp
+mQuit
+playRect
+mEvent
+on
+mOpenEditor
+mCloseEditor
+mSetText
+mGetText
+noclear
+mVerbDispose
+startScript
+version
+mRespondsTo
+mInstanceRespondsTo
+mMessageList
+chars
+words
+items
+lines
+picture
+in
+mPerformOther
+fadeIn
+fadeOut
+stop
+playFile
+playCast
+name
+textStyle
+textFont
+textHeight
+textAlign
+textSize
+castmembers
+center
+plain
+bold
+italic
+underline
+outline
+shadow
+condense
+extend
+mSetHandler
+menu
+menus
+menuItem
+menuItems
+mAtTransition
+mCanDoTrans
+mTransDial
+resource
+soundEnabled
+imageDirect
+colorDepth
+exitLock
+fullColorPermit
+selStart
+selEnd
+switchColorDepth
+fixStageSize
+centerStage
+checkBoxAccess
+checkBoxType
+buttonStyle
+multiSound
+stageColor
+beepOn
+mouseDownScript
+mouseUpScript
+keyDownScript
+timeoutScript
+timer
+timeoutLength
+timeoutLapsed
+timeoutKeydown
+timeoutMouse
+timeoutPlay
+number
+volume
+checkMark
+enabled
+script
+floatPrecision
+instance
+global
+set
+exit
+when
+delete
+puppetSound
+open
+ticks
+abs
+length
+string
+charToNum
+numToChar
+sqrt
+integerp
+stringp
+objectp
+floatp
+integer
+offset
+maxinteger
+result
+nothing
+value
+memorysize
+freeBlock
+freeBytes
+commandDown
+optionDown
+stillDown
+shiftDown
+controlDown
+clickOn
+key
+stageLeft
+stageRight
+stageTop
+stageBottom
+machineType
+mouseH
+mouseV
+selection
+pathName
+labelList
+pauseState
+mouseLine
+mouseItem
+mouseWord
+mouseChar
+mouseCast
+colorQD
+doubleClick
+keyCode
+lastClick
+lastKey
+lastRoll
+lastEvent
+marker
+rollOver
+soundBusy
+xfactoryList
+random
+constrainH
+constrainV
+continue
+delay
+openDA
+installMenu
+showResFile
+printFrom
+quit
+spriteBox
+startTimer
+restart
+shutDown
+zoomBox
+openXLib
+closeXLib
+showXLib
+dontPassEvent
+openResFile
+closeResFile
+updateStage
+playAccel
+immediateSprite
+puppetSprite
+puppetTempo
+puppetTransition
+puppetPalette
+alert
+preLoad
+preLoadCast
+mci
+setCallBack
+beep
+showLocals
+showGlobals
+perFrameHook
+long
+short
+abbreviated
+abbrev
+abbr
+time
+date
+do
+clearGlobals
+unLoad
+unLoadCast
+trails
+duration
+controller
+directToStage
+visibility
+ramNeeded
+movieRate
+movieTime
+startTime
+stopTime
+romanLingo
+quickTimePresent
+picturep
+float
+soundLevel
+framesToHMS
+hmsToFrames
+mciWait
+mciBusy
+closeDA
+window
+copyToClipBoard
+pasteClipBoardInto
+move
+importFileInto
+duplicate
+findEmpty
+fileName
+title
+visible
+close
+titleVisible
+tell
+size
+add
+addAt
+addProp
+append
+deleteAt
+deleteAll
+deleteProp
+deleteOne
+getAt
+getProp
+getaProp
+getPropAt
+getPos
+getOne
+getLast
+setAt
+setProp
+setaProp
+count
+findPos
+findPosNear
+sort
+min
+max
+loc
+rect
+point
+inflate
+intersect
+union
+inside
+map
+scriptText
+regPoint
+bitmap
+filmLoop
+button
+shape
+digitalVideo
+modified
+loaded
+castType
+lastFrame
+frameLabel
+framePalette
+frameTempo
+frameScript
+moveToFront
+moveToBack
+sin
+cos
+tan
+atan
+exp
+log
+log10
+power
+pi
+param
+paramCount
+next
+previous
+keyUp
+erase
+depth
+randomSeed
+trace
+saveMovie
+clickLoc
+preLoadEventAbort
+updateMovieEnabled
+drawRect
+sourceRect
+windowType
+modal
+windowList
+itemDelimiter
+last
+keyUpScript
+forget
+down
+moviePath
+movieName
+enterFrame
+exitFrame
+halt
+abort
+pass
+property
+list
+linearList
+propList
+stage
+traceLoad
+traceLogFile
+purgePriority
+frameRate
+preloadRam
+pausedAtStart
+video
+blend
+scoreColor
+scriptNum
+searchPaths
+searchCurrentFolder
+movieFileSize
+movieFileFreeSize
+getNthFileNameInFolder
+actor
+actorList
+ancestor
+collectChangeRects
+updateRect
+stepFrame
+mouseTrack
+birth
+hitTest
+mouseHitTest
+ilk
+void
+voidp
+listp
+send
+sendAncestor
+symbolp
+crop
+cpuHogTicks
+symbol
+object
+activateWindow
+deactivateWindow
+openWindow
+closeWindow
+moveWindow
+zoomInWindow
+zoomOutWindow
+doEffects
+searchPath
+videoForWindowsPresent
Commit: 887621bf5388ea905d355d7357340e6d0c783460
https://github.com/scummvm/scummvm/commit/887621bf5388ea905d355d7357340e6d0c783460
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-10-03T16:00:11+02:00
Commit Message:
DIRECTOR: LINGO: Further work on d4-d5 keyword differences
Changed paths:
R engines/director/lingo/docs/d4.keywords.txt
engines/director/lingo/docs/d4-d5.txt
diff --git a/engines/director/lingo/docs/d4-d5.txt b/engines/director/lingo/docs/d4-d5.txt
index 859b07da709..b3bb4558a9b 100644
--- a/engines/director/lingo/docs/d4-d5.txt
+++ b/engines/director/lingo/docs/d4-d5.txt
@@ -1,78 +1,34 @@
-> actor
-> adjust
-> antiAlias
-> appFileSpec
-> case
-> checkMark
-> cpuHogTicks
-> deleteAll
-> doEffects
-> duration
-> editFocusSprite
-> enterFrame
-> fileType
-> fixed
-> imageDirect
-> immediate
-> interface
-> is
-> limit
-> linearList
-> log10
-> macro
-> mActivate
-> maskMember
-> mAtTransition
-> mCanDoTrans
-> mciBusy
-> mCloseEditor
-> members
-> messageLock
-> method
-> mEvent
-> mGetText
-> mIdle
-> mKeyDown
-> mMouseDown
-> mMouseUp
-> mOpenEditor
-> mouseDoubleClick
-> mouseEnter
-> mouseHitTest
-> mouseSprite
-> mouseStillDown
-> mouseWithin
-> mPerformOther
-> mQuit
-> mSetHandler
-> mSetText
-> mStartUp
-> mTransDial
-> mUpdate
-> music
-> noclear
-> object
-> off
-> otherwise
-> parent
-> productName
-> productVersion
-> propList
-> quickTime
-> resource
-> scroll
-> searchPaths
-> send
-> sendAncestor
-> setTrackEnabled
-> startScript
-> super
-> symbol
-> textWrap
-> timeCode
-> timeout
-> track
-> tracks
-> vga
-> videoForWindows
-> visibility
+adjust
+antiAlias
+appFileSpec
+case
+editFocusSprite
+fileType
+fixed
+interface
+is
+limit
+maskMember
+members
+messageLock
+mOpenEditor
+mouseDoubleClick
+mouseEnter
+mouseHitTest
+mouseSprite
+mouseStillDown
+mouseWithin
+music
+otherwise
+parent
+productName
+productVersion
+quickTime
+scroll
+setTrackEnabled
+textWrap
+timeCode
+track
+tracks
+vga
+videoForWindows
diff --git a/engines/director/lingo/docs/d4.keywords.txt b/engines/director/lingo/docs/d4.keywords.txt
deleted file mode 100644
index 1395c8f563b..00000000000
--- a/engines/director/lingo/docs/d4.keywords.txt
+++ /dev/null
@@ -1,513 +0,0 @@
- -
- --
- ()
- []
- *
- /
- &
- &&
- #
- +
- <
- <=
- <>
- =
- >
- >=
- �
-abbr
-abort
-abs
-actorList
-add
-addAt
-addProp
-after
-alert
-ancestor
-and
-append
-atan
-backColor of cast
-backColor of sprite
-BACKSPACE
-beep
-beepOn
-before
-birth
-blend of sprite
-bottom of sprite
-buttonStyle
-cast backColor
-cast castType
-cast depth
-cast fileName
-cast foreColor
-cast height
-cast hilite
-cast loaded
-cast modified
-cast name
-cast number
-cast palette
-cast picture
-cast purgePriority
-cast rect
-cast regPoint
-cast scriptText
-cast size
-cast text
-cast width
-castmembers
-castNum of sprite
-castType of cast
-center
-centerStage
-char of
-chars
-charToNum
-checkBoxAccess
-checkBoxType
-checkMark of menuItem
-clearGlobals
-clickLoc
-clickOn
-close window
-closeDA
-closeResFile
-closeXlib
-colorDepth
-colorQD
-commandDown
-constrainH
-constraint of sprite
-constrainV
-contains
-continue
-controlDown
-controller of cast
-copyToClipBoard cast
-cos
-count
-crop
-cursor
-cursor of sprite
-date
-delay
-delete
-deleteAt
-deleteProp
-depth of cast
-digitalVideo
-digitalVideo cast center
-digitalVideo cast controller
-digitalVideo cast crop
-digitalVideo cast directToStage
-digitalVideo cast duration
-digitalVideo cast frameRate
-digitalVideo cast loop
-digitalVideo cast pausedAtStart
-digitalVideo cast preload
-digitalVideo cast sound
-digitalVideo cast video
-digitalVideo sprite movieRate
-digitalVideo sprite movieTime
-digitalVideo sprite startTime
-digitalVideo sprite stopTime
-digitalVideo sprite volume
-directToStage of cast
-do
-done
-dontPassEvent
-doubleClick
-down
-drawRect of window
-duplicate cast {n}
-editableText of sprite
-else
-EMPTY
-enabled of menuItem
-end
-ENTER
-erase cast
-exit
-exit repeat
-exitFrame
-exitLock
-exp
-factory
-fadeIn
-fadeOut
-FALSE
-field
-fileName of cast
-fileName of window
-findEmpty
-findPos
-findPosNear
-fixStageSize
-float
-floatP
-floatPrecision
-foreColor of cast
-foreColor of sprite
-forget
-frame
-frameLabel
-framePalette
-frameRate of cast
-frameScript
-framesToHMS
-frameTempo
-freeBlock
-freeBytes
-getaProp
-getAt
-getLast
-getNthFileNameInFolder
-getOne
-getPos
-getProp
-getPropAt
-global
-go
-go loop
-go next
-go previous
-halt
-height of cast
-height of sprite
-hilite
-hilite of cast
-HMStoFrames
-idle
-if
-ilk list
-ilk point
-ilk rect
-importFileInto
-in
-inflate rect
-ink of sprite
-inside point
-installMenu
-instance
-integer
-integerP
-intersect rect
-intersects
-into
-item of
-itemDelimiter
-items
-key
-keyCode
-keyDown
-keyDownScript
-keyUp
-keyUpScript
-label
-labelList
-last
-lastClick
-lastEvent
-lastFrame
-lastKey
-lastRoll
-left of sprite
-length
-line of
-lines
-lineSize of sprite
-list
-list ilk
-listP
-loaded of cast
-locH of sprite
-locV of sprite
-log
-long
-loop
-loop of cast
-machineType
-map point
-map rect
-marker
-mAtFrame
-max
-maxInteger
-mci
-mDescribe
-mDispose
-me
-memorySize
-menu
-menuItem
-menuItems
-menus
-mGet
-min
-mInstanceRespondsTo
-mMessageList
-mName
-mNew
-mod
-modal window
-modified of cast
-mouseCast
-mouseChar
-mouseDown
-mouseDownScript
-mouseH
-mouseItem
-mouseLine
-mouseUp
-mouseUpScript
-mouseV
-mouseWord
-move
-moveableSprite of sprite
-moveToBack
-moveToFront
-movie
-movieFileFreeSize
-movieFileSize
-movieName
-moviePath
-movieRate of sprite
-movieTime of sprite
-mPerform
-mPut
-mRespondsTo
-multiSound
-name of cast
-name of menu
-name of menuItem
-next
-next repeat
-not
-nothing
-number of cast
-number of castMembers
-number of chars
-number of items
-number of lines
-number of menuItems
-number of menus
-number of words
-numToChar
-objectP
-of
-offset
-offset rect
-on
-on enterFrame
-on enterFrame
-on exitFrame
-on idle
-on keyDown
-on keyUp
-on mouseDown
-on mouseUp
-on startMovie
-on stopMovie
-open
-open window
-openDA
-openResFile
-openXlib
-optionDown
-or
-palette of cast
-param
-paramCount
-pass
-pasteClipBoardInto
-pathName
-pause
-pausedAtStart of cast
-pauseState
-perFrameHook
-pi
-picture of cast
-pictureP
-play
-play done
-playFile
-point
-power
-preLoad
-preload of cast
-preLoadCast
-preLoadEventAbort
-preLoadRAM
-previous
-printFrom
-property
-puppet
-puppetPalette
-puppetSound
-puppetSprite
-puppetTempo
-puppetTransition
-purgePriority of cast
-put
-put after
-put before
-put into
-quickTimePresent
-quit
-QUOTE
-ramNeeded
-random
-randomSeed
-rect
-rect of cast
-rect of window
-rect point
-regPoint of cast
-repeat while
-repeat with
-restart
-result
-return
-RETURN
-right of sprite
-rollOver
-romanLingo
-saveMovie
-scoreColor
-script of menuItem
-scriptNum of sprite
-scriptText of cast
-searchCurrentFolder
-searchPath
-selection
-selEnd
-selStart
-set
-setaProp
-setAt
-setCallBack
-setProp
-shiftDown
-short
-showGlobals
-showLocals
-showResFile
-showXlib
-shutDown
-sin
-size of cast
-sort
-sound close
-sound fadeIn
-sound fadeOut
-sound of cast
-sound playFile
-sound stop
-soundBusy
-soundEnabled
-soundLevel
-sourceRect of window
-sprite
-sprite backColor
-sprite blend
-sprite bottom
-sprite castNum
-sprite constraint
-sprite cursor
-sprite editableText
-sprite foreColor
-sprite height
-sprite ink
-sprite intersects
-sprite left
-sprite lineSize
-sprite locH
-sprite locV
-sprite moveableSprite
-sprite right
-sprite scriptNum
-sprite stretch
-sprite top
-sprite trails
-sprite type
-sprite visible
-sprite width
-sprite within
-spriteBox
-sqrt
-stage
-stageBottom
-stageColor
-stageLeft
-stageRight
-stageTop
-startMovie
-starts
-startTime of sprite
-startTimer
-stillDown
-stop
-stopMovie
-stopTime of sprite
-stretch of sprite
-string
-stringP
-switchColorDepth
-symbolP
-TAB
-tan
-tell
-text of cast
-textAlign
-textFont
-textHeight
-textSize
-textStyle
-the
-then
-ticks
-time
-timeoutKeyDown
-timeoutLapsed
-timeoutLength
-timeoutMouse
-timeoutPlay
-timeoutScript
-timer
-title
-titleVisible
-to
-top of sprite
-trace
-traceLoad
-traceLogFile
-trails of sprite
-TRUE
-type of sprite
-union rect
-unLoad
-unLoadCast
-updateMovieEnabled
-updateStage
-value
-video
-visible of sprite
-visible of window
-voidP
-volume of sound
-volume of sprite
-while
-width of cast
-width of sprite
-window
-windowList
-windowType
-with
-within
-word of
-words
-xFactoryList
-zoomBox
Commit: d62648804631b190c359656dbd8f43b02d31b3fa
https://github.com/scummvm/scummvm/commit/d62648804631b190c359656dbd8f43b02d31b3fa
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-10-03T16:00:11+02:00
Commit Message:
WAGE: Cover string/string equality test in scripts
Changed paths:
engines/wage/script.cpp
diff --git a/engines/wage/script.cpp b/engines/wage/script.cpp
index bab621175bc..548000d97bb 100644
--- a/engines/wage/script.cpp
+++ b/engines/wage/script.cpp
@@ -639,6 +639,7 @@ enum {
kCompEqChrChr,
kCompEqSceneScene,
kCompEqStringTextInput,
+ kCompEqStringString,
kCompEqTextInputString,
kCompEqNumberTextInput,
kCompEqTextInputNumber,
@@ -687,6 +688,7 @@ struct Comparator {
{ '=', SCENE, SCENE, kCompEqSceneScene },
{ '=', STRING, TEXT_INPUT, kCompEqStringTextInput },
{ '=', TEXT_INPUT, STRING, kCompEqTextInputString },
+ { '=', STRING, STRING, kCompEqStringString },
{ '=', NUMBER, TEXT_INPUT, kCompEqNumberTextInput },
{ '=', TEXT_INPUT, NUMBER, kCompEqTextInputNumber },
@@ -772,6 +774,14 @@ bool Script::compare(Operand *o1, Operand *o2, int comparator) {
}
case kCompEqTextInputString:
return compare(o2, o1, kCompEqStringTextInput);
+ case kCompEqStringString:
+ {
+ Common::String s1(*o1->_value.string), s2(*o2->_value.string);
+ s1.toLowercase();
+ s2.toLowercase();
+
+ return s1.contains(s2);
+ }
case kCompEqNumberTextInput:
if (_inputText == NULL) {
return false;
More information about the Scummvm-git-logs
mailing list