Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-12-11 23:53:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
bagnz0r 2013-07-07 00:06:47 +02:00
commit f3f2c80f4c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/Config.cpp
View File

@ -129,8 +129,8 @@ void Config::Load(const char *iniFileName)
IniFile::Section *sound = iniFile.GetOrCreateSection("Sound");
sound->Get("Enable", &bEnableSound, true);
sound->Get("EnableAtrac3plus", &bEnableAtrac3plus, true);
sound->Get("BGMVolume", &iBGMVolume, 8);
sound->Get("SEVolume", &iSEVolume, 8);
sound->Get("BGMVolume", &iBGMVolume, 4);
sound->Get("SEVolume", &iSEVolume, 4);
IniFile::Section *control = iniFile.GetOrCreateSection("Control");
control->Get("ShowStick", &bShowAnalogStick, false);

3
Core/HLE/sceKernelVTimer.cpp
View File

@ -329,7 +329,8 @@ void __startVTimer(VTimer *vt) {
vt->nvt.active = 1;
vt->nvt.base = cyclesToUs(CoreTiming::GetTicks());
if (vt->nvt.schedule != 0 && vt->nvt.handlerAddr != 0)
// Checking for zero here breaks audio in Monster Hunter. It still doesn't work well though.
if (/*vt->nvt.schedule != 0 &&*/ vt->nvt.handlerAddr != 0)
__KernelScheduleVTimer(vt, vt->nvt.schedule);
}