wbrawner/reone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor InGameMenu::getBtn* and GUI::getControl(Ptr) for brevity

Browse source 
Signed-off-by: William Brawner <me@wbrawner.com>
This commit is contained in:
William Brawner 2021-05-30 18:23:22 -06:00 committed by seedhartha
parent 6fd62fc65c
commit 46bb9d42f6
2 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/engine/game/gui/ingame/ingame.cpp
View file

@ -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

20
src/engine/gui/gui.cpp
View file

@ -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);
}