summaryrefslogtreecommitdiff
path: root/src/flooritem.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-22 14:21:27 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-22 14:21:27 +0300
commit48646db55005a0da079bd2c945875dc8225e2f86 (patch)
tree4d7b18cb201682cbb32f1f1677a0935a8e7928a4 /src/flooritem.cpp
parent9c12fcdfe590f34543fcecc2691b625c408f1746 (diff)
downloadmv-48646db55005a0da079bd2c945875dc8225e2f86.tar.gz
mv-48646db55005a0da079bd2c945875dc8225e2f86.tar.bz2
mv-48646db55005a0da079bd2c945875dc8225e2f86.tar.xz
mv-48646db55005a0da079bd2c945875dc8225e2f86.zip
Move color into gui dir.
Diffstat (limited to 'src/flooritem.cpp')
-rw-r--r--src/flooritem.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/flooritem.cpp b/src/flooritem.cpp
index 2592e6feb..6780b10fa 100644
--- a/src/flooritem.cpp
+++ b/src/flooritem.cpp
@@ -122,21 +122,21 @@ void FloorItem::draw(Graphics *const graphics,
if (curTime > mDropTime + 28 && curTime < mDropTime + 50)
{
- graphics->setColor(gcn::Color(80, 200, 20, 200));
+ graphics->setColor(Color(80, 200, 20, 200));
graphics->fillRectangle(gcn::Rectangle(
x, y, dx, dy));
}
else if (curTime > mDropTime + 19
&& curTime < mDropTime + 28)
{
- graphics->setColor(gcn::Color(200, 80, 20,
+ graphics->setColor(Color(200, 80, 20,
80 + 10 * (curTime - mDropTime - 18)));
graphics->fillRectangle(gcn::Rectangle(
x, y, dx, dy));
}
else if (curTime > mDropTime && curTime < mDropTime + 20)
{
- graphics->setColor(gcn::Color(20, 20, 255,
+ graphics->setColor(Color(20, 20, 255,
7 * (curTime - mDropTime)));
graphics->fillRectangle(gcn::Rectangle(
x, y, dx, dy));
@@ -153,7 +153,7 @@ void FloorItem::draw(Graphics *const graphics,
{
if (font && mAmount > 1)
{
-// graphics->setColor(gcn::Color(255, 255, 255, 100));
+// graphics->setColor(Color(255, 255, 255, 100));
graphics->setColor(userPalette->getColor(
UserPalette::FLOOR_ITEM_TEXT));
font->drawString(graphics, toString(mAmount), x, y);