From 8cc101b3b0ea7b0ddc17016722f2d9f97d9b95e0 Mon Sep 17 00:00:00 2001 From: kalaposfos13 <153381648+kalaposfos13@users.noreply.github.com> Date: Thu, 27 Feb 2025 14:15:14 +0100 Subject: [PATCH] clang --- src/core/libraries/pad/pad.cpp | 2 +- src/input/controller.h | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/core/libraries/pad/pad.cpp b/src/core/libraries/pad/pad.cpp index a62afc1a9..b9ddd8ba9 100644 --- a/src/core/libraries/pad/pad.cpp +++ b/src/core/libraries/pad/pad.cpp @@ -365,7 +365,7 @@ int PS4_SYSV_ABI scePadReadState(s32 handle, OrbisPadData* pData) { int connectedCount = 0; bool isConnected = false; Input::State state; - controllers[ handle - 1]->ReadState(&state, &isConnected, &connectedCount); + controllers[handle - 1]->ReadState(&state, &isConnected, &connectedCount); pData->buttons = state.buttonsState; pData->leftStick.x = state.axes[static_cast(Input::Axis::LeftX)]; pData->leftStick.y = state.axes[static_cast(Input::Axis::LeftY)]; diff --git a/src/input/controller.h b/src/input/controller.h index e4a0adc3e..a60a83dea 100644 --- a/src/input/controller.h +++ b/src/input/controller.h @@ -47,7 +47,8 @@ inline int GetAxis(int min, int max, int value) { constexpr u32 MAX_STATES = 32; class GameController { -friend class GameControllers; + friend class GameControllers; + public: GameController(); virtual ~GameController() = default; @@ -91,8 +92,11 @@ private: class GameControllers { std::array controllers; + public: - GameControllers() : controllers({new GameController(), new GameController(), new GameController(), new GameController()}) {}; + GameControllers() + : controllers({new GameController(), new GameController(), new GameController(), + new GameController()}) {}; virtual ~GameControllers() = default; GameController* operator[](const size_t& i) const { if (i > 3) {