Merge branch 'level-select' of ssh://treeki.rustedlogic.net:30000/Kamek into level-select

1 files changed, 7 insertions, 7 deletions

diff --git a/src/koopatlas/mapmusic.cpp b/src/koopatlas/mapmusic.cpp
index 480dd9e..d73d3da 100644
--- a/src/koopatlas/mapmusic.cpp
+++ b/src/koopatlas/mapmusic.cpp
@@ -76,14 +76,14 @@ void dKPMusic::execute() {
 		return;
 
 	if (s_handle.GetSound() == 0) {
-		OSReport("SOUND IS NOT PLAYING!\n");
+		nw4r::db::Exception_Printf_("SOUND IS NOT PLAYING!\n");
 		return;
 	}
 
 	if (s_countdownToSwitch >= 0) {
 		s_countdownToSwitch--;
 		if (s_countdownToSwitch == 0) {
-			OSReport("Switching brstm files to song %d.\n", s_nextSong);
+			nw4r::db::Exception_Printf_("Switching brstm files to song %d.\n", s_nextSong);
 
 			char brstmPath[48];
 			sprintf(brstmPath, "/Sound/new/map%d.er", s_nextSong);
@@ -107,19 +107,19 @@ void dKPMusic::execute() {
 			//OSReport("CANCEL successfully called!\n");
 			bool result = DVDFastOpen(DVDConvertPathToEntrynum(brstmPath), fileInfo);
 
-			OSReport("StrmSound is at %p, StrmPlayer is at %p, FileStream pointer is at %p, FileStream is at %p, FileInfo is at %p\n", sound, player, fileStreamPointer, fileStream, fileInfo);
-			OSReport("Changed to name %s. FastOpen returned: %d\n", brstmPath, result);
+			nw4r::db::Exception_Printf_("StrmSound is at %p, StrmPlayer is at %p, FileStream pointer is at %p, FileStream is at %p, FileInfo is at %p\n", sound, player, fileStreamPointer, fileStream, fileInfo);
+			nw4r::db::Exception_Printf_("Changed to name %s. FastOpen returned: %d\n", brstmPath, result);
 
 			u8 *trackArray = player+0xB58;
 			u8 *track = (trackArray + (0x38 * 1));
 			u8 **voicePointer = (u8**)(track+4);
 			u8 *voice = *voicePointer;
-			OSReport("Track Array: %p; Track: %p; Voice Pointer: %p; Voice: %p\n", trackArray, track, voicePointer, voice);
+			nw4r::db::Exception_Printf_("Track Array: %p; Track: %p; Voice Pointer: %p; Voice: %p\n", trackArray, track, voicePointer, voice);
 
 			for (int i = 0; i < 2; i++) {
 				int sourceBlockID = (s_nextSong*2)+i;
 				u8 *sourceData = ((u8*)(s_adpcmInfoLoader.buffer)) + (0x30*sourceBlockID);
-				OSReport("Using ADPCM data for channel %d from block %d, data at %p\n", i, sourceBlockID, sourceData);
+				nw4r::db::Exception_Printf_("Using ADPCM data for channel %d from block %d, data at %p\n", i, sourceBlockID, sourceData);
 
 				Voice_SetADPCMLoop(voice, i, sourceData+0x28);
 
@@ -128,7 +128,7 @@ void dKPMusic::execute() {
 					int axVoiceID = (i*4) + j;
 					u8 **axVoicePointer = (u8**)(voice + 0xC + (axVoiceID*4));
 					u8 *axVoice = *axVoicePointer;
-					OSReport("Setting AxVoice ID %d, with pointer at %p, located at %p\n", axVoiceID, axVoicePointer, axVoice);
+					nw4r::db::Exception_Printf_("Setting AxVoice ID %d, with pointer at %p, located at %p\n", axVoiceID, axVoicePointer, axVoice);
 
 					if (axVoice)
 						AxVoice_SetADPCM(axVoice, sourceData);