per previous discussion, IEmulator.ResetFrameCounter() should reset lag frame related stuff as well

This commit is contained in:
goyuken 2012-11-25 15:41:40 +00:00
parent 557f2c8815
commit 0094562d2a
15 changed files with 40 additions and 6 deletions

View File

@ -45,6 +45,8 @@ namespace BizHawk.Emulation.Computers.Commodore64
public void ResetFrameCounter()
{
_frame = 0;
_lagcount = 0;
_islag = false;
}
// audio/video

View File

@ -33,6 +33,8 @@ namespace BizHawk
public void ResetFrameCounter()
{
_frame = 0;
_lagcount = 0;
_islag = false;
}
public static readonly ControllerDefinition Atari2600ControllerDefinition = new ControllerDefinition

View File

@ -63,6 +63,8 @@ namespace BizHawk
public void ResetFrameCounter()
{
_frame = 0;
_lagcount = 0;
_islag = false;
}
public byte[] SaveStateBinary()

View File

@ -484,6 +484,8 @@ namespace BizHawk.Emulation.Consoles.Calculator
public void ResetFrameCounter()
{
Frame = 0;
_lagcount = 0;
islag = false;
}
public int LagCount { get { return _lagcount; } set { _lagcount = value; } }

View File

@ -233,7 +233,12 @@ namespace BizHawk.Emulation.Consoles.Coleco
}
public void Dispose() { }
public void ResetFrameCounter() { }
public void ResetFrameCounter()
{
Frame = 0;
_lagcount = 0;
islag = false;
}
public string SystemId { get { return "Coleco"; } }
public GameInfo game;

View File

@ -132,6 +132,9 @@ namespace BizHawk.Emulation.Consoles.Intellivision
public void ResetFrameCounter()
{
Frame = 0;
LagCount = 0;
IsLagFrame = false;
}
public void SaveStateText(TextWriter writer)

View File

@ -58,6 +58,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo.GBA
{
Frame = 0;
LagCount = 0;
IsLagFrame = false;
}
#region saveram

View File

@ -289,9 +289,9 @@ namespace BizHawk.Emulation.Consoles.GB
public void ResetFrameCounter()
{
// is this right?
Frame = 0;
LagCount = 0;
IsLagFrame = false;
}
#region savestates

View File

@ -320,6 +320,8 @@ namespace BizHawk.Emulation.Consoles.Nintendo
public void ResetFrameCounter()
{
_frame = 0;
_lagcount = 0;
islag = false;
}
public long Timestamp { get; private set; }

View File

@ -196,9 +196,9 @@ namespace BizHawk.Emulation.Consoles.Nintendo.SNES
CGWSEL_COLORSUBMASK = 41,
CGWSEL_ADDSUBMODE = 42,
CGWSEL_DIRECTCOLOR = 43,
//$2101 OBSEL
OBSEL_NAMEBASE = 50,
OBSEL_NAMESEL = 51,
//$2101 OBSEL
OBSEL_NAMEBASE = 50,
OBSEL_NAMESEL = 51,
OBSEL_SIZE = 52,
}
@ -734,7 +734,12 @@ namespace BizHawk.Emulation.Consoles.Nintendo.SNES
StoreSaveRam(cleardata);
}
public void ResetFrameCounter() { timeFrameCounter = 0; }
public void ResetFrameCounter()
{
timeFrameCounter = 0;
LagCount = 0;
IsLagFrame = false;
}
#region savestates

View File

@ -236,6 +236,8 @@ namespace BizHawk.Emulation.Consoles.TurboGrafx
{
// this should just be a public setter instead of a new method.
Frame = 0;
_lagcount = 0;
islag = false;
}
public void FrameAdvance(bool render, bool rendersound)

View File

@ -204,7 +204,10 @@ namespace BizHawk.Emulation.Consoles.PSX
public void ResetFrameCounter()
{
// FIXME when all this stuff is implemented
Frame = 0;
LagCount = 0;
//IsLagFrame = false;
}
public void FrameAdvance(bool render, bool rendersound)

View File

@ -38,6 +38,8 @@ namespace BizHawk.Emulation.Consoles.Sega
public void ResetFrameCounter()
{
Frame = 0;
_lagcount = 0;
islag = false;
}
// Genesis timings:

View File

@ -67,6 +67,8 @@ namespace BizHawk.Emulation.Consoles.Sega
public void ResetFrameCounter()
{
Frame = 0;
_lagcount = 0;
islag = false;
}
public int LagCount { get { return _lagcount; } set { _lagcount = value; } }

View File

@ -30,6 +30,7 @@ namespace BizHawk
public void ResetFrameCounter()
{
Frame = 0;
// no lag frames on this stub core
}
public void FrameAdvance(bool render, bool rendersound)