Updated functional tests, fixed defects found in the review

 - Reviewed by Henri Lampela

diff --git a/doc/testing/functionality-tests.doc b/doc/testing/functionality-tests.doc
index 2f0b811..abe8e45 100644 (file)
Binary files a/doc/testing/functionality-tests.doc and b/doc/testing/functionality-tests.doc differ

diff --git a/src/map/frienditemshandler.cpp b/src/map/frienditemshandler.cpp
index e116c22..55fd84a 100644 (file)
--- a/src/map/frienditemshandler.cpp
+++ b/src/map/frienditemshandler.cpp
@@ -107,11 +107,11 @@ bool FriendItemsHandler::collides(BaseLocationItem *item1, BaseLocationItem *ite
     if (item1Rect.intersects(item2Rect))
         return true;
 
-    if (item1Rect.left() < MAP_MIN_PIXEL_X + item1Rect.width() / 2) {
+    if (item1Rect.left() < (MAP_MIN_PIXEL_X + item1Rect.width() / 2)) {
         QRect translated = item1Rect.translated(MAP_PIXELS_X, 0);
         if (translated.intersects(item2Rect))
             return true;
-    } else if (item1Rect.right() > MAP_MAX_PIXEL_X  - item1Rect.width() / 2) {
+    } else if (item1Rect.right() > (MAP_MAX_PIXEL_X  - item1Rect.width() / 2)) {
         QRect translated = item1Rect.translated(-MAP_PIXELS_X, 0);
         if (translated.intersects(item2Rect))
             return true;