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

Rename IEmulator.ResetFrameCounter() to ResetCounts() as that is a more precise term since it resets frame and lag counter variables (and theoretically any other similar counters that could get implemented)

This commit is contained in:
adelikat 2013-11-03 16:29:51 +00:00
parent fd89c0cff4
commit bbc12256b2
21 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Client.EmuHawk/MainForm.Movie.cs
View File

@ -37,7 +37,7 @@ namespace BizHawk.Client.EmuHawk
if (Global.MovieSession.Movie.StartsFromSavestate) if (Global.MovieSession.Movie.StartsFromSavestate)
{ {
LoadStateFile(Global.MovieSession.Movie.Filename, Path.GetFileName(Global.MovieSession.Movie.Filename)); LoadStateFile(Global.MovieSession.Movie.Filename, Path.GetFileName(Global.MovieSession.Movie.Filename));
Global.Emulator.ResetFrameCounter(); Global.Emulator.ResetCounters();
} }
if (record) if (record)
{ {
@ -112,7 +112,7 @@ namespace BizHawk.Client.EmuHawk
if (Global.MovieSession.Movie.StartsFromSavestate) if (Global.MovieSession.Movie.StartsFromSavestate)
{ {
LoadStateFile(Global.MovieSession.Movie.Filename, Path.GetFileName(Global.MovieSession.Movie.Filename)); LoadStateFile(Global.MovieSession.Movie.Filename, Path.GetFileName(Global.MovieSession.Movie.Filename));
Global.Emulator.ResetFrameCounter(); Global.Emulator.ResetCounters();
} }
Global.Emulator.ClearSaveRam(); Global.Emulator.ClearSaveRam();
Global.MovieSession.Movie.StartPlayback(); Global.MovieSession.Movie.StartPlayback();

2
BizHawk.Emulation/Computers/Commodore64/C64.cs
View File

@ -33,7 +33,7 @@ namespace BizHawk.Emulation.Computers.Commodore64
public int Frame { get { return _frame; } set { _frame = value; } } public int Frame { get { return _frame; } set { _frame = value; } }
public bool IsLagFrame { get { return _islag; } } public bool IsLagFrame { get { return _islag; } }
public int LagCount { get { return _lagcount; } set { _lagcount = value; } } public int LagCount { get { return _lagcount; } set { _lagcount = value; } }
public void ResetFrameCounter() public void ResetCounters()
{ {
_frame = 0; _frame = 0;
_lagcount = 0; _lagcount = 0;

2
BizHawk.Emulation/Consoles/Atari/2600/Atari2600.cs
View File

@ -37,7 +37,7 @@ namespace BizHawk
Console.WriteLine("Game uses mapper " + game.GetOptionsDict()["m"]); Console.WriteLine("Game uses mapper " + game.GetOptionsDict()["m"]);
HardReset(); HardReset();
} }
public void ResetFrameCounter() public void ResetCounters()
{ {
_frame = 0; _frame = 0;
_lagcount = 0; _lagcount = 0;

2
BizHawk.Emulation/Consoles/Atari/7800/Atari7800.cs
View File

@ -99,7 +99,7 @@ namespace BizHawk.Emulation
} }
public void ResetFrameCounter() public void ResetCounters()
{ {
_frame = 0; _frame = 0;
_lagcount = 0; _lagcount = 0;

2
BizHawk.Emulation/Consoles/Calculator/TI83.cs
View File

@ -497,7 +497,7 @@ namespace BizHawk.Emulation.Consoles.Calculator
private bool islag = false; private bool islag = false;
public int Frame { get; set; } public int Frame { get; set; }
public void ResetFrameCounter() public void ResetCounters()
{ {
Frame = 0; Frame = 0;
_lagcount = 0; _lagcount = 0;

2
BizHawk.Emulation/Consoles/Coleco/ColecoVision.cs
View File

@ -233,7 +233,7 @@ namespace BizHawk.Emulation.Consoles.Coleco
} }
public void Dispose() { } public void Dispose() { }
public void ResetFrameCounter() public void ResetCounters()
{ {
Frame = 0; Frame = 0;
_lagcount = 0; _lagcount = 0;

2
BizHawk.Emulation/Consoles/Intellivision/Intellivision.cs
View File

@ -149,7 +149,7 @@ namespace BizHawk.Emulation.Consoles.Intellivision
set { } set { }
} }
public void ResetFrameCounter() public void ResetCounters()
{ {
Frame = 0; Frame = 0;
LagCount = 0; LagCount = 0;

2
BizHawk.Emulation/Consoles/Nintendo/GBA/Meteor.cs
View File

@ -72,7 +72,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo.GBA
// todo: information about the saveram type would be useful here. // todo: information about the saveram type would be useful here.
public string BoardName { get { return null; } } public string BoardName { get { return null; } }
public void ResetFrameCounter() public void ResetCounters()
{ {
Frame = 0; Frame = 0;
LagCount = 0; LagCount = 0;

2
BizHawk.Emulation/Consoles/Nintendo/Gameboy/Gambatte.cs
View File

@ -358,7 +358,7 @@ namespace BizHawk.Emulation.Consoles.GB
#endregion #endregion
public void ResetFrameCounter() public void ResetCounters()
{ {
Frame = 0; Frame = 0;
LagCount = 0; LagCount = 0;

2
BizHawk.Emulation/Consoles/Nintendo/Gameboy/GambatteLink.cs
View File

@ -238,7 +238,7 @@ namespace BizHawk.Emulation.Consoles.GB
#endregion #endregion
public void ResetFrameCounter() public void ResetCounters()
{ {
Frame = 0; Frame = 0;
LagCount = 0; LagCount = 0;

2
BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs
View File

@ -70,7 +70,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo.N64
public int Frame { get; set; } public int Frame { get; set; }
public int LagCount { get; set; } public int LagCount { get; set; }
public bool IsLagFrame { get; set; } public bool IsLagFrame { get; set; }
public void ResetFrameCounter() public void ResetCounters()
{ {
Frame = 0; Frame = 0;
LagCount = 0; LagCount = 0;

2
BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs
View File

@ -399,7 +399,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
bool islag = false; bool islag = false;
public int Frame { get { return _frame; } set { _frame = value; } } public int Frame { get { return _frame; } set { _frame = value; } }
public void ResetFrameCounter() public void ResetCounters()
{ {
_frame = 0; _frame = 0;
_lagcount = 0; _lagcount = 0;

2
BizHawk.Emulation/Consoles/Nintendo/SNES/LibsnesCore.cs
View File

@ -583,7 +583,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo.SNES
StoreSaveRam(cleardata); StoreSaveRam(cleardata);
} }
public void ResetFrameCounter() public void ResetCounters()
{ {
timeFrameCounter = 0; timeFrameCounter = 0;
LagCount = 0; LagCount = 0;

2
BizHawk.Emulation/Consoles/PC Engine/PCEngine.cs
View File

@ -237,7 +237,7 @@ namespace BizHawk.Emulation.Consoles.TurboGrafx
public int LagCount { get { return _lagcount; } set { _lagcount = value; } } public int LagCount { get { return _lagcount; } set { _lagcount = value; } }
public bool IsLagFrame { get { return islag; } } public bool IsLagFrame { get { return islag; } }
public void ResetFrameCounter() public void ResetCounters()
{ {
// this should just be a public setter instead of a new method. // this should just be a public setter instead of a new method.
Frame = 0; Frame = 0;

2
BizHawk.Emulation/Consoles/PSX/Octoshock.cs
View File

@ -202,7 +202,7 @@ namespace BizHawk.Emulation.Consoles.PSX
} }
public void ResetFrameCounter() public void ResetCounters()
{ {
// FIXME when all this stuff is implemented // FIXME when all this stuff is implemented
Frame = 0; Frame = 0;

2
BizHawk.Emulation/Consoles/Sega/Genesis/Genesis.cs
View File

@ -38,7 +38,7 @@ namespace BizHawk.Emulation.Consoles.Sega
private SoundMixer SoundMixer; private SoundMixer SoundMixer;
public void ResetFrameCounter() public void ResetCounters()
{ {
Frame = 0; Frame = 0;
_lagcount = 0; _lagcount = 0;

2
BizHawk.Emulation/Consoles/Sega/SMS/SMS.cs
View File

@ -70,7 +70,7 @@ namespace BizHawk.Emulation.Consoles.Sega
bool islag = false; bool islag = false;
public int Frame { get; set; } public int Frame { get; set; }
public void ResetFrameCounter() public void ResetCounters()
{ {
Frame = 0; Frame = 0;
_lagcount = 0; _lagcount = 0;

4
BizHawk.Emulation/Consoles/Sega/Saturn/Yabause.cs
View File

@ -42,7 +42,7 @@ namespace BizHawk.Emulation.Consoles.Sega.Saturn
CoreComm.RomStatusDetails = "Yeh"; CoreComm.RomStatusDetails = "Yeh";
this.CoreComm = CoreComm; this.CoreComm = CoreComm;
this.CD = CD; this.CD = CD;
ResetFrameCounter(); ResetCounters();
Init(bios, GL); Init(bios, GL);
} }
@ -294,7 +294,7 @@ namespace BizHawk.Emulation.Consoles.Sega.Saturn
#endregion #endregion
public void ResetFrameCounter() public void ResetCounters()
{ {
Frame = 0; Frame = 0;
LagCount = 0; LagCount = 0;

2
BizHawk.Emulation/Consoles/Sony/PSP/PSP.cs
View File

@ -156,7 +156,7 @@ namespace BizHawk.Emulation.Consoles.Sony.PSP
} }
} }
public void ResetFrameCounter() public void ResetCounters()
{ {
} }

2
BizHawk.Emulation/Interfaces/Base Implementations/NullEmulator.cs
View File

@ -27,7 +27,7 @@ namespace BizHawk
domains.Add(new MemoryDomain("Main RAM", 1, Endian.Little, addr => 0, (a, v) => { })); domains.Add(new MemoryDomain("Main RAM", 1, Endian.Little, addr => 0, (a, v) => { }));
memoryDomains = domains.AsReadOnly(); memoryDomains = domains.AsReadOnly();
} }
public void ResetFrameCounter() public void ResetCounters()
{ {
Frame = 0; Frame = 0;
// no lag frames on this stub core // no lag frames on this stub core

2
BizHawk.Emulation/Interfaces/IEmulator.cs
View File

@ -60,7 +60,7 @@ namespace BizHawk
bool SaveRamModified { get; set; } bool SaveRamModified { get; set; }
void ResetFrameCounter(); void ResetCounters();
void SaveStateText(TextWriter writer); void SaveStateText(TextWriter writer);
void LoadStateText(TextReader reader); void LoadStateText(TextReader reader);
void SaveStateBinary(BinaryWriter writer); void SaveStateBinary(BinaryWriter writer);