diff --git a/Source/Core/Core/Src/ARDecrypt.cpp b/Source/Core/Core/Src/ARDecrypt.cpp index 5ac1d2bebd..9982a72c39 100644 --- a/Source/Core/Core/Src/ARDecrypt.cpp +++ b/Source/Core/Core/Src/ARDecrypt.cpp @@ -468,7 +468,7 @@ void DecryptARCode(std::vector vCodes, std::vector &ops) buildseeds(); u32 uCodes[1200]; - int i,ret; + u32 i,ret; for(i = 0; i < vCodes.size(); ++i) { diff --git a/Source/Core/Core/Src/ActionReplay.cpp b/Source/Core/Core/Src/ActionReplay.cpp index 3f38e39c52..312f5f2ea4 100644 --- a/Source/Core/Core/Src/ActionReplay.cpp +++ b/Source/Core/Core/Src/ActionReplay.cpp @@ -161,7 +161,7 @@ bool RunActionReplayCode(const ARCode &arcode) { u8 zcode; bool doFillNSlide = false; bool doMemoryCopy = false; - u32 addr_last; + u32 addr_last = 0; u32 val_last; code = arcode; diff --git a/Source/Core/DolphinWX/Src/AboutDolphin.h b/Source/Core/DolphinWX/Src/AboutDolphin.h index 09db9ac625..10eff52c66 100644 --- a/Source/Core/DolphinWX/Src/AboutDolphin.h +++ b/Source/Core/DolphinWX/Src/AboutDolphin.h @@ -45,7 +45,6 @@ class AboutDolphin : public wxDialog wxButton *m_Close; wxStaticText *Message; - wxImage *iDolphinLogo; wxBitmap *DolphinLogo; wxStaticBitmap *sbDolphinLogo; diff --git a/Source/Core/DolphinWX/Src/ISOFile.h b/Source/Core/DolphinWX/Src/ISOFile.h index 920844e25f..c6f49cf60c 100644 --- a/Source/Core/DolphinWX/Src/ISOFile.h +++ b/Source/Core/DolphinWX/Src/ISOFile.h @@ -54,15 +54,14 @@ private: u64 m_VolumeSize; DiscIO::IVolume::ECountry m_Country; - bool m_BlobCompressed; - - u32 m_ImageSize; - u8* m_pImage; #if !defined(OSX64) wxImage m_Image; #endif bool m_Valid; + bool m_BlobCompressed; + u8* m_pImage; + u32 m_ImageSize; bool LoadFromCache(); void SaveToCache(); diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index 0b13a70aec..cc54649b83 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -373,7 +373,7 @@ void CISOProperties::CreateGUIControls() void CISOProperties::OnClose(wxCloseEvent& WXUNUSED (event)) { - if (!SaveGameConfig(GameIniFile)) + if (!SaveGameConfig()) wxMessageBox(wxString::Format(_("Could not save %s"), GameIniFile.c_str()), _("Error"), wxOK|wxICON_ERROR, this); Destroy(); } @@ -500,7 +500,7 @@ void CISOProperties::LoadGameConfig() // Cheats->Append(wxString(arCodes[i].name.c_str(), wxConvUTF8)); } -bool CISOProperties::SaveGameConfig(std::string GameIniFile) +bool CISOProperties::SaveGameConfig() { if (UseDualCore->Get3StateValue() == wxCHK_UNDETERMINED) GameIni.DeleteKey("Core", "UseDualCore"); @@ -539,4 +539,4 @@ void CISOProperties::OnEditConfig(wxCommandEvent& WXUNUSED (event)) { File::Launch(GameIniFile.c_str()); } -} \ No newline at end of file +} diff --git a/Source/Core/DolphinWX/Src/ISOProperties.h b/Source/Core/DolphinWX/Src/ISOProperties.h index 5c6c53b5aa..67702c5d0e 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.h +++ b/Source/Core/DolphinWX/Src/ISOProperties.h @@ -202,7 +202,7 @@ class CISOProperties : public wxDialog IniFile GameIni; std::string GameIniFile; void LoadGameConfig(); - bool SaveGameConfig(std::string GameIniFile); + bool SaveGameConfig(); }; #endif diff --git a/Source/Core/DolphinWX/Src/PluginManager.cpp b/Source/Core/DolphinWX/Src/PluginManager.cpp index de8cc950db..c8e802fff7 100644 --- a/Source/Core/DolphinWX/Src/PluginManager.cpp +++ b/Source/Core/DolphinWX/Src/PluginManager.cpp @@ -129,7 +129,7 @@ void CPluginManager::ScanForPlugins(wxWindow* _wxWindow) // ------------- void CPluginManager::OpenConfig(void* _Parent, const char *_rFilename) { - int ret = Common::CPlugin::Load(_rFilename); + Common::CPlugin::Load(_rFilename); Common::CPlugin::Config((HWND)_Parent); Common::CPlugin::Release();