From ee52b13ae63f098c4e26a9812b2088f80fcbe7cc Mon Sep 17 00:00:00 2001
From: Ray <raysan5@gmail.com>
Date: Wed, 16 Mar 2016 17:50:51 +0100
Subject: [PATCH] Corrected bug on GetCollisionRec()

---
 src/shapes.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/shapes.c b/src/shapes.c
index 51730a053..46095d11f 100644
--- a/src/shapes.c
+++ b/src/shapes.c
@@ -429,9 +429,24 @@ Rectangle GetCollisionRec(Rectangle rec1, Rectangle rec2)
                 retRec.height = rec2.height - dyy;
             }
         }
-
-        if (retRec.width >= rec2.width) retRec.width = rec2.width;
-        if (retRec.height >= rec2.height) retRec.height = rec2.height;
+		
+        if (rec1.width > rec2.width)
+        {
+            if (retRec.width >= rec2.width) retRec.width = rec2.width;
+        }
+        else
+        {
+            if (retRec.width >= rec1.width) retRec.width = rec1.width;
+        }
+        
+        if (rec1.height > rec2.height)
+        {
+            if (retRec.height >= rec2.height) retRec.height = rec2.height;
+        }
+        else
+        {
+           if (retRec.height >= rec1.height) retRec.height = rec1.height;
+        }
     }
 
     return retRec;