mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r17787) -Codechange: be a bit more verbose about while allegro failed with some actions.

This commit is contained in:
rubidium 2009-10-17 14:39:43 +00:00
parent d1d35b95b6
commit c37029d5e1
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/music/allegro_m.cpp
View File

@ -25,11 +25,17 @@ extern int _allegro_instance_count;
const char *MusicDriver_Allegro::Start(const char * const *param)
{
if (_allegro_instance_count == 0 && install_allegro(SYSTEM_AUTODETECT, &errno, NULL)) return "Failed to set up Allegro";
if (_allegro_instance_count == 0 && install_allegro(SYSTEM_AUTODETECT, &errno, NULL)) {
DEBUG(driver, 0, "allegro: install_allegro failed '%s'", allegro_error);
return "Failed to set up Allegro";
}
_allegro_instance_count++;
/* Initialise the sound */
if (install_sound(DIGI_AUTODETECT, MIDI_AUTODETECT, NULL) != 0) return "Failed to set up Allegro sound";
if (install_sound(DIGI_AUTODETECT, MIDI_AUTODETECT, NULL) != 0) {
DEBUG(driver, 0, "allegro: install_sound failed '%s'", allegro_error);
return "Failed to set up Allegro sound";
}
/* Okay, there's no soundcard */
if (midi_card == MIDI_NONE) {

10
src/sound/allegro_s.cpp
View File

@ -51,11 +51,17 @@ extern int _allegro_instance_count;
const char *SoundDriver_Allegro::Start(const char * const *parm)
{
if (_allegro_instance_count == 0 && install_allegro(SYSTEM_AUTODETECT, &errno, NULL)) return "Failed to set up Allegro";
if (_allegro_instance_count == 0 && install_allegro(SYSTEM_AUTODETECT, &errno, NULL)) {
DEBUG(driver, 0, "allegro: install_allegro failed '%s'", allegro_error);
return "Failed to set up Allegro";
}
_allegro_instance_count++;
/* Initialise the sound */
if (install_sound(DIGI_AUTODETECT, MIDI_AUTODETECT, NULL) != 0) return "Failed to set up Allegro sound";
if (install_sound(DIGI_AUTODETECT, MIDI_AUTODETECT, NULL) != 0) {
DEBUG(driver, 0, "allegro: install_sound failed '%s'", allegro_error);
return "Failed to set up Allegro sound";
}
/* Okay, there's no soundcard */
if (digi_card == DIGI_NONE) {

7
src/video/allegro_v.cpp
View File

@ -201,7 +201,7 @@ static bool CreateMainSurface(uint w, uint h)
GetAvailableVideoMode(&w, &h);
if (set_gfx_mode(_fullscreen ? GFX_AUTODETECT_FULLSCREEN : GFX_AUTODETECT_WINDOWED, w, h, 0, 0) != 0) {
DEBUG(driver, 0, "Allegro: Couldn't allocate a window to draw on");
DEBUG(driver, 0, "Allegro: Couldn't allocate a window to draw on '%s'", allegro_error);
return false;
}
@ -415,7 +415,10 @@ int _allegro_instance_count = 0;
const char *VideoDriver_Allegro::Start(const char * const *parm)
{
if (_allegro_instance_count == 0 && install_allegro(SYSTEM_AUTODETECT, &errno, NULL)) return "Failed to set up Allegro";
if (_allegro_instance_count == 0 && install_allegro(SYSTEM_AUTODETECT, &errno, NULL)) {
DEBUG(driver, 0, "allegro: install_allegro failed '%s'", allegro_error);
return "Failed to set up Allegro";
}
_allegro_instance_count++;
install_timer();