diff options
-rw-r--r-- | source/application/StarRenderer_opengl20.cpp | 2 | ||||
-rw-r--r-- | source/rendering/StarFontTextureGroup.cpp | 4 | ||||
-rw-r--r-- | source/rendering/StarFontTextureGroup.hpp | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/source/application/StarRenderer_opengl20.cpp b/source/application/StarRenderer_opengl20.cpp index 082221d..2cf09a5 100644 --- a/source/application/StarRenderer_opengl20.cpp +++ b/source/application/StarRenderer_opengl20.cpp @@ -693,8 +693,6 @@ void OpenGl20Renderer::GlRenderBuffer::set(List<RenderPrimitive> primitives) { } void OpenGl20Renderer::logGlErrorSummary(String prefix) { - prefix += ": "; - Logger::error(prefix.utf8Ptr()); List<GLenum> errors; while (GLenum error = glGetError()) errors.append(error); diff --git a/source/rendering/StarFontTextureGroup.cpp b/source/rendering/StarFontTextureGroup.cpp index fe15381..76defee 100644 --- a/source/rendering/StarFontTextureGroup.cpp +++ b/source/rendering/StarFontTextureGroup.cpp @@ -28,9 +28,9 @@ String const& FontTextureGroup::activeFont() { return m_fontName; } -void FontTextureGroup::addFont(FontPtr const& font, String const& name, bool default) { +void FontTextureGroup::addFont(FontPtr const& font, String const& name, bool isDefault) { m_fonts[name] = font; - if (default) + if (isDefault) m_defaultFont = m_font = font; } diff --git a/source/rendering/StarFontTextureGroup.hpp b/source/rendering/StarFontTextureGroup.hpp index e75fd56..15d2895 100644 --- a/source/rendering/StarFontTextureGroup.hpp +++ b/source/rendering/StarFontTextureGroup.hpp @@ -35,7 +35,7 @@ public: // Switches the current font void switchFont(String const& font); String const& activeFont(); - void addFont(FontPtr const& font, String const& name, bool default = false); + void addFont(FontPtr const& font, String const& name, bool isDefault = false); void clearFonts(); private: StringMap<FontPtr> m_fonts; |