diff options
| author | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-30 18:53:54 +0200 |
|---|---|---|
| committer | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-30 18:55:43 +0200 |
| commit | 4ef9c7675ada82961d83601712a47ebad78b67b5 (patch) | |
| tree | cdfd863219a8dc1031e727740e7d895296c5855d /src/content_inventory.h | |
| parent | f69123050b62ada635751b7155bb6822b0a97a9b (diff) | |
| parent | dbea511a6f877450cfd5adb86efa55a8f00cc9a1 (diff) | |
| download | minetest-4ef9c7675ada82961d83601712a47ebad78b67b5.tar.gz minetest-4ef9c7675ada82961d83601712a47ebad78b67b5.tar.bz2 minetest-4ef9c7675ada82961d83601712a47ebad78b67b5.zip | |
Merge remote-tracking branch 'origin/upstream'
Diffstat (limited to 'src/content_inventory.h')
| -rw-r--r-- | src/content_inventory.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/content_inventory.h b/src/content_inventory.h index 54aa2151a..0f410128b 100644 --- a/src/content_inventory.h +++ b/src/content_inventory.h @@ -22,13 +22,14 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "common_irrlicht.h" // For u8, s16 #include <string> +#include "mapnode.h" // For content_t class InventoryItem; class ServerActiveObject; class ServerEnvironment; -bool item_material_is_cookable(u8 content); -InventoryItem* item_material_create_cook_result(u8 content); +bool item_material_is_cookable(content_t content); +InventoryItem* item_material_create_cook_result(content_t content); std::string item_craft_get_image_name(const std::string &subname); ServerActiveObject* item_craft_create_object(const std::string &subname, |