From e3420a0d3db79f0e0216c4fca2fc91078ddb4543 Mon Sep 17 00:00:00 2001
From: Jean Fabre-Monplaisir <jean-isaac-fm@live.fr>
Date: Mon, 2 Feb 2015 01:40:47 +0100
Subject: line collisions

---
 problem.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/problem.cpp b/problem.cpp
index de6461e..a6d48c5 100644
--- a/problem.cpp
+++ b/problem.cpp
@@ -66,7 +66,8 @@ bool hilare_a_mvt::intersects(const obstacle &o) const {
 		return false;
 
 	}
-	if (o.c.r >= segment(from.pos(),to.pos()).dist(o.c.c))return true ;
+	if (o.c.r + p->r_c_car >= segment(from.pos(),to.pos()).dist(o.c.c)) return true ;
+	if (o.c.r + p->r_c_trolley >= segment(from.pos_trolley(),to.pos_trolley()).dist(o.c.c)) return true ;
 	return false;
 }
 
-- 
cgit v1.2.3