des
/
pacman
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename variable and remove unneeded curlies

This commit is contained in:
Patricia Aas 2021-08-25 11:26:13 +02:00
parent 4b7015b96b
commit d196491ea4
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Ghost.cpp
View File

@ -145,15 +145,17 @@ void Ghost::updateDirection(const GameState & gameState) {
struct Move { struct Move {
Direction direction; Direction direction;
Position position; Position position;
double distance = std::numeric_limits<double>::infinity(); double distance_to_target = std::numeric_limits<double>::infinity();
}; };
const Position current_position = { double(current_grid_position.x), double(current_grid_position.y) }; const Position current_position = { double(current_grid_position.x), double(current_grid_position.y) };
const auto [x, y] = current_position; const auto [x, y] = current_position;
std::array<Move, 4> possible_moves = { { Move{ Direction::UP, { x, y - 1 } }, std::array<Move, 4> possible_moves = {
Move{ Direction::LEFT, { x - 1, y } }, Move{ Direction::UP, { x, y - 1 } },
Move{ Direction::DOWN, { x, y + 1 } }, Move{ Direction::LEFT, { x - 1, y } },
Move{ Direction::RIGHT, { x + 1, y } } } }; Move{ Direction::DOWN, { x, y + 1 } },
Move{ Direction::RIGHT, { x + 1, y } }
};
const Position target_position = target(gameState); const Position target_position = target(gameState);
@ -175,11 +177,11 @@ void Ghost::updateDirection(const GameState & gameState) {
if (!can_walk) if (!can_walk)
continue; continue;
move.distance = std::hypot(move.position.x - target_position.x, move.position.y - target_position.y); move.distance_to_target = std::hypot(move.position.x - target_position.x, move.position.y - target_position.y);
} }
const auto optimal_move = std::min_element(possible_moves.begin(), possible_moves.end(), [](const auto & a, const auto & b) { const auto optimal_move = std::min_element(possible_moves.begin(), possible_moves.end(), [](const auto & a, const auto & b) {
return a.distance < b.distance; return a.distance_to_target < b.distance_to_target;
}); });
auto move = *optimal_move; auto move = *optimal_move;