cpp/openttd-patchpack/source Changeset - r13268:c5ec69a8761b

Changeset - r13268:c5ec69a8761b

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

rubidium - 15 years ago 2009-10-17 14:39:43
rubidium@openttd.org

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

3 files changed with 21 insertions and 6 deletions:

src/music/allegro_m.cpp

src/sound/allegro_s.cpp

src/video/allegro_v.cpp

0 comments (0 inline, 0 general)

src/music/allegro_m.cpp

➞

Show inline comments

@@ @@ -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) {

src/sound/allegro_s.cpp

➞

Show inline comments

@@ @@ -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) {

src/video/allegro_v.cpp

➞

Show inline comments

@@ @@ -201,7 +201,7 @@ static bool CreateMainSurface(uint w, ui @@
 	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();

0 comments (0 inline, 0 general)