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.cpp | |
| parent | f69123050b62ada635751b7155bb6822b0a97a9b (diff) | |
| parent | dbea511a6f877450cfd5adb86efa55a8f00cc9a1 (diff) | |
| download | dragonfireclient-4ef9c7675ada82961d83601712a47ebad78b67b5.tar.xz | |
Merge remote-tracking branch 'origin/upstream'
Diffstat (limited to 'src/content_inventory.cpp')
| -rw-r--r-- | src/content_inventory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/content_inventory.cpp b/src/content_inventory.cpp index 1068defb5..322250606 100644 --- a/src/content_inventory.cpp +++ b/src/content_inventory.cpp @@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc., //#include "serverobject.h" #include "content_sao.h" -bool item_material_is_cookable(u8 content) +bool item_material_is_cookable(content_t content) { if(content == CONTENT_TREE) return true; @@ -34,7 +34,7 @@ bool item_material_is_cookable(u8 content) return false; } -InventoryItem* item_material_create_cook_result(u8 content) +InventoryItem* item_material_create_cook_result(content_t content) { if(content == CONTENT_TREE) return new CraftItem("lump_of_coal", 1); |