diff options
| author | Jamieson Christian | 2006-03-05 22:35:26 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2006-03-05 22:35:26 +0000 |
| commit | 06398d1a840e64ba63e5adad7e10c0d315a3832e (patch) | |
| tree | 9477d99268ae48cc53f58ee72434d1760a6e7b54 | |
| parent | ac33309a4d7d2f53f73bcd1818e3e87bcbb99f61 (diff) | |
| download | scummvm-rg350-06398d1a840e64ba63e5adad7e10c0d315a3832e.tar.gz scummvm-rg350-06398d1a840e64ba63e5adad7e10c0d315a3832e.tar.bz2 scummvm-rg350-06398d1a840e64ba63e5adad7e10c0d315a3832e.zip | |
Removed tag2str usage, which eliminates scumm/util.h dependency.
svn-id: r21107
| -rw-r--r-- | engines/scumm/imuse/imuse.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/engines/scumm/imuse/imuse.cpp b/engines/scumm/imuse/imuse.cpp index d070f54ff4..fd96a77221 100644 --- a/engines/scumm/imuse/imuse.cpp +++ b/engines/scumm/imuse/imuse.cpp @@ -33,10 +33,6 @@ #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 @@ bool IMuseInternal::isMT32(int sound) { 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 @@ bool IMuseInternal::isMIDI(int sound) { 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; } |