diff options
author | Eugene Sandulenko | 2010-08-18 12:58:22 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2010-10-12 22:59:01 +0000 |
commit | b01994a53bbc96da907a4c28934e644184291017 (patch) | |
tree | 7454011b38391985e9f7ce6bca101f1394d127be /engines/sword25/gfx/text.cpp | |
parent | 4c4e821326a3772ad59fee836eabd5175bbb84ca (diff) | |
download | scummvm-rg350-b01994a53bbc96da907a4c28934e644184291017.tar.gz scummvm-rg350-b01994a53bbc96da907a4c28934e644184291017.tar.bz2 scummvm-rg350-b01994a53bbc96da907a4c28934e644184291017.zip |
SWORD25: removed BS_ prefix from rest of the classes.
The things which are intentionally left with the prefix:
BS_LOG, BS_ASSERT, BS_Rect, BS_String.
svn-id: r53261
Diffstat (limited to 'engines/sword25/gfx/text.cpp')
-rw-r--r-- | engines/sword25/gfx/text.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/engines/sword25/gfx/text.cpp b/engines/sword25/gfx/text.cpp index d3e846abc5..6d568f1b43 100644 --- a/engines/sword25/gfx/text.cpp +++ b/engines/sword25/gfx/text.cpp @@ -74,7 +74,7 @@ Text::Text(RenderObjectPtr<RenderObject> ParentPtr) : // ----------------------------------------------------------------------------- -Text::Text(BS_InputPersistenceBlock &Reader, RenderObjectPtr<RenderObject> ParentPtr, unsigned int Handle) : +Text::Text(InputPersistenceBlock &Reader, RenderObjectPtr<RenderObject> ParentPtr, unsigned int Handle) : RenderObject(ParentPtr, TYPE_TEXT, Handle) { m_InitSuccess = Unpersist(Reader); } @@ -152,15 +152,15 @@ bool Text::DoRender() { if (!FontPtr) return false; // Charactermap-Resource locken. - BS_ResourceManager *RMPtr = GetResourceManager(); + ResourceManager *RMPtr = GetResourceManager(); BitmapResource *CharMapPtr; { - BS_Resource *pResource = RMPtr->RequestResource(FontPtr->GetCharactermapFileName()); + Resource *pResource = RMPtr->RequestResource(FontPtr->GetCharactermapFileName()); if (!pResource) { BS_LOG_ERRORLN("Could not request resource \"%s\".", FontPtr->GetCharactermapFileName().c_str()); return false; } - if (pResource->GetType() != BS_Resource::TYPE_BITMAP) { + if (pResource->GetType() != Resource::TYPE_BITMAP) { BS_LOG_ERRORLN("Requested resource \"%s\" is not a bitmap.", FontPtr->GetCharactermapFileName().c_str()); return false; } @@ -169,7 +169,7 @@ bool Text::DoRender() { } // Framebufferobjekt holen. - GraphicEngine *GfxPtr = static_cast<GraphicEngine *>(BS_Kernel::GetInstance()->GetService("gfx")); + GraphicEngine *GfxPtr = static_cast<GraphicEngine *>(Kernel::GetInstance()->GetService("gfx")); BS_ASSERT(GfxPtr); bool Result = true; @@ -207,25 +207,25 @@ bool Text::DoRender() { // ----------------------------------------------------------------------------- -BS_ResourceManager *Text::GetResourceManager() { +ResourceManager *Text::GetResourceManager() { // Pointer auf den Resource-Manager holen. - return BS_Kernel::GetInstance()->GetResourceManager(); + return Kernel::GetInstance()->GetResourceManager(); } // ----------------------------------------------------------------------------- FontResource *Text::LockFontResource() { - BS_ResourceManager *RMPtr = GetResourceManager(); + ResourceManager *RMPtr = GetResourceManager(); // Font-Resource locken. FontResource *FontPtr; { - BS_Resource *ResourcePtr = RMPtr->RequestResource(m_Font); + Resource *ResourcePtr = RMPtr->RequestResource(m_Font); if (!ResourcePtr) { BS_LOG_ERRORLN("Could not request resource \"%s\".", m_Font.c_str()); return NULL; } - if (ResourcePtr->GetType() != BS_Resource::TYPE_FONT) { + if (ResourcePtr->GetType() != Resource::TYPE_FONT) { BS_LOG_ERRORLN("Requested resource \"%s\" is not a font.", m_Font.c_str()); return NULL; } @@ -333,7 +333,7 @@ void Text::UpdateMetrics(FontResource &FontResource) { // Persistenz // ----------------------------------------------------------------------------- -bool Text::Persist(BS_OutputPersistenceBlock &Writer) { +bool Text::Persist(OutputPersistenceBlock &Writer) { bool Result = true; Result &= RenderObject::Persist(Writer); @@ -349,7 +349,7 @@ bool Text::Persist(BS_OutputPersistenceBlock &Writer) { return Result; } -bool Text::Unpersist(BS_InputPersistenceBlock &Reader) { +bool Text::Unpersist(InputPersistenceBlock &Reader) { bool Result = true; Result &= RenderObject::Unpersist(Reader); |