diff options
| author | rog <rdragoon@optonline.net> | 2012-11-12 11:39:33 -0500 |
|---|---|---|
| committer | rog <rdragoon@optonline.net> | 2012-11-12 20:40:11 -0500 |
| commit | 8fe5aa4ee8568bd502dade463be18c7f7504a0de (patch) | |
| tree | c3e6c37c580f64a0856e51b463a43d4d96400418 | |
| parent | a5d210129d433cee7df6c7d8d52152ade13ebcd0 (diff) | |
movie cleanup
| -rw-r--r-- | Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/Core/Src/Movie.cpp | 12 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 2 |
3 files changed, 6 insertions, 10 deletions
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp index 038eb6e9a9..c157e55d1b 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp @@ -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 diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index aa6fa0bd81..189201a36a 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -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()); } } diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index c4e37e761e..226b7227c3 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -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(); |