This commit is contained in:
parent
2e11130250
commit
f223de1e59
4 changed files with 5 additions and 3 deletions
|
@ -457,6 +457,7 @@ void CSaveLoadDatabase::createData()
|
||||||
m_dataBuffer.m_systemDetails.m_screenOffY=VidGetYOfs();
|
m_dataBuffer.m_systemDetails.m_screenOffY=VidGetYOfs();
|
||||||
for(i=0;i<=CSoundMediator::NUM_VOLUMETYPESTOSAVE;i++)
|
for(i=0;i<=CSoundMediator::NUM_VOLUMETYPESTOSAVE;i++)
|
||||||
{
|
{
|
||||||
|
PAUL_DBGMSG("createData: %d=%d",i,CSoundMediator::getVolume((CSoundMediator::VOLUMETYPE)i));
|
||||||
m_dataBuffer.m_systemDetails.m_volumes[i]=CSoundMediator::getVolume((CSoundMediator::VOLUMETYPE)i);
|
m_dataBuffer.m_systemDetails.m_volumes[i]=CSoundMediator::getVolume((CSoundMediator::VOLUMETYPE)i);
|
||||||
}
|
}
|
||||||
m_dataBuffer.m_systemDetails.m_controlStyle=CPadConfig::getConfig();;
|
m_dataBuffer.m_systemDetails.m_controlStyle=CPadConfig::getConfig();;
|
||||||
|
@ -485,6 +486,7 @@ void CSaveLoadDatabase::restoreData(int _loadSettingsOnly)
|
||||||
VidSetXYOfs(m_dataBuffer.m_systemDetails.m_screenOffX,m_dataBuffer.m_systemDetails.m_screenOffY);
|
VidSetXYOfs(m_dataBuffer.m_systemDetails.m_screenOffX,m_dataBuffer.m_systemDetails.m_screenOffY);
|
||||||
for(i=0;i<=CSoundMediator::NUM_VOLUMETYPESTOSAVE;i++)
|
for(i=0;i<=CSoundMediator::NUM_VOLUMETYPESTOSAVE;i++)
|
||||||
{
|
{
|
||||||
|
PAUL_DBGMSG("restoreData: %d=%d",i,m_dataBuffer.m_systemDetails.m_volumes[i]);
|
||||||
CSoundMediator::setVolume((CSoundMediator::VOLUMETYPE)i,m_dataBuffer.m_systemDetails.m_volumes[i]);
|
CSoundMediator::setVolume((CSoundMediator::VOLUMETYPE)i,m_dataBuffer.m_systemDetails.m_volumes[i]);
|
||||||
}
|
}
|
||||||
CPadConfig::setConfig(m_dataBuffer.m_systemDetails.m_controlStyle);
|
CPadConfig::setConfig(m_dataBuffer.m_systemDetails.m_controlStyle);
|
||||||
|
|
|
@ -92,7 +92,7 @@ private:
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
SAVELOAD_HEADERID=4,
|
SAVELOAD_HEADERID=5,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -370,8 +370,7 @@ void CSoundMediator::initialise()
|
||||||
s_targetVolume[i]=INITIAL_VOLUME;
|
s_targetVolume[i]=INITIAL_VOLUME;
|
||||||
s_volumeDirty[i]=true;
|
s_volumeDirty[i]=true;
|
||||||
}
|
}
|
||||||
// s_targetVolume[VOL_SONG]=INITIAL_VOLUME-32;
|
s_targetVolume[VOL_SPEECH]=INITIAL_SPEECH_VOLUME;
|
||||||
s_targetVolume[VOL_SPEECH]=INITIAL_VOLUME+64;
|
|
||||||
|
|
||||||
ASSERT(CXAStream::MIN_VOLUME==0); // Just incase someone decides to change any of these.. things in here will break ( PKG )
|
ASSERT(CXAStream::MIN_VOLUME==0); // Just incase someone decides to change any of these.. things in here will break ( PKG )
|
||||||
ASSERT(CXAStream::MAX_VOLUME==32767);
|
ASSERT(CXAStream::MAX_VOLUME==32767);
|
||||||
|
|
|
@ -251,6 +251,7 @@ private:
|
||||||
{
|
{
|
||||||
VOLUME_CHANGE_SPEED=2,
|
VOLUME_CHANGE_SPEED=2,
|
||||||
INITIAL_VOLUME=192,
|
INITIAL_VOLUME=192,
|
||||||
|
INITIAL_SPEECH_VOLUME=255,
|
||||||
};
|
};
|
||||||
|
|
||||||
CSoundMediator() {;}
|
CSoundMediator() {;}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue