merged some stuff from upstream while merging delta

[dragonfireclient.git] / src / content_inventory.cpp

diff --git a/src/content_inventory.cpp b/src/content_inventory.cpp
index 7d995cb5f1e7893f32a94c0a25f38a4630805913..1068defb5e8772a3289704fcef077aba8b5dfd03 100644 (file)
--- a/src/content_inventory.cpp
+++ b/src/content_inventory.cpp
@@ -65,6 +65,8 @@ std::string item_craft_get_image_name(const std::string &subname)
                return "clay_brick.png";
        else if(subname == "rat")
                return "rat.png";
+       else if(subname == "firefly")
+               return "firefly.png";
        else
                return "cloud.png"; // just something
 }
@@ -77,13 +79,18 @@ ServerActiveObject* item_craft_create_object(const std::string &subname,
                ServerActiveObject *obj = new RatSAO(env, id, pos);
                return obj;
        }
+       else if(subname == "firefly")
+       {
+               ServerActiveObject *obj = new FireflySAO(env, id, pos);
+               return obj;
+       }
 
        return NULL;
 }
 
 s16 item_craft_get_drop_count(const std::string &subname)
 {
-       if(subname == "rat")
+       if(subname == "rat" || subname == "firefly")
                return 1;
 
        return -1;