diff options
| author | rubidium <rubidium@openttd.org> | 2009-10-17 14:39:43 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-10-17 14:39:43 +0000 |
| commit | c37029d5e1bbf2be998a2aca7735711358972f5a (patch) | |
| tree | 34865073b1a5b8f84609b4a2d8b2288e38c90d8e | |
| parent | d1d35b95b6e75a263b9395125af7d22faf02f462 (diff) | |
| download | openttd-c37029d5e1bbf2be998a2aca7735711358972f5a.tar.xz | |
(svn r17787) -Codechange: be a bit more verbose about while allegro failed with some actions.
| -rw-r--r-- | src/music/allegro_m.cpp | 10 | ||||
| -rw-r--r-- | src/sound/allegro_s.cpp | 10 | ||||
| -rw-r--r-- | src/video/allegro_v.cpp | 7 |
3 files changed, 21 insertions, 6 deletions
diff --git a/src/music/allegro_m.cpp b/src/music/allegro_m.cpp index d48d65325..ba73e2f64 100644 --- a/src/music/allegro_m.cpp +++ b/src/music/allegro_m.cpp @@ -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) { diff --git a/src/sound/allegro_s.cpp b/src/sound/allegro_s.cpp index cde0aad21..cef716407 100644 --- a/src/sound/allegro_s.cpp +++ b/src/sound/allegro_s.cpp @@ -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) { diff --git a/src/video/allegro_v.cpp b/src/video/allegro_v.cpp index a92a115e2..542422aef 100644 --- a/src/video/allegro_v.cpp +++ b/src/video/allegro_v.cpp @@ -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(); |