From 1586cdac53935cd4735162ad8337c269f0dfa718 Mon Sep 17 00:00:00 2001 From: khonkhortisan Date: Tue, 19 Mar 2013 11:05:32 -0700 Subject: [PATCH] unkn own block -> unkn own node --- builtin/misc_register.lua | 8 ++++---- games/minimal/mods/experimental/init.lua | 4 ++-- src/content_cao.cpp | 6 +++--- src/game.cpp | 2 +- src/nodedef.cpp | 2 +- textures/base/pack/unknown_block.png | Bin 582 -> 0 bytes textures/base/pack/unknown_node.png | Bin 0 -> 608 bytes 7 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 textures/base/pack/unknown_block.png create mode 100644 textures/base/pack/unknown_node.png 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 deleted file mode 100644 index a27cb8ca9a6765af1d7a3a3885b0c7e3be9046d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 582 zcmV-M0=fN(P)Tq(nzM650T0)kT!mfX$CCC=^_%5X+)StS!^XPSq6EKQcU6A%Ov}n zdGF1+=bn4+eT9DS;d(q}00g5Un{2g^C*QWXI4LV!X%Sk5&7P~zR=fx`E%U#@_f zWK2e{+d=M($zBnQ7vXe9>FM|LH|OI$zn-2oc(GcOo&RVzDtGYiZJpiYfyy0JDsTAl zGa(oaDfD{}*Vy%x*@;4RKJ^0z%Q>;@=~p}uWkm_}w+Z<{!gK*cRFp3d0r6z?wIk~2+9Z_gOFzJkLS$9klJ)^GqH-00s9dF4 zud(z4qH-0}w6v3BTP*zmfa~mq{s%Cmbb#@627nudMCB^0^#*`Zqm93qYe9c8M-m&} zWXN^)0svtljw0+$hB^Sy!mIU$%-1iUPk@G$B#LIehMXmddL=9@!v28l99vEZ=(rEqKu6(6|$(582H$MRuKvEYy- z3Kbv7$y5oLG*JJat2wsy!tPCme;}qOD-Bcz#+wXZ++FO=dW~G#@IRn3$`T-U5y|zQ uV^-@8UZQjd1d?N0dM^p?|Grdtk-q_xQ5Yz7&fs|f0000