Commit 1a990e00 authored by Gerhard Stein's avatar Gerhard Stein Committed by Gerhard Stein

More consistency in Audio volumes

parent 9d2670eb
......@@ -99,8 +99,8 @@ bool CSettings::saveDrvCfg()
Configuration.WriteInt("Audio", "format", (gSound.getAudioSpec()).format);
Configuration.WriteInt("Audio", "rate", (gSound.getAudioSpec()).freq);
Configuration.SetKeyword("Audio", "sndblaster", gSound.getSoundBlasterMode());
Configuration.WriteInt("Audio", "musicvol", (gSound.getMusicVolume()/8));
Configuration.WriteInt("Audio", "soundvol", (gSound.getSoundVolume()/8));
Configuration.WriteInt("Audio", "musicvol", (gSound.getMusicVolume()));
Configuration.WriteInt("Audio", "soundvol", (gSound.getSoundVolume()));
}
catch(...)
......
......@@ -565,8 +565,9 @@ void CPlayGameGalaxy::ponder(const float deltaT)
else
{
if(!msgboxactive && gInput.getPressedCommand(playerCount, IC_STATUS))
{
{
gSound.playSound(SOUND_STATUS_SLIDE_IN);
inv.toggleStatusScreen();
}
}
......
......@@ -46,7 +46,7 @@ starTimer(TIME_STAR_SHOWN)
void CStunnable::getTouchedBy(CSpriteObject &theObject)
{
CBullet *bullet = dynamic_cast<CBullet*>(&theObject);
if( theObject.exists && bullet != NULL )
if( theObject.exists && bullet != nullptr )
{
bullet->setAction(A_KEENSHOT_IMPACT);
bullet->playSound( SOUND_SHOT_HIT );
......
......@@ -43,11 +43,11 @@ GalaxyMenu(GsRect<float>(0.075f, 0.24f, 0.85f, 0.4f) )
mpSBToggle = new ComboSelection( "Card", filledStrList( 2, "PC Speaker", "Soundblaster" ) );
mpMenuDialog->addControl( mpSBToggle );
mpSoundVolume = new NumberControl( "Sound Vol", 0, SDL_MIX_MAXVOLUME, 8, gSound.getSoundVolume() );
mpSoundVolume = new NumberControl( "Sound Vol", 0, 100, 4, gSound.getSoundVolume() );
mpMenuDialog->addControl( mpSoundVolume );
mpMusicVolume = new NumberControl( "Music Vol", 0, SDL_MIX_MAXVOLUME, 8, gSound.getMusicVolume() );
mpMusicVolume = new NumberControl( "Music Vol", 0, 100, 4, gSound.getMusicVolume() );
mpMenuDialog->addControl( mpMusicVolume );
setMenuLabel("SNDEFFMENULABEL");
......
......@@ -41,11 +41,11 @@ VorticonMenu(GsRect<float>(0.075f, 0.24f, 0.85f, 0.4f) )
mpSBToggle = new ComboSelection( "Card", filledStrList( 2, "PC Speaker", "Soundblaster" ) );
mpMenuDialog->addControl( mpSBToggle );
mpSoundVolume = new NumberControl( "Sound Vol", 0, SDL_MIX_MAXVOLUME, 8, gSound.getSoundVolume(), true );
mpSoundVolume = new NumberControl( "Sound Vol", 0, 100, 4, gSound.getSoundVolume(), true );
mpMenuDialog->addControl( mpSoundVolume );
mpMusicVolume = new NumberControl( "Music Vol", 0, SDL_MIX_MAXVOLUME, 8, gSound.getMusicVolume(), true );
mpMusicVolume = new NumberControl( "Music Vol", 0, 100, 4, gSound.getMusicVolume(), true );
mpMenuDialog->addControl( mpMusicVolume );
}
......
......@@ -123,7 +123,6 @@ bool Audio::init()
Mix_QuerySpec(&audio_rate, &audio_format, &audio_channels);
const auto bits = audio_format&0xFF;
//const auto sample_size = bits/8 + audio_channels;
mAudioSpec.freq = audio_rate;
mAudioSpec.format = audio_format;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment