unkn own block -> unkn own node

diff --git a/builtin/misc_register.lua b/builtin/misc_register.lua
index d1e28fdab4b57d30aa6196e882954f40129ef5a0..4041fb9e21fe92a1fc43839f5e54a8d6a228737f 100644 (file)
--- a/builtin/misc_register.lua
+++ b/builtin/misc_register.lua
@@ -253,8 +253,8 @@ minetest.register_item(":unknown", {
 
 minetest.register_node(":air", {
        description = "Air (you hacker you!)",
-       inventory_image = "unknown_block.png",
-       wield_image = "unknown_block.png",
+       inventory_image = "unknown_node.png",
+       wield_image = "unknown_node.png",
        drawtype = "airlike",
        paramtype = "light",
        sunlight_propagates = true,
@@ -269,8 +269,8 @@ minetest.register_node(":air", {
 
 minetest.register_node(":ignore", {
        description = "Ignore (you hacker you!)",
-       inventory_image = "unknown_block.png",
-       wield_image = "unknown_block.png",
+       inventory_image = "unknown_node.png",
+       wield_image = "unknown_node.png",
        drawtype = "airlike",
        paramtype = "none",
        sunlight_propagates = false,

diff --git a/games/minimal/mods/experimental/init.lua b/games/minimal/mods/experimental/init.lua
index 2edfd0f67e04696eed8d01be81137120a9cc60b5..6fce9698aadcedc483917ea00029167b7e6a5e34 100644 (file)
--- a/games/minimal/mods/experimental/init.lua
+++ b/games/minimal/mods/experimental/init.lua
@@ -28,10 +28,10 @@ minetest.after(1.0, switch_player_visual)
 ]]
 
 minetest.register_node("experimental:soundblock", {
-       tile_images = {"unknown_block.png", "default_tnt_bottom.png",
+       tile_images = {"unknown_node.png", "default_tnt_bottom.png",
                        "default_tnt_side.png", "default_tnt_side.png",
                        "default_tnt_side.png", "default_tnt_side.png"},
-       inventory_image = minetest.inventorycube("unknown_block.png",
+       inventory_image = minetest.inventorycube("unknown_node.png",
                        "default_tnt_side.png", "default_tnt_side.png"),
        groups = {dig_immediate=3},
 })

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 8bec67c8c46dcd10aa99eab01bcf16fc6f5afba9..9738dc34c24eee94deeeec96b00ff112aae1dec8 100644 (file)
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -864,7 +864,7 @@ class GenericCAO : public ClientActiveObject
                        m_spritenode = smgr->addBillboardSceneNode(
                                        NULL, v2f(1, 1), v3f(0,0,0), -1);
                        m_spritenode->setMaterialTexture(0,
-                                       tsrc->getTextureRaw("unknown_block.png"));
+                                       tsrc->getTextureRaw("unknown_node.png"));
                        m_spritenode->setMaterialFlag(video::EMF_LIGHTING, false);
                        m_spritenode->setMaterialFlag(video::EMF_BILINEAR_FILTER, false);
                        m_spritenode->setMaterialType(video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF);
@@ -1268,7 +1268,7 @@ class GenericCAO : public ClientActiveObject
                {
                        if(m_prop.visual == "sprite")
                        {
-                               std::string texturestring = "unknown_block.png";
+                               std::string texturestring = "unknown_node.png";
                                if(m_prop.textures.size() >= 1)
                                        texturestring = m_prop.textures[0];
                                texturestring += mod;
@@ -1334,7 +1334,7 @@ class GenericCAO : public ClientActiveObject
                        {
                                for (u32 i = 0; i < 6; ++i)
                                {
-                                       std::string texturestring = "unknown_block.png";
+                                       std::string texturestring = "unknown_node.png";
                                        if(m_prop.textures.size() > i)
                                                texturestring = m_prop.textures[i];
                                        texturestring += mod;

diff --git a/src/game.cpp b/src/game.cpp
index 5e4e0614803f5050733c0a3c11d227d16207d0b6..65feb50bf308921ed0c43eb00859cf9f74afdd56 100644 (file)
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -2388,7 +2388,7 @@ void the_game(
                                infotext = narrow_to_wide(meta->getString("infotext"));
                        } else {
                                MapNode n = map.getNode(nodepos);
-                               if(nodedef->get(n).tiledef[0].name == "unknown_block.png"){
+                               if(nodedef->get(n).tiledef[0].name == "unknown_node.png"){
                                        infotext = L"Unknown node: ";
                                        infotext += narrow_to_wide(nodedef->get(n).name);
                                }

diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index ca889890781128a34da81eb0dc0a8a05dc159bc9..e2b72333f33d4a6185cc60b4153437e85966edaa 100644 (file)
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -593,7 +593,7 @@ class CNodeDefManager: public IWritableNodeDefManager
                        {
                                tiledef[j] = f->tiledef[j];
                                if(tiledef[j].name == "")
-                                       tiledef[j].name = "unknown_block.png";
+                                       tiledef[j].name = "unknown_node.png";
                        }
 
                        bool is_liquid = false;

diff --git a/textures/base/pack/unknown_block.png b/textures/base/pack/unknown_block.png
deleted file mode 100644 (file)
index a27cb8c..0000000
Binary files a/textures/base/pack/unknown_block.png and /dev/null differ

diff --git a/textures/base/pack/unknown_node.png b/textures/base/pack/unknown_node.png
new file mode 100644 (file)
index 0000000..9cae26d
Binary files /dev/null and b/textures/base/pack/unknown_node.png differ