From a6a1e6ed1a8de1294970a5af6ba992c38d4022b8 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Fri, 11 Nov 2011 20:50:09 +0200 Subject: random scripting work-in-progress --- src/content_inventory.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/content_inventory.cpp') diff --git a/src/content_inventory.cpp b/src/content_inventory.cpp index 1d5c6b355..51c6f751e 100644 --- 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; -- cgit v1.2.3