diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-07-23 19:04:37 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-07-23 19:04:37 +0300 |
| commit | 2587bb361cfc96b3a695d1476e39b9c0ecaa6553 (patch) | |
| tree | 6e6a35e0ee35883201189df9c545cc44b7a06658 /src/content_inventory.cpp | |
| parent | 90d793f8f369bf1431d7a915198cd49b98bbe2d7 (diff) | |
| parent | 976ec31c1faedc3a34935c3aafd6a868e222d1ad (diff) | |
| download | minetest-2587bb361cfc96b3a695d1476e39b9c0ecaa6553.tar.gz minetest-2587bb361cfc96b3a695d1476e39b9c0ecaa6553.tar.bz2 minetest-2587bb361cfc96b3a695d1476e39b9c0ecaa6553.zip | |
merged the content type extension and delta
Diffstat (limited to 'src/content_inventory.cpp')
| -rw-r--r-- | src/content_inventory.cpp | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/src/content_inventory.cpp b/src/content_inventory.cpp index 78fa6f3d1..322250606 100644 --- a/src/content_inventory.cpp +++ b/src/content_inventory.cpp @@ -49,14 +49,24 @@ std::string item_craft_get_image_name(const std::string &subname) { if(subname == "Stick") return "stick.png"; + else if(subname == "paper") + return "paper.png"; + else if(subname == "book") + return "book.png"; else if(subname == "lump_of_coal") return "lump_of_coal.png"; else if(subname == "lump_of_iron") return "lump_of_iron.png"; + else if(subname == "lump_of_clay") + return "lump_of_clay.png"; else if(subname == "steel_ingot") return "steel_ingot.png"; + else if(subname == "clay_brick") + return "clay_brick.png"; else if(subname == "rat") return "rat.png"; + else if(subname == "firefly") + return "firefly.png"; else return "cloud.png"; // just something } @@ -69,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; @@ -83,7 +98,7 @@ s16 item_craft_get_drop_count(const std::string &subname) bool item_craft_is_cookable(const std::string &subname) { - if(subname == "lump_of_iron") + if(subname == "lump_of_iron" || subname == "lump_of_clay") return true; return false; @@ -93,6 +108,8 @@ InventoryItem* item_craft_create_cook_result(const std::string &subname) { if(subname == "lump_of_iron") return new CraftItem("steel_ingot", 1); + else if(subname == "lump_of_clay") + return new CraftItem("clay_brick", 1); return NULL; } |