grant/Isaacpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add cancel parameter for Spawner::for_each

Browse Source
This commit is contained in:
Grant Horner
2025-12-04 10:30:05 -05:00
parent eec22cd791
commit 5abfedb205
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
main.cpp
View File

@@ -164,10 +164,11 @@ void update_tears() {
} }
} }
enemy_spawner.for_each([&center, &active](auto &enemy) { enemy_spawner.for_each([&center, &active](auto &enemy, auto& cancel) {
if (enemy.alive() && CheckCollisionCircles(center, player.tear_radius, enemy.center, enemy.radius)) { if (enemy.alive() && CheckCollisionCircles(center, player.tear_radius, enemy.center, enemy.radius)) {
active = false; active = false;
if (--enemy.hp == 0) score++; if (--enemy.hp == 0) score++;
cancel = true;
} }
}); });
@@ -265,7 +266,7 @@ int main() {
} }
} }
enemy_spawner.for_each([now](Enemy &enemy) { enemy_spawner.for_each([now](Enemy &enemy, auto& cancel) {
if (enemy.alive()) { if (enemy.alive()) {
enemy.center = Vector2MoveTowards(enemy.center, player.center(), enemy.speed); enemy.center = Vector2MoveTowards(enemy.center, player.center(), enemy.speed);
const Color enemy_color = enemy.hp == 1 ? PINK : enemy.hp == 2 ? ORANGE : RED; const Color enemy_color = enemy.hp == 1 ? PINK : enemy.hp == 2 ? ORANGE : RED;
@@ -285,7 +286,7 @@ int main() {
} }
}); });
item_spawner.for_each([&item_pickup_text_buffer, now, &item_last_picked_up](Item &item) { item_spawner.for_each([&item_pickup_text_buffer, now, &item_last_picked_up](Item &item, auto& cancel) {
if (!item.active) return; if (!item.active) return;
DrawCircleV(item.center, item.radius, item.color()); DrawCircleV(item.center, item.radius, item.color());

4
spawner.h
View File

@@ -24,7 +24,9 @@ struct Spawner {
void for_each(F&& func) { void for_each(F&& func) {
std::lock_guard lock{mutex}; std::lock_guard lock{mutex};
for (auto& value : values) { for (auto& value : values) {
func(value); bool cancel = false;
func(value, cancel);
if (cancel) break;;
} }
} }