]> rtime.felk.cvut.cz Git - hubacji1/bcar.git/commitdiff
Fix collide
authorJiri Vlasak <jiri.vlasak.2@cvut.cz>
Mon, 19 Jul 2021 14:45:10 +0000 (16:45 +0200)
committerJiri Vlasak <jiri.vlasak.2@cvut.cz>
Tue, 20 Jul 2021 14:49:17 +0000 (16:49 +0200)
src/pslot.cc

index f23bd70fa2d55ebb9dfa9b218e838fe7c393551d..ec6462776b71842d65313b7c107e2c250db140e6 100644 (file)
@@ -131,17 +131,17 @@ bool
 ParkingSlot::collide(BicycleCar const& c) const
 {
        return c.left().intersects_with(this->rear_)
-               && c.left().intersects_with(this->curb_)
-               && c.left().intersects_with(this->front_)
-               && c.rear().intersects_with(this->rear_)
-               && c.rear().intersects_with(this->curb_)
-               && c.rear().intersects_with(this->front_)
-               && c.right().intersects_with(this->rear_)
-               && c.right().intersects_with(this->curb_)
-               && c.right().intersects_with(this->front_)
-               && c.front().intersects_with(this->rear_)
-               && c.front().intersects_with(this->curb_)
-               && c.front().intersects_with(this->front_);
+               || c.left().intersects_with(this->curb_)
+               || c.left().intersects_with(this->front_)
+               || c.rear().intersects_with(this->rear_)
+               || c.rear().intersects_with(this->curb_)
+               || c.rear().intersects_with(this->front_)
+               || c.right().intersects_with(this->rear_)
+               || c.right().intersects_with(this->curb_)
+               || c.right().intersects_with(this->front_)
+               || c.front().intersects_with(this->rear_)
+               || c.front().intersects_with(this->curb_)
+               || c.front().intersects_with(this->front_);
 }
 
 std::vector<BicycleCar>