diff options
author | madmaxoft <github@xoft.cz> | 2014-07-17 16:33:09 +0200 |
---|---|---|
committer | madmaxoft <github@xoft.cz> | 2014-07-17 16:33:09 +0200 |
commit | 993fd14ddfc881cf5be951df77da0338124d68cc (patch) | |
tree | 828cd0c784698ca4533aeaf2592d9fed75fe55a3 /src/CraftingRecipes.cpp | |
parent | Merge pull request #1183 from Howaner/Sounds (diff) | |
download | cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.tar cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.tar.gz cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.tar.bz2 cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.tar.lz cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.tar.xz cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.tar.zst cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.zip |
Diffstat (limited to 'src/CraftingRecipes.cpp')
-rw-r--r-- | src/CraftingRecipes.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/CraftingRecipes.cpp b/src/CraftingRecipes.cpp index 0f1951351..a2ce359f3 100644 --- a/src/CraftingRecipes.cpp +++ b/src/CraftingRecipes.cpp @@ -135,7 +135,7 @@ void cCraftingGrid::ConsumeGrid(const cCraftingGrid & a_Grid) { if ((a_Grid.m_Width != m_Width) || (a_Grid.m_Height != m_Height)) { - LOGWARNING("Consuming a grid of different dimensions: (%d, %d) vs (%d, %d)", + LOGWARNING("Consuming a grid of different dimensions: (%d, %d) vs (%d, %d)", a_Grid.m_Width, a_Grid.m_Height, m_Width, m_Height ); } @@ -196,7 +196,7 @@ void cCraftingGrid::Dump(void) #ifdef _DEBUG int idx = x + m_Width * y; #endif - LOGD("Slot (%d, %d): Type %d, health %d, count %d", + LOGD("Slot (%d, %d): Type %d, health %d, count %d", x, y, m_Items[idx].m_ItemType, m_Items[idx].m_ItemDamage, m_Items[idx].m_ItemCount ); } @@ -250,7 +250,7 @@ void cCraftingRecipe::Dump(void) { LOGD("Recipe ingredients:"); m_Ingredients.Dump(); - LOGD("Result: Type %d, health %d, count %d", + LOGD("Result: Type %d, health %d, count %d", m_Result.m_ItemType, m_Result.m_ItemDamage, m_Result.m_ItemCount ); } @@ -665,7 +665,7 @@ cCraftingRecipes::cRecipe * cCraftingRecipes::MatchRecipe(const cItem * a_Crafti const cItem & Item = itrS->m_Item; if ( - (itrS->x >= a_GridWidth) || + (itrS->x >= a_GridWidth) || (itrS->y >= a_GridHeight) || (Item.m_ItemType != a_CraftingGrid[GridID].m_ItemType) || // same item type? (Item.m_ItemCount > a_CraftingGrid[GridID].m_ItemCount) || // not enough items |