[Scummvm-cvs-logs] SF.net SVN: scummvm:[48276] scummvm/trunk/engines
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Thu Mar 18 16:04:38 CET 2010
Revision: 48276
http://scummvm.svn.sourceforge.net/scummvm/?rev=48276&view=rev
Author: fingolfin
Date: 2010-03-18 15:04:38 +0000 (Thu, 18 Mar 2010)
Log Message:
-----------
Switch from Common::tag2string(foo).c_str() to tag2str(foo)
Modified Paths:
--------------
scummvm/trunk/engines/kyra/script.cpp
scummvm/trunk/engines/kyra/script_tim.cpp
scummvm/trunk/engines/scumm/smush/smush_player.cpp
Modified: scummvm/trunk/engines/kyra/script.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script.cpp 2010-03-18 15:04:15 UTC (rev 48275)
+++ scummvm/trunk/engines/kyra/script.cpp 2010-03-18 15:04:38 UTC (rev 48276)
@@ -96,7 +96,7 @@
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;
Modified: scummvm/trunk/engines/kyra/script_tim.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_tim.cpp 2010-03-18 15:04:15 UTC (rev 48275)
+++ scummvm/trunk/engines/kyra/script_tim.cpp 2010-03-18 15:04:38 UTC (rev 48276)
@@ -134,7 +134,7 @@
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;
Modified: scummvm/trunk/engines/scumm/smush/smush_player.cpp
===================================================================
--- scummvm/trunk/engines/scumm/smush/smush_player.cpp 2010-03-18 15:04:15 UTC (rev 48275)
+++ scummvm/trunk/engines/scumm/smush/smush_player.cpp 2010-03-18 15:04:38 UTC (rev 48276)
@@ -1026,7 +1026,7 @@
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 @@
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);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list