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

movie cleanup

This commit is contained in:
rog 2012-11-12 11:39:33 -05:00
parent a5d210129d
commit 8fe5aa4ee8
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp
View File

@ -52,7 +52,7 @@ CEXIMemoryCard::CEXIMemoryCard(const int index)
, m_bDirty(false)
{
m_strFilename = (card_index == 0) ? SConfig::GetInstance().m_strMemoryCardA : SConfig::GetInstance().m_strMemoryCardB;
if (Movie::IsUsingMemcard() && Movie::IsPlayingInput() && Movie::IsConfigSaved() && Movie::IsStartingFromClearSave())
if (Movie::IsPlayingInput() && Movie::IsConfigSaved() && Movie::IsUsingMemcard() && Movie::IsStartingFromClearSave())
m_strFilename = "Movie.raw";
// we're potentially leaking events here, since there's no UnregisterEvent until emu shutdown, but I guess it's inconsequential

12
Source/Core/Core/Src/Movie.cpp
View File

@ -92,7 +92,7 @@ std::string GetInputDisplay()
void FrameUpdate()
{
if (SConfig::GetInstance().m_pauseMovie && IsPlayingInput() && g_currentInputCount == g_totalInputCount -1)
if (IsPlayingInput() && g_currentInputCount == g_totalInputCount -1 && SConfig::GetInstance().m_pauseMovie)
{
Core::SetState(Core::CORE_PAUSE);
}
@ -135,7 +135,7 @@ void Init()
g_bFrameStep = false;
g_bFrameStop = false;
bSaveConfig = false;
iCPUCore = SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore;
if (IsPlayingInput())
{
ReadHeader();
@ -743,11 +743,8 @@ void LoadInput(const char *filename)
ReadHeader();
if (!g_bReadOnly)
{
if (g_rerecords > tmpHeader.numRerecords)
{
tmpHeader.numRerecords = g_rerecords;
}
tmpHeader.numRerecords++;
g_rerecords++;
tmpHeader.numRerecords = g_rerecords;
t_record.Seek(0, SEEK_SET);
t_record.WriteArray(&tmpHeader, 1);
}
@ -968,7 +965,6 @@ void PlayController(SPADStatus *PadStatus, int controllerID)
}
else
{
Core::SetState(Core::CORE_PAUSE);
PanicAlert("Change the disc to %s", g_discChange.c_str());
}
}

2
Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
View File

@ -1116,7 +1116,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
else if (g_ActiveConfig.bOverlayProjStats)
{
Statistics::ToStringProj(st);
D3D::font.DrawTextScaled(0, 35, 20, 20, 0.0f, 0xFF00FFFF, st);
D3D::font.DrawTextScaled(0, 36, 20, 20, 0.0f, 0xFF00FFFF, st);
}
OSD::DrawMessages();