aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25/gfx/animationtemplate.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2010-08-06 10:59:35 +0000
committerEugene Sandulenko2010-10-12 22:29:37 +0000
commit6dcf9f0ee557e692df3c70a263ca35068ff45380 (patch)
treead705b0174fda87d448900178c688c302e8625a3 /engines/sword25/gfx/animationtemplate.cpp
parentc1b5e5acb88201910b07d20819a677ee09e64df4 (diff)
downloadscummvm-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/animationtemplate.cpp')
-rw-r--r--engines/sword25/gfx/animationtemplate.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sword25/gfx/animationtemplate.cpp b/engines/sword25/gfx/animationtemplate.cpp
index 1594ed61f1..4ed604467b 100644
--- a/engines/sword25/gfx/animationtemplate.cpp
+++ b/engines/sword25/gfx/animationtemplate.cpp
@@ -53,7 +53,7 @@ namespace Sword25 {
// Konstruktion / Destruktion
// -----------------------------------------------------------------------------
-unsigned int BS_AnimationTemplate::Create(const std::string & SourceAnimation)
+unsigned int BS_AnimationTemplate::Create(const Common::String & SourceAnimation)
{
BS_AnimationTemplate * AnimationTemplatePtr = new BS_AnimationTemplate(SourceAnimation);
@@ -104,7 +104,7 @@ unsigned int BS_AnimationTemplate::Create(BS_InputPersistenceBlock & Reader, uns
// -----------------------------------------------------------------------------
-BS_AnimationTemplate::BS_AnimationTemplate(const std::string & SourceAnimation)
+BS_AnimationTemplate::BS_AnimationTemplate(const Common::String & SourceAnimation)
{
// Objekt registrieren.
BS_AnimationTemplateRegistry::GetInstance().RegisterObject(this);
@@ -158,7 +158,7 @@ BS_AnimationTemplate::BS_AnimationTemplate(BS_InputPersistenceBlock & Reader, un
// -----------------------------------------------------------------------------
-BS_AnimationResource * BS_AnimationTemplate::RequestSourceAnimation(const std::string & SourceAnimation) const
+BS_AnimationResource * BS_AnimationTemplate::RequestSourceAnimation(const Common::String & SourceAnimation) const
{
BS_ResourceManager * RMPtr = BS_Kernel::GetInstance()->GetResourceManager();
BS_Resource * ResourcePtr;
@@ -300,7 +300,7 @@ bool BS_AnimationTemplate::Unpersist(BS_InputPersistenceBlock & Reader)
}
// Die Animations-Resource wird für die gesamte Lebensdauer des Objektes gelockt
- std::string SourceAnimation;
+ Common::String SourceAnimation;
Reader.Read(SourceAnimation);
m_SourceAnimationPtr = RequestSourceAnimation(SourceAnimation);