From 2f62f7ae1d27657a5d27f1dc16c45ee22583f58a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93lafur=20Waage?= Date: Thu, 9 Sep 2021 10:59:59 +0200 Subject: [PATCH] Reverting pellet C++20 changes since we don't target 20 fully. --- lib/Pellets.cpp | 6 +++++- lib/SuperPellets.cpp | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/Pellets.cpp b/lib/Pellets.cpp index 566b227..39de56d 100644 --- a/lib/Pellets.cpp +++ b/lib/Pellets.cpp @@ -7,7 +7,11 @@ Pellets::Pellets() : positions(initialPelletPositions()) {} bool Pellets::eatPelletAtPosition(GridPosition p) { - return std::erase(positions, p) > 0; + auto it = std::find(positions.begin(), positions.end(), p); + if (it == positions.end()) + return false; + positions.erase(it); + return true; } } // namespace pacman diff --git a/lib/SuperPellets.cpp b/lib/SuperPellets.cpp index 9fae338..0e851e6 100644 --- a/lib/SuperPellets.cpp +++ b/lib/SuperPellets.cpp @@ -7,7 +7,11 @@ SuperPellets::SuperPellets() : positions(initialSuperPelletPositions()) {} bool SuperPellets::eatPelletAtPosition(GridPosition p) { - return std::erase(positions, p) > 0; + auto it = std::find(positions.begin(), positions.end(), p); + if (it == positions.end()) + return false; + positions.erase(it); + return true; } } // namespace pacman