Skip to content

Commit bf5f489

Browse files
committed
Engine: Rewrite find broadcast methods
1 parent d7b86ef commit bf5f489

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

src/engine/internal/engine.cpp

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -755,24 +755,22 @@ std::shared_ptr<Broadcast> Engine::broadcastAt(int index) const
755755

756756
int Engine::findBroadcast(const std::string &broadcastName) const
757757
{
758-
int i = 0;
759-
for (auto broadcast : m_broadcasts) {
760-
if (broadcast->name() == broadcastName)
761-
return i;
762-
i++;
763-
}
764-
return -1;
758+
auto it = std::find_if(m_broadcasts.begin(), m_broadcasts.end(), [broadcastName](std::shared_ptr<Broadcast> broadcast) { return broadcast->name() == broadcastName; });
759+
760+
if (it == m_broadcasts.end())
761+
return -1;
762+
else
763+
return it - m_broadcasts.begin();
765764
}
766765

767766
int Engine::findBroadcastById(const std::string &broadcastId) const
768767
{
769-
int i = 0;
770-
for (auto broadcast : m_broadcasts) {
771-
if (broadcast->id() == broadcastId)
772-
return i;
773-
i++;
774-
}
775-
return -1;
768+
auto it = std::find_if(m_broadcasts.begin(), m_broadcasts.end(), [broadcastId](std::shared_ptr<Broadcast> broadcast) { return broadcast->id() == broadcastId; });
769+
770+
if (it == m_broadcasts.end())
771+
return -1;
772+
else
773+
return it - m_broadcasts.begin();
776774
}
777775

778776
void Engine::addGreenFlagScript(std::shared_ptr<Block> hatBlock)

0 commit comments

Comments
 (0)