summaryrefslogtreecommitdiffstats
path: root/src/Items
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-07-17 23:15:53 +0200
committermadmaxoft <github@xoft.cz>2014-07-17 23:16:55 +0200
commitc03161f75d22a7965aea20fb9843ae580a07079a (patch)
treeabb301835bb65031bee9e040bde43dd078164692 /src/Items
parentMore trailing whitespace fixes. (diff)
downloadcuberite-c03161f75d22a7965aea20fb9843ae580a07079a.tar
cuberite-c03161f75d22a7965aea20fb9843ae580a07079a.tar.gz
cuberite-c03161f75d22a7965aea20fb9843ae580a07079a.tar.bz2
cuberite-c03161f75d22a7965aea20fb9843ae580a07079a.tar.lz
cuberite-c03161f75d22a7965aea20fb9843ae580a07079a.tar.xz
cuberite-c03161f75d22a7965aea20fb9843ae580a07079a.tar.zst
cuberite-c03161f75d22a7965aea20fb9843ae580a07079a.zip
Diffstat (limited to 'src/Items')
-rw-r--r--src/Items/ItemFishingRod.h2
-rw-r--r--src/Items/ItemHandler.cpp14
2 files changed, 8 insertions, 8 deletions
diff --git a/src/Items/ItemFishingRod.h b/src/Items/ItemFishingRod.h
index 0c07cd422..6350a38ba 100644
--- a/src/Items/ItemFishingRod.h
+++ b/src/Items/ItemFishingRod.h
@@ -63,7 +63,7 @@ class cSweepEntityCallback :
{
public:
cSweepEntityCallback(Vector3d a_PlayerPos) :
- m_PlayerPos(a_PlayerPos)
+ m_PlayerPos(a_PlayerPos)
{
}
diff --git a/src/Items/ItemHandler.cpp b/src/Items/ItemHandler.cpp
index 3e02a43fa..178bc2fca 100644
--- a/src/Items/ItemHandler.cpp
+++ b/src/Items/ItemHandler.cpp
@@ -459,13 +459,13 @@ bool cItemHandler::IsTool()
{
// TODO: Rewrite this to list all tools specifically
return
- (m_ItemType >= 256 && m_ItemType <= 259)
- || (m_ItemType == 261)
- || (m_ItemType >= 267 && m_ItemType <= 279)
- || (m_ItemType >= 283 && m_ItemType <= 286)
- || (m_ItemType >= 290 && m_ItemType <= 294)
- || (m_ItemType == 325)
- || (m_ItemType == 346);
+ ((m_ItemType >= 256) && (m_ItemType <= 259)) ||
+ (m_ItemType == 261) ||
+ ((m_ItemType >= 267) && (m_ItemType <= 279)) ||
+ ((m_ItemType >= 283) && (m_ItemType <= 286)) ||
+ ((m_ItemType >= 290) && (m_ItemType <= 294)) ||
+ (m_ItemType == 325) ||
+ (m_ItemType == 346);
}