Mercurial > hg > openttd

changeset 13278:9b5e7a9fc04b draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r17787) -Codechange: be a bit more verbose about while allegro failed with some actions.
author rubidium <rubidium@openttd.org>
date Sat, 17 Oct 2009 14:39:43 +0000
parents fe0462278733
children 002f137c1f88
files src/music/allegro_m.cpp src/sound/allegro_s.cpp src/video/allegro_v.cpp
diffstat 3 files changed, 21 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/music/allegro_m.cpp
+++ b/src/music/allegro_m.cpp
@@ -25,11 +25,17 @@
 
 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) {
--- a/src/sound/allegro_s.cpp
+++ b/src/sound/allegro_s.cpp
@@ -51,11 +51,17 @@
 
 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) {
--- a/src/video/allegro_v.cpp
+++ b/src/video/allegro_v.cpp
@@ -201,7 +201,7 @@
 
 	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 @@
 
 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();