X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fcontent_inventory.cpp;h=51c6f751efa2e60615b4759d9655aea820d31ea7;hb=f97d4355beb79370d3bc69ea6baabb33ed90a8cd;hp=59997ee4b69a6902896c566c172dfefe51bafc4d;hpb=88dc8c694ed0e182b4d5ace4fcd94a0a82946c31;p=dragonfireclient.git

diff --git a/src/content_inventory.cpp b/src/content_inventory.cpp
index 59997ee4b..51c6f751e 100644
--- a/src/content_inventory.cpp
+++ b/src/content_inventory.cpp
@@ -72,24 +72,31 @@ std::string item_craft_get_image_name(const std::string &subname)
 	else if(subname == "firefly")
 		return "firefly.png";
 	else if(subname == "apple")
-		return "apple.png";
-		else if(subname == "apple_iron")
+		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
 }
 
 ServerActiveObject* item_craft_create_object(const std::string &subname,
-		ServerEnvironment *env, u16 id, v3f pos)
+		ServerEnvironment *env, v3f pos)
 {
 	if(subname == "rat")
 	{
-		ServerActiveObject *obj = new RatSAO(env, id, pos);
+		ServerActiveObject *obj = new RatSAO(env, pos);
 		return obj;
 	}
 	else if(subname == "firefly")
 	{
-		ServerActiveObject *obj = new FireflySAO(env, id, pos);
+		ServerActiveObject *obj = new FireflySAO(env, pos);
+		return obj;
+	}
+	else if(subname == "testobject1")
+	{
+		ServerActiveObject *obj = new LuaEntitySAO(env, pos, "TNT", "");
 		return obj;
 	}
 
@@ -98,7 +105,7 @@ ServerActiveObject* item_craft_create_object(const std::string &subname,
 
 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;