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

Fixed a little crash I had in ISOProperties with Mario Kart Wii, it was trying to read a third unknown partition type. 

Effectively toggling throttle in DSP HLE/LLE when the game is running

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3096 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
sl1nk3.s 2009-04-27 23:27:56 +00:00
parent 989f4fb6da
commit adb791dd58
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DiscIO/Src/FileSystemGCWii.cpp
View File

@ -166,6 +166,8 @@ bool CFileSystemGCWii::InitFileSystem()
} }
else else
{ {
// Mario Kart Wii gets here on its third partition...
// Does it use a fake partition ? another type we don't know ?
return false; return false;
} }

8
Source/Core/DolphinWX/Src/ISOProperties.cpp
View File

@ -71,9 +71,11 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
WiiPartition temp; WiiPartition temp;
if ((temp.Partition = DiscIO::CreateVolumeFromFilename(fileName, i)) != NULL) if ((temp.Partition = DiscIO::CreateVolumeFromFilename(fileName, i)) != NULL)
{ {
temp.FileSystem = DiscIO::CreateFileSystem(temp.Partition); if ((temp.FileSystem = DiscIO::CreateFileSystem(temp.Partition)) != NULL)
temp.FileSystem->GetFileList(temp.Files); {
WiiDisc.push_back(temp); temp.FileSystem->GetFileList(temp.Files);
WiiDisc.push_back(temp);
}
} }
else else
break; break;

3
Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp
View File

@ -97,6 +97,9 @@ void ConfigDialog::SettingsChanged(wxCommandEvent& event)
g_Config.m_EnableHLEAudio = m_buttonEnableHLEAudio->GetValue(); g_Config.m_EnableHLEAudio = m_buttonEnableHLEAudio->GetValue();
ac_Config.m_EnableDTKMusic = m_buttonEnableDTKMusic->GetValue(); ac_Config.m_EnableDTKMusic = m_buttonEnableDTKMusic->GetValue();
ac_Config.m_EnableThrottle = m_buttonEnableThrottle->GetValue(); ac_Config.m_EnableThrottle = m_buttonEnableThrottle->GetValue();
if (soundStream != NULL)
soundStream->GetMixer()->SetThrottle(ac_Config.m_EnableThrottle);
#ifdef __APPLE__ #ifdef __APPLE__
strncpy(ac_Config.sBackend, m_BackendSelection->GetValue().mb_str(), 128); strncpy(ac_Config.sBackend, m_BackendSelection->GetValue().mb_str(), 128);
#else #else

4
Source/Plugins/Plugin_DSP_LLE/Src/DSPConfigDlgLLE.cpp
View File

@ -91,6 +91,9 @@ void DSPConfigDialogLLE::SettingsChanged(wxCommandEvent& event)
{ {
ac_Config.m_EnableDTKMusic = m_buttonEnableDTKMusic->GetValue(); ac_Config.m_EnableDTKMusic = m_buttonEnableDTKMusic->GetValue();
ac_Config.m_EnableThrottle = m_buttonEnableThrottle->GetValue(); ac_Config.m_EnableThrottle = m_buttonEnableThrottle->GetValue();
if (soundStream != NULL)
soundStream->GetMixer()->SetThrottle(ac_Config.m_EnableThrottle);
#ifdef __APPLE__ #ifdef __APPLE__
strncpy(ac_Config.sBackend, m_BackendSelection->GetValue().mb_str(), 128); strncpy(ac_Config.sBackend, m_BackendSelection->GetValue().mb_str(), 128);
#else #else
@ -99,7 +102,6 @@ void DSPConfigDialogLLE::SettingsChanged(wxCommandEvent& event)
ac_Config.Update(); ac_Config.Update();
g_Config.Save(); g_Config.Save();
if (event.GetId() == wxID_OK) if (event.GetId() == wxID_OK)
EndModal(wxID_OK); EndModal(wxID_OK);
} }