aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25/gfx/animation.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/animation.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/animation.cpp')
-rw-r--r--engines/sword25/gfx/animation.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sword25/gfx/animation.cpp b/engines/sword25/gfx/animation.cpp
index 30b8bd76db..a2b2051c59 100644
--- a/engines/sword25/gfx/animation.cpp
+++ b/engines/sword25/gfx/animation.cpp
@@ -57,7 +57,7 @@ namespace Sword25 {
// Konstruktion / Destruktion
// --------------------------
-BS_Animation::BS_Animation(BS_RenderObjectPtr<BS_RenderObject> ParentPtr, const std::string & FileName) :
+BS_Animation::BS_Animation(BS_RenderObjectPtr<BS_RenderObject> ParentPtr, const Common::String & FileName) :
BS_TimedRenderObject(ParentPtr, BS_RenderObject::TYPE_ANIMATION)
{
// Das BS_RenderObject konnte nicht erzeugt werden, daher muss an dieser Stelle abgebrochen werden.
@@ -109,7 +109,7 @@ BS_Animation::BS_Animation(BS_InputPersistenceBlock & Reader, BS_RenderObjectPtr
// -----------------------------------------------------------------------------
-void BS_Animation::InitializeAnimationResource(const std::string &FileName)
+void BS_Animation::InitializeAnimationResource(const Common::String &FileName)
{
// Die Resource wird für die gesamte Lebensdauer des Animations-Objektes gelockt.
BS_Resource * ResourcePtr = BS_Kernel::GetInstance()->GetResourceManager()->RequestResource(FileName);
@@ -633,7 +633,7 @@ void BS_Animation::SetScaleFactorY(float ScaleFactorY)
// -----------------------------------------------------------------------------
-const std::string & BS_Animation::GetCurrentAction() const
+const Common::String & BS_Animation::GetCurrentAction() const
{
BS_AnimationDescription * animationDescriptionPtr = GetAnimationDescription();
BS_ASSERT(animationDescriptionPtr);
@@ -776,7 +776,7 @@ void BS_Animation::UnpersistCallbackVector(BS_InputPersistenceBlock & Reader, st
{
ANIMATION_CALLBACK_DATA CallbackData;
- std::string CallbackFunctionName;
+ Common::String CallbackFunctionName;
Reader.Read(CallbackFunctionName);
CallbackData.Callback = reinterpret_cast<ANIMATION_CALLBACK>(BS_CallbackRegistry::GetInstance().ResolveCallbackFunction(CallbackFunctionName));
@@ -861,7 +861,7 @@ bool BS_Animation::Unpersist(BS_InputPersistenceBlock & Reader)
Reader.Read(Marker);
if (Marker == 0)
{
- std::string ResourceFilename;
+ Common::String ResourceFilename;
Reader.Read(ResourceFilename);
InitializeAnimationResource(ResourceFilename);
}