ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

A couple bugfixes for float editing autorestore

This commit is contained in:
SuuperW 2015-03-16 17:04:10 +00:00
parent a3eadc8e5f
commit 84acda3bbc
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
View File

@ -361,7 +361,6 @@ namespace BizHawk.Client.EmuHawk
RefreshDialog();
}
_triggerAutoRestore = true;
_triggerAutoRestoreFromFrame = TasView.CurrentCell.RowIndex.Value;
_floatPaintState = CurrentTasMovie.GetFloatState(frame, buttonName);
@ -721,6 +720,9 @@ namespace BizHawk.Client.EmuHawk
if (_floatEditRow != -1)
{
float value = CurrentTasMovie.GetFloatState(_floatEditRow, _floatEditColumn);
float prev = value;
string prevTyped = _floatTypedValue;
Emulation.Common.ControllerDefinition.FloatRange range = Global.MovieSession.MovieControllerAdapter.Type.FloatRanges
[Global.MovieSession.MovieControllerAdapter.Type.FloatControls.IndexOf(_floatEditColumn)];
// Range for N64 Y axis has max -128 and min 127. That should probably be fixed ControllerDefinition.cs, but I'll put a quick fix here anyway.
@ -785,8 +787,11 @@ namespace BizHawk.Client.EmuHawk
{
if (_floatTypedValue == "")
{
value = 0f;
CurrentTasMovie.SetFloatState(_floatEditRow, _floatEditColumn, value);
if (prevTyped != "")
{
value = 0f;
CurrentTasMovie.SetFloatState(_floatEditRow, _floatEditColumn, value);
}
}
else
{
@ -797,6 +802,12 @@ namespace BizHawk.Client.EmuHawk
value = rMin;
CurrentTasMovie.SetFloatState(_floatEditRow, _floatEditColumn, value);
}
if (value != prev) // Auto-restore
{
_triggerAutoRestore = true;
_triggerAutoRestoreFromFrame = _floatEditRow;
DoTriggeredAutoRestoreIfNeeded();
}
}
}

1
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
View File

@ -565,7 +565,6 @@ namespace BizHawk.Client.EmuHawk
_triggerAutoRestore = false;
_triggerAutoRestoreFromFrame = null;
}
}