From 75e0b38d835d5707494218748a404bc284f37852 Mon Sep 17 00:00:00 2001 From: tonibm19 Date: Mon, 10 Feb 2014 18:17:44 +0100 Subject: Maybe fixed boat placing --- src/Items/ItemBoat.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/Items/ItemBoat.h b/src/Items/ItemBoat.h index 31d1ca52e..dd6eaaf14 100644 --- a/src/Items/ItemBoat.h +++ b/src/Items/ItemBoat.h @@ -31,7 +31,7 @@ public: virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override { - if (a_Dir != BLOCK_FACE_YM || a_Dir != BLOCK_FACE_NONE) + if (a_Dir > 0) { return false; } -- cgit v1.2.3 From 23f69bc0931a6b2f5b9575283abb6c63d306655a Mon Sep 17 00:00:00 2001 From: worktycho Date: Mon, 10 Feb 2014 17:59:17 +0000 Subject: Fixed stupid mistax in conditional boats can't be placed if the face is not block_face_none and not block_face_YM, not if it is only not one. --- src/Items/ItemBoat.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src') diff --git a/src/Items/ItemBoat.h b/src/Items/ItemBoat.h index 31d1ca52e..929533c9c 100644 --- a/src/Items/ItemBoat.h +++ b/src/Items/ItemBoat.h @@ -1,4 +1,3 @@ - // ItemBoat.h // Declares the various boat ItemHandlers @@ -31,7 +30,7 @@ public: virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override { - if (a_Dir != BLOCK_FACE_YM || a_Dir != BLOCK_FACE_NONE) + if (a_Dir != BLOCK_FACE_YM && a_Dir != BLOCK_FACE_NONE) { return false; } -- cgit v1.2.3 From 7ad4a86c4947a619951db9fdad4f37bbb4252236 Mon Sep 17 00:00:00 2001 From: worktycho Date: Mon, 10 Feb 2014 18:06:49 +0000 Subject: Added additional parenthasies --- src/Items/ItemBoat.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src') diff --git a/src/Items/ItemBoat.h b/src/Items/ItemBoat.h index b45485251..a28ec8e22 100644 --- a/src/Items/ItemBoat.h +++ b/src/Items/ItemBoat.h @@ -1,4 +1,3 @@ - // ItemBoat.h // Declares the various boat ItemHandlers @@ -31,7 +30,7 @@ public: virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override { - if (a_Dir != BLOCK_FACE_YM && a_Dir != BLOCK_FACE_NONE) + if ((a_Dir != BLOCK_FACE_YM) && (a_Dir != BLOCK_FACE_NONE)) { return false; } -- cgit v1.2.3