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

Fixed a display bug cauased by player highlighting 

(also renamed a variable and changed comment lines)
This commit is contained in:
Suuper 2015-07-23 13:30:25 -05:00
parent f9cd2f4075
commit 3c3cdc4590
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
View File

@ -148,9 +148,10 @@ namespace BizHawk.Client.Common.MovieConversionExtensions
tas.CopyVerificationLog(old.VerificationLog);
tas.CopyVerificationLog(entries.Take(frame));
// States: TODO
// States can't be easily moved over, because they contain the frame number.
// TODO? I'm not sure how this would be done.
// Lag Log: TODO
// Lag Log
tas.TasLagLog.FromLagLog(old.TasLagLog);
tas.TasLagLog.StartFromFrame(frame);

12
BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
View File

@ -276,19 +276,19 @@ namespace BizHawk.Client.Common
}
StateAccessed(frame);
}
private void RemoveState(int index)
private void RemoveState(int frame)
{
if (States[index] == null)
if (States[frame] == null)
{
DiskUsed -= _expectedStateSize; // Disk length?
string path = Path.Combine(statePath, index.ToString());
string path = Path.Combine(statePath, frame.ToString());
File.Delete(path);
}
else
Used -= (ulong)States[index].Length;
States.RemoveAt(States.IndexOfKey(index));
Used -= (ulong)States[frame].Length;
States.RemoveAt(States.IndexOfKey(frame));
accessed.Remove(index);
accessed.Remove(frame);
}
private void StateAccessed(int index)
{

2
BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs
View File

@ -1339,7 +1339,7 @@ namespace BizHawk.Client.EmuHawk
QueryItemBkColor(f + startRow, columns[j], ref itemColor);
if (itemColor == Color.White)
itemColor = rowColor;
else if (itemColor.A != 255)
else if (itemColor.A != 255 && itemColor.A != 0)
{
float alpha = (float)itemColor.A / 255;
itemColor = Color.FromArgb(rowColor.R - (int)((rowColor.R - itemColor.R) * alpha),