This commit is contained in:
Yorick
2015-04-07 14:49:00 +02:00
parent 41b4c5db8f
commit 284823c28b
+11 -11
View File
@@ -105,13 +105,13 @@ public class Visitor
possible = false;
}
}
// for (Visitor object : visitors)
// {
// if (hitTestVisitor(object) && object != this)
// {
// possible = false;
// }
// }
for (Visitor object : visitors)
{
if (hitTestVisitor(object) && object != this)
{
possible = false;
}
}
if (possible == false)
{
position = oldPosition;
@@ -216,8 +216,8 @@ public class Visitor
}
// public boolean hitTestVisitor(Visitor v)
// {
// return (getEndX() >= v.position.getX() && getEndY() >= v.position.getY() && v.getEndX() >= position.getX() && v.getEndY() >= position.getY());
// }
public boolean hitTestVisitor(Visitor v)
{
return (getEndX() >= v.position.getX() && getEndY() >= v.position.getY() && v.getEndX() >= position.getX() && v.getEndY() >= position.getY());
}
}