diff options
author | khonkhortisan <khonkhortisan@gmail.com> | 2013-03-19 11:05:32 -0700 |
---|---|---|
committer | PilzAdam <pilzadam@minetest.net> | 2013-04-05 15:57:39 +0200 |
commit | 1586cdac53935cd4735162ad8337c269f0dfa718 (patch) | |
tree | 3eaa488549109e7e7fc3259e07211a39034dde99 | |
parent | 1bae82e6c4ee6242dee0f87aa2f2575331861770 (diff) | |
download | minetest-1586cdac53935cd4735162ad8337c269f0dfa718.tar.gz minetest-1586cdac53935cd4735162ad8337c269f0dfa718.tar.bz2 minetest-1586cdac53935cd4735162ad8337c269f0dfa718.zip |
unkn own block -> unkn own node
-rw-r--r-- | builtin/misc_register.lua | 8 | ||||
-rw-r--r-- | games/minimal/mods/experimental/init.lua | 4 | ||||
-rw-r--r-- | src/content_cao.cpp | 6 | ||||
-rw-r--r-- | src/game.cpp | 2 | ||||
-rw-r--r-- | src/nodedef.cpp | 2 | ||||
-rw-r--r-- | textures/base/pack/unknown_block.png | bin | 582 -> 0 bytes | |||
-rw-r--r-- | textures/base/pack/unknown_node.png | bin | 0 -> 608 bytes |
7 files changed, 11 insertions, 11 deletions
diff --git a/builtin/misc_register.lua b/builtin/misc_register.lua index d1e28fdab..4041fb9e2 100644 --- 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 2edfd0f67..6fce9698a 100644 --- 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 8bec67c8c..9738dc34c 100644 --- a/src/content_cao.cpp +++ b/src/content_cao.cpp @@ -864,7 +864,7 @@ public: 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 @@ public: { 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 @@ public: { 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 5e4e06148..65feb50bf 100644 --- 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 ca8898907..e2b72333f 100644 --- a/src/nodedef.cpp +++ b/src/nodedef.cpp @@ -593,7 +593,7 @@ public: { 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 Binary files differdeleted file mode 100644 index a27cb8ca9..000000000 --- a/textures/base/pack/unknown_block.png +++ /dev/null diff --git a/textures/base/pack/unknown_node.png b/textures/base/pack/unknown_node.png Binary files differnew file mode 100644 index 000000000..9cae26d5c --- /dev/null +++ b/textures/base/pack/unknown_node.png |