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

Merge pull request #996 from RachelBryk/clear-mc-bongos 

Clear movie variables that might have been set from a previous run.
This commit is contained in:
shuffle2 2014-09-06 11:46:21 -07:00
parent f2237ecd64 2a82b591e1
commit d0d6f70980
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/Movie.cpp
View File

@ -438,17 +438,21 @@ bool BeginRecordingInput(int controllers)
g_currentLagCount = g_totalLagCount = 0; g_currentLagCount = g_totalLagCount = 0;
g_currentInputCount = g_totalInputCount = 0; g_currentInputCount = g_totalInputCount = 0;
g_totalTickCount = g_tickCountAtLastInput = 0; g_totalTickCount = g_tickCountAtLastInput = 0;
bongos = 0;
memcards = 0;
if (NetPlay::IsNetPlayRunning()) if (NetPlay::IsNetPlayRunning())
{ {
bNetPlay = true; bNetPlay = true;
g_recordingStartTime = NETPLAY_INITIAL_GCTIME; g_recordingStartTime = NETPLAY_INITIAL_GCTIME;
} }
else else
{
g_recordingStartTime = Common::Timer::GetLocalTimeSinceJan1970(); g_recordingStartTime = Common::Timer::GetLocalTimeSinceJan1970();
}
g_rerecords = 0; g_rerecords = 0;
for (int i = 0; i < MAX_SI_CHANNELS; i++) for (int i = 0; i < MAX_SI_CHANNELS; ++i)
if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_TARUKONGA) if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_TARUKONGA)
bongos |= (1 << i); bongos |= (1 << i);
@ -1253,7 +1257,7 @@ void GetSettings()
void CheckMD5() void CheckMD5()
{ {
for (int i=0, n=0; i<16; i++) for (int i = 0, n = 0; i < 16; ++i)
{ {
if (tmpHeader.md5[i] != 0) if (tmpHeader.md5[i] != 0)
continue; continue;