summaryrefslogtreecommitdiff
path: root/src/flooritem.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-09-12 18:29:12 +0300
committerAndrei Karas <akaras@inbox.ru>2011-09-13 04:41:55 +0300
commit6bd4fff31e0b44b8b71876250c626fe8c15b4105 (patch)
treecdd7f984a0850864316ae23c33120b6d282b70ba /src/flooritem.cpp
parentf457675ecfd704c99e84fe14f0a1dd49a69a9c76 (diff)
downloadmv-6bd4fff31e0b44b8b71876250c626fe8c15b4105.tar.gz
mv-6bd4fff31e0b44b8b71876250c626fe8c15b4105.tar.bz2
mv-6bd4fff31e0b44b8b71876250c626fe8c15b4105.tar.xz
mv-6bd4fff31e0b44b8b71876250c626fe8c15b4105.zip
Add missing checks to some files and style fixes.
Diffstat (limited to 'src/flooritem.cpp')
-rw-r--r--src/flooritem.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/flooritem.cpp b/src/flooritem.cpp
index 63112511e..9b11bdc9c 100644
--- a/src/flooritem.cpp
+++ b/src/flooritem.cpp
@@ -50,14 +50,13 @@ FloorItem::FloorItem(int id,
mX(x),
mY(y),
mMap(map),
-// mAlpha(1.0f),
+ mDropTime(cur_time),
mAmount(amount),
mPickupCount(0),
mColor(color),
- mShowMsg(true)
+ mShowMsg(true),
+ mHighlight(config.getBoolValue("floorItemsHighlight"))
{
- mDropTime = cur_time;
-
setMap(map);
if (map)
{
@@ -99,9 +98,8 @@ bool FloorItem::draw(Graphics *graphics, int offsetX, int offsetY) const
const int x = mX * mMap->getTileWidth() + offsetX;
const int y = mY * mMap->getTileHeight() + offsetY;
gcn::Font *font = 0;
- const bool highl = config.getBoolValue("floorItemsHighlight");
- if (highl)
+ if (mHighlight)
{
int curTime = cur_time;
font = gui->getFont();
@@ -118,7 +116,7 @@ bool FloorItem::draw(Graphics *graphics, int offsetX, int offsetY) const
{
graphics->setColor(gcn::Color(200, 80, 20,
80 + 10 * (curTime - mDropTime - 18)));
- graphics->fillRectangle(gcn::Rectangle(
+ graphics->fillRectangle(gcn::Rectangle(
x, y, dx, dy));
}
else if (curTime > mDropTime && curTime < mDropTime + 20)
@@ -133,7 +131,7 @@ bool FloorItem::draw(Graphics *graphics, int offsetX, int offsetY) const
const bool res = ActorSprite::draw(graphics, offsetX, offsetY);
- if (highl)
+ if (mHighlight)
{
if (font && mAmount > 1)
{