summaryrefslogtreecommitdiff
path: root/src/gui/fonts/font.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-25 01:58:52 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-25 01:58:52 +0300
commite3682e2cdcb59c36792f6f9c39569e0af01088f0 (patch)
treeb4d7a665652e4a8c00f28d557f96b120abc62002 /src/gui/fonts/font.cpp
parent1b3a9751ae558e45c614f04525d5ff65e3c0fc1e (diff)
downloadmv-e3682e2cdcb59c36792f6f9c39569e0af01088f0.tar.gz
mv-e3682e2cdcb59c36792f6f9c39569e0af01088f0.tar.bz2
mv-e3682e2cdcb59c36792f6f9c39569e0af01088f0.tar.xz
mv-e3682e2cdcb59c36792f6f9c39569e0af01088f0.zip
Dont set global color variables before drawing text.
This allow not set actual OpenGL color on each call because it useless for drawing text.
Diffstat (limited to 'src/gui/fonts/font.cpp')
-rw-r--r--src/gui/fonts/font.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/fonts/font.cpp b/src/gui/fonts/font.cpp
index 31ca8552a..2e894a380 100644
--- a/src/gui/fonts/font.cpp
+++ b/src/gui/fonts/font.cpp
@@ -202,6 +202,8 @@ void Font::clear()
}
void Font::drawString(Graphics *const graphics,
+ Color col,
+ const Color &col2,
const std::string &text,
const int x, const int y)
{
@@ -212,8 +214,8 @@ void Font::drawString(Graphics *const graphics,
return;
}
- Color col = graphics->getColor();
- const Color &col2 = graphics->getColor2();
+// Color col = graphics->getColor();
+// const Color &col2 = graphics->getColor2();
const float alpha = static_cast<float>(col.a) / 255.0F;
/* The alpha value is ignored at string generation so avoid caching the