From c1202a2ecca352d5491364877fbe11e509cda8d3 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Tue, 15 Nov 2011 13:22:29 +0200 Subject: [PATCH] Update inventory texture too --- src/nodedef.cpp | 6 ++++++ src/nodedef.h | 1 + 2 files changed, 7 insertions(+) diff --git a/src/nodedef.cpp b/src/nodedef.cpp index d589c5ec..57807449 100644 --- a/src/nodedef.cpp +++ b/src/nodedef.cpp @@ -64,6 +64,7 @@ void ContentFeatures::setInventoryTexture(std::string imgname, imgname += "^[forcesingle"; + inventory_texture_name = imgname; inventory_texture = tsrc->getTextureRaw(imgname); } @@ -84,6 +85,7 @@ void ContentFeatures::setInventoryTextureCube(std::string top, imgname_full += left; imgname_full += "{"; imgname_full += right; + inventory_texture_name = imgname_full; inventory_texture = tsrc->getTextureRaw(imgname_full); } #endif @@ -181,6 +183,10 @@ public: if(f->special_material2) f->special_material2->setTexture(0, f->special_atlas->atlas); } + if(f->inventory_texture_name != ""){ + f->inventory_texture = + tsrc->getTextureRaw(f->inventory_texture_name); + } } #endif } diff --git a/src/nodedef.h b/src/nodedef.h index 0430621e..a093cb79 100644 --- a/src/nodedef.h +++ b/src/nodedef.h @@ -113,6 +113,7 @@ struct ContentFeatures */ TileSpec tiles[6]; + std::string inventory_texture_name; video::ITexture *inventory_texture; // Used currently for flowing liquids -- 2.30.2