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

Revert "fix warning: format '%x' expects argument of type 'unsigned int*', but argument 3 has type 'u8* {aka unsigned char*}'" 

This reverts commit b9953f5d6a.
This commit is contained in:
Rachel Bryk 2013-06-24 09:14:22 -04:00
parent 5f91998302
commit f73a97b242
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,7 @@ std::string author = "";
u64 g_titleID = 0; u64 g_titleID = 0;
unsigned char MD5[16]; unsigned char MD5[16];
u8 bongos; u8 bongos;
u32 revision[5]; u8 revision[20];
bool g_bRecordingFromSaveState = false; bool g_bRecordingFromSaveState = false;
bool g_bPolled = false; bool g_bPolled = false;
@ -1184,9 +1184,9 @@ void GetSettings()
g_bClearSave = !File::Exists(SConfig::GetInstance().m_strMemoryCardA); g_bClearSave = !File::Exists(SConfig::GetInstance().m_strMemoryCardA);
bMemcard = SConfig::GetInstance().m_EXIDevice[0] == EXIDEVICE_MEMORYCARD; bMemcard = SConfig::GetInstance().m_EXIDevice[0] == EXIDEVICE_MEMORYCARD;
for (int i = 0; i < 5; ++i) for (int i = 0; i < 20; ++i)
{ {
sscanf(SCM_REV_STR + 8 * i, "%08x", &revision[i]); sscanf(SCM_REV_STR + 2 * i, "%02x", &revision[i]);
} }
} }