Browse Source

Clang-tidy: readability-static-accessed-through-instance

pull/2243/head
Anders Jenbo 5 years ago
parent
commit
2641932763
  1. 2
      Source/controls/controller.cpp
  2. 4
      Source/controls/controller_motion.cpp

2
Source/controls/controller.cpp

@ -38,7 +38,7 @@ ControllerButtonEvent ToControllerButtonEvent(const SDL_Event &event)
const Joystick *joystick = Joystick::Get(event);
if (joystick != nullptr)
result.button = joystick->ToControllerButton(event);
result.button = devilution::Joystick::ToControllerButton(event);
return result;
}

4
Source/controls/controller_motion.cpp

@ -130,13 +130,13 @@ bool ProcessControllerMotion(const SDL_Event &event, ControllerButtonEvent ctrlE
{
#ifndef USE_SDL1
GameController *const controller = GameController::Get(event);
if (controller != nullptr && controller->ProcessAxisMotion(event)) {
if (controller != nullptr && devilution::GameController::ProcessAxisMotion(event)) {
ScaleJoysticks();
return true;
}
#endif
Joystick *const joystick = Joystick::Get(event);
if (joystick != nullptr && joystick->ProcessAxisMotion(event)) {
if (joystick != nullptr && devilution::Joystick::ProcessAxisMotion(event)) {
ScaleJoysticks();
return true;
}

Loading…
Cancel
Save