Move tool stuff to tool.{h,cpp}

[oweals/minetest.git] / src / content_inventory.cpp

diff --git a/src/content_inventory.cpp b/src/content_inventory.cpp
index 1d5c6b35594214f483c5bbc981ec40eb8dc627a1..51c6f751efa2e60615b4759d9655aea820d31ea7 100644 (file)
--- a/src/content_inventory.cpp
+++ b/src/content_inventory.cpp
@@ -75,6 +75,8 @@ std::string item_craft_get_image_name(const std::string &subname)
                return "apple.png^[forcesingle";
        else if(subname == "apple_iron")
                return "apple_iron.png";
+       else if(subname == "testobject1") // test object
+               return "unknown_block.png^[forcesingle";
        else
                return "cloud.png"; // just something
 }
@@ -92,13 +94,18 @@ ServerActiveObject* item_craft_create_object(const std::string &subname,
                ServerActiveObject *obj = new FireflySAO(env, pos);
                return obj;
        }
+       else if(subname == "testobject1")
+       {
+               ServerActiveObject *obj = new LuaEntitySAO(env, pos, "TNT", "");
+               return obj;
+       }
 
        return NULL;
 }
 
 s16 item_craft_get_drop_count(const std::string &subname)
 {
-       if(subname == "rat" || subname == "firefly")
+       if(subname == "rat" || subname == "firefly" || subname == "testobject1")
                return 1;
 
        return -1;