diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-09-26 15:10:02 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-09-26 15:10:02 +0300 |
| commit | 061d4b420206c67fb346d75fb6bcaf4aa8147ca8 (patch) | |
| tree | 3f17c19e529baf3a6ae13479b7805fbe5cdf46ba /src/inventory.cpp | |
| parent | b9e680d06cf56b7c8b41a6b5626a3b94304adf42 (diff) | |
| parent | 2ecd53ce09d8f20a06b057c24924a010fa2eefde (diff) | |
| download | minetest-061d4b420206c67fb346d75fb6bcaf4aa8147ca8.tar.gz minetest-061d4b420206c67fb346d75fb6bcaf4aa8147ca8.tar.bz2 minetest-061d4b420206c67fb346d75fb6bcaf4aa8147ca8.zip | |
Merge branch 'view_bobbing_and_vielded_tool'
Diffstat (limited to 'src/inventory.cpp')
| -rw-r--r-- | src/inventory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/inventory.cpp b/src/inventory.cpp index f31e19f77..a3e35c92c 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -158,7 +158,7 @@ InventoryItem *MaterialItem::createCookResult() const */ #ifndef SERVER -video::ITexture * CraftItem::getImage() +video::ITexture * CraftItem::getImage() const { if(g_texturesource == NULL) return NULL; @@ -224,7 +224,7 @@ bool CraftItem::use(ServerEnvironment *env, Player *player) TODO: Remove */ #ifndef SERVER -video::ITexture * MapBlockObjectItem::getImage() +video::ITexture * MapBlockObjectItem::getImage() const { if(m_inventorystring.substr(0,3) == "Rat") return g_texturesource->getTextureRaw("rat.png"); |