From 46bb9d42f66c425b7300daad01d0fe99e23cd91c Mon Sep 17 00:00:00 2001
From: William Brawner <me@wbrawner.com>
Date: Sun, 30 May 2021 18:23:22 -0600
Subject: [PATCH] Refactor InGameMenu::getBtn* and GUI::getControl(Ptr) for
 brevity

Signed-off-by: William Brawner <me@wbrawner.com>
---
 src/engine/game/gui/ingame/ingame.cpp | 10 ++--------
 src/engine/gui/gui.cpp                | 20 ++++++--------------
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/src/engine/game/gui/ingame/ingame.cpp b/src/engine/game/gui/ingame/ingame.cpp
index df02b1f6..de266c6d 100644
--- a/src/engine/game/gui/ingame/ingame.cpp
+++ b/src/engine/game/gui/ingame/ingame.cpp
@@ -250,17 +250,11 @@ void InGameMenu::onClick(const string &control) {
 }
 
 shared_ptr<Button> InGameMenu::getBtnChange2() {
-    if (!isTSL(_game->gameId())) {
-        return nullptr;
-    }
-    return getControlPtr<Button>("BTN_CHANGE2");
+    return isTSL(_game->gameId()) ? getControlPtr<Button>("BTN_CHANGE2") : nullptr;
 }
 
 shared_ptr<Button> InGameMenu::getBtnChange3() {
-    if (!isTSL(_game->gameId())) {
-        return nullptr;
-    }
-    return getControlPtr<Button>("BTN_CHANGE3");
+    return isTSL(_game->gameId()) ? getControlPtr<Button>("BTN_CHANGE3") : nullptr;
 }
 
 } // namespace game
diff --git a/src/engine/gui/gui.cpp b/src/engine/gui/gui.cpp
index 7fa89ac7..9feb105e 100644
--- a/src/engine/gui/gui.cpp
+++ b/src/engine/gui/gui.cpp
@@ -324,24 +324,16 @@ void GUI::setControlDiscardColor(const string &tag, glm::vec3 color) {
 }
 
 Control &GUI::getControl(const string &tag) const {
-    auto it = find_if(
-        _controls.begin(),
-        _controls.end(),
-        [&tag](auto &ctrl) { return ctrl->tag() == tag; });
-
-    if (it != _controls.end()) return **it;
-
+    for (auto &control : _controls) {
+        if (control->tag() == tag) return *control;
+    }
     throw runtime_error("Control not found: " + tag);
 }
 
 shared_ptr<Control> GUI::getControlPtr(const string &tag) const {
-    auto it = find_if(
-        _controls.begin(),
-        _controls.end(),
-        [&tag](auto &ctrl) { return ctrl->tag() == tag; });
-
-    if (it != _controls.end()) return *it;
-
+    for (auto &control : _controls) {
+        if (control->tag() == tag) return control;
+    }
     throw runtime_error("Control not found: " + tag);
 }