Skip to content

Commit 9e1ed5f

Browse files
committed
clang-tidy, input:
- fix more errors - remove duplicate call to get_menu_event
1 parent a41c76c commit 9e1ed5f

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

src/manager/sdl_key.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,9 @@ helper::expected<sdl::Key, std::string> sdl::Key::from_string(const std::string&
396396

397397
for (const auto& modifier : multiple) {
398398
const auto sdl_modifier = to_sdl_modifier(modifier);
399-
if (((other.m_modifiers & sdl_modifier) & (this->m_modifiers & sdl_modifier)) == 0) {
399+
if (((other.m_modifiers & sdl_modifier) & (this->m_modifiers & sdl_modifier) //NOLINT(misc-redundant-expression)
400+
)
401+
== 0) {
400402
return false;
401403
}
402404
}

src/scenes/single_player_game/single_player_game.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,15 +110,17 @@ namespace scenes {
110110

111111
const auto& game_input = m_game->game_input();
112112

113-
if ((game_input->get_menu_event(event) == input::MenuEvent::Pause
113+
const auto& menu_event = game_input->get_menu_event(event);
114+
115+
if ((menu_event == input::MenuEvent::Pause
114116
or input_manager->get_navigation_event(event) == input::NavigationEvent::BACK)
115117
and not m_game->is_game_finished()) {
116118
m_next_scene = NextScene::Pause;
117119
m_game->set_paused(true);
118120
return true;
119121
}
120122

121-
if (game_input->get_menu_event(event) == input::MenuEvent::OpenSettings) {
123+
if (menu_event == input::MenuEvent::OpenSettings) {
122124
m_next_scene = NextScene::Settings;
123125
return true;
124126
}

src/ui/components/label.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace ui {
2323
void render(const ServiceProvider& service_provider) const override;
2424

2525
[[nodiscard]] Widget::EventHandleResult
26-
handle_event(const std::shared_ptr<input::InputManager>& input_manager, const SDL_Event&) override;
26+
handle_event(const std::shared_ptr<input::InputManager>& input_manager, const SDL_Event& /*event*/) override;
2727

2828
void set_text(const ServiceProvider& service_provider, const std::string& text);
2929
};

0 commit comments

Comments
 (0)