?
This commit is contained in:
parent
8de0dc19dd
commit
e7ffed3005
1 changed files with 14 additions and 9 deletions
|
@ -156,23 +156,28 @@ bool PlateauSafari::deplacementValideCoor(const int x1, const int y1,
|
||||||
Position pos1 = barriere->getPos();
|
Position pos1 = barriere->getPos();
|
||||||
Position pos2 = barriere->getPos2();
|
Position pos2 = barriere->getPos2();
|
||||||
|
|
||||||
|
/* Conditions si vrai = bloqués */
|
||||||
// Gauche vers droite
|
// Gauche vers droite
|
||||||
const bool gvd = std::max(pos1.first, pos2.first) >= std::max(x1, x2);
|
const bool gvd =
|
||||||
|
y1 == y2 && x1 > x2 && x2 >= std::max(pos1.first, pos2.first);
|
||||||
// Droite vers gauche
|
// Droite vers gauche
|
||||||
const bool dvg = std::min(pos1.first, pos2.first) <= std::min(x1, x2);
|
const bool dvg =
|
||||||
|
y1 == y2 && x1 < x2 && x2 <= std::min(pos1.first, pos2.first);
|
||||||
// Haut vers bas / Descendre
|
// Haut vers bas / Descendre
|
||||||
const bool hvb = std::max(pos1.second, pos2.second) >= std::max(y1, y2);
|
const bool hvb =
|
||||||
|
x1 == x2 && y1 < y2 && y2 >= std::max(pos1.second, pos2.second);
|
||||||
// Bas vers haut / Monter
|
// Bas vers haut / Monter
|
||||||
const bool bvh = std::min(pos1.second, pos2.second) <= std::min(y1, y2);
|
const bool bvh =
|
||||||
|
x1 == x2 && y1 > y2 && y2 <= std::min(pos1.second, pos2.second);
|
||||||
|
|
||||||
if (d) {
|
if (d) {
|
||||||
std::cout << std::boolalpha << "barriere" << pos1.first << ","
|
std::cout << std::boolalpha << "barriere " << pos1.first << ","
|
||||||
<< pos1.second << "|" << pos2.first << "," << pos2.second
|
<< pos1.second << " | " << pos2.first << "," << pos2.second
|
||||||
<< " et pieces" << x1 << "," << y1 << "|" << x2 << "," << y2
|
<< " et pieces " << x1 << "," << y1 << " | " << x2 << "," << y2
|
||||||
<< "=> " << gvd << " " << dvg << " " << hvb << " " << bvh << " "
|
<< " => " << gvd << " " << dvg << " " << hvb << " " << bvh
|
||||||
<< std::endl;
|
<< std::endl;
|
||||||
}
|
}
|
||||||
if (gvd && dvg && hvb && bvh) {
|
if (gvd || dvg || hvb || bvh) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Reference in a new issue