[Scummvm-cvs-logs] SF.net SVN: scummvm: [21107] scummvm/trunk/engines/scumm/imuse/imuse.cpp

Jamieson630 at users.sourceforge.net Jamieson630 at users.sourceforge.net
Sun Mar 5 16:16:19 CET 2006


Revision: 21107
Author:   Jamieson630
Date:     2006-03-05 14:35:26 -0800 (Sun, 05 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=21107&view=rev

Log Message:
-----------
Removed tag2str usage, which eliminates scumm/util.h dependency.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/imuse/imuse.cpp
Modified: scummvm/trunk/engines/scumm/imuse/imuse.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse/imuse.cpp	2006-03-05 22:31:49 UTC (rev 21106)
+++ scummvm/trunk/engines/scumm/imuse/imuse.cpp	2006-03-05 22:35:26 UTC (rev 21107)
@@ -33,11 +33,7 @@
 #include "scumm/imuse/instrument.h"
 #include "scumm/saveload.h"
 #include "scumm/scumm.h"
-#include "scumm/util.h"
 
-#include "sound/mididrv.h"
-
-
 namespace Scumm {
 
 ////////////////////////////////////////
@@ -152,7 +148,7 @@
 	if (ptr[8] == 'S' && ptr[9] == 'O')
 		return false;
 
-	error("Unknown music type: '%s'", tag2str(tag));
+	error("Unknown music type: '%c%c%c%c'", (char)tag>>24, (char)tag>>16, (char)tag>>8, (char)tag);
 
 	return false;
 }
@@ -194,7 +190,7 @@
 	if (ptr[8] == 'S' && ptr[9] == 'O')
 		return true;
 
-	error("Unknown music type: '%s'", tag2str(tag));
+	error("Unknown music type: '%c%c%c%c'", (char)tag>>24, (char)tag>>16, (char)tag>>8, (char)tag);
 
 	return false;
 }







More information about the Scummvm-git-logs mailing list