File tree Expand file tree Collapse file tree 1 file changed +7
-3
lines changed
src/BizHawk.Client.EmuHawk/tools/Lua/Libraries Expand file tree Collapse file tree 1 file changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -446,12 +446,16 @@ public void LoadBranch(int index)
446
446
}
447
447
448
448
[ LuaMethodExample ( "local sttasget = tastudio.getmarker( 500 );" ) ]
449
- [ LuaMethod ( "getmarker" , "returns the marker text at the given frame, or nil if there is no marker for the given frame" ) ]
450
- public string /*?*/ GetMarker ( int frame )
449
+ [ LuaMethod (
450
+ name : "getmarker" ,
451
+ description : "Returns the label of the marker on the given frame."
452
+ + " If that frame doesn't have a marker (or TAStudio isn't running), returns nil."
453
+ + " If branchID is specified, searches the markers in that branch instead." ) ]
454
+ public string /*?*/ GetMarker ( int frame , string /*?*/ branchID = null )
451
455
{
452
456
if ( Engaged ( ) )
453
457
{
454
- var marker = Tastudio . CurrentTasMovie . Markers . Get ( frame ) ;
458
+ var marker = MarkerListForBranch ( branchID ) ? . Get ( frame ) ;
455
459
if ( marker != null )
456
460
{
457
461
return marker . Message ;
You can’t perform that action at this time.
0 commit comments