Removed/replaced BREAKPOINT

svn-id: r41025

2 files changed, 9 insertions, 5 deletions

diff --git a/engines/sci/sfx/core.cpp b/engines/sci/sfx/core.cpp
index 5030cde77e..549a337a64 100644
--- a/engines/sci/sfx/core.cpp
+++ b/engines/sci/sfx/core.cpp
@@ -540,7 +540,9 @@ void SfxState::updateMultiSong() {
 		oldseeker->next_stopping = oldseeker->next_playing;
 		oldseeker->next_playing = &not_playing_anymore;
 
-		if (oldseeker == oldseeker->next_playing) { BREAKPOINT(); }
+		if (oldseeker == oldseeker->next_playing) { 
+			error("updateMultiSong() failed. Breakpoint in %s, line %d\n", __FILE__, __LINE__);
+		}
 	}
 
 	/* Second, re-generate the new song queue. */
@@ -549,7 +551,9 @@ void SfxState::updateMultiSong() {
 		newseeker->next_playing
 		= song_lib_find_next_active(_songlib, newseeker);
 
-		if (newseeker == newseeker->next_playing) { BREAKPOINT(); }
+		if (newseeker == newseeker->next_playing) { 
+			error("updateMultiSong() failed. Breakpoint in %s, line %d\n", __FILE__, __LINE__);
+		}
 	}
 	/* We now need to update the currently playing song list, because we're
 	** going to use some functions that require this list to be in a sane
diff --git a/engines/sci/sfx/iterator.cpp b/engines/sci/sfx/iterator.cpp
index 173c4ab160..8192e4c75b 100644
--- a/engines/sci/sfx/iterator.cpp
+++ b/engines/sci/sfx/iterator.cpp
@@ -441,7 +441,7 @@ static int _sci_midi_process_state(BaseSongIterator *self, byte *buf, int *resul
 
 	default:
 		warning("Invalid iterator state %d!", channel->state);
-		BREAKPOINT();
+		error("Breakpoint in %s, line %d\n", __FILE__, __LINE__);
 		return SI_FINISHED;
 	}
 }
@@ -1290,7 +1290,7 @@ static void songit_tee_death_notification(TeeSongIterator *self, SongIterator *c
 		self->_status &= ~TEE_RIGHT_ACTIVE;
 		self->_children[TEE_RIGHT].it = NULL;
 	} else {
-		BREAKPOINT();
+		error("songit_tee_death_notification() failed: Breakpoint in %s, line %d\n", __FILE__, __LINE__);
 	}
 }
 
@@ -1580,7 +1580,7 @@ int songit_next(SongIterator **it, byte *buf, int *result, int mask) {
 		if (retval == SI_MORPH) {
 			fprintf(stderr, "  Morphing %p (stored at %p)\n", (void *)*it, (void *)it);
 			if (!SIMSG_SEND((*it), SIMSG_ACK_MORPH)) {
-				BREAKPOINT();
+				error("SI_MORPH failed. Breakpoint in %s, line %d\n", __FILE__, __LINE__);
 			} else
 				fprintf(stderr, "SI_MORPH successful\n");
 		}