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 @@ -459,12 +459,16 @@ public void LoadBranch(int index)
459
459
}
460
460
461
461
[ LuaMethodExample ( "local sttasget = tastudio.getmarker( 500 );" ) ]
462
- [ LuaMethod ( "getmarker" , "returns the marker text at the given frame, or an empty string if there is no marker for the given frame" ) ]
463
- public string GetMarker ( int frame )
462
+ [ LuaMethod (
463
+ name : "getmarker" ,
464
+ description : "Returns the label of the marker on the given frame."
465
+ + " If that frame doesn't have a marker (or TAStudio isn't running), returns an empty string."
466
+ + " If branchID is specified, searches the markers in that branch instead." ) ]
467
+ public string GetMarker ( int frame , string /*?*/ branchID = null )
464
468
{
465
469
if ( Engaged ( ) )
466
470
{
467
- var marker = Tastudio . CurrentTasMovie . Markers . Get ( frame ) ;
471
+ var marker = MarkerListForBranch ( branchID ) . Get ( frame ) ;
468
472
if ( marker != null )
469
473
{
470
474
return marker . Message ;
You can’t perform that action at this time.
0 commit comments