diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-08-26 16:55:05 +0200 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-08-26 16:55:05 +0200 |
| commit | 6d9dbf93e6c0247cb9b19d3f52a1837a5833b22d (patch) | |
| tree | 4e6e178095ac8cf89dc0dba4f532913891305436 /src/flooritem.cpp | |
| parent | ee8f131b49bb9b1d66cac3840b3c566eb49bcf3f (diff) | |
| download | Mana-6d9dbf93e6c0247cb9b19d3f52a1837a5833b22d.tar.gz Mana-6d9dbf93e6c0247cb9b19d3f52a1837a5833b22d.tar.bz2 Mana-6d9dbf93e6c0247cb9b19d3f52a1837a5833b22d.tar.xz Mana-6d9dbf93e6c0247cb9b19d3f52a1837a5833b22d.zip | |
Merged testing branch into master.
Diffstat (limited to 'src/flooritem.cpp')
| -rw-r--r-- | src/flooritem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/flooritem.cpp b/src/flooritem.cpp index 84e07f35..aed77351 100644 --- a/src/flooritem.cpp +++ b/src/flooritem.cpp @@ -45,10 +45,10 @@ FloorItem::FloorItem(int id, mPos.y = y * map->getTileHeight() + ((Net::getNetworkType() == ServerInfo::MANASERV) ? 15 : 32); - setupSpriteDisplay(ItemDB::get(itemId).getDisplay()); + setupSpriteDisplay(itemDb->get(itemId).getDisplay()); } const ItemInfo &FloorItem::getInfo() const { - return ItemDB::get(mId); + return itemDb->get(mId); } |