0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed segfault if sound not available

Browse source
This commit is contained in:
Dave White 2003-09-18 23:19:29 +00:00
parent b18dc37696
commit 6e4ae9a502
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
preferences.cpp
View file

@ -367,7 +367,7 @@ void show_video_mode_dialog(display& disp)
return;
for(int i = 0; modes[i] != NULL; ++i) {
if(modes[i]->w >= 1024) {
if(modes[i]->w >= 1024 && modes[i]->h >= 768) {
const std::pair<int,int> new_res(modes[i]->w,modes[i]->h);
if(std::count(resolutions.begin(),resolutions.end(),new_res) > 0)
continue;

9
sound.cpp
View file

@ -38,12 +38,11 @@ manager::manager()
Mix_OpenAudio(MIX_DEFAULT_FREQUENCY,MIX_DEFAULT_FORMAT,2,1024);
if(res >= 0) {
mix_ok = true;
Mix_AllocateChannels(8);
} else {
mix_ok = false;
std::cerr << "Could not initialize audio: " << SDL_GetError() << "\n";
}
Mix_AllocateChannels(8);
}
manager::~manager()
@ -158,6 +157,9 @@ void play_sound(const std::string& file)
void set_music_volume(double vol)
{
if(!mix_ok)
return;
if(vol < 0.05) {
Mix_HaltMusic();
music_off = true;
@ -179,6 +181,9 @@ void set_music_volume(double vol)
void set_sound_volume(double vol)
{
if(!mix_ok)
return;
if(vol < 0.05) {
sound_off = true;
return;