dir += "/data";
std::string testfname = dir;
testfname += "/credits.txt";
+ bool sourcedir = false;
FILE* f = fopen(testfname.c_str(), "r");
if(f) {
fclose(f);
if(!PHYSFS_addToSearchPath(dir.c_str(), 1)) {
std::cout << "Warning: Couldn't add '" << dir
<< "' to physfs searchpath: " << PHYSFS_getLastError() << "\n";
+ } else {
+ sourcedir = true;
}
}
+ if(!sourcedir) {
#if defined(APPDATADIR) || defined(ENABLE_BINRELOC)
- std::string datadir;
+ std::string datadir;
#ifdef ENABLE_BINRELOC
- char* brdatadir = br_strcat(DATADIR, "/" PACKAGE_NAME);
- datadir = brdatadir;
- free(brdatadir);
+ char* brdatadir = br_strcat(DATADIR, "/" PACKAGE_NAME);
+ datadir = brdatadir;
+ free(brdatadir);
#else
- datadir = APPDATADIR;
+ datadir = APPDATADIR;
#endif
- if(!PHYSFS_addToSearchPath(datadir.c_str(), 1)) {
- std::cout << "Couldn't add '" << datadir
- << "' to physfs searchpath: " << PHYSFS_getLastError() << "\n";
- }
+ if(!PHYSFS_addToSearchPath(datadir.c_str(), 1)) {
+ std::cout << "Couldn't add '" << datadir
+ << "' to physfs searchpath: " << PHYSFS_getLastError() << "\n";
+ }
#endif
+ }
// allow symbolic links
PHYSFS_permitSymbolicLinks(1);
{
sound_manager = new SoundManager();
- int format = MIX_DEFAULT_FORMAT;
- if(Mix_OpenAudio(config->audio_frequency, format, config->audio_channels,
- config->audio_chunksize) < 0) {
- std::cerr << "Couldn't initialize audio ("
- << config->audio_frequency << "HZ, " << config->audio_channels
- << " Channels, Format " << format << ", ChunkSize "
- << config->audio_chunksize << "): " << SDL_GetError() << "\n";
- return;
- }
- sound_manager->set_audio_device_available(true);
sound_manager->enable_sound(config->sound_enabled);
sound_manager->enable_music(config->music_enabled);
-
- if(Mix_AllocateChannels(config->audio_voices) < 0) {
- std::cerr << "Couldn't allocate '" << config->audio_voices << "' audio voices: "
- << SDL_GetError() << "\n";
- return;
- }
}
static void quit_audio()
{
if(sound_manager) {
- if(sound_manager->audio_device_available())
- Mix_CloseAudio();
-
delete sound_manager;
sound_manager = 0;
}
}
if(SDL_GetTicks() - ticks >= (max - min))
running = false;
+ sound_manager->update();
SDL_Delay(10);
}
}