diff options
author | Eugene Sandulenko | 2010-10-19 21:03:33 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2010-10-19 21:03:33 +0000 |
commit | 6629efc676ca48e958dcfa0ee4e66e6aba1c6597 (patch) | |
tree | 3e76022f90ca9590c1ec376fc436461eaeee11ef /engines/sword25/gfx/text.cpp | |
parent | ae78107e2a8732977313e208f1d08e65d50ec8e8 (diff) | |
download | scummvm-rg350-6629efc676ca48e958dcfa0ee4e66e6aba1c6597.tar.gz scummvm-rg350-6629efc676ca48e958dcfa0ee4e66e6aba1c6597.tar.bz2 scummvm-rg350-6629efc676ca48e958dcfa0ee4e66e6aba1c6597.zip |
SWORD25: Enforced code formatting rules in rest of the engine
svn-id: r53626
Diffstat (limited to 'engines/sword25/gfx/text.cpp')
-rw-r--r-- | engines/sword25/gfx/text.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/sword25/gfx/text.cpp b/engines/sword25/gfx/text.cpp index 69e0818503..55a87a41d6 100644 --- a/engines/sword25/gfx/text.cpp +++ b/engines/sword25/gfx/text.cpp @@ -73,7 +73,7 @@ Text::Text(InputPersistenceBlock &reader, RenderObjectPtr<RenderObject> parentPt bool Text::setFont(const Common::String &font) { // Font precachen. - if (getResourceManager()->PrecacheResource(font)) { + if (getResourceManager()->precacheResource(font)) { _font = font; updateFormat(); forceRefresh(); @@ -134,12 +134,12 @@ bool Text::doRender() { ResourceManager *rmPtr = getResourceManager(); BitmapResource *charMapPtr; { - 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() != 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; } @@ -148,7 +148,7 @@ bool Text::doRender() { } // Framebufferobjekt holen. - GraphicEngine *gfxPtr = Kernel::GetInstance()->GetGfx(); + GraphicEngine *gfxPtr = Kernel::getInstance()->getGfx(); BS_ASSERT(gfxPtr); bool result = true; @@ -187,7 +187,7 @@ bool Text::doRender() { ResourceManager *Text::getResourceManager() { // Pointer auf den Resource-Manager holen. - return Kernel::GetInstance()->GetResourceManager(); + return Kernel::getInstance()->getResourceManager(); } FontResource *Text::lockFontResource() { @@ -196,12 +196,12 @@ FontResource *Text::lockFontResource() { // Font-Resource locken. FontResource *fontPtr; { - Resource *resourcePtr = rmPtr->RequestResource(_font); + Resource *resourcePtr = rmPtr->requestResource(_font); if (!resourcePtr) { BS_LOG_ERRORLN("Could not request resource \"%s\".", _font.c_str()); return NULL; } - if (resourcePtr->GetType() != Resource::TYPE_FONT) { + if (resourcePtr->getType() != Resource::TYPE_FONT) { BS_LOG_ERRORLN("Requested resource \"%s\" is not a font.", _font.c_str()); return NULL; } |