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 @@ -444,12 +444,16 @@ public void LoadBranch(int index)
444
444
}
445
445
446
446
[ LuaMethodExample ( "local sttasget = tastudio.getmarker( 500 );" ) ]
447
- [ LuaMethod ( "getmarker" , "returns the marker text at the given frame, or an empty string if there is no marker for the given frame" ) ]
448
- public string GetMarker ( int frame )
447
+ [ LuaMethod (
448
+ name : "getmarker" ,
449
+ description : "Returns the label of the marker on the given frame."
450
+ + " If that frame doesn't have a marker (or TAStudio isn't running), returns an empty string."
451
+ + " If branchIndex is specified, searches the markers in that branch instead." ) ]
452
+ public string GetMarker ( int frame , int ? branchIndex = null )
449
453
{
450
454
if ( Engaged ( ) )
451
455
{
452
- var marker = Tastudio . CurrentTasMovie . Markers . Get ( frame ) ;
456
+ var marker = MarkerListForBranch ( branchIndex ) . Get ( frame ) ;
453
457
if ( marker != null )
454
458
{
455
459
return marker . Message ;
You can’t perform that action at this time.
0 commit comments