diff options
| author | Eugene Sandulenko | 2010-08-06 10:59:22 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2010-10-12 22:28:54 +0000 |
| commit | c1b5e5acb88201910b07d20819a677ee09e64df4 (patch) | |
| tree | 4fe37c784226184c75846bc10106028efa8b90fd /engines/sword25/gfx/text.cpp | |
| parent | 87553862d92d462534cb7a050bf481d9cd1d0d59 (diff) | |
| download | scummvm-rg350-c1b5e5acb88201910b07d20819a677ee09e64df4.tar.gz scummvm-rg350-c1b5e5acb88201910b07d20819a677ee09e64df4.tar.bz2 scummvm-rg350-c1b5e5acb88201910b07d20819a677ee09e64df4.zip | |
SWORD25: Fix warnings and compilation
svn-id: r53217
Diffstat (limited to 'engines/sword25/gfx/text.cpp')
| -rw-r--r-- | engines/sword25/gfx/text.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sword25/gfx/text.cpp b/engines/sword25/gfx/text.cpp index e91976366e..a469a929d5 100644 --- a/engines/sword25/gfx/text.cpp +++ b/engines/sword25/gfx/text.cpp @@ -84,7 +84,7 @@ BS_Text::BS_Text(BS_InputPersistenceBlock & Reader, BS_RenderObjectPtr<BS_Render // ----------------------------------------------------------------------------- -bool BS_Text::SetFont(const std::string & Font) +bool BS_Text::SetFont(const Common::String & Font) { // Font precachen. if (GetResourceManager()->PrecacheResource(Font)) @@ -104,7 +104,7 @@ bool BS_Text::SetFont(const std::string & Font) // ----------------------------------------------------------------------------- -void BS_Text::SetText(const std::string & Text) +void BS_Text::SetText(const Common::String & Text) { m_Text = Text; UpdateFormat(); @@ -398,11 +398,11 @@ bool BS_Text::Unpersist(BS_InputPersistenceBlock & Reader) // Beim Laden der anderen Member werden die Set-Methoden benutzt statt der tatsächlichen Member. // So wird das Layout automatisch aktualisiert und auch alle anderen notwendigen Methoden ausgeführt. - std::string Font; + Common::String Font; Reader.Read(Font); SetFont(Font); - std::string Text; + Common::String Text; Reader.Read(Text); SetText(Text); |