diff options
author | Eugene Sandulenko | 2010-08-06 10:59:35 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2010-10-12 22:29:37 +0000 |
commit | 6dcf9f0ee557e692df3c70a263ca35068ff45380 (patch) | |
tree | ad705b0174fda87d448900178c688c302e8625a3 /engines/sword25/gfx/staticbitmap.cpp | |
parent | c1b5e5acb88201910b07d20819a677ee09e64df4 (diff) | |
download | scummvm-rg350-6dcf9f0ee557e692df3c70a263ca35068ff45380.tar.gz scummvm-rg350-6dcf9f0ee557e692df3c70a263ca35068ff45380.tar.bz2 scummvm-rg350-6dcf9f0ee557e692df3c70a263ca35068ff45380.zip |
SWORD25: std::string -> Common::String in gfx/
svn-id: r53218
Diffstat (limited to 'engines/sword25/gfx/staticbitmap.cpp')
-rw-r--r-- | engines/sword25/gfx/staticbitmap.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sword25/gfx/staticbitmap.cpp b/engines/sword25/gfx/staticbitmap.cpp index 6257e016f7..21544b8b3c 100644 --- a/engines/sword25/gfx/staticbitmap.cpp +++ b/engines/sword25/gfx/staticbitmap.cpp @@ -54,7 +54,7 @@ namespace Sword25 { // Konstruktion / Destruktion // ----------------------------------------------------------------------------- -BS_StaticBitmap::BS_StaticBitmap(BS_RenderObjectPtr<BS_RenderObject> ParentPtr, const std::string& Filename) : +BS_StaticBitmap::BS_StaticBitmap(BS_RenderObjectPtr<BS_RenderObject> ParentPtr, const Common::String& Filename) : BS_Bitmap(ParentPtr, TYPE_STATICBITMAP) { // Das BS_Bitmap konnte nicht erzeugt werden, daher muss an dieser Stelle abgebrochen werden. @@ -73,7 +73,7 @@ BS_StaticBitmap::BS_StaticBitmap(BS_InputPersistenceBlock & Reader, BS_RenderObj // ----------------------------------------------------------------------------- -bool BS_StaticBitmap::InitBitmapResource(const std::string & Filename) +bool BS_StaticBitmap::InitBitmapResource(const Common::String & Filename) { // Bild-Resource laden BS_Resource* ResourcePtr = BS_Kernel::GetInstance()->GetResourceManager()->RequestResource(Filename); @@ -225,7 +225,7 @@ bool BS_StaticBitmap::Unpersist(BS_InputPersistenceBlock & Reader) bool Result = true; Result &= BS_Bitmap::Unpersist(Reader); - std::string ResourceFilename; + Common::String ResourceFilename; Reader.Read(ResourceFilename); Result &= InitBitmapResource(ResourceFilename); |