diff options
author | Hal9OOO <miglietta.francesco@gmail.com> | 2012-10-25 19:15:19 +0200 |
---|---|---|
committer | Hal9OOO <miglietta.francesco@gmail.com> | 2012-10-25 19:15:19 +0200 |
commit | 3531d0f9abc4c773cab8353a0b70ad3d4a3a255e (patch) | |
tree | 7f934b293c04321d6791f40f673b10a2e8ea1a0d /src/flooritem.cpp | |
parent | 4358743175ef738cd2943ab1e5fb741c560f1bd4 (diff) | |
parent | 1e4aa6a5e7476bea736b89fe5d7094b6a68705e5 (diff) | |
download | manaverse-3531d0f9abc4c773cab8353a0b70ad3d4a3a255e.tar.gz manaverse-3531d0f9abc4c773cab8353a0b70ad3d4a3a255e.tar.bz2 manaverse-3531d0f9abc4c773cab8353a0b70ad3d4a3a255e.tar.xz manaverse-3531d0f9abc4c773cab8353a0b70ad3d4a3a255e.zip |
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/flooritem.cpp')
-rw-r--r-- | src/flooritem.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/flooritem.cpp b/src/flooritem.cpp index 7826f7855..2a7ca5aed 100644 --- a/src/flooritem.cpp +++ b/src/flooritem.cpp @@ -48,7 +48,8 @@ FloorItem::FloorItem(const int id, const int itemId, const int x, const int y, mPickupCount(0), mColor(color), mShowMsg(true), - mHighlight(config.getBoolValue("floorItemsHighlight")) + mHighlight(config.getBoolValue("floorItemsHighlight")), + mCursor(Cursor::CURSOR_PICKUP) { setMap(map); const ItemInfo &info = ItemDB::get(itemId); @@ -72,6 +73,7 @@ FloorItem::FloorItem(const int id, const int itemId, const int x, const int y, mPos.y = 0; } + mCursor = info.getPickupCursor(); setupSpriteDisplay(info.getDisplay(), true, 1, info.getDyeColorsString(mColor)); mYDiff = 31; |