summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-07-28 21:27:22 +0300
committerAndrei Karas <akaras@inbox.ru>2013-07-28 21:27:22 +0300
commite73a43ece5cc449d915d85c6bdda2615deacc87d (patch)
tree1cfe84704746605bd2a49a534f96a3b82800a107
parent4b6141e28035ed237419d64eee69739219989b73 (diff)
downloadplus-e73a43ece5cc449d915d85c6bdda2615deacc87d.tar.gz
plus-e73a43ece5cc449d915d85c6bdda2615deacc87d.tar.bz2
plus-e73a43ece5cc449d915d85c6bdda2615deacc87d.tar.xz
plus-e73a43ece5cc449d915d85c6bdda2615deacc87d.zip
move bools in flooritem.
-rw-r--r--src/flooritem.cpp4
-rw-r--r--src/flooritem.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/flooritem.cpp b/src/flooritem.cpp
index 2c02179dd..623dd9682 100644
--- a/src/flooritem.cpp
+++ b/src/flooritem.cpp
@@ -46,10 +46,10 @@ FloorItem::FloorItem(const int id, const int itemId, const int x, const int y,
mDropTime(cur_time),
mAmount(amount),
mPickupCount(0),
+ mCursor(Cursor::CURSOR_PICKUP),
mColor(color),
mShowMsg(true),
- mHighlight(config.getBoolValue("floorItemsHighlight")),
- mCursor(Cursor::CURSOR_PICKUP)
+ mHighlight(config.getBoolValue("floorItemsHighlight"))
{
setMap(map);
const ItemInfo &info = ItemDB::get(itemId);
diff --git a/src/flooritem.h b/src/flooritem.h
index c73b39bd4..86fb1703e 100644
--- a/src/flooritem.h
+++ b/src/flooritem.h
@@ -106,11 +106,11 @@ class FloorItem final : public ActorSprite
int mX, mY;
int mDropTime;
int mAmount;
- unsigned mPickupCount;
+ unsigned int mPickupCount;
+ Cursor::Cursor mCursor;
unsigned char mColor;
bool mShowMsg;
bool mHighlight;
- Cursor::Cursor mCursor;
};
#endif // FLOORITEM_H