use some consistent naming without needless abbreviations. Not eryone cn red abbrvs wll

This commit is contained in:
adelikat 2020-06-01 12:24:32 -05:00
parent 4f6699ff26
commit d088f89ca2
7 changed files with 10 additions and 10 deletions

View File

@ -165,7 +165,7 @@ namespace BizHawk.Client.Common
{ {
if (Emulator is Emulation.Cores.Nintendo.SubNESHawk.SubNESHawk subNes) if (Emulator is Emulation.Cores.Nintendo.SubNESHawk.SubNESHawk subNes)
{ {
Header[HeaderKeys.VBlankCount] = subNes.VBL_CNT.ToString(); Header[HeaderKeys.VBlankCount] = subNes.VblankCount.ToString();
} }
else if (Emulator is Emulation.Cores.Nintendo.Gameboy.Gameboy gameboy) else if (Emulator is Emulation.Cores.Nintendo.Gameboy.Gameboy gameboy)
{ {
@ -173,7 +173,7 @@ namespace BizHawk.Client.Common
} }
else if (Emulator is Emulation.Cores.Nintendo.SubGBHawk.SubGBHawk subGb) else if (Emulator is Emulation.Cores.Nintendo.SubGBHawk.SubGBHawk subGb)
{ {
Header[HeaderKeys.CycleCount] = subGb.Cycle_CNT.ToString(); Header[HeaderKeys.CycleCount] = subGb.CycleCount.ToString();
} }
var file = new FileInfo(fn); var file = new FileInfo(fn);

View File

@ -102,7 +102,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SubGBHawk
current_cycle++; current_cycle++;
frame_cycle++; frame_cycle++;
Cycle_CNT++; CycleCount++;
if (frame_cycle == 70224) if (frame_cycle == 70224)
{ {

View File

@ -44,7 +44,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SubGBHawk
ser.Sync(nameof(frame_cycle), ref frame_cycle); ser.Sync(nameof(frame_cycle), ref frame_cycle);
ser.Sync(nameof(input_frame_length), ref input_frame_length); ser.Sync(nameof(input_frame_length), ref input_frame_length);
ser.Sync(nameof(input_frame_length_int), ref input_frame_length_int); ser.Sync(nameof(input_frame_length_int), ref input_frame_length_int);
ser.Sync(nameof(Cycle_CNT), ref Cycle_CNT); ser.Sync(nameof(CycleCount), ref CycleCount);
} }
} }
} }

View File

@ -22,7 +22,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SubGBHawk
HardReset(); HardReset();
current_cycle = 0; current_cycle = 0;
Cycle_CNT = 0; CycleCount = 0;
_GBStatable = _GBCore.ServiceProvider.GetService<IStatable>(); _GBStatable = _GBCore.ServiceProvider.GetService<IStatable>();
@ -48,7 +48,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SubGBHawk
public GBHawk.GBHawk _GBCore; public GBHawk.GBHawk _GBCore;
// needed for movies to accurately calculate timing // needed for movies to accurately calculate timing
public long Cycle_CNT; public long CycleCount;
public void HardReset() => _GBCore.HardReset(); public void HardReset() => _GBCore.HardReset();

View File

@ -58,7 +58,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SubNESHawk
if (_isLag) if (_isLag)
{ {
_lagCount++; _lagCount++;
VBL_CNT++; VblankCount++;
} }
reset_frame = false; reset_frame = false;

View File

@ -43,7 +43,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SubNESHawk
ser.Sync(nameof(current_cycle), ref current_cycle); ser.Sync(nameof(current_cycle), ref current_cycle);
ser.Sync(nameof(reset_cycle), ref reset_cycle); ser.Sync(nameof(reset_cycle), ref reset_cycle);
ser.Sync(nameof(reset_cycle_int), ref reset_cycle_int); ser.Sync(nameof(reset_cycle_int), ref reset_cycle_int);
ser.Sync(nameof(VBL_CNT), ref VBL_CNT); ser.Sync(nameof(VblankCount), ref VblankCount);
} }
} }
} }

View File

@ -26,7 +26,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SubNESHawk
HardReset(); HardReset();
current_cycle = 0; current_cycle = 0;
_nesCore.cpu.ext_ppu_cycle = current_cycle; _nesCore.cpu.ext_ppu_cycle = current_cycle;
VBL_CNT = 0; VblankCount = 0;
_nesStatable = _nesCore.ServiceProvider.GetService<IStatable>(); _nesStatable = _nesCore.ServiceProvider.GetService<IStatable>();
@ -59,7 +59,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SubNESHawk
private readonly NES.NES _nesCore; private readonly NES.NES _nesCore;
// needed for movies to accurately calculate timing // needed for movies to accurately calculate timing
public int VBL_CNT; public int VblankCount;
public void HardReset() => _nesCore.HardReset(); public void HardReset() => _nesCore.HardReset();