|
@@ -215,12 +215,11 @@ class World
|
|
|
} while (!targetIsReached && !open.empty());
|
|
} while (!targetIsReached && !open.empty());
|
|
|
|
|
|
|
|
// Remove origin and target
|
|
// Remove origin and target
|
|
|
- if (!discovered.empty()) {
|
|
+ if (!discovered.empty() && discovered.front() == origin)
|
|
|
discovered.pop_front();
|
|
discovered.pop_front();
|
|
|
|
|
|
|
|
- if (!discovered.empty())
|
|
+ if (!discovered.empty() && discovered.back() == target)
|
|
|
- discovered.pop_back();
|
|
+ discovered.pop_back();
|
|
|
- }
|
|
|
|
|
|
|
|
|
|
// Build path
|
|
// Build path
|
|
|
if (targetIsReached) {
|
|
if (targetIsReached) {
|
