diff options
-rw-r--r-- | engines/sword25/gfx/graphicengine.cpp | 4 | ||||
-rw-r--r-- | engines/sword25/gfx/text.cpp | 6 | ||||
-rw-r--r-- | engines/sword25/gfx/text.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/sword25/gfx/graphicengine.cpp b/engines/sword25/gfx/graphicengine.cpp index 9f3ce665cd..9742059053 100644 --- a/engines/sword25/gfx/graphicengine.cpp +++ b/engines/sword25/gfx/graphicengine.cpp @@ -400,8 +400,8 @@ void GraphicEngine::UpdateLastFrameDuration() { } namespace { -bool DoSaveScreenshot(GraphicEngine &GraphicEngine, const Common::String &Filename) { - Graphics::Surface *data = GraphicEngine.GetScreenshot(); +bool DoSaveScreenshot(GraphicEngine &graphicEngine, const Common::String &Filename) { + Graphics::Surface *data = graphicEngine.GetScreenshot(); if (!data) { BS_LOG_ERRORLN("Call to GetScreenshot() failed. Cannot save screenshot."); return false; diff --git a/engines/sword25/gfx/text.cpp b/engines/sword25/gfx/text.cpp index 1b0c3a78f0..d3d77cb0d2 100644 --- a/engines/sword25/gfx/text.cpp +++ b/engines/sword25/gfx/text.cpp @@ -317,14 +317,14 @@ void Text::UpdateFormat() { // ----------------------------------------------------------------------------- -void Text::UpdateMetrics(FontResource &FontResource) { +void Text::UpdateMetrics(FontResource &fontResource) { _width = 0; _height = 0; for (uint i = 0; i < m_Text.size(); ++i) { - const Common::Rect &CurRect = FontResource.GetCharacterRect((byte)m_Text[i]); + const Common::Rect &CurRect = fontResource.GetCharacterRect((byte)m_Text[i]); _width += CurRect.width(); - if (i != m_Text.size() - 1) _width += FontResource.GetGapWidth(); + if (i != m_Text.size() - 1) _width += fontResource.GetGapWidth(); if (_height < CurRect.height()) _height = CurRect.height(); } } diff --git a/engines/sword25/gfx/text.h b/engines/sword25/gfx/text.h index ed3a83e630..407cd3c1cb 100644 --- a/engines/sword25/gfx/text.h +++ b/engines/sword25/gfx/text.h @@ -171,7 +171,7 @@ private: Common::Array<LINE> m_Lines; void UpdateFormat(); - void UpdateMetrics(FontResource &FontResource); + void UpdateMetrics(FontResource &fontResource); ResourceManager *GetResourceManager(); FontResource *LockFontResource(); }; |