diff options
| author | Max Horn | 2010-03-18 15:04:38 +0000 |
|---|---|---|
| committer | Max Horn | 2010-03-18 15:04:38 +0000 |
| commit | 4e99cfc549d404c8c7b9b3e3478e12975039980d (patch) | |
| tree | a3394c721551b1f9cb0fea3973c2763ba1124c8f | |
| parent | a17bbf3c2e8b9f9983adf2fd84fa8c7525f78cbb (diff) | |
| download | scummvm-rg350-4e99cfc549d404c8c7b9b3e3478e12975039980d.tar.gz scummvm-rg350-4e99cfc549d404c8c7b9b3e3478e12975039980d.tar.bz2 scummvm-rg350-4e99cfc549d404c8c7b9b3e3478e12975039980d.zip | |
Switch from Common::tag2string(foo).c_str() to tag2str(foo)
svn-id: r48276
| -rw-r--r-- | engines/kyra/script.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/script_tim.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/smush/smush_player.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/script.cpp b/engines/kyra/script.cpp index dd7cced83c..d58b04f080 100644 --- a/engines/kyra/script.cpp +++ b/engines/kyra/script.cpp @@ -96,7 +96,7 @@ bool EMCInterpreter::callback(Common::IFFChunk &chunk) { break; default: - warning("Unexpected chunk '%s' of size %d found in file '%s'", Common::tag2string(chunk._type).c_str(), chunk._size, _filename); + warning("Unexpected chunk '%s' of size %d found in file '%s'", tag2str(chunk._type), chunk._size, _filename); } return false; diff --git a/engines/kyra/script_tim.cpp b/engines/kyra/script_tim.cpp index edfd5a37a0..343ea9307b 100644 --- a/engines/kyra/script_tim.cpp +++ b/engines/kyra/script_tim.cpp @@ -134,7 +134,7 @@ bool TIMInterpreter::callback(Common::IFFChunk &chunk) { break; default: - warning("Unexpected chunk '%s' of size %d found in file '%s'", Common::tag2string(chunk._type).c_str(), chunk._size, _filename); + warning("Unexpected chunk '%s' of size %d found in file '%s'", tag2str(chunk._type), chunk._size, _filename); } return false; diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp index a81e385890..251b031737 100644 --- a/engines/scumm/smush/smush_player.cpp +++ b/engines/scumm/smush/smush_player.cpp @@ -1026,7 +1026,7 @@ void SmushPlayer::parseNextFrame() { return; } - debug(3, "Chunk: %s at %x", Common::tag2string(subType).c_str(), subOffset); + debug(3, "Chunk: %s at %x", tag2str(subType), subOffset); switch (subType) { case MKID_BE('AHDR'): // FT INSANE may seek file to the beginning @@ -1036,7 +1036,7 @@ void SmushPlayer::parseNextFrame() { handleFrame(subSize, *_base); break; default: - error("Unknown Chunk found at %x: %s, %d", subOffset, Common::tag2string(subType).c_str(), subSize); + error("Unknown Chunk found at %x: %s, %d", subOffset, tag2str(subType), subSize); } _base->seek(subOffset + subSize, SEEK_SET); |