Replaced Chunk::ChunkString by tag2str

svn-id: r24325

5 files changed, 7 insertions, 15 deletions

diff --git a/engines/scumm/smush/chunk.cpp b/engines/scumm/smush/chunk.cpp
index 3290d9e793..7c7c27ac72 100644
--- a/engines/scumm/smush/chunk.cpp
+++ b/engines/scumm/smush/chunk.cpp
@@ -31,16 +31,6 @@
 
 namespace Scumm {
 
-const char *Chunk::ChunkString(Chunk::type t) {
-	static char data[5];
-	data[0] = (char)((t >> 24) & 0xFF);
-	data[1] = (char)((t >> 16) & 0xFF);
-	data[2] = (char)((t >> 8) & 0xFF);
-	data[3] = (char)((t >> 0) & 0xFF);
-	data[4] = 0;
-	return data;
-}
-
 BaseChunk::BaseChunk() :
 	_type(0),
 	_size(0),
diff --git a/engines/scumm/smush/chunk.h b/engines/scumm/smush/chunk.h
index 7d5b1926fa..22ca675413 100644
--- a/engines/scumm/smush/chunk.h
+++ b/engines/scumm/smush/chunk.h
@@ -35,7 +35,6 @@ public:
 	virtual ~Chunk() {};
 	enum seek_type { seek_start, seek_end, seek_cur };
 	typedef uint32 type;
-	static const char *ChunkString(type t);
 	virtual type getType() const = 0;
 	virtual uint32 getSize() const = 0;
 	virtual Chunk *subBlock() = 0;
diff --git a/engines/scumm/smush/imuse_channel.cpp b/engines/scumm/smush/imuse_channel.cpp
index 9afbfe8d47..c679c3f6ff 100644
--- a/engines/scumm/smush/imuse_channel.cpp
+++ b/engines/scumm/smush/imuse_channel.cpp
@@ -22,6 +22,7 @@
 
 #include "common/stdafx.h"
 #include "scumm/scumm.h"
+#include "scumm/util.h"
 #include "scumm/smush/channel.h"
 #include "scumm/smush/chunk.h"
 #include "scumm/smush/chunk_type.h"
@@ -153,7 +154,7 @@ bool ImuseChannel::handleMap(Chunk &map) {
 			handleStop(*sub);
 			break;
 		default:
-			error("Unknown iMUS subChunk found : %s, %d", Chunk::ChunkString(sub->getType()), sub->getSize());
+			error("Unknown iMUS subChunk found : %s, %d", tag2str(sub->getType()), sub->getSize());
 		}
 		delete sub;
 	}
@@ -243,7 +244,7 @@ bool ImuseChannel::handleSubTags(int32 &offset) {
 			}
 			return false;
 		default:
-			error("unknown Chunk in iMUS track : %s ", Chunk::ChunkString(type));
+			error("unknown Chunk in iMUS track : %s ", tag2str(type));
 		}
 		offset += size + 8;
 		return true;
diff --git a/engines/scumm/smush/saud_channel.cpp b/engines/scumm/smush/saud_channel.cpp
index 662da3ee76..77bc4c89e2 100644
--- a/engines/scumm/smush/saud_channel.cpp
+++ b/engines/scumm/smush/saud_channel.cpp
@@ -23,6 +23,7 @@
 #include "common/stdafx.h"
 #include "common/endian.h"
 
+#include "scumm/util.h"
 #include "scumm/smush/channel.h"
 #include "scumm/smush/chunk.h"
 #include "scumm/smush/chunk_type.h"
@@ -83,7 +84,7 @@ bool SaudChannel::handleSubTags(int32 &offset) {
 			offset += 8;
 			return false;
 		default:
-			error("unknown Chunk in SAUD track : %s ", Chunk::ChunkString(type));
+			error("unknown Chunk in SAUD track : %s ", tag2str(type));
 		}
 		offset += size + 8;
 		return true;
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index 4f47994cec..246016dc8e 100644
--- a/engines/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
@@ -38,6 +38,7 @@
 #include "scumm/imuse/imuse.h"
 #include "scumm/scumm.h"
 #include "scumm/sound.h"
+#include "scumm/util.h"
 #include "scumm/smush/channel.h"
 #include "scumm/smush/chunk_type.h"
 #include "scumm/smush/chunk.h"
@@ -984,7 +985,7 @@ void SmushPlayer::handleFrame(Chunk &b) {
 			handleTextResource(*sub);
 			break;
 		default:
-			error("Unknown frame subChunk found : %s, %d", Chunk::ChunkString(sub->getType()), sub->getSize());
+			error("Unknown frame subChunk found : %s, %d", tag2str(sub->getType()), sub->getSize());
 		}
 
 		b.reseek();