diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-08-13 13:14:55 +0200 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-08-13 13:14:55 +0200 |
| commit | c3c3d3a72d7517863f015364e62ca0dff46a6807 (patch) | |
| tree | 6cde75c125bf0f372f56e4671eacc310a01aeaa4 | |
| parent | Fixed forgotten error checking (diff) | |
| download | cuberite-c3c3d3a72d7517863f015364e62ca0dff46a6807.tar cuberite-c3c3d3a72d7517863f015364e62ca0dff46a6807.tar.gz cuberite-c3c3d3a72d7517863f015364e62ca0dff46a6807.tar.bz2 cuberite-c3c3d3a72d7517863f015364e62ca0dff46a6807.tar.lz cuberite-c3c3d3a72d7517863f015364e62ca0dff46a6807.tar.xz cuberite-c3c3d3a72d7517863f015364e62ca0dff46a6807.tar.zst cuberite-c3c3d3a72d7517863f015364e62ca0dff46a6807.zip | |
| -rw-r--r-- | src/CraftingRecipes.cpp | 4 | ||||
| -rw-r--r-- | src/CraftingRecipes.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/CraftingRecipes.cpp b/src/CraftingRecipes.cpp index 085b6e0d5..48178eecb 100644 --- a/src/CraftingRecipes.cpp +++ b/src/CraftingRecipes.cpp @@ -83,7 +83,7 @@ cItem & cCraftingGrid::GetItem(int x, int y) const -void cCraftingGrid::SetItem(int x, int y, ENUM_ITEM_ID a_ItemType, int a_ItemCount, short a_ItemHealth) +void cCraftingGrid::SetItem(int x, int y, ENUM_ITEM_ID a_ItemType, char a_ItemCount, short a_ItemHealth) { // Accessible through scripting, must verify parameters: if ((x < 0) || (x >= m_Width) || (y < 0) || (y >= m_Height)) @@ -228,7 +228,7 @@ void cCraftingRecipe::Clear(void) -void cCraftingRecipe::SetResult(ENUM_ITEM_ID a_ItemType, int a_ItemCount, short a_ItemHealth) +void cCraftingRecipe::SetResult(ENUM_ITEM_ID a_ItemType, char a_ItemCount, short a_ItemHealth) { m_Result = cItem(a_ItemType, a_ItemCount, a_ItemHealth); } diff --git a/src/CraftingRecipes.h b/src/CraftingRecipes.h index 0250d2f68..fe1e15817 100644 --- a/src/CraftingRecipes.h +++ b/src/CraftingRecipes.h @@ -33,7 +33,7 @@ public: int GetWidth (void) const {return m_Width; } int GetHeight(void) const {return m_Height; } cItem & GetItem (int x, int y) const; - void SetItem (int x, int y, ENUM_ITEM_ID a_ItemType, int a_ItemCount, short a_ItemHealth); + void SetItem (int x, int y, ENUM_ITEM_ID a_ItemType, char a_ItemCount, short a_ItemHealth); void SetItem (int x, int y, const cItem & a_Item); void Clear (void); @@ -72,13 +72,13 @@ public: int GetIngredientsHeight(void) const {return m_Ingredients.GetHeight(); } cItem & GetIngredient (int x, int y) const {return m_Ingredients.GetItem(x, y); } const cItem & GetResult (void) const {return m_Result; } - void SetResult (ENUM_ITEM_ID a_ItemType, int a_ItemCount, short a_ItemHealth); + void SetResult (ENUM_ITEM_ID a_ItemType, char a_ItemCount, short a_ItemHealth); void SetResult (const cItem & a_Item) { m_Result = a_Item; } - void SetIngredient (int x, int y, ENUM_ITEM_ID a_ItemType, int a_ItemCount, short a_ItemHealth) + void SetIngredient (int x, int y, ENUM_ITEM_ID a_ItemType, char a_ItemCount, short a_ItemHealth) { m_Ingredients.SetItem(x, y, a_ItemType, a_ItemCount, a_ItemHealth); } |