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/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/inventory.h')
| -rw-r--r-- | src/inventory.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/inventory.h b/src/inventory.h index 07d81a3f7..5c64f89bb 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -30,8 +30,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "common_irrlicht.h" #include "debug.h" #include "mapblockobject.h" -// For g_materials -#include "main.h" +#include "main.h" // For g_materials +#include "mapnode.h" // For content_t #define QUANTITY_ITEM_MAX_COUNT 99 @@ -113,7 +113,7 @@ protected: class MaterialItem : public InventoryItem { public: - MaterialItem(u8 content, u16 count): + MaterialItem(content_t content, u16 count): InventoryItem(count) { m_content = content; @@ -175,12 +175,12 @@ public: /* Special methods */ - u8 getMaterial() + content_t getMaterial() { return m_content; } private: - u8 m_content; + content_t m_content; }; //TODO: Remove |